concurrently 3.4.0 → 3.6.1

package/test/test-parseCmds.js

@@ -0,0 +1,204 @@
+'use strict';
+const assert = require('assert');
+const sinon = require('sinon');
+
+const parseCmds = require('../src/parseCmds');
+
+const sandbox = sinon.createSandbox();
+
+describe('parseCmds', () => {
+
+    afterEach(() => {
+        sandbox.restore();
+    });
+
+    it('returns a list of command objects', () => {
+        const cmds = parseCmds([ 'echo test' ]);
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'echo test',
+                name: '',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('strips quotes', () => {
+        const cmds = parseCmds([ '"echo test"' ]);
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'echo test',
+                name: '',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('assigns names', () => {
+        const cmds = parseCmds([ 'echo test', 'echo test2' ], {
+            names: 'echo-test,echo-test2'
+        });
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'echo test',
+                name: 'echo-test',
+                color: undefined
+            },
+            {
+                cmd: 'echo test2',
+                name: 'echo-test2',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('assigns names with custom separator', () => {
+        const cmds = parseCmds([ 'echo test', 'echo test2' ], {
+            names: 'echo-test|echo-test2',
+            nameSeparator: '|'
+        });
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'echo test',
+                name: 'echo-test',
+                color: undefined
+            },
+            {
+                cmd: 'echo test2',
+                name: 'echo-test2',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('assigns colours', () => {
+        const cmds = parseCmds([ 'echo test', 'echo test2' ], {
+            prefixColors: 'blue'
+        });
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'echo test',
+                name: '',
+                color: 'blue'
+            },
+            {
+                cmd: 'echo test2',
+                name: '',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('expands npm: shortcut', () => {
+        const cmds = parseCmds([ 'npm:watch:js' ]);
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'npm run watch:js',
+                name: 'watch:js',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('expands npm: shortcut with assigned name', () => {
+        const cmds = parseCmds([ 'npm:watch:js' ], {
+            names: 'js'
+        });
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'npm run watch:js',
+                name: 'js',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('expands npm: shortcut with wildcard', () => {
+        sandbox.stub(require('../src/pkgInfo'), 'getScripts').returns([
+            'test', 'start', 'watch:js', 'watch:css', 'watch:node'
+        ]);
+
+        const cmds = parseCmds([ 'npm:watch:*' ]);
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'npm run watch:js',
+                name: 'js',
+                color: undefined
+            },
+            {
+                cmd: 'npm run watch:css',
+                name: 'css',
+                color: undefined
+            },
+            {
+                cmd: 'npm run watch:node',
+                name: 'node',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('expands npm: shortcut with wildcard and name prefix', () => {
+        sandbox.stub(require('../src/pkgInfo'), 'getScripts').returns([
+            'test', 'start', 'watch:js', 'watch:css', 'watch:node'
+        ]);
+
+        const cmds = parseCmds([ 'npm:watch:*' ], {
+            names: 'w:'
+        });
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'npm run watch:js',
+                name: 'w:js',
+                color: undefined
+            },
+            {
+                cmd: 'npm run watch:css',
+                name: 'w:css',
+                color: undefined
+            },
+            {
+                cmd: 'npm run watch:node',
+                name: 'w:node',
+                color: undefined
+            }
+        ]);
+    });
+
+    it('applies prefix colors to expanded commands', () => {
+        sandbox.stub(require('../src/pkgInfo'), 'getScripts').returns([
+            'test', 'start', 'watch:js', 'watch:css', 'watch:node'
+        ]);
+
+        const cmds = parseCmds([ 'npm:watch:*' ], {
+            prefixColors: 'blue,magenta,cyan'
+        });
+
+        assert.deepStrictEqual(cmds, [
+            {
+                cmd: 'npm run watch:js',
+                name: 'js',
+                color: 'blue'
+            },
+            {
+                cmd: 'npm run watch:css',
+                name: 'css',
+                color: 'magenta'
+            },
+            {
+                cmd: 'npm run watch:node',
+                name: 'node',
+                color: 'cyan'
+            }
+        ]);
+    });
+});

package/test/utils.js

@@ -1,31 +1,39 @@
-var childProcess = require('child_process');
-var _ = require('lodash');
-var shellQuote = require('shell-quote');
+'use strict';
+const childProcess = require('child_process');
+const _ = require('lodash');
+const readline = require('readline');
+const shellQuote = require('shell-quote');
+
+// If true, output of commands are shown
+const DEBUG_TESTS = process.env.DEBUG_TESTS === 'true';
 
 function run(cmd, opts) {
     opts = _.merge({
-        pipe: true,
-        cwd: undefined,
-        callback: function(child) {
-            // Since we return promise, we need to provide
-            // this callback if one wants to access the child
-            // process reference
-            // Called immediately after successful child process
-            // spawn
-        }
+        // If set to a function, it will be called for each line
+        // written to the child process's stdout as (line, child)
+        onOutputLine: undefined,
+        onErrorLine: undefined
     }, opts);
 
-    var child;
-    var parts = shellQuote.parse(cmd);
+    let child;
+    const parts = shellQuote.parse(cmd);
     try {
         child = childProcess.spawn(_.head(parts), _.tail(parts), {
-            cwd: opts.cwd,
-            stdio: opts.pipe ? "inherit" : null
+            stdio: DEBUG_TESTS && !opts.onOutputLine ? 'inherit': null,
         });
     } catch (e) {
         return Promise.reject(e);
     }
-    opts.callback(child);
+
+    if (opts.onOutputLine) {
+        readLines(child, opts.onOutputLine);
+    }
+
+    if (opts.onErrorLine) {
+        readLines(child, opts.onErrorLine, 'stderr');
+    }
+
+    readLines(child, (l) => { console.log(l); }, 'stderr');
 
     return new Promise(function(resolve, reject) {
         child.on('error', function(err) {
@@ -38,6 +46,23 @@ function run(cmd, opts) {
     });
 }
 
+function readLines(child, callback, src) {
+    src = src || 'stdout';
+
+    const rl = readline.createInterface({
+        input: child[src],
+        output: null
+    });
+
+    rl.on('line', function(line) {
+        if (DEBUG_TESTS) {
+            console.log(line);
+        }
+
+        callback(line, child);
+    });
+}
+
 module.exports = {
     run: run
 };

package/.eslintrc

@@ -1,31 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "node": true
-  },
-  "globals": {},
-  "rules": {
-    "no-bitwise": 2,
-    "camelcase": 2,
-    "curly": 2,
-    "eqeqeq": 2,
-    "wrap-iife": [
-      2,
-      "any"
-    ],
-    "indent": [
-      2,
-      4,
-      {
-        "SwitchCase": 1
-      }
-    ],
-    "no-use-before-define": 0,
-    "new-cap": 2,
-    "no-caller": 2,
-    "quotes": [
-      2,
-      "single"
-    ]
-  }
-}

package/.jshintrc

@@ -1,17 +0,0 @@
-{
-  "node": true,
-  "browser": true,
-  "predef": [ "Promise" ],
-  "bitwise": true,
-  "camelcase": true,
-  "curly": true,
-  "eqeqeq": true,
-  "immed": true,
-  "indent": 4,
-  "latedef": false,
-  "newcap": true,
-  "noarg": true,
-  "quotmark": "single",
-  "regexp": true,
-  "devel": true
-}

package/.npmignore

@@ -1,31 +0,0 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# Deployed apps should consider commenting this line out:
-# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
-node_modules
-
-# OS X
-.DS_Store
-
-# Vagrant directory
-.vagrant

package/tst.js

@@ -1 +0,0 @@
-setTimeout(() =>console.log("i win!"), 3000);