concurrently 6.1.0 → 6.2.0

package/README.md

@@ -169,9 +169,10 @@ Killing other processes
                          code                                          [boolean]
 
 Restarting
-  --restart-tries  How many times a process that died should restart.
+      --restart-tries  How many times a process that died should restart.
+                       Negative numbers will make the process restart forever.
                                                            [number] [default: 0]
-  --restart-after  Delay time to respawn the process, in milliseconds.
+      --restart-after  Delay time to respawn the process, in milliseconds.
                                                            [number] [default: 0]
 
 Options:
@@ -257,9 +258,9 @@ concurrently can be used programmatically by using the API documented below:
 
 > Returns: a `Promise` that resolves if the run was successful (according to `successCondition` option),
 > or rejects, containing an array of objects with information for each command that has been run, in the order
-> that the commands terminated. The objects have the shape `{ command, index, exitCode }`, where `command` is the object
-> passed in the `commands` array and `index` its index there. Default values (empty strings or objects) are returned for
-> the fields that were not specified.
+> that the commands terminated. The objects have the shape `{ command, index, exitCode, killed }`, where `command` is the object
+> passed in the `commands` array, `index` its index there and `killed` indicates if the process was killed as a result of 
+> `killOthers`. Default values (empty strings or objects) are returned for the fields that were not specified.
 
 Example:
 

package/bin/concurrently.js

@@ -107,7 +107,9 @@ const args = yargs
 
         // Restarting
         'restart-tries': {
-            describe: 'How many times a process that died should restart.',
+            describe:
+                'How many times a process that died should restart.\n' +
+                'Negative numbers will make the process restart forever.',
             default: defaults.restartTries,
             type: 'number'
         },

package/bin/concurrently.spec.js

@@ -300,7 +300,7 @@ describe('--kill-others-on-fail', () => {
 });
 
 describe('--handle-input', () => {
-    it('is alised to -i', done => {
+    it('is aliased to -i', done => {
         const child = run('-i "node fixtures/read-echo.js"');
         child.log.subscribe(line => {
             if (/READING/.test(line)) {

package/package.json

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

package/src/command.js

@@ -14,6 +14,7 @@ module.exports = class Command {
         this.killProcess = killProcess;
         this.spawn = spawn;
         this.spawnOpts = spawnOpts;
+        this.killed = false;
 
         this.error = new Rx.Subject();
         this.close = new Rx.Subject();
@@ -41,6 +42,7 @@ module.exports = class Command {
                 },
                 index: this.index,
                 exitCode: exitCode === null ? signal : exitCode,
+                killed: this.killed,
             });
         });
         child.stdout && pipeTo(Rx.fromEvent(child.stdout, 'data'), this.stdout);
@@ -50,6 +52,7 @@ module.exports = class Command {
 
     kill(code) {
         if (this.killable) {
+            this.killed = true;
             this.killProcess(this.pid, code);
         }
     }

package/src/command.spec.js

@@ -60,6 +60,7 @@ describe('#start()', () => {
 
         command.close.subscribe(data => {
             expect(data.exitCode).toBe(0);
+            expect(data.killed).toBe(false);
             expect(command.process).toBeUndefined();
             done();
         });
@@ -74,6 +75,7 @@ describe('#start()', () => {
 
         command.close.subscribe(data => {
             expect(data.exitCode).toBe('SIGKILL');
+            expect(data.killed).toBe(false);
             done();
         });
 
@@ -98,6 +100,7 @@ describe('#start()', () => {
 
         command.close.subscribe(data => {
             expect(data.command).toEqual(commandInfo);
+            expect(data.killed).toBe(false);
             expect(data.index).toBe(1);
             done();
         });
@@ -164,4 +167,17 @@ describe('#kill()', () => {
 
         expect(killProcess).not.toHaveBeenCalled();
     });
+
+    it('marks the command as killed', done => {
+        command.start();
+        
+        command.close.subscribe(data => {
+            expect(data.exitCode).toBe(1);
+            expect(data.killed).toBe(true);
+            done();
+        });
+
+        command.kill();
+        process.emit('close', 1, null);
+    });
 });

package/src/completion-listener.js

@@ -1,5 +1,5 @@
 const Rx = require('rxjs');
-const { bufferCount, map, switchMap, take } = require('rxjs/operators');
+const { bufferCount, switchMap, take } = require('rxjs/operators');
 
 module.exports = class CompletionListener {
     constructor({ successCondition, scheduler }) {

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

@@ -7,6 +7,7 @@ module.exports = class RestartProcess {
     constructor({ delay, tries, logger, scheduler }) {
         this.delay = +delay || defaults.restartDelay;
         this.tries = +tries || defaults.restartTries;
+        this.tries = this.tries < 0 ? Infinity : this.tries;
         this.logger = logger;
         this.scheduler = scheduler;
     }

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

@@ -69,6 +69,8 @@ it('restarts processes up to tries', () => {
     expect(commands[0].start).toHaveBeenCalledTimes(2);
 });
 
+it.todo('restart processes forever, if tries is negative');
+
 it('restarts processes until they succeed', () => {
     controller.handle(commands);