concurrently 2.1.0 → 2.2.0

package/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/kimmobrunfeldt/concurrently.svg)](https://travis-ci.org/kimmobrunfeldt/concurrently)
 
-**Version: 2.1.0** ([*previous stable*](https://github.com/kimmobrunfeldt/concurrently/tree/2.0.0))
+**Version: 2.2.0** ([*previous stable*](https://github.com/kimmobrunfeldt/concurrently/tree/2.1.0))
 
 Run multiple commands concurrently.
 Like `npm run watch-js & npm run watch-less` but better.
@@ -45,8 +45,9 @@ Options:
   -V, --version                     output the version number
   -k, --kill-others                 kill other processes if one exits or dies
   --no-color                        disable colors from logging
+  --names                           names different processes, i.e --name "web,api,hot-server" to be used in the prefix switch
   -p, --prefix <prefix>             prefix used in logging for each process.
-  Possible values: index, pid, time, command, none or a template. Default: index. Example template "{time}-{pid}"
+  Possible values: index, pid, time, command, name, none or a template. Default: index. Example template "{time}-{pid}"
 
   -tf, --timestamp-format <format>  specify the timestamp in moment format. Default: YYYY-MM-DD HH:mm:ss.SSS
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "concurrently",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "description": "Run commands concurrently",
     "main": "src/main.js",
     "bin": {

package/src/main.js

@@ -8,6 +8,7 @@ var program = require('commander');
 var _ = require('lodash');
 var chalk = require('chalk');
 var spawn = Promise.promisifyAll(require('cross-spawn'));
+var isWindows = /^win/.test(process.platform);
 
 var config = {
     // Kill other processes if one dies
@@ -209,6 +210,9 @@ function run(commands) {
         var parts = separateCmdArgs(cmd);
 
         var spawnOpts = config.raw ? {stdio: 'inherit'} : {};
+        if (isWindows) {
+            spawnOpts.detached = false;
+        }
         var child;
         try {
             child = spawn(_.head(parts), _.tail(parts), spawnOpts);
@@ -306,7 +310,11 @@ function handleClose(streams, children, childrenInfo) {
 
             // Send SIGTERM to alive children
             _.each(aliveChildren, function(child) {
-                child.kill();
+                if (isWindows) {
+                    spawn('taskkill', ["/pid", child.pid, '/f', '/t']);
+                } else {
+                    child.kill('SIGINT');
+                }
             });
         });
     }

package/test/test-functional.js

@@ -41,7 +41,7 @@ describe('concurrently', function() {
     });
 
     it('at least one unsuccessful commands should exit non-zero', function(done) {
-        run('node ./src/main.js "echo" "exit 1" "echo"', {pipe: DEBUG_TESTS})
+        run('node ./src/main.js "echo" "return 1" "echo"', {pipe: DEBUG_TESTS})
         .then(function(exitCode) {
             assert.notStrictEqual(exitCode, 0);
             done();