concurrently 6.2.2 → 6.5.1

package/README.md

@@ -116,21 +116,25 @@ Help:
 concurrently [options] <command ...>
 
 General
-  -m, --max-processes  How many processes should run at once.
-                       New processes only spawn after all restart tries of a
-                       process.                                         [number]
-  -n, --names          List of custom names to be used in prefix template.
-                       Example names: "main,browser,server"             [string]
-  --name-separator     The character to split <names> on. Example usage:
-                       concurrently -n "styles|scripts|server" --name-separator
-                       "|"                                        [default: ","]
-  -r, --raw            Output only raw output of processes, disables prettifying
-                       and concurrently coloring.                      [boolean]
-  -s, --success        Return exit code of zero or one based on the success or
-                       failure of the "first" child to terminate, the "last
-                       child", or succeed only if "all" child processes succeed.
+  -m, --max-processes   How many processes should run at once.
+                        New processes only spawn after all restart tries of a
+                        process.                                        [number]
+  -n, --names           List of custom names to be used in prefix template.
+                        Example names: "main,browser,server"            [string]
+      --name-separator  The character to split <names> on. Example usage:
+                        concurrently -n "styles|scripts|server" --name-separator
+                        "|"                                       [default: ","]
+  -r, --raw             Output only raw output of processes, disables
+                        prettifying and concurrently coloring.         [boolean]
+  -s, --success         Return exit code of zero or one based on the success or
+                        failure of the "first" child to terminate, the "last
+                        child", or succeed only if "all" child processes
+                        succeed.
                               [choices: "first", "last", "all"] [default: "all"]
-  --no-color           Disables colors from logging                    [boolean]
+      --no-color        Disables colors from logging                   [boolean]
+      --hide            Comma-separated list of processes to hide the output.
+                        The processes can be identified by their name or index.
+                                                          [string] [default: ""]
 
 Prefix styling
   -p, --prefix            Prefix used in logging for each process.
@@ -199,6 +203,10 @@ Examples:
      $ concurrently --names "HTTP,WATCH" -c "bgBlue.bold,bgMagenta.bold"
      "http-server" "npm run watch"
 
+ - Configuring via environment variables with CONCURRENTLY_ prefix
+
+     $ CONCURRENTLY_RAW=true CONCURRENTLY_KILL_OTHERS=true concurrently "echo hello" "echo world"
+
  - Send input to default
 
      $ concurrently --handle-input "nodemon" "npm run watch-js"
@@ -218,9 +226,9 @@ Examples:
 
      $ concurrently npm:watch-node npm:watch-js npm:watch-css
 
- - Shortened NPM run command with wildcard
+ - Shortened NPM run command with wildcard (make sure to wrap it in quotes!)
 
