concurrently 4.1.2 → 5.1.0

package/README.md

@@ -147,7 +147,7 @@ Prefix styling
                           prefix when it is set to "command"
                                                           [number] [default: 10]
   -t, --timestamp-format  Specify the timestamp in moment/date-fns format.
-                                   [string] [default: "YYYY-MM-DD HH:mm:ss.SSS"]
+                                   [string] [default: "yyyy-MM-dd HH:mm:ss.SSS"]
 
 Input handling
   -i, --handle-input      Whether input should be forwarded to the child
@@ -191,10 +191,6 @@ Examples:
      $ 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 --handle-input "nodemon" "npm run watch-js"
@@ -247,11 +243,11 @@ concurrently can be used programmatically by using the API documented below:
     Anything else means all processes should exit successfully.
     - `restartTries`: how many attempts to restart a process that dies will be made. Default: `0`.
     - `restartDelay`: how many milliseconds to wait between process restarts. Default: `0`.
-    - `timestampFormat`: a [date-fns/moment format](https://date-fns.org/v1.29.0/docs/format)
-    to use when prefixing with `time`. Default: `YYYY-MM-DD HH:mm:ss.ZZZ`
+    - `timestampFormat`: a [date-fns format](https://date-fns.org/v2.0.1/docs/format)
+    to use when prefixing with `time`. Default: `yyyy-MM-dd HH:mm:ss.ZZZ`
 
 > Returns: a `Promise` that resolves if the run was successful (according to `successCondition` option),
-> or rejects otherwise.
+> or rejects, containing an array with the exit codes of each command that has been run.
 
 Example:
 

package/bin/epilogue.txt

@@ -16,10 +16,6 @@ Examples:
 
      $ $0 --names "HTTP,WATCH" -c "bgBlue.bold,bgMagenta.bold" "http-server" "npm run watch"
 
- - Shortened NPM run commands
-
-     $ $0 npm:watch-node npm:watch-js npm:watch-css
-
  - Send input to default
 
      $ $0 --handle-input "nodemon" "npm run watch-js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concurrently",
-  "version": "4.1.2",
+  "version": "5.1.0",
   "description": "Run commands concurrently",
   "main": "index.js",
   "bin": {
@@ -30,14 +30,14 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^2.4.2",
-    "date-fns": "^1.30.1",
+    "date-fns": "^2.0.1",
     "lodash": "^4.17.15",
     "read-pkg": "^4.0.1",
     "rxjs": "^6.5.2",
     "spawn-command": "^0.0.2-1",
-    "supports-color": "^4.5.0",
-    "tree-kill": "^1.2.1",
-    "yargs": "^12.0.5"
+    "supports-color": "^6.1.0",
+    "tree-kill": "^1.2.2",
+    "yargs": "^13.3.0"
   },
   "devDependencies": {
     "coveralls": "^3.0.4",
@@ -45,6 +45,13 @@
     "jest": "^24.8.0",
     "jest-create-mock-instance": "^1.1.0"
   },
+  "files": [
+    "bin",
+    "!**/fixtures",
+    "index.js",
+    "src",
+    "!*.spec.js"
+  ],
   "jest": {
     "collectCoverage": true,
     "collectCoverageFrom": [

package/src/completion-listener.js

@@ -7,29 +7,33 @@ module.exports = class CompletionListener {
         this.scheduler = scheduler;
     }
 
-    listen(commands) {
-        const closeStreams = commands.map(command => command.close);
-        const allClosed = Rx.zip(...closeStreams);
-        return Rx.merge(...closeStreams).pipe(
-            bufferCount(closeStreams.length),
-            map(exitCodes => {
-                switch (this.successCondition) {
-                /* eslint-disable indent */
-                    case 'first':
-                        return exitCodes[0] === 0;
+    isSuccess(exitCodes) {
+        switch (this.successCondition) {
+        /* eslint-disable indent */
+            case 'first':
+                return exitCodes[0] === 0;
+
+            case 'last':
+                return exitCodes[exitCodes.length - 1] === 0;
 
-                    case 'last':
-                        return exitCodes[exitCodes.length - 1] === 0;
+            default:
+                return exitCodes.every(exitCode => exitCode === 0);
+            /* eslint-enable indent */
+        }
+    }
 
-                    default:
-                        return exitCodes.every(exitCode => exitCode === 0);
-                /* eslint-enable indent */
-                }
-            }),
-            switchMap(success => success
-                ? Rx.of(null, this.scheduler)
-                : Rx.throwError(new Error(), this.scheduler)),
-            take(1)
-        ).toPromise();
+    listen(commands) {
+        const closeStreams = commands.map(command => command.close);
+        return Rx.merge(...closeStreams)
+            .pipe(
+                bufferCount(closeStreams.length),
+                switchMap(exitCodes =>
+                    this.isSuccess(exitCodes)
+                        ? Rx.of(exitCodes, this.scheduler)
+                        : Rx.throwError(exitCodes, this.scheduler)
+                ),
+                take(1)
+            )
+            .toPromise();
     }
 };

package/src/defaults.js

@@ -22,6 +22,6 @@ module.exports = {
     restartDelay: 0,
     // Condition of success for concurrently itself.
     success: 'all',
-    // Refer to https://date-fns.org/v1.29.0/docs/format
-    timestampFormat: 'YYYY-MM-DD HH:mm:ss.SSS'
+    // Refer to https://date-fns.org/v2.0.1/docs/format
+    timestampFormat: 'yyyy-MM-dd HH:mm:ss.SSS'
 };

package/src/flow-control/kill-on-signal.js

@@ -8,7 +8,7 @@ module.exports = class KillOnSignal {
 
     handle(commands) {
         let caughtSignal;
-        ['SIGINT', 'SIGTERM'].forEach(signal => {
+        ['SIGINT', 'SIGTERM', 'SIGHUP'].forEach(signal => {
             this.process.on(signal, () => {
                 caughtSignal = signal;
                 commands.forEach(command => command.kill(signal));

package/src/get-spawn-opts.js

@@ -1,7 +1,7 @@
 const supportsColor = require('supports-color');
 
 module.exports = ({
-    colorSupport = supportsColor,
+    colorSupport = supportsColor.stdout,
     process = global.process,
     raw = false
 } = {}) => Object.assign(

package/.editorconfig

@@ -1,28 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-# 4 space indentation
-[*.py]
-indent_style = space
-indent_size = 4
-
-# Tab indentation (no size specified)
-[*.js]
-indent_style = space
-indent_size = 4
-
-# Matches the exact files package.json and .travis.yml
-[{package.json,.travis.yml,Gruntfile.js}]
-indent_style = space
-indent_size = 2
-
-[Makefile]
-indent_style = tab
-indent_size = 4

package/.eslintrc.json

@@ -1,23 +0,0 @@
-{
-    "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,11 +0,0 @@
-language: node_js
-node_js:
-  - 12
-  - 10
-  - 8
-  - 6
-script:
-  - npm test
-  - npm run lint
-after_success:
-  - npm run report-coverage

package/.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "eslint.enable": true,
-    "jest.autoEnable": true,
-    "jest.showCoverageOnLoad": true,
-    "editor.rulers": [100]
-}

package/CONTRIBUTING.md

@@ -1,23 +0,0 @@
-# Contributing
-
-Pull requests and contributions are warmly welcome.
-Please follow existing code style and commit message conventions. Also remember to keep documentation
-updated.
-
-**Pull requests:** You don't need to bump version numbers or modify anything related to releasing. That stuff is fully automated, just write the functionality.
-
-# Maintaining
-
-## Test
-
-Tests can be run with command:
-
-```bash
-npm run test
-```
-
-## Release
-
-* Commit all changes
-* Run `./node_modules/.bin/releasor --bump minor`, which will create new tag and publish code to GitHub and npm. See https://github.com/kimmobrunfeldt/releasor for options
-* Edit GitHub release notes

package/appveyor.yml

@@ -1,18 +0,0 @@
-environment:
-  matrix:
-    - nodejs_version: '10'
-    - nodejs_version: '8'
-    - nodejs_version: '6'
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - set CI=true
-  - npm -g install npm@latest
-  - set PATH=%APPDATA%\npm;%PATH%
-  - npm install
-build: off
-test_script:
-  - node --version
-  - npm --version
-  - set SHELL=cmd.exe
-  - set SHELL_EXECUTION_FLAG=/c
-  - npm test

package/bin/concurrently.spec.js

@@ -1,365 +0,0 @@
-const readline = require('readline');
-const _ = require('lodash');
-const Rx = require('rxjs');
-const { buffer, map } = require('rxjs/operators');
-const spawn = require('spawn-command');
-
-const isWindows = process.platform === 'win32';
-const createKillMessage = prefix => new RegExp(
-    _.escapeRegExp(prefix) +
-    ' exited with code ' +
-    (isWindows ? 1 : '(SIGTERM|143)')
-);
-
-const run = args => {
-    const child = spawn('node ./concurrently.js ' + args, {
-        cwd: __dirname,
-        env: Object.assign({}, process.env, {
-            // When upgrading from jest 23 -> 24, colors started printing in the test output.
-            // They are forcibly disabled here
-            FORCE_COLOR: 0
-        }),
-    });
-
-    const stdout = readline.createInterface({
-        input: child.stdout,
-        output: null
-    });
-
-    const stderr = readline.createInterface({
-        input: child.stderr,
-        output: null
-    });
-
-    const close = Rx.fromEvent(child, 'close');
-    const log = Rx.merge(
-        Rx.fromEvent(stdout, 'line'),
-        Rx.fromEvent(stderr, 'line')
-    ).pipe(map(data => data.toString()));
-
-    return {
-        close,
-        log,
-        stdin: child.stdin,
-        pid: child.pid
-    };
-};
-
-it('has help command', done => {
-    run('--help').close.subscribe(event => {
-        expect(event[0]).toBe(0);
-        done();
-    }, done);
-});
-
-it('has version command', done => {
-    Rx.combineLatest(
-        run('--version').close,
-        run('-V').close,
-        run('-v').close
-    ).subscribe(events => {
-        expect(events[0][0]).toBe(0);
-        expect(events[1][0]).toBe(0);
-        expect(events[2][0]).toBe(0);
-        done();
-    }, done);
-});
-
-describe('exiting conditions', () => {
-    it('is of success by default when running successful commands', done => {
-        run('"echo foo" "echo bar"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBe(0);
-                done();
-            }, done);
-    });
-
-    it('is of failure by default when one of the command fails', done => {
-        run('"echo foo" "exit 1"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBeGreaterThan(0);
-                done();
-            }, done);
-    });
-
-    it('is of success when --success=first and first command to exit succeeds', done => {
-        run('--success=first "echo foo" "sleep 0.5 && exit 1"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBe(0);
-                done();
-            }, done);
-    });
-
-    it('is of failure when --success=first and first command to exit fails', done => {
-        run('--success=first "exit 1" "sleep 0.5 && echo foo"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBeGreaterThan(0);
-                done();
-            }, done);
-    });
-
-    it('is of success when --success=last and last command to exit succeeds', done => {
-        run('--success=last "exit 1" "sleep 0.5 && echo foo"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBe(0);
-                done();
-            }, done);
-    });
-
-    it('is of failure when --success=last and last command to exit fails', done => {
-        run('--success=last "echo foo" "sleep 0.5 && exit 1"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBeGreaterThan(0);
-                done();
-            }, done);
-    });
-
-    it.skip('is of success when a SIGINT is sent', done => {
-        const child = run('"node fixtures/read-echo.js"');
-        child.close.subscribe(exit => {
-            // TODO This is null within Node, but should be 0 outside (eg from real terminal)
-            expect(exit[0]).toBe(0);
-            done();
-        }, done);
-
-        process.kill(child.pid, 'SIGINT');
-    });
-
-    it('is aliased to -s', done => {
-        run('-s last "exit 1" "sleep 0.5 && echo foo"')
-            .close
-            .subscribe(exit => {
-                expect(exit[0]).toBe(0);
-                done();
-            }, done);
-    });
-});
-
-describe('--raw', () => {
-    it('is aliased to -r', done => {
-        const child = run('-r "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toHaveLength(2);
-            expect(lines).toContainEqual(expect.stringContaining('foo'));
-            expect(lines).toContainEqual(expect.stringContaining('bar'));
-            done();
-        }, done);
-    });
-
-    it('does not log any extra output', done => {
-        const child = run('--raw "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toHaveLength(2);
-            expect(lines).toContainEqual(expect.stringContaining('foo'));
-            expect(lines).toContainEqual(expect.stringContaining('bar'));
-            done();
-        }, done);
-    });
-});
-
-describe('--names', () => {
-    it('is aliased to -n', done => {
-        const child = run('-n foo,bar "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[foo] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[bar] bar'));
-            done();
-        }, done);
-    });
-
-    it('prefixes with names', done => {
-        const child = run('--names foo,bar "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[foo] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[bar] bar'));
-            done();
-        }, done);
-    });
-
-    it('is split using --name-separator arg', done => {
-        const child = run('--names "foo|bar" --name-separator "|" "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[foo] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[bar] bar'));
-            done();
-        }, done);
-    });
-});
-
-describe('--prefix', () => {
-    it('is alised to -p', done => {
-        const child = run('-p command "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[echo foo] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[echo bar] bar'));
-            done();
-        }, done);
-    });
-
-    it('specifies custom prefix', done => {
-        const child = run('--prefix command "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[echo foo] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[echo bar] bar'));
-            done();
-        }, done);
-    });
-});
-
-describe('--prefix-length', () => {
-    it('is alised to -l', done => {
-        const child = run('-p command -l 5 "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[ec..o] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[ec..r] bar'));
-            done();
-        }, done);
-    });
-
-    it('specifies custom prefix length', done => {
-        const child = run('--prefix command --prefix-length 5 "echo foo" "echo bar"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[ec..o] foo'));
-            expect(lines).toContainEqual(expect.stringContaining('[ec..r] bar'));
-            done();
-        }, done);
-    });
-});
-
-describe('--restart-tries', () => {
-    it('changes how many times a command will restart', done => {
-        const child = run('--restart-tries 1 "exit 1"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toEqual([
-                expect.stringContaining('[0] exit 1 exited with code 1'),
-                expect.stringContaining('[0] exit 1 restarted'),
-                expect.stringContaining('[0] exit 1 exited with code 1'),
-            ]);
-            done();
-        }, done);
-    });
-});
-
-describe('--kill-others', () => {
-    it('is alised to -k', done => {
-        const child = run('-k "sleep 10" "exit 0"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[1] exit 0 exited with code 0'));
-            expect(lines).toContainEqual(expect.stringContaining('Sending SIGTERM to other processes'));
-            expect(lines).toContainEqual(expect.stringMatching(createKillMessage('[0] sleep 10')));
-            done();
-        }, done);
-    });
-
-    it('kills on success', done => {
-        const child = run('--kill-others "sleep 10" "exit 0"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[1] exit 0 exited with code 0'));
-            expect(lines).toContainEqual(expect.stringContaining('Sending SIGTERM to other processes'));
-            expect(lines).toContainEqual(expect.stringMatching(createKillMessage('[0] sleep 10')));
-            done();
-        }, done);
-    });
-
-    it('kills on failure', done => {
-        const child = run('--kill-others "sleep 10" "exit 1"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[1] exit 1 exited with code 1'));
-            expect(lines).toContainEqual(expect.stringContaining('Sending SIGTERM to other processes'));
-            expect(lines).toContainEqual(expect.stringMatching(createKillMessage('[0] sleep 10')));
-            done();
-        }, done);
-    });
-});
-
-describe('--kill-others-on-fail', () => {
-    it('does not kill on success', done => {
-        const child = run('--kill-others-on-fail "sleep 0.5" "exit 0"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[1] exit 0 exited with code 0'));
-            expect(lines).toContainEqual(expect.stringContaining('[0] sleep 0.5 exited with code 0'));
-            done();
-        }, done);
-    });
-
-    it('kills on failure', done => {
-        const child = run('--kill-others-on-fail "sleep 10" "exit 1"');
-        child.log.pipe(buffer(child.close)).subscribe(lines => {
-            expect(lines).toContainEqual(expect.stringContaining('[1] exit 1 exited with code 1'));
-            expect(lines).toContainEqual(expect.stringContaining('Sending SIGTERM to other processes'));
-            expect(lines).toContainEqual(expect.stringMatching(createKillMessage('[0] sleep 10')));
-            done();
-        }, done);
-    });
-});
-
-describe('--handle-input', () => {
-    it('is alised to -i', done => {
-        const child = run('-i "node fixtures/read-echo.js"');
-        child.log.subscribe(line => {
-            if (/READING/.test(line)) {
-                child.stdin.write('stop\n');
-            }
-
-            if (/\[0\] stop/.test(line)) {
-                done();
-            }
-        }, done);
-    });
-
-    it('forwards input to first process by default', done => {
-        const child = run('--handle-input "node fixtures/read-echo.js"');
-        child.log.subscribe(line => {
-            if (/READING/.test(line)) {
-                child.stdin.write('stop\n');
-            }
-
-            if (/\[0\] stop/.test(line)) {
-                done();
-            }
-        }, done);
-    });
-
-
-    it('forwards input to process --default-input-target', done => {
-        const lines = [];
-        const child = run('-ki --default-input-target 1 "node fixtures/read-echo.js" "node fixtures/read-echo.js"');
-        child.log.subscribe(line => {
-            lines.push(line);
-            if (/\[1\] READING/.test(line)) {
-                child.stdin.write('stop\n');
-            }
-        }, done);
-
-        child.close.subscribe(exit => {
-            expect(exit[0]).toBeGreaterThan(0);
-            expect(lines).toContainEqual(expect.stringContaining('[1] stop'));
-            expect(lines).toContainEqual(expect.stringMatching(createKillMessage('[0] node fixtures/read-echo.js')));
-            done();
-        }, done);
-    });
-
-    it('forwards input to specified process', done => {
-        const lines = [];
-        const child = run('-ki "node fixtures/read-echo.js" "node fixtures/read-echo.js"');
-        child.log.subscribe(line => {
-            lines.push(line);
-            if (/\[1\] READING/.test(line)) {
-                child.stdin.write('1:stop\n');
-            }
-        }, done);
-
-        child.close.subscribe(exit => {
-            expect(exit[0]).toBeGreaterThan(0);
-            expect(lines).toContainEqual(expect.stringContaining('[1] stop'));
-            expect(lines).toContainEqual(expect.stringMatching(createKillMessage('[0] node fixtures/read-echo.js')));
-            done();
-        }, done);
-    });
-});

package/bin/fixtures/read-echo.js

@@ -1,10 +0,0 @@
-process.stdin.on('data', (chunk) => {
-    const line = chunk.toString().trim();
-    console.log(line);
-
-    if (line === 'stop') {
-        process.exit(0);
-    }
-});
-
-console.log('READING');