Fix: using cross-spawn-async for spaced paths (fixes #26, fixes #27)

Author: mysticatea

package.json

@@ -22,10 +22,10 @@
   },
   "dependencies": {
     "babel-runtime": "^6.3.13",
+    "cross-spawn-async": "^2.1.9",
     "minimatch": "^3.0.0",
     "ps-tree": "^1.0.1",
-    "shell-quote": "^1.4.3",
-    "which": "^1.2.0"
+    "shell-quote": "^1.4.3"
   },
   "devDependencies": {
     "babel-cli": "^6.4.0",

src/lib/run-task.js

@@ -5,7 +5,6 @@
  */
 import {parse as parseArgs} from "shell-quote";
 import spawn from "./spawn";
-import whichNpm from "./which-npm";
 
 /**
  * Converts a given stream to an option for `child_process.spawn`.
@@ -52,14 +51,14 @@ function detectStreamKind(stream, std) {
  */
 export default function runTask(task, stdin, stdout, stderr, prefixOptions) {
     let cp = null;
-    const promise = whichNpm().then(npmPath => new Promise((resolve, reject) => {
+    const promise = new Promise((resolve, reject) => {
         const stdinKind = detectStreamKind(stdin, process.stdin);
         const stdoutKind = detectStreamKind(stdout, process.stdout);
         const stderrKind = detectStreamKind(stderr, process.stderr);
 
         // Execute.
         cp = spawn(
-            npmPath,
+            "npm",
             ["run-script"].concat(prefixOptions, parseArgs(task)),
             {stdio: [stdinKind, stdoutKind, stderrKind]}
         );
@@ -78,7 +77,7 @@ export default function runTask(task, stdin, stdout, stderr, prefixOptions) {
             cp = null;
             resolve({task, code});
         });
-    }));
+    });
 
     promise.abort = function abort() {
         if (cp != null) {

src/lib/spawn-posix.js

@@ -4,7 +4,7 @@
  * See LICENSE file in root directory for full license.
  */
 /* eslint no-param-reassign: 0 */
-import cp from "child_process";
+import crossSpawn from "cross-spawn-async";
 import getDescendentProcessInfo from "ps-tree";
 
 /**
@@ -42,7 +42,7 @@ function kill() {
  * @private
  */
 export default function spawn(command, args, options) {
-    const child = cp.spawn(command, args, options);
+    const child = crossSpawn(command, args, options);
     child.kill = kill;
 
     return child;

src/lib/spawn-win32.js

@@ -3,14 +3,14 @@
  * @copyright 2015 Toru Nagashima. All rights reserved.
  * See LICENSE file in root directory for full license.
  */
-import cp from "child_process";
+import crossSpawn from "cross-spawn-async";
 
 /**
  * Kills the new process and its sub processes forcibly.
  * @this ChildProcess
  */
 function kill() {
-    cp.spawn("taskkill", ["/F", "/T", "/PID", this.pid]);
+    crossSpawn("taskkill", ["/F", "/T", "/PID", this.pid]);
 }
 
 /**
@@ -27,7 +27,7 @@ function kill() {
  * @private
  */
 export default function spawn(command, args, options) {
-    const child = cp.spawn(command, args, options);
+    const child = crossSpawn(command, args, options);
     child.kill = kill;
 
     return child;