concurrently 3.4.0 → 3.6.1

package/.eslintrc.json

@@ -0,0 +1,23 @@
+{
+    "root": true,
+    "env": {
+        "browser": false,
+        "node": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 6
+    },
+    "rules": {
+        "block-spacing": "error",
+        "curly": "error",
+        "eqeqeq": ["error", "always", { "null": "ignore" }],
+        "indent": ["error", 4],
+        "keyword-spacing": "error",
+        "no-var": "error",
+        "prefer-const": "error",
+        "quotes": ["error", "single"],
+        "semi": "error",
+        "space-before-blocks": "error",
+        "space-before-function-paren": ["error", "never"]
+    }
+}

package/.travis.yml

@@ -1,10 +1,11 @@
 language: node_js
 node_js:
-  - 7
+  - 8
   - 6
   - 4
-before_script:
-  - npm install -g mocha
+script:
+  - npm test
+  - npm run lint
 notifications:
   email:
     - kimmobrunfeldt+concurrent@gmail.com

package/README.md

@@ -11,7 +11,7 @@ Like `npm run watch-js & npm run watch-less` but better.
 
 **Features:**
 
-* Cross platform, works also in Windows
+* Cross platform (including Windows)
 * Output is easy to follow with prefixes
 * With `--kill-others` switch, all commands are killed if one dies
 * Spawns commands with [spawn-command](https://github.com/mmalecki/spawn-command)
@@ -32,7 +32,7 @@ npm install concurrently --save
 
 ## Usage
 
-Remember to surround separate commands with quotes, like this:
+Remember to surround separate commands with quotes:
 ```bash
 concurrently "command1 arg" "command2 arg"
 ```
@@ -46,6 +46,46 @@ In package.json, escape quotes:
 "start": "concurrently \"command1 arg\" \"command2 arg\""
 ```
 
+NPM run commands can be shortened:
+
+```bash
+concurrently "npm:watch-js" "npm:watch-css" "npm:watch-node"
+
+# Equivalent to:
+concurrently -n watch-js,watch-css,watch-node "npm run watch-js" "npm run watch-css" "npm run watch-node"
+```
+
+NPM shortened commands also support wildcards. Given the following scripts in
+package.json:
+
+```javascript
+{
+    //...
+    "scripts": {
+        // ...
+        "watch-js": "...",
+        "watch-css": "...",
+        "watch-node": "...",
+        // ...
+    },
+    // ...
+}
+```
+
+```bash
+concurrently "npm:watch-*"
+
+# Equivalent to:
+concurrently -n js,css,node "npm run watch-js" "npm run watch-css" "npm run watch-node"
+
+# Any name provided for the wildcard command will be used as a prefix to the wildcard
+# part of the script name:
+concurrently -n w: npm:watch-*
+
+# Equivalent to:
+concurrently -n w:js,w:css,w:node "npm run watch-js" "npm run watch-css" "npm run watch-node"
+```
+
 Good frontend one-liner example [here](https://github.com/kimmobrunfeldt/dont-copy-paste-this-frontend-template/blob/5cd2bde719654941bdfc0a42c6f1b8e69ae79980/package.json#L9).
 
 Help:
@@ -59,9 +99,10 @@ Options:
   -h, --help                       output usage information
   -V, --version                    output the version number
   -k, --kill-others                kill other processes if one exits or dies
+  --kill-others-on-fail            kill other processes if one exits with non zero status code
   --no-color                       disable colors from logging
   -p, --prefix <prefix>            prefix used in logging for each process.
-  Possible values: index, pid, time, command, name, none, or a template. Default: index. Example template: "{time}-{pid}"
+  Possible values: index, pid, time, command, name, none, or a template. Default: index or name (when --names is set). Example template: "{time}-{pid}"
 
   -n, --names <names>              List of custom names to be used in prefix template.
   Example names: "main,browser,server"
@@ -85,12 +126,30 @@ Options:
   The option can be used to shorten long commands.
   Works only if prefix is set to "command". Default: 10
 
+  --allow-restart                  Restart a process which died. Default: false
+
+  --restart-after <miliseconds>    delay time to respawn the process. Default: 0
+  
+  --restart-tries <times>          limit the number of respawn tries. Default: 1
+
+  --default-input-target <identifier> identifier for child process to which input on stdin should be sent if not specified at start of input. Can be either the index or the name of the process. Default: 0
+
+Input:
+
+Input can be sent to any of the child processes using either the name or index
+of the command followed by a colon. If no child identifier is specified then the
+input will be sent to the child specified by the `--default-input-target`
+option, which defaults to index 0.
 
 Examples:
 
  - Kill other processes if one exits or dies
 
      $ concurrently --kill-others "grunt watch" "http-server"
+     
+ - Kill other processes if one exits with non zero status code
+
+     $ concurrently --kill-others-on-fail "npm run build:client" "npm run build:server"
 
  - Output nothing more than stdout+stderr of child processes
 
@@ -106,7 +165,59 @@ Examples:
 
  - Custom names and colored prefixes
 
-     $ concurrently --prefix "[{name}]" --names "HTTP,WATCH" -c "bgBlue.bold,bgMagenta.bold" "npm run watch" "http-server"
+     $ concurrently --names "HTTP,WATCH" -c "bgBlue.bold,bgMagenta.bold" "http-server" "npm run watch"
+     
+ - Shortened NPM run commands
+
+     $ concurrently npm:watch-node npm:watch-js npm:watch-css
+
+ - Send input to default
+
+     $ concurrently "nodemon" "npm run watch-js"
+     rs  # Sends rs command to nodemon process
+
+ - Specify a default-input-target
+
+     $ concurrently --default-input-target 1 "npm run watch-js" nodemon
+     rs
+
+ - Send input to specific child identified by index
+
+     $ concurrently "npm run watch-js" nodemon
+     1:rs
+
+ - Send input to specific child identified by name
+
+     $ concurrently -n js,srv "npm run watch-js" nodemon
+     srv:rs
+
+ - Send input to default
+
+     $ concurrently "nodemon" "npm run watch-js"
+     rs  # Sends rs command to nodemon process
+
+ - Specify a default-input-target
+
+     $ concurrently --default-input-target 1 "npm run watch-js" nodemon
+     rs
+
+ - Send input to specific child identified by index
+
+     $ concurrently "npm run watch-js" nodemon
+     1:rs
+
+ - Send input to specific child identified by name
+
+     $ concurrently -n js,srv "npm run watch-js" nodemon
+     srv:rs
+
+ - Shortened NPM run commands
+
+     $ concurrently npm:watch-node npm:watch-js npm:watch-css
+
+ - Shortened NPM run command with wildcard
+
+     $ concurrently npm:watch-*
 
 For more details, visit https://github.com/kimmobrunfeldt/concurrently
 ```
@@ -137,17 +248,3 @@ and you won't even notice the difference.
 
 Another option would be to just run all commands in separate terminals. I got
 tired of opening terminals and made **concurrently**.
-
-### NPM Issue
-
-Previously I thought this could fix some problems I had with watching scripts and this readme said:
-
-> When running watch or serve tasks, I'd recommend to use `--kill-others` option:
->
-> ```bash
-> concurrently --kill-others "npm run watch-js" "npm run watch-less"
-> ```
->
-> That way, if for some reason e.g. your `watch-less` died, you would notice it easier.
-
-However NPM didn't work as I hoped it would. See [this issue](https://github.com/kimmobrunfeldt/concurrently/issues/4).

package/appveyor.yml

@@ -1,13 +1,12 @@
 environment:
   matrix:
-    - nodejs_version: '7'
+    - nodejs_version: '8'
     - nodejs_version: '6'
     - nodejs_version: '4'
 install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true
   - npm -g install npm@latest
-  - npm install -g mocha
   - set PATH=%APPDATA%\npm;%PATH%
   - npm install
 build: off

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concurrently",
-  "version": "3.4.0",
+  "version": "3.6.1",
   "description": "Run commands concurrently",
   "main": "src/main.js",
   "bin": {
@@ -11,7 +11,12 @@
     "node": ">=4.0.0"
   },
   "scripts": {
-    "test": "mocha"
+    "lint": "eslint .",
+    "test": "mocha",
+    "echo": "echo",
+    "echo-test": "echo test",
+    "echo-sound-beep": "echo beep",
+    "echo-sound-boop": "echo boop"
   },
   "repository": {
     "type": "git",
@@ -32,10 +37,11 @@
   },
   "homepage": "https://github.com/kimmobrunfeldt/concurrently",
   "dependencies": {
-    "chalk": "0.5.1",
+    "chalk": "^2.4.1",
     "commander": "2.6.0",
     "date-fns": "^1.23.0",
     "lodash": "^4.5.1",
+    "read-pkg": "^3.0.0",
     "rx": "2.3.24",
     "spawn-command": "^0.0.2-1",
     "supports-color": "^3.2.3",
@@ -43,12 +49,14 @@
   },
   "devDependencies": {
     "chai": "^1.10.0",
+    "eslint": "^4.19.1",
     "mocha": "^2.1.0",
     "mustache": "^1.0.0",
     "releasor": "^1.2.1",
     "semver": "^4.2.0",
     "shell-quote": "^1.4.3",
     "shelljs": "^0.3.0",
+    "sinon": "^4.1.3",
     "string": "^3.0.0"
   }
 }

package/src/findChild.js

@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = function(targetId, children, childrenInfo) {
+
+    return children.find((child) => {
+        return (
+            childrenInfo[child.pid].index.toString() === targetId ||
+            childrenInfo[child.pid].name === targetId
+        );
+    });
+};