-     $ concurrently npm:watch-*
+     $ concurrently "npm:watch-*"
 
 For more details, visit https://github.com/open-cli-tools/concurrently
 ```
@@ -250,6 +258,9 @@ concurrently can be used programmatically by using the API documented below:
     - `prefix`: the prefix type to use when logging processes output.
       Possible values: `index`, `pid`, `time`, `command`, `name`, `none`, or a template (eg `[{time} process: {pid}]`).
       Default: the name of the process, or its index if no name is set.
+    - `prefixColors`: a list of colors as supported by [chalk](https://www.npmjs.com/package/chalk).
+      If concurrently would run more commands than there are colors, the last color is repeated.
+      Prefix colors specified per-command take precedence over this list.
     - `prefixLength`: how many characters to show when prefixing with `command`. Default: `10`
     - `raw`: whether raw mode should be used, meaning strictly process output will
     be logged, without any prefixes, colouring or extra stuff.

package/bin/concurrently.js

@@ -11,6 +11,8 @@ const args = yargs
     .version('v', require('../package.json').version)
     .alias('v', 'V')
     .alias('v', 'version')
+    // TODO: Add some tests for this.
+    .env('CONCURRENTLY')
     .options({
         // General
         'm': {
@@ -55,6 +57,18 @@ const args = yargs
             describe: 'Disables colors from logging',
             type: 'boolean'
         },
+        'hide': {
+            describe:
+                'Comma-separated list of processes to hide the output.\n' +
+                'The processes can be identified by their name or index.',
+            default: defaults.hide,
+            type: 'string'
+        },
+        'timings': {
+            describe: 'Show timing information for all processes',
+            type: 'boolean',
+            default: defaults.timings
+        },
 
         // Kill others
         'k': {
@@ -135,7 +149,7 @@ const args = yargs
                 'Can be either the index or the name of the process.'
         }
     })
-    .group(['m', 'n', 'name-separator', 'raw', 's', 'no-color'], 'General')
+    .group(['m', 'n', 'name-separator', 'raw', 's', 'no-color', 'hide', 'timings'], 'General')
     .group(['p', 'c', 'l', 't'], 'Prefix styling')
     .group(['i', 'default-input-target'], 'Input handling')
     .group(['k', 'kill-others-on-fail'], 'Killing other processes')
@@ -144,19 +158,12 @@ const args = yargs
     .epilogue(fs.readFileSync(__dirname + '/epilogue.txt', { encoding: 'utf8' }))
     .argv;
 
-const prefixColors = args.prefixColors.split(',');
 const names = (args.names || '').split(args.nameSeparator);
 
-let lastColor;
-concurrently(args._.map((command, index) => {
-    // Use documented behaviour of repeating last colour when specifying more commands than colours
-    lastColor = prefixColors[index] || lastColor;
-    return {
-        command,
-        prefixColor: lastColor,
-        name: names[index]
-    };
-}), {
+concurrently(args._.map((command, index) => ({
+    command,
+    name: names[index]
+})), {
     handleInput: args.handleInput,
     defaultInputTarget: args.defaultInputTarget,
     killOthers: args.killOthers
@@ -164,12 +171,15 @@ concurrently(args._.map((command, index) => {
         : (args.killOthersOnFail ? ['failure'] : []),
     maxProcesses: args.maxProcesses,
     raw: args.raw,
+    hide: args.hide.split(','),
     prefix: args.prefix,
+    prefixColors: args.prefixColors.split(','),
     prefixLength: args.prefixLength,
     restartDelay: args.restartAfter,
     restartTries: args.restartTries,
     successCondition: args.success,
-    timestampFormat: args.timestampFormat
+    timestampFormat: args.timestampFormat,
+    timings: args.timings
 }).then(
     () => process.exit(0),
     () => process.exit(1)

package/bin/concurrently.spec.js

@@ -163,6 +163,26 @@ describe('--raw', () => {
     });
 });
 
+describe('--hide', () => {
+    it('hides the output of a process by its index', done => {
+        const child = run('--hide 1 "echo foo" "echo bar"');
+        child.log.pipe(buffer(child.close)).subscribe(lines => {
+            expect(lines).toContainEqual(expect.stringContaining('foo'));
+            expect(lines).not.toContainEqual(expect.stringContaining('bar'));
+            done();
+        }, done);
+    });
+
+    it('hides the output of a process by its name', done => {
+        const child = run('-n foo,bar --hide bar "echo foo" "echo bar"');
+        child.log.pipe(buffer(child.close)).subscribe(lines => {
+            expect(lines).toContainEqual(expect.stringContaining('foo'));
+            expect(lines).not.toContainEqual(expect.stringContaining('bar'));
+            done();
+        }, done);
+    });
+});
+
 describe('--names', () => {
     it('is aliased to -n', done => {
         const child = run('-n foo,bar "echo foo" "echo bar"');
@@ -326,7 +346,6 @@ describe('--handle-input', () => {
         }, 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"');
@@ -363,3 +382,47 @@ describe('--handle-input', () => {
         }, done);
     });
 });
+
+describe('--timings', () => {
+    const defaultTimestampFormatRegex = /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}/;
+    const processStartedMessageRegex = (index, command) => {
+        return new RegExp( `^\\[${ index }] ${ command } started at ${ defaultTimestampFormatRegex.source }$` );
+    };
+    const processStoppedMessageRegex = (index, command) => {
+        return new RegExp( `^\\[${ index }] ${ command } stopped at ${ defaultTimestampFormatRegex.source } after (\\d|,)+ms$` );
+    };
+    const expectLinesForProcessStartAndStop = (lines, index, command) => {
+        const escapedCommand = _.escapeRegExp(command);
+        expect(lines).toContainEqual(expect.stringMatching(processStartedMessageRegex(index, escapedCommand)));
+        expect(lines).toContainEqual(expect.stringMatching(processStoppedMessageRegex(index, escapedCommand)));
+    };
+
+    const expectLinesForTimingsTable = (lines) => {
+        const tableTopBorderRegex = /┌[─┬]+┐/g;
+        expect(lines).toContainEqual(expect.stringMatching(tableTopBorderRegex));
+        const tableHeaderRowRegex = /(\W+(name|duration|exit code|killed|command)\W+){5}/g;
+        expect(lines).toContainEqual(expect.stringMatching(tableHeaderRowRegex));
+        const tableBottomBorderRegex = /└[─┴]+┘/g;
+        expect(lines).toContainEqual(expect.stringMatching(tableBottomBorderRegex));
+    };
+
+    it('shows timings on success', done => {
+        const child = run('--timings "sleep 0.5" "exit 0"');
+        child.log.pipe(buffer(child.close)).subscribe(lines => {
+            expectLinesForProcessStartAndStop(lines, 0, 'sleep 0.5');
+            expectLinesForProcessStartAndStop(lines, 1, 'exit 0');
+            expectLinesForTimingsTable(lines);
+            done();
+        }, done);
+    });
+
+    it('shows timings on failure', done => {
+        const child = run('--timings "sleep 0.75" "exit 1"');
+        child.log.pipe(buffer(child.close)).subscribe(lines => {
+            expectLinesForProcessStartAndStop(lines, 0, 'sleep 0.75');
+            expectLinesForProcessStartAndStop(lines, 1, 'exit 1');
+            expectLinesForTimingsTable(lines);
+            done();
+        }, done);
+    });
+});

package/bin/epilogue.txt

@@ -16,6 +16,10 @@ Examples:
 
      $ $0 --names "HTTP,WATCH" -c "bgBlue.bold,bgMagenta.bold" "http-server" "npm run watch"
 
+ - Configuring via environment variables with CONCURRENTLY_ prefix
+
+     $ CONCURRENTLY_RAW=true CONCURRENTLY_KILL_OTHERS=true $0 "echo hello" "echo world"
+
  - Send input to default
 
      $ $0 --handle-input "nodemon" "npm run watch-js"
@@ -35,8 +39,8 @@ Examples:
 
      $ $0 npm:watch-node npm:watch-js npm:watch-css
 
- - Shortened NPM run command with wildcard
+ - Shortened NPM run command with wildcard (make sure to wrap it in quotes!)
 
-     $ $0 npm:watch-*
+     $ $0 "npm:watch-*"
 
 For more details, visit https://github.com/open-cli-tools/concurrently

package/index.js

@@ -8,9 +8,11 @@ const RestartProcess = require('./src/flow-control/restart-process');
 
 const concurrently = require('./src/concurrently');
 const Logger = require('./src/logger');
+const LogTimings = require( './src/flow-control/log-timings' );
 
 module.exports = exports = (commands, options = {}) => {
     const logger = new Logger({
+        hide: options.hide,
         outputStream: options.outputStream || process.stdout,
         prefixFormat: options.prefix,
         prefixLength: options.prefixLength,
@@ -42,8 +44,14 @@ module.exports = exports = (commands, options = {}) => {
             new KillOthers({
                 logger,
                 conditions: options.killOthers
+            }),
+            new LogTimings({
+                logger: options.timings ? logger: null,
+                timestampFormat: options.timestampFormat,
             })
-        ]
+        ],
+        prefixColors: options.prefixColors || [],
+        timings: options.timings
     });
 };
 
@@ -58,3 +66,4 @@ exports.LogError = LogError;
 exports.LogExit = LogExit;
 exports.LogOutput = LogOutput;
 exports.RestartProcess = RestartProcess;
+exports.LogTimings = LogTimings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "concurrently",
-  "version": "6.2.2",
+  "version": "6.5.1",
   "description": "Run commands concurrently",
   "main": "index.js",
   "bin": {

package/src/command-parser/expand-npm-wildcard.js

@@ -32,12 +32,21 @@ module.exports = class ExpandNpmWildcard {
         const preWildcard = _.escapeRegExp(cmdName.substr(0, wildcardPosition));
         const postWildcard = _.escapeRegExp(cmdName.substr(wildcardPosition + 1));
         const wildcardRegex = new RegExp(`^${preWildcard}(.*?)${postWildcard}$`);
+        const currentName = commandInfo.name || '';
 
         return this.scripts
-            .filter(script => wildcardRegex.test(script))
-            .map(script => Object.assign({}, commandInfo, {
-                command: `${npmCmd} run ${script}${args}`,
-                name: script
-            }));
+            .map(script => {
+                const match = script.match(wildcardRegex);
+
+                if (match) {
+                    return Object.assign({}, commandInfo, {
+                        command: `${npmCmd} run ${script}${args}`,
+                        // Will use an empty command name if command has no name and the wildcard match is empty,
+                        // e.g. if `npm:watch-*` matches `npm run watch-`.
+                        name: currentName + match[1],
+                    });
+                }
+            })
+            .filter(Boolean);
     }
 };

package/src/command-parser/expand-npm-wildcard.spec.js

@@ -1,4 +1,5 @@
 const ExpandNpmWildcard = require('./expand-npm-wildcard');
+const fs = require('fs');
 
 let parser, readPkg;
 
@@ -7,6 +8,34 @@ beforeEach(() => {
     parser = new ExpandNpmWildcard(readPkg);
 });
 
+describe('ExpandNpmWildcard#readPackage', () => {
+    it('can read package', () => {
+        const expectedPackage = {
+            'name': 'concurrently',
+            'version': '6.4.0',
+        };
+        jest.spyOn(fs, 'readFileSync').mockImplementation((path, options) => {
+            if (path === 'package.json') {
+                return JSON.stringify(expectedPackage);
+            }
+            return null;
+        });
+
+        const actualReadPackage = ExpandNpmWildcard.readPackage();
+        expect(actualReadPackage).toEqual(expectedPackage);
+    });
+
+    it('can handle errors reading package', () => {
+        jest.spyOn(fs, 'readFileSync').mockImplementation(() => {
+            throw new Error('Error reading package');
+        });
+
+        expect(() => ExpandNpmWildcard.readPackage()).not.toThrow();
+        expect(ExpandNpmWildcard.readPackage()).toEqual({});
+    });
+
+});
+
 it('returns same command if not an npm run command', () => {
     const commandInfo = {
         command: 'npm test'
@@ -42,8 +71,25 @@ for (const npmCmd of ['npm', 'yarn', 'pnpm']) {
             });
 
             expect(parser.parse({ command: `${npmCmd} run foo-*-baz qux` })).toEqual([
-                { name: 'foo-bar-baz', command: `${npmCmd} run foo-bar-baz qux` },
-                { name: 'foo--baz', command: `${npmCmd} run foo--baz qux` },
+                { name: 'bar', command: `${npmCmd} run foo-bar-baz qux` },
+                { name: '', command: `${npmCmd} run foo--baz qux` },
+            ]);
+        });
+
+        it('uses existing command name as prefix to the wildcard match', () => {
+            readPkg.mockReturnValue({
+                scripts: {
+                    'watch-js': '',
+                    'watch-css': '',
+                }
+            });
+
+            expect(parser.parse({
+                name: 'w:',
+                command: `${npmCmd} run watch-*`,
+            })).toEqual([
+                { name: 'w:js', command: `${npmCmd} run watch-js` },
+                { name: 'w:css', command: `${npmCmd} run watch-css` },
             ]);
         });
 

package/src/command.js

@@ -17,6 +17,7 @@ module.exports = class Command {
         this.killed = false;
 
         this.error = new Rx.Subject();
+        this.timer = new Rx.Subject();
         this.close = new Rx.Subject();
         this.stdout = new Rx.Subject();
         this.stderr = new Rx.Subject();
@@ -26,13 +27,21 @@ module.exports = class Command {
         const child = this.spawn(this.command, this.spawnOpts);
         this.process = child;
         this.pid = child.pid;
+        const startDate = new Date(Date.now());
+        const highResStartTime = process.hrtime();
+        this.timer.next({startDate});
 
         Rx.fromEvent(child, 'error').subscribe(event => {
             this.process = undefined;
+            const endDate = new Date(Date.now());
+            this.timer.next({startDate, endDate});
             this.error.next(event);
         });
         Rx.fromEvent(child, 'close').subscribe(([exitCode, signal]) => {
             this.process = undefined;
+            const endDate = new Date(Date.now());
+            this.timer.next({startDate, endDate});
+            const [durationSeconds, durationNanoSeconds] = process.hrtime(highResStartTime);
             this.close.next({
                 command: {
                     command: this.command,
@@ -43,6 +52,11 @@ module.exports = class Command {
                 index: this.index,
                 exitCode: exitCode === null ? signal : exitCode,
                 killed: this.killed,
+                timings: {
+                    startDate,
+                    endDate,
+                    durationSeconds: durationSeconds + (durationNanoSeconds / 1e9),
+                }
             });
         });
         child.stdout && pipeTo(Rx.fromEvent(child.stdout, 'data'), this.stdout);

package/src/command.spec.js

@@ -1,4 +1,5 @@
 const EventEmitter = require('events');
+const process = require('process');
 const Command = require('./command');
 
 const createProcess = () => {
@@ -54,6 +55,72 @@ describe('#start()', () => {
         process.emit('error', 'foo');
     });
 
+    it('shares start and close timing events to the timing stream', done => {
+        const process = createProcess();
+        const command = new Command({ spawn: () => process });
+
+        const startDate = new Date();
+        const endDate = new Date(startDate.getTime() + 1000);
+        jest.spyOn(Date, 'now')
+            .mockReturnValueOnce(startDate.getTime())
+            .mockReturnValueOnce(endDate.getTime());
+
+        let callCount = 0;
+        command.timer.subscribe(({startDate: actualStartDate, endDate: actualEndDate}) => {
+            switch (callCount) {
+            case 0:
+                expect(actualStartDate).toStrictEqual(startDate);
+                expect(actualEndDate).toBeUndefined();
+                break;
+            case 1:
+                expect(actualStartDate).toStrictEqual(startDate);
+                expect(actualEndDate).toStrictEqual(endDate);
+                done();
+                break;
+            default:
+                throw new Error('Unexpected call count');
+            }
+            callCount++;
+        });
+
+        command.start();
+        process.emit('close', 0, null);
+
+    });
+
+    it('shares start and error timing events to the timing stream', done => {
+        const process = createProcess();
+        const command = new Command({ spawn: () => process });
+
+        const startDate = new Date();
+        const endDate = new Date(startDate.getTime() + 1000);
+        jest.spyOn(Date, 'now')
+            .mockReturnValueOnce(startDate.getTime())
+            .mockReturnValueOnce(endDate.getTime());
+
+        let callCount = 0;
+        command.timer.subscribe(({startDate: actualStartDate, endDate: actualEndDate}) => {
+            switch (callCount) {
+            case 0:
+                expect(actualStartDate).toStrictEqual(startDate);
+                expect(actualEndDate).toBeUndefined();
+                break;
+            case 1:
+                expect(actualStartDate).toStrictEqual(startDate);
+                expect(actualEndDate).toStrictEqual(endDate);
+                done();
+                break;
+            default:
+                throw new Error('Unexpected call count');
+            }
+            callCount++;
+        });
+
+        command.start();
+        process.emit('error', 0, null);
+
+    });
+
     it('shares closes to the close stream with exit code', done => {
         const process = createProcess();
         const command = new Command({ spawn: () => process });
@@ -83,6 +150,31 @@ describe('#start()', () => {
         process.emit('close', null, 'SIGKILL');
     });
 
+    it('shares closes to the close stream with timing information', done => {
+        const process1 = createProcess();
+        const command = new Command({ spawn: () => process1 });
+
+        const startDate = new Date();
+        const endDate = new Date(startDate.getTime() + 1000);
+        jest.spyOn(Date, 'now')
+            .mockReturnValueOnce(startDate.getTime())
+            .mockReturnValueOnce(endDate.getTime());
+
+        jest.spyOn(process, 'hrtime')
+            .mockReturnValueOnce([0, 0])
+            .mockReturnValueOnce([1, 1e8]);
+
+        command.close.subscribe(data => {
+            expect(data.timings.startDate).toStrictEqual(startDate);
+            expect(data.timings.endDate).toStrictEqual(endDate);
+            expect(data.timings.durationSeconds).toBe(1.1);
+            done();
+        });
+
+        command.start();
+        process1.emit('close', null, 'SIGKILL');
+    });
+
     it('shares closes to the close stream with command info and index', done => {
         const process = createProcess();
         const commandInfo = {
@@ -170,7 +262,7 @@ describe('#kill()', () => {
 
     it('marks the command as killed', done => {
         command.start();
-        
+
         command.close.subscribe(data => {
             expect(data.exitCode).toBe(1);
             expect(data.killed).toBe(true);

package/src/completion-listener.js

@@ -32,7 +32,7 @@ module.exports = class CompletionListener {
                         ? Rx.of(exitInfos, this.scheduler)
                         : Rx.throwError(exitInfos, this.scheduler)
                 ),
-                take(1)
+                take(1),
             )
             .toPromise();
     }

package/src/completion-listener.spec.js

@@ -85,4 +85,5 @@ describe('with success condition set to last', () => {
 
         return expect(result).rejects.toEqual([{ exitCode: 0 }, { exitCode: 1 }]);
     });
+
 });

package/src/concurrently.js

@@ -18,6 +18,7 @@ const defaults = {
     raw: false,
     controllers: [],
     cwd: undefined,
+    timings: false
 };
 
 module.exports = (commands, options) => {
@@ -32,21 +33,28 @@ module.exports = (commands, options) => {
         new ExpandNpmWildcard()
     ];
 
+    let lastColor = '';
     commands = _(commands)
         .map(mapToCommandInfo)
         .flatMap(command => parseCommand(command, commandParsers))
-        .map((command, index) => new Command(
-            Object.assign({
-                index,
-                spawnOpts: getSpawnOpts({
-                    raw: options.raw,
-                    env: command.env,
-                    cwd: command.cwd || options.cwd,
-                }),
-                killProcess: options.kill,
-                spawn: options.spawn,
-            }, command)
-        ))
+        .map((command, index) => {
+            // Use documented behaviour of repeating last color when specifying more commands than colors
+            lastColor = options.prefixColors && options.prefixColors[index] || lastColor;
+            return new Command(
+                Object.assign({
+                    index,
+                    spawnOpts: getSpawnOpts({
+                        raw: options.raw,
+                        env: command.env,
+                        cwd: command.cwd || options.cwd,
+                    }),
+                    prefixColor: lastColor,
+                    killProcess: options.kill,
+                    spawn: options.spawn,
+                    timings: options.timings,
+                }, command)
+            );
+        })
         .value();
 
     const handleResult = options.controllers.reduce(
@@ -67,7 +75,9 @@ module.exports = (commands, options) => {
         maybeRunMore(commandsLeft);
     }
 
-    return new CompletionListener({ successCondition: options.successCondition })
+    return new CompletionListener({
+        successCondition: options.successCondition,
+    })
         .listen(commands)
         .finally(() => {
             handleResult.onFinishCallbacks.forEach((onFinish) => onFinish());
@@ -75,13 +85,15 @@ module.exports = (commands, options) => {
 };
 
 function mapToCommandInfo(command) {
-    return {
+    return Object.assign({
         command: command.command || command,
         name: command.name || '',
-        prefixColor: command.prefixColor || '',
         env: command.env || {},
         cwd: command.cwd || '',
-    };
+
+    }, command.prefixColor ? {
+        prefixColor: command.prefixColor,
+    } : {});
 }
 
 function parseCommand(command, parsers) {

package/src/concurrently.spec.js

@@ -84,6 +84,19 @@ it('runs commands with a name or prefix color', () => {
     });
 });
 
+it('runs commands with a list of colors', () => {
+    create(['echo', 'kill'], {
+        prefixColors: ['red']
+    });
+
+    controllers.forEach(controller => {
+        expect(controller.handle).toHaveBeenCalledWith([
+            expect.objectContaining({ command: 'echo', prefixColor: 'red' }),
+            expect.objectContaining({ command: 'kill', prefixColor: 'red' }),
+        ]);
+    });
+});
+
 it('passes commands wrapped from a controller to the next one', () => {
     const fakeCommand = createFakeCommand('banana', 'banana');
     controllers[0].handle.mockReturnValue({ commands: [fakeCommand] });

package/src/defaults.js

@@ -10,6 +10,8 @@ module.exports = {
     handleInput: false,
     // How many processes to run at once
     maxProcesses: 0,
+    // Indices and names of commands whose output to be not logged
+    hide: '',
     nameSeparator: ',',
     // Which prefix style to use when logging processes output.
     prefix: '',
@@ -27,5 +29,7 @@ module.exports = {
     // Refer to https://date-fns.org/v2.0.1/docs/format
     timestampFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
     // Current working dir passed as option to spawn command. Default: process.cwd()
-    cwd: undefined
+    cwd: undefined,
+    // Whether to show timing information for processes in console output
+    timings: false,
 };

package/src/flow-control/base-handler.spec.js

@@ -0,0 +1,22 @@
+const stream = require('stream');
+const { createMockInstance } = require('jest-create-mock-instance');
+
+const Logger = require('../logger');
+const createFakeCommand = require('./fixtures/fake-command');
+const BaseHandler = require('./base-handler');
+
+let commands, controller, inputStream, logger;
+
+beforeEach(() => {
+    commands = [
+        createFakeCommand('foo', 'echo foo', 0),
+        createFakeCommand('bar', 'echo bar', 1),
+    ];
+    inputStream = new stream.PassThrough();
+    logger = createMockInstance(Logger);
+    controller = new BaseHandler({ logger });
+});
+
+it('returns same commands and null onFinish callback by default', () => {
+    expect(controller.handle(commands)).toMatchObject({ commands, onFinish: null });
+});

package/src/flow-control/log-timings.js

@@ -0,0 +1,64 @@
+const formatDate = require('date-fns/format');
+const Rx = require('rxjs');
+const { bufferCount, take } = require('rxjs/operators');
+const _ = require('lodash');
+const BaseHandler = require('./base-handler');
+
+module.exports = class LogTimings extends BaseHandler {
+    constructor({ logger, timestampFormat }) {
+        super({ logger });
+
+        this.timestampFormat = timestampFormat;
+    }
+
+    printExitInfoTimingTable(exitInfos) {
+        const exitInfoTable = _(exitInfos)
+            .sortBy(({ timings }) => timings.durationSeconds)
+            .reverse()
+            .map(({ command, timings, killed, exitCode }) => {
+                const readableDurationMs = (timings.endDate - timings.startDate).toLocaleString();
+                return {
+                    name: command.name,
+                    duration: `${readableDurationMs}ms`,
+                    'exit code': exitCode,
+                    killed,
+                    command: command.command,
+                };
+            })
+            .value();
+
+        this.logger.logGlobalEvent('Timings:');
+        this.logger.logTable(exitInfoTable);
+        return exitInfos;
+    };
+
+    handle(commands) {
+        if (!this.logger) {
+            return { commands };
+        }
+
+        // individual process timings
+        commands.forEach(command => {
+            command.timer.subscribe(({ startDate, endDate }) => {
+                if (!endDate) {
+                    const formattedStartDate = formatDate(startDate, this.timestampFormat);
+                    this.logger.logCommandEvent(`${command.command} started at ${formattedStartDate}`, command);
+                } else {
+                    const durationMs = endDate.getTime() - startDate.getTime();
+                    const formattedEndDate = formatDate(endDate, this.timestampFormat);
+                    this.logger.logCommandEvent(`${command.command} stopped at ${formattedEndDate} after ${durationMs.toLocaleString()}ms`, command);
+                }
+            });
+        });
+
+        // overall summary timings
+        const closeStreams = commands.map(command => command.close);
+        this.allProcessesClosed = Rx.merge(...closeStreams).pipe(
+            bufferCount(closeStreams.length),
+            take(1),
+        );
+        this.allProcessesClosed.subscribe((exitInfos) => this.printExitInfoTimingTable(exitInfos));
+
+        return { commands };
+    }
+};

package/src/flow-control/log-timings.spec.js

@@ -0,0 +1,137 @@
+const { createMockInstance } = require('jest-create-mock-instance');
+const formatDate = require('date-fns/format');
+const Logger = require('../logger');
+const LogTimings = require( './log-timings' );
+const createFakeCommand = require('./fixtures/fake-command');
+
+// shown in timing order
+const startDate0 = new Date();
+const startDate1 = new Date(startDate0.getTime() + 1000);
+const endDate1 = new Date(startDate0.getTime() + 3000);
+const endDate0 = new Date(startDate0.getTime() + 5000);
+
+const timestampFormat = 'yyyy-MM-dd HH:mm:ss.SSS';
+const getDurationText = (startDate, endDate) => `${(endDate.getTime() - startDate.getTime()).toLocaleString()}ms`;
+const command0DurationTextMs = getDurationText(startDate0, endDate0);
+const command1DurationTextMs = getDurationText(startDate1, endDate1);
+
+const exitInfoToTimingInfo = ({ command, timings, killed, exitCode }) => {
+    const readableDurationMs = getDurationText(timings.startDate, timings.endDate);
+    return {
+        name: command.name,
+        duration: readableDurationMs,
+        'exit code': exitCode,
+        killed,
+        command: command.command,
+    };
+};
+
+let controller, logger, commands, command0ExitInfo, command1ExitInfo;
+
+beforeEach(() => {
+    commands = [
+        createFakeCommand('foo', 'command 1', 0),
+        createFakeCommand('bar', 'command 2', 1),
+    ];
+
+    command0ExitInfo = {
+        command: commands[0].command,
+        timings: {
+            startDate: startDate0,
+            endDate: endDate0,
+        },
+        index: commands[0].index,
+        killed: false,
+        exitCode: 0,
+    };
+
+    command1ExitInfo = {
+        command: commands[1].command,
+        timings: {
+            startDate: startDate1,
+            endDate: endDate1,
+        },
+        index: commands[1].index,
+        killed: false,
+        exitCode: 0,
+    };
+
+    logger = createMockInstance(Logger);
+    controller = new LogTimings({ logger, timestampFormat });
+});
+
+it('returns same commands', () => {
+    expect(controller.handle(commands)).toMatchObject({ commands });
+});
+
+it('does not log timings and doesn\'t throw if no logger is provided', () => {
+    controller = new LogTimings({  });
+    controller.handle(commands);
+
+    commands[0].timer.next({ startDate: startDate0 });
+    commands[1].timer.next({ startDate: startDate1 });
+    commands[1].timer.next({ startDate: startDate1, endDate: endDate1 });
+    commands[0].timer.next({ startDate: startDate0, endDate: endDate0 });
+
+    expect(logger.logCommandEvent).toHaveBeenCalledTimes(0);
+});
+
+it('logs the timings at the start and end (ie complete or error) event of each command', () => {
+    controller.handle(commands);
+
+    commands[0].timer.next({ startDate: startDate0 });
+    commands[1].timer.next({ startDate: startDate1 });
+    commands[1].timer.next({ startDate: startDate1, endDate: endDate1 });
+    commands[0].timer.next({ startDate: startDate0, endDate: endDate0 });
+
+    expect(logger.logCommandEvent).toHaveBeenCalledTimes(4);
+    expect(logger.logCommandEvent).toHaveBeenCalledWith(
+        `${commands[0].command} started at ${formatDate(startDate0, timestampFormat)}`,
+        commands[0]
+    );
+    expect(logger.logCommandEvent).toHaveBeenCalledWith(
+        `${commands[1].command} started at ${formatDate(startDate1, timestampFormat)}`,
+        commands[1]
+    );
+    expect(logger.logCommandEvent).toHaveBeenCalledWith(
+        `${commands[1].command} stopped at ${formatDate(endDate1, timestampFormat)} after ${command1DurationTextMs}`,
+        commands[1]
+    );
+    expect(logger.logCommandEvent).toHaveBeenCalledWith(
+        `${commands[0].command} stopped at ${formatDate(endDate0, timestampFormat)} after ${command0DurationTextMs}`,
+        commands[0]
+    );
+});
+
+it('does not log timings summary if there was an error', () => {
+    controller.handle(commands);
+
+    commands[0].close.next(command0ExitInfo);
+    commands[1].error.next();
+
+    expect(logger.logTable).toHaveBeenCalledTimes(0);
+
+});
+
+it('logs the sorted timings summary when all processes close successfully', () => {
+    jest.spyOn(controller, 'printExitInfoTimingTable');
+    controller.handle(commands);
+
+    commands[0].close.next(command0ExitInfo);
+    commands[1].close.next(command1ExitInfo);
+
+    expect(logger.logTable).toHaveBeenCalledTimes(1);
+
+    // un-sorted ie by finish order
+    expect(controller.printExitInfoTimingTable).toHaveBeenCalledWith([
+        command0ExitInfo,
+        command1ExitInfo
+    ]);
+
+    // sorted by duration
+    expect(logger.logTable).toHaveBeenCalledWith([
+        exitInfoToTimingInfo(command1ExitInfo),
+        exitInfoToTimingInfo(command0ExitInfo)
+    ]);
+
+});

package/src/flow-control/restart-process.spec.js

@@ -69,7 +69,15 @@ it('restarts processes up to tries', () => {
     expect(commands[0].start).toHaveBeenCalledTimes(2);
 });
 
-it.todo('restart processes forever, if tries is negative');
+it('restart processes forever, if tries is negative', () => {
+    controller = new RestartProcess({
+        logger,
+        scheduler,
+        delay: 100,
+        tries: -1
+    });
+    expect(controller.tries).toBe(Infinity);
+});
 
 it('restarts processes until they succeed', () => {
     controller.handle(commands);

package/src/logger.js

@@ -5,7 +5,11 @@ const formatDate = require('date-fns/format');
 const defaults = require('./defaults');
 
 module.exports = class Logger {
-    constructor({ outputStream, prefixFormat, prefixLength, raw, timestampFormat }) {
+    constructor({ hide, outputStream, prefixFormat, prefixLength, raw, timestampFormat }) {
+        // To avoid empty strings from hiding the output of commands that don't have a name,
+        // keep in the list of commands to hide only strings with some length.
+        // This might happen through the CLI when no `--hide` argument is specified, for example.
+        this.hide = _.castArray(hide).filter(name => name || name === 0).map(String);
         this.raw = raw;
         this.outputStream = outputStream;
         this.prefixFormat = prefixFormat;
@@ -76,6 +80,10 @@ module.exports = class Logger {
     }
 
     logCommandText(text, command) {
+        if (this.hide.includes(String(command.index)) || this.hide.includes(command.name)) {
+            return;
+        }
+
         const prefix = this.colorText(command, this.getPrefix(command));
         return this.log(prefix + (prefix ? ' ' : ''), text);
     }
@@ -88,6 +96,63 @@ module.exports = class Logger {
         this.log(chalk.reset('-->') + ' ', chalk.reset(text) + '\n');
     }
 
+    logTable(tableContents) {
+        // For now, can only print array tables with some content.
+        if (this.raw || !Array.isArray(tableContents) || !tableContents.length) {
+            return;
+        }
+
+        let nextColIndex = 0;
+        const headers = {};
+        const contentRows = tableContents.map(row => {
+            const rowContents = [];
+            Object.keys(row).forEach((col) => {
+                if (!headers[col]) {
+                    headers[col] = {
+                        index: nextColIndex++,
+                        //
+                        length: col.length,
+                    };
+                }
+
+                const colIndex = headers[col].index;
+                const formattedValue = String(row[col] == null ? '' : row[col]);
+                // Update the column length in case this rows value is longer than the previous length for the column.
+                headers[col].length = Math.max(formattedValue.length, headers[col].length);
+                rowContents[colIndex] = formattedValue;
+                return rowContents;
+            });
+            return rowContents;
+        });
+
+        const headersFormatted = Object
+            .keys(headers)
+            .map(header => header.padEnd(headers[header].length, ' '));
+
+        if (!headersFormatted.length) {
+            // No columns exist.
+            return;
+        }
+
+        const borderRowFormatted = headersFormatted.map(header => '─'.padEnd(header.length, '─'));
+
+        this.logGlobalEvent(`┌─${borderRowFormatted.join('─┬─')}─┐`);
+        this.logGlobalEvent(`│ ${headersFormatted.join(' │ ')} │`);
+        this.logGlobalEvent(`├─${borderRowFormatted.join('─┼─')}─┤`);
+
+        contentRows.forEach(contentRow => {
+            const contentRowFormatted = headersFormatted.map((header, colIndex) => {
+                // If the table was expanded after this row was processed, it won't have this column.
+                // Use an empty string in this case.
+                const col = contentRow[colIndex] || '';
+                return col.padEnd(header.length, ' ');
+            });
+            this.logGlobalEvent(`│ ${contentRowFormatted.join(' │ ')} │`);
+        });
+
+        this.logGlobalEvent(`└─${borderRowFormatted.join('─┴─')}─┘`);
+    }
+
     log(prefix, text) {
         if (this.raw) {
             return this.outputStream.write(text);

package/src/logger.spec.js

@@ -176,6 +176,20 @@ describe('#logCommandText()', () => {
 
         expect(logger.log).toHaveBeenCalledWith(chalk.hex(prefixColor)('[1]') + ' ', 'foo');
     });
+
+    it('does nothing if command is hidden by name', () => {
+        const logger = createLogger({ hide: ['abc'] });
+        logger.logCommandText('foo', { name: 'abc' });
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
+    it('does nothing if command is hidden by index', () => {
+        const logger = createLogger({ hide: [3] });
+        logger.logCommandText('foo', { index: 3 });
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
 });
 
 describe('#logCommandEvent()', () => {
@@ -186,6 +200,20 @@ describe('#logCommandEvent()', () => {
         expect(logger.log).not.toHaveBeenCalled();
     });
 
+    it('does nothing if command is hidden by name', () => {
+        const logger = createLogger({ hide: ['abc'] });
+        logger.logCommandEvent('foo', { name: 'abc' });
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
+    it('does nothing if command is hidden by index', () => {
+        const logger = createLogger({ hide: [3] });
+        logger.logCommandEvent('foo', { index: 3 });
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
     it('logs text in gray dim', () => {
         const logger = createLogger();
         logger.logCommandEvent('foo', { index: 1 });
@@ -193,3 +221,98 @@ describe('#logCommandEvent()', () => {
         expect(logger.log).toHaveBeenCalledWith(chalk.reset('[1]') + ' ', chalk.reset('foo') + '\n');
     });
 });
+
+describe('#logTable()', () => {
+    it('does not log anything in raw mode', () => {
+        const logger = createLogger({ raw: true });
+        logger.logTable([{ foo: 1, bar: 2 }]);
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
+    it('does not log anything if value is not an array', () => {
+        const logger = createLogger();
+        logger.logTable({});
+        logger.logTable(null);
+        logger.logTable(0);
+        logger.logTable('');
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
+    it('does not log anything if array is empy', () => {
+        const logger = createLogger();
+        logger.logTable([]);
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
+    it('does not log anything if array items have no properties', () => {
+        const logger = createLogger();
+        logger.logTable([{}]);
+
+        expect(logger.log).not.toHaveBeenCalled();
+    });
+
+    it('logs a header for each item\'s properties', () => {
+        const logger = createLogger();
+        logger.logTable([{ foo: 1, bar: 2 }]);
+
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ foo │ bar │') + '\n',
+        );
+    });
+
+    it('logs padded headers according to longest column\'s value', () => {
+        const logger = createLogger();
+        logger.logTable([{ a: 'foo', b: 'barbaz' }]);
+
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ a   │ b      │') + '\n',
+        );
+    });
+
+    it('logs each items\'s values', () => {
+        const logger = createLogger();
+        logger.logTable([{ foo: 123 }, { foo: 456 }]);
+
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ 123 │') + '\n',
+        );
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ 456 │') + '\n',
+        );
+    });
+
+    it('logs each items\'s values padded according to longest column\'s value', () => {
+        const logger = createLogger();
+        logger.logTable([{ foo: 1 }, { foo: 123 }]);
+
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ 1   │') + '\n',
+        );
+    });
+
+    it('logs items with different properties in each', () => {
+        const logger = createLogger();
+        logger.logTable([{ foo: 1 }, { bar: 2 }]);
+
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ foo │ bar │') + '\n',
+        );
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│ 1   │     │') + '\n',
+        );
+        expect(logger.log).toHaveBeenCalledWith(
+            chalk.reset('-->') + ' ',
+            chalk.reset('│     │ 2   │') + '\n',
+        );
+    });
+});