cross-spawn-cb 0.6.3 → 0.6.4

package/lib/spawnCallback.js

@@ -15,15 +15,15 @@ module.exports = function spawnCallback(command, args, options, callback) {
   var cp = spawn(command, args, options);
 
   // collect output
-  var stdout, stderr;
+  var res = { stdout: null, stderr: null };
   if (options.encoding) {
     if (cp.stdout) {
-      stdout = [];
-      cp.stdout.on('data', stdout.push.bind(stdout));
+      res.stdout = [];
+      cp.stdout.on('data', res.stdout.push.bind(res.stdout));
     }
     if (cp.stderr) {
-      stderr = [];
-      cp.stderr.on('data', stderr.push.bind(stderr));
+      res.stderr = [];
+      cp.stderr.on('data', res.stderr.push.bind(res.stderr));
     }
   }
 
@@ -35,34 +35,29 @@ module.exports = function spawnCallback(command, args, options, callback) {
   // done
   cp.on('close', function (status, signal) {
     nextTick(function closeNextTick() {
-      // process output
-      if (options.encoding) {
-        if (stdout) stdout = Buffer.concat(stdout);
-        if (stderr) stderr = Buffer.concat(stderr);
-
-        if (options.encoding !== 'buffer') {
-          if (stdout) stdout = stdout.toString(options.encoding);
-          if (stderr) stderr = stderr.toString(options.encoding);
-        }
+      // prepare result
+      res.pid = cp.pid;
+      res.status = status;
+      res.signal = signal;
+      if (res.stdout) {
+        res.stdout = Buffer.concat(res.stdout);
+        if (options.encoding !== 'buffer') res.stdout = res.stdout.toString(options.encoding);
+      }
+      if (res.stderr) {
+        res.stderr = Buffer.concat(res.stderr);
+        if (options.encoding !== 'buffer') res.stderr = res.stderr.toString(options.encoding);
       }
+      res.stdio = [null, res.stdout, res.stderr];
 
       // process errors
-      var err = status !== 0 ? new Error('Non-zero exit code: ' + status) : null;
-      if (stderr && stderr.length) {
+      var err = res.status !== 0 ? new Error('Non-zero exit code: ' + res.status) : null;
+      if (res.stderr && res.stderr.length) {
         err = err || new Error('stderr has content');
-        err.stderr = Buffer.isBuffer(stderr) ? stderr.toString('utf8') : stderr;
+        for (var key in res) {
+          err[key] = Buffer.isBuffer(res[key]) ? res[key].toString('utf8') : res[key];
+        }
       }
-      if (err) return callback(err);
-
-      // non error result
-      callback(null, {
-        pid: cp.pid,
-        output: [null, stdout, stderr],
-        stdout: stdout,
-        stderr: stderr,
-        status: status,
-        signal: signal,
-      });
+      err ? callback(err) : callback(null, res);
     });
   });
 

package/lib/spawnSyncCallback.js

@@ -10,20 +10,27 @@ module.exports = function spawnSyncCallback(command, args, options) {
     stdio: 'pipe',
     encoding: 'utf8',
   });
-  var result = spawnSync(command, args, syncOptions);
-  if (result.stdout && (options.stdout === 'inherit' || options.stdio === 'inherit')) {
-    process.stdout.write(result.stdout);
-    result.stdout = null;
+
+  var res = spawnSync(command, args, syncOptions);
+
+  // pipe if inherited
+  if (res.stdout && (options.stdout === 'inherit' || options.stdio === 'inherit')) {
+    process.stdout.write(res.stdout);
+    res.stdout = null;
   }
-  if (result.stderr && (options.stderr === 'inherit' || options.stdio === 'inherit')) {
-    process.stderr.write(result.stderr);
-    result.stderr = null;
+  if (res.stderr && (options.stderr === 'inherit' || options.stdio === 'inherit')) {
+    process.stderr.write(res.stderr);
+    res.stderr = null;
   }
-  var err = result.status ? new Error('Non-zero exit code: ' + result.status) : null;
-  if (result.stderr && result.stderr.length) {
+
+  // process errors
+  var err = res.status !== 0 ? new Error('Non-zero exit code: ' + res.status) : null;
+  if (res.stderr && res.stderr.length) {
     err = err || new Error('stderr has content');
-    err.stderr = result.stderr;
+    for (var key in res) {
+      err[key] = Buffer.isBuffer(res[key]) ? res[key].toString('utf8') : res[key];
+    }
   }
   if (err) throw err;
-  return result;
+  return res;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-spawn-cb",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Cross spawn with a completion callback",
   "keywords": [
     "cross-spawn",