New feature: mixied running.

Author: mysticatea

README.md

@@ -16,15 +16,15 @@ npm install npm-run-all
 ## Usage
 
 ```
-Usage: npm-run-all [OPTIONS] <task> [...tasks]
+Usage: npm-run-all [OPTIONS] [...tasks]
 
   Run specified tasks.
 
   Options:
-    -h, --help      Print this text.
-    -p, --parallel  Run specified tasks on parallel.
-                    By default, run on sequential.
-    -v, --version   Print version number.
+    -h, --help                  Print this text.
+    -p, --parallel [...tasks]   Grouping tasks to run on parallel.
+    -s, --sequential [...tasks] Grouping tasks to run on sequential.
+    -v, --version               Print version number.
 ```
 
 ### Run tasks on sequential
@@ -45,6 +45,24 @@ This is same as `npm run watch:html & npm run watch:js`.
 
 Of course, this can be run on **Windows** as well!
 
+### Run tasks on mixed sequential and parallel.
+
+```
+npm-run-all clean lint --parallel watch:html watch:js
+```
+
+1. First, this runs `clean` and `lint` sequentially.
+2. Next, runs `build:html` and `build:js` parallelly.
+
+```
+npm-run-all a b --parallel c d --sequential e f --parallel g h i
+```
+
+1. First, runs `a` and `b` sequentially.
+2. Second, runs `c` and `d` parallelly.
+3. Third, runs `e` and `f` sequentially.
+4. Lastly, runs `g`, `h`, and `i` parallelly.
+
 
 ## Node API
 

package.json

@@ -23,8 +23,7 @@
     "testing:build": "npm run build:babel -- --watch --source-maps-inline",
     "testing:mocha": "npm run test:mocha -- --watch --growl",
     "test-task:env-check": "node test/tasks/env-check.js",
-    "test-task:append-a": "node test/tasks/append.js a",
-    "test-task:append-b": "node test/tasks/append.js b",
+    "test-task:append": "node test/tasks/append.js",
     "test-task:error": "node test/tasks/error.js",
     "test-task:stdio": "node test/tasks/stdio.js"
   },

src/command.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env node
 
