cross-spawn-cb 0.5.14 → 0.6.2

package/lib/spawnCallback.js

@@ -13,38 +13,44 @@ module.exports = function spawnCallback(command, args, options, callback) {
   callback = once(callback);
 
   var cp = spawn(command, args, options);
+
+  // collect output
   var stdout, stderr;
-  if (cp.stdout) {
-    stdout = [];
-    cp.stdout.on('data', stdout.push.bind(stdout));
-  }
-  if (cp.stderr) {
-    stderr = [];
-    cp.stderr.on('data', stderr.push.bind(stderr));
+  if (options.encoding) {
+    if (cp.stdout) {
+      stdout = [];
+      cp.stdout.on('data', stdout.push.bind(stdout));
+    }
+    if (cp.stderr) {
+      stderr = [];
+      cp.stderr.on('data', stderr.push.bind(stderr));
+    }
   }
+
+  // some versions of node emit both an error and close
   cp.on('error', function error(err) {
-    // some versions of node emit both an error and close
     err.code === 'OK' || callback(err);
   });
+
+  // done
   cp.on('close', function (status, signal) {
     nextTick(function closeNextTick() {
-      // format results
-      if (stdout) stdout = Buffer.concat(stdout);
-      if (stderr) stderr = Buffer.concat(stderr);
-      if ((options.encoding && options.encoding !== 'buffer') || options.stdio === 'string') {
-        stdout = stdout.toString(options.encoding);
-        stderr = stderr.toString(options.encoding);
-      } else if (options.stdout === 'string') {
-        stdout = stdout.toString(options.encoding);
-      } else if (options.stderr === 'string') {
-        stderr = stderr.toString(options.encoding);
+      // process output
+      if (options.encoding) {
+        stdout = Buffer.concat(stdout);
+        stderr = Buffer.concat(stderr);
+
+        if (options.encoding !== 'buffer') {
+          stdout = stdout.toString(options.encoding);
+          stderr = stderr.toString(options.encoding);
+        }
       }
 
       // process errors
       var err = status !== 0 ? new Error('Non-zero exit code: ' + status) : null;
       if (stderr && stderr.length) {
         err = err || new Error('stderr has content');
-        err.stderr = stderr;
+        err.stderr = Buffer.isBuffer(stderr) ? stderr.toString('utf8') : stderr;
       }
       if (err) return callback(err);
 

package/package.json

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