Fixed tests

Author: piranna

lib/ast2js/_spawnStream.js

@@ -1,9 +1,10 @@
-var EventEmitter = require('events')
-var spawn        = require('child_process').spawn
-var stream       = require('stream')
+const EventEmitter = require('events')
+const spawn        = require('child_process').spawn
+const stream       = require('stream')
 
-var Duplex   = stream.Duplex
-var Writable = stream.Writable
+const Duplex   = stream.Duplex
+const Readable = stream.Readable
+const Writable = stream.Writable
 
 
 function noop(){}
@@ -25,19 +26,19 @@ function wrapStdio(command, argv, options)
   var stderr = stdio[2]
 
   // Wrap stdio
-  if(typeof stdin === 'string'
+  if(typeof stdin === 'string' || typeof stdin === 'number'
   || stdin && stdin.constructor.name === 'ReadStream')
     stdin = null
   else
     stdio[0] = 'pipe'
 
-  if(typeof stdout === 'string'
+  if(typeof stdout === 'string' || typeof stdout === 'number'
   || stdout && stdout.constructor.name === 'WriteStream')
     stdout = null
   else
     stdio[1] = 'pipe'
 
-  if(typeof stderr === 'string'
+  if(typeof stderr === 'string' || typeof stderr === 'number'
   || stderr && stderr.constructor.name === 'WriteStream')
     stderr = null
   else
@@ -47,17 +48,17 @@ function wrapStdio(command, argv, options)
   var cp = spawn(command, argv, options)
 
   // Adjust events, pipe streams and restore stdio
-  if(stdin)
+  if(stdin != null)
   {
     stdin.pipe(cp.stdin)
     cp.stdin = null
   }
-  if(stdout)
+  if(stdout != null)
   {
     cp.stdout.pipe(stdout)
     cp.stdout = null
   }
-  if(stderr)
+  if(stderr != null)
   {
     cp.stderr.pipe(stderr)
     cp.stderr = null
@@ -83,47 +84,44 @@ function spawnStream(command, argv, options)
   var stdout = stdio[1]
   var stderr = stdio[2]
 
-  if(stdin  == null) stdin  = 'pipe'
-  if(stdout == null) stdout = 'pipe'
-  if(stderr == null) stderr = 'pipe'
-
   var cp = wrapStdio(command, argv, options)
 
-  stdin  = (stdin  === 'pipe') ? cp.stdin  : null
-  stdout = (stdout === 'pipe') ? cp.stdout : null
-  stderr = (stderr === 'pipe') ? cp.stderr : null
+  stdin  = (stdin  == null || stdin  === 'pipe') ? cp.stdin  : null
+  stdout = (stdout == null || stdout === 'pipe') ? cp.stdout : null
+  stderr = (stderr == null || stderr === 'pipe') ? cp.stderr : null
 
   var result
 
-  // Both `stdin` and `stdout` are open, probably the normal case.
-  // Create a `Duplex` object with them so command can be used as a filter.
-  if(stdin && stdout)
-  {
-    result = Duplex()
-    result._read  = noop
-    result._write = stdin.write.bind(stdin)
+  // Both `stdin` and `stdout` are open, probably the normal case. Create a
+  // `Duplex` object with them so command can be used as a filter
+  if(stdin && stdout) result = Duplex()
 
-    result.on('finish', stdin.end.bind(stdin))
+  // Only `stdout` is open, use it directly
+  else if(stdout) result = Readable()
 
-    stdout
-    .on('data', result.push.bind(result))
-    .on('end' , result.emit.bind(result, 'end'))
-  }
+  // Only `stdin` is open, ensure is always 'only' `Writable`
+  else if(stdin) result = Writable()
+
+  // Both `stdin` and `stdout` are clossed
+  else result = new EventEmitter()
 
-  // Only `stdin` is open, ensure is always 'only' writable.
-  else if(stdin)
+  // Connect stdio streams
+  if(stdin)
   {
-    result = Writable()
     result._write = stdin.write.bind(stdin)
-
-    result.on('finish', stdin.end.bind(stdin))
+    result.once('finish', stdin.end.bind(stdin))
   }
 
-  // Only `stdout` is open, use it directly.
-  else if(stdout) result = stdout
+  if(stdout)
+  {
+    result._read = noop
+    stdout.on  ('data', result.push.bind(result))
+    stdout.once('end' , result.push.bind(result, null))
+  }
 
-  // Both `stdin` and `stdout` are clossed.
-  else result = new EventEmitter()
+  // Use child process `exit` event instead of missing `stdout` `end` event
+  else
+    cp.once('exit', result.emit.bind(result, 'end'))
 
   if(stderr)
   {
@@ -138,12 +136,10 @@ function spawnStream(command, argv, options)
     if(out_stderr) out_stderr.pipe(stderr)
   }
 
+  // Propagate process events
   cp.on('error', result.emit.bind(result, 'error'))
   cp.on('exit' , result.emit.bind(result, 'exit' ))
 
-  // No `stdout`, emit `end` event when child process exit
-  if(!stdout) cp.once('exit', result.emit.bind(result, 'end'))
-
   return result
 }
 

package.json

@@ -34,6 +34,7 @@
     "concat-stream": "^1.5.2",
     "easy-coveralls": "0.0.1",
     "mocha": "^3.1.2",
-    "string-to-stream": "^1.1.0"
+    "string-to-stream": "^1.1.0",
+    "tmp": "0.0.31"
   }
 }

test.js

@@ -0,0 +1 @@
+asdf