-import {readFileSync} from "fs";
-import {join as joinPath} from "path";
-import minimist from "minimist";
 import runAll from "./index";
 
 if (require.main === module) {
@@ -16,56 +13,86 @@ Usage: npm-run-all [OPTIONS] [...tasks]
   Run specified tasks.
 
   Options:
-    -h, --help      Print this text.
-    -p, --parallel  Run specified tasks on parallel.
-                    By default, run on sequential.
-    -v, --version   Print version number.
+    -h, --help                  Print this text.
+    -p, --parallel [...tasks]   Grouping tasks to run on parallel.
+    -s, --sequential [...tasks] Grouping tasks to run on sequential.
+    -v, --version               Print version number.
 
   See Also:
     https://github.com/mysticatea/npm-run-all
 `);
 }
 
 function printVersion() {
-  const version = JSON.parse(
-    readFileSync(
-      joinPath(__dirname, "../package.json"),
-      {encoding: "utf8"}
-    )
-  ).version;
+  console.log("v" + require("../package.json").version);
+}
+
+function createQueue(args) {
+  return args.reduce((queue, arg) => {
+    switch (arg) {
+      case "-s":
+      case "--sequential":
+        queue.push({parallel: false, tasks: []});
+        break;
+
+      case "-p":
+      case "--parallel":
+        queue.push({parallel: true, tasks: []});
+        break;
 
-  console.log("v" + version);
+      default:
+        if (arg[0] === "-") {
+          throw new Error("Invalid Option: " + arg);
+        }
+        queue[queue.length - 1].tasks.push(arg);
+        break;
+    }
+    return queue;
+  }, [{parallel: false, tasks: []}]);
 }
 
 /*eslint no-process-exit:0*/
 function main(args) {
-  const options = minimist(args, {
-    boolean: ["help", "parallel", "version"],
-    alias: {"h": "help", "p": "parallel", "v": "version"},
-    unknown: arg => {
-      if (arg[0] === "-") {
-        console.error(`Unknown Option: ${arg}`);
-        process.exit(1);
-      }
-    }
-  });
+  if (args.length === 0) {
+    args.push("--help");
+  }
+  switch (args[0]) {
+    case "-h":
+    case "--help":
+      printHelp();
+      return;
+
+    case "-v":
+    case "--version":
+      printVersion();
+      return;
+  }
 
-  if (options._.length === 0 || options.help) {
-    printHelp();
-    process.exit(0);
+  let queue;
+  try {
+    queue = createQueue(args);
   }
-  if (options.version) {
-    printVersion();
-    process.exit(0);
+  catch (err) {
+    console.error(err.message);
+    process.exit(1);
   }
 
-  runAll(
-      options._,
+  (function next() {
+    const group = queue.shift();
+    if (group == null) {
+      return;
+    }
+    if (group.tasks.length === 0) {
+      next();
+      return;
+    }
+    runAll(
+      group.tasks,
       {
         stdout: process.stdout,
         stderr: process.stderr,
-        parallel: options.parallel
-      }
-    )
-    .catch(() => process.exit(1));
+        parallel: group.parallel
+      })
+      .then(next, () => process.exit(1));
+  })();
 }

test/mixed.js

@@ -0,0 +1,29 @@
+import {execSync} from "child_process";
+import assert from "power-assert";
+import {result, removeResult} from "./lib/util";
+
+// Test targets.
+import runAll from "../lib/index";
+import "../lib/command";
+
+describe("npm-run-all", () => {
+  beforeEach(removeResult);
+  after(removeResult);
+
+  it("should run tasks, mixed sequential and parallel 1:", () => {
+    execSync("node lib/command.js \"test-task:append a\" -p \"test-task:append b\" \"test-task:append c\" -s \"test-task:append d\" \"test-task:append e\"");
+    assert(result() === "aabcbcddee" ||
+           result() === "aabccbddee" ||
+           result() === "aacbbcddee" ||
+           result() === "aacbcbddee");
+  });
+
+  it("should run tasks, mixed sequential and parallel 2:", () => {
+    execSync("node lib/command.js -p \"test-task:append b\" \"test-task:append c\" -s \"test-task:append d\" \"test-task:append e\"");
+    assert(result() === "bcbcddee" ||
+           result() === "bccbddee" ||
+           result() === "cbbcddee" ||
+           result() === "cbcbddee");
+  });
+
+});

test/parallel.js

@@ -12,7 +12,7 @@ describe("npm-run-all", () => {
 
   describe("should run tasks on parallel when was given --parallel option:", () => {
     it("lib version", () => {
-      return runAll(["test-task:append-a", "test-task:append-b"], {parallel: true})
+      return runAll(["test-task:append a", "test-task:append b"], {parallel: true})
         .then(() => {
           assert(result() === "abab" ||
                  result() === "baba" ||
@@ -22,7 +22,7 @@ describe("npm-run-all", () => {
     });
 
     it("command version", () => {
-      execSync("node lib/command.js --parallel test-task:append-a test-task:append-b");
+      execSync("node lib/command.js --parallel \"test-task:append a\" \"test-task:append b\"");
       assert(result() === "abab" ||
              result() === "baba" ||
              result() === "abba" ||

test/sequential.js

@@ -12,14 +12,14 @@ describe("npm-run-all", () => {
 
   describe("should run tasks on sequential:", () => {
     it("lib version", () => {
-      return runAll(["test-task:append-a", "test-task:append-b"], {parallel: false})
+      return runAll(["test-task:append a", "test-task:append b"], {parallel: false})
         .then(() => {
           assert(result() === "aabb");
         });
     });
 
     it("command version", () => {
-      execSync("node lib/command.js test-task:append-a test-task:append-b");
+      execSync("node lib/command.js \"test-task:append a\" \"test-task:append b\"");
       assert(result() === "aabb");
     });
   });

test/tasks/append.js

@@ -5,4 +5,4 @@ function append() {
 }
 
 append();
-setTimeout(append, 500);
+setTimeout(append, 100);