cmd,tap: make tap readable stream and pipe to stdout and file if outfile

Semver: major

Author: evanlucas

bin/cmd.js

@@ -96,17 +96,17 @@ if (parsed.list) {
 }
 
 if (parsed.tap) {
-  const stream = parsed.out
-    ? fs.createWriteStream(parsed.out)
-    : process.stdout
-
-  const tap = new Tap(stream)
-  var isEnding = false
+  const tap = new Tap()
+  tap.pipe(process.stdout)
+  if (parsed.out) tap.pipe(fs.createWriteStream(parsed.out))
+  var count = 0
+  var total = args.length
 
   v.on('commit', (c) => {
+    count++
     const test = tap.test(c.commit.sha)
     formatTap(test, c.commit, c.messages, v)
-    if (isEnding) {
+    if (count === total) {
       setImmediate(() => {
         tap.end()
         if (tap.status === 'fail')
@@ -116,10 +116,7 @@ if (parsed.tap) {
   })
 
   function run() {
-    if (!args.length) {
-      isEnding = true
-      return
-    }
+    if (!args.length) return
     const sha = args.shift()
     load(sha, (err, data) => {
       if (err) throw err

lib/tap.js

@@ -49,9 +49,11 @@ class Test {
   }
 }
 
-module.exports = class Tap {
-  constructor(stream) {
-    this.stream = stream
+const Readable = require('stream').Readable
+
+module.exports = class Tap extends Readable {
+  constructor() {
+    super()
     this._wroteVersion = false
     this._count = 0
     this._passes = 0
@@ -90,14 +92,16 @@ module.exports = class Tap {
   }
 
   write(str = '') {
-    this.stream.write(`${str}\n`)
+    this.push(`${str}\n`)
   }
 
   test(name) {
     const t = new Test(this, name)
     return t
   }
 
+  _read() {}
+
   end() {
     this.write()
     this.write(`0..${this._count}`)
@@ -109,5 +113,7 @@ module.exports = class Tap {
     if (this._failures) {
       this.write(`# fail  ${this._failures}`)
     }
+
+    this.push(null)
   }
 }