Release 1.0.0 beta.5

CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [unreleased]
+### Added
+### Changed
+### Fixed
+### Removed
+
+## [1.0.0-beta.5] - 2018-05-08
+### Added
+- Add "wait-on" options to configuration.
+- Add "abort-on-error" configuration option for services.
+- Add "Standard" directories option to configuration.
+- Specs can be defined as an Array of paths to files or folders.
+- Services can wait for other services.
+- Add narval default environment variables to all commands, services and tests.
+- Write services logs to files. These files are available inside Docker containers too.
+- Add integration tests.
+
+### Changed
+- Use "wait-on" instead of "wait-for" inside Docker.
+- Changed method to start Docker services internally. Now use "docker-compose-up start" command independently for each service, for better control.
+
+### Fixed
+- Do not force process exit on finish. Let it exit gracefully.
+- Install mandatory nodejs dependencies in Docker containers only in containers with nodejs available.
+
+### Removed
+- Remove "depends_on" docker-containers property. Not necessary any more because of new feature "wait-on".
+
 ## [1.0.0-beta.4] - 2018-04-25
 ### Added
 - Add "shell" option.

lib/commands.js

@@ -9,13 +9,8 @@ const _ = require('lodash')
 
 const options = require('./options')
 const istanbulMocha = require('./istanbul-mocha')
-
-const logProcessData = function (data) {
-  data = _.trim(data)
-  if (data.length) {
-    console.log(data)
-  }
-}
+const processLogs = require('./process-logs')
+const tracer = require('./tracer')
 
 const windowsBaseCommand = function () {
   return {
@@ -59,34 +54,43 @@ const run = function (command, opts) {
   return getBaseCommand()
     .then((baseCommand) => {
       return new Promise((resolve, reject) => {
-        let proc = childProcess.spawn(baseCommand.cmd, baseCommand.args.concat(path.join(process.cwd(), command)), {
+        let logs
+        const proc = childProcess.spawn(baseCommand.cmd, baseCommand.args.concat(path.join(process.cwd(), command)), {
           cwd: process.cwd(),
           env: _.extend({}, process.env, {
             FORCE_COLOR: true
           }, opts.env),
           windowsHide: true,
           windowsVerbatimArguments: true
         })
-
-        proc.stdout.setEncoding('utf8')
-        proc.stdout.on('data', (data) => {
-          logProcessData(data)
+        logs = new processLogs.Handler(proc, {
+          type: opts.suiteType,
+          suite: opts.suite,
+          service: opts.service
+        }, {
+          close: true
         })
 
-        proc.stderr.on('data', (data) => {
-          logProcessData(data)
+        proc.on('error', (err) => {
+          tracer.error(`Error trying to run command. ${err.message}`)
+          reject(err)
         })
 
+        proc.stdout.setEncoding('utf8')
+
         if (opts.sync) {
-          proc.on('close', (code) => {
-            if (code !== null && code !== 0) {
-              reject(new Error(`Error running command. Exit code ${code}`))
+          logs.on('close', (logData) => {
+            if (logData.processCode !== null && logData.processCode !== 0) {
+              reject(new Error(`Error running command. Exit code ${logData.processCode}`))
             } else {
               resolve(0)
             }
           })
         } else {
-          resolve(proc)
+          resolve({
+            process: proc,
+            logs: logs
+          })
         }
       })
     })

lib/config.js

@@ -72,8 +72,13 @@ const checkDockerContainers = function (customConfig) {
   return customConfig['docker-containers'] || []
 }
 
+const checkStandardConfig = function (customConfig) {
+  return customConfig.standard || {}
+}
+
 const checkConfig = function (configs) {
   return Promise.props({
+    standard: checkStandardConfig(configs.custom),
     dockerImages: checkDockerImages(configs.custom),
     dockerContainers: checkDockerContainers(configs.custom),
     suitesByType: getSuitesByType(configs.custom, configs.default)

lib/docker-resources/.narval/scripts/run-cmd.sh

@@ -4,7 +4,7 @@ command_to_run=$1
 command_params=$2
 coverage_options=$3
 coverage_enabled=$4
-wait_for=$5
+wait_on=$5
 exit_after=$6
 
 log_title="[Narval] [DEBUG]"
@@ -16,7 +16,7 @@ log_sep="================================"
 # echo "$log_title command_params: $command_params"
 # echo "$log_title coverage_options: $coverage_options"
 # echo "$log_title coverage_enabled: $coverage_enabled"
-# echo "$log_title wait_for: $wait_for"
+# echo "$log_title wait_on: $wait_on"
 # echo "$log_title exit_after: $exit_after"
 
 if [ -z "$command_to_run" ]; then
@@ -43,8 +43,9 @@ else
     command_to_run="node_modules/.bin/narval-msc-istanbul $coverage_options cover ./$command_to_run"
   fi
 
-  if [ "$wait_for" != "" ]; then
-    command_to_run=".narval/scripts/wait-for-it.sh $wait_for -- ./$command_to_run"
+  if [ "$wait_on" != "" ]; then
+    echo "WAITING FOR: $wait_on"
+    wait-on $wait_on
   fi
 
   echo "$log_sep"