package: swap out tape for custom tap and add -o flag

Semver: minor
Fixes: #3

Author: evanlucas

bin/cmd.js

@@ -3,24 +3,27 @@
 'use strict'
 
 const exec = require('child_process').exec
+const fs = require('fs')
 const http = require('http')
 const https = require('https')
 const url = require('url')
 const nopt = require('nopt')
-
+const path = require('path')
 const pretty = require('../lib/format-pretty')
-const tap = require('../lib/format-tap')
+const formatTap = require('../lib/format-tap')
 const Validator = require('../lib')
-
+const Tap = require('../lib/tap')
 const knownOpts = { help: Boolean
                   , version: Boolean
                   , 'validate-metadata': Boolean
                   , tap: Boolean
+                  , out: path
                   }
 const shortHand = { h: ['--help']
                   , v: ['--version']
                   , V: ['--validate-metadata']
                   , t: ['--tap']
+                  , o: ['--out']
                   }
 
 const parsed = nopt(knownOpts, shortHand)
@@ -77,14 +80,28 @@ function loadPatch(uri, cb) {
 const v = new Validator(parsed)
 
 if (parsed.tap) {
-  var errCount = 0
+  const stream = parsed.out
+    ? fs.createWriteStream(parsed.out)
+    : process.stdout
+
+  const tap = new Tap(stream)
+  var isEnding = false
+
   v.on('commit', (c) => {
-    errCount += c.commit.errors
-    tap(c.commit, c.messages, v)
+    const test = tap.test(c.commit.sha)
+    formatTap(test, c.commit, c.messages, v)
+    if (isEnding) {
+      setImmediate(() => {
+        tap.end()
+        if (tap.status === 'fail')
+          process.exitCode = 1
+      })
+    }
   })
 
   function run() {
     if (!args.length) {
+      isEnding = true
       return
     }
     const sha = args.shift()

lib/format-tap.js

@@ -1,27 +1,22 @@
 'use strict'
 
-const tap = require('tape')
-
-module.exports = function formatTap(context, msgs, validator) {
-  tap.test(context.sha, (t) => {
-    t.plan(msgs.length)
-    for (const m of msgs) {
-      switch (m.level) {
-        case 'pass':
-          const a = m.string
-            ? ` [${m.string}]`
-            : ''
-          t.pass(`${m.id}: ${m.message}${a}`)
-          break
-        case 'skip':
-          t.skip(`${m.id}: ${m.message}`)
-          break
-        case 'fail':
-          onFail(context, m, validator, t)
-          break
-      }
+module.exports = function formatTap(t, context, msgs, validator) {
+  for (const m of msgs) {
+    switch (m.level) {
+      case 'pass':
+        const a = m.string
+          ? ` [${m.string}]`
+          : ''
+        t.pass(`${m.id}: ${m.message}${a}`)
+        break
+      case 'skip':
+        t.skip(`${m.id}: ${m.message}`)
+        break
+      case 'fail':
+        onFail(context, m, validator, t)
+        break
     }
-  })
+  }
 }
 
 function onFail(context, m, validator, t) {
@@ -50,8 +45,7 @@ function lengthFail(context, m, validator, t) {
   , at: {
       line: m.line || 0
     , column: m.column || 0
-    , file: body
-    , function: ''
+    , body: body
     }
   })
 }
@@ -61,7 +55,11 @@ function subsystemFail(context, m, validator, t) {
     found: m.string
   , compare: 'indexOf() !== -1'
   , wanted: m.wanted || ''
-  , at: `${m.line || 0}:${m.column || 0}`
+  , at: {
+      line: m.line || 0
+    , column: m.column || 0
+    , body: m.title
+    }
   })
 }
 
@@ -73,8 +71,7 @@ function defaultFail(context, m, validator, t) {
   , at: {
       line: m.line || 0
     , column: m.column || 0
-    , file: context.body
-    , function: ''
+    , body: context.body
     }
   })
 }

lib/tap.js

@@ -0,0 +1,113 @@
+'use strict'
+
+const util = require('util')
+
+class Test {
+  constructor(tap, name) {
+    this.tap = tap
+    this.name = name
+    this._count = 0
+    this._passes = 0
+    this._failures = 0
+    this._skips = 0
+    this.begin()
+  }
+
+  pass(msg) {
+    this.tap.write(`ok ${++this._count} ${msg}`)
+    this._passes++
+    this.tap.pass()
+  }
+
+  fail(msg, extra) {
+    this.tap.write(`not ok ${++this._count} ${msg}`)
+    if (extra) {
+      this.tap.write('  ---')
+      if (typeof extra === 'object') {
+        extra = util.inspect(extra)
+      }
+
+      if (typeof extra === 'string') {
+        extra.split(/\n/).forEach((item) => {
+          this.tap.write(`    ${item}`)
+        })
+      }
+      this.tap.write('  ...')
+    }
+    this._failures++
+    this.tap.fail()
+  }
+
+  skip(msg) {
+    this.tap.write(`ok ${++this._count} ${msg} # SKIP`)
+    this._skips++
+    this.tap.skip()
+  }
+
+  begin() {
+    this.tap.write(`# ${this.name}`)
+  }
+}
+
+module.exports = class Tap {
+  constructor(stream) {
+    this.stream = stream
+    this._wroteVersion = false
+    this._count = 0
+    this._passes = 0
+    this._failures = 0
+    this._skips = 0
+  }
+
+  get status() {
+    if (this._failures) {
+      return 'fail'
+    }
+
+    return 'pass'
+  }
+
+  writeVersion() {
+    if (!this._wroteVersion) {
+      this.write('TAP version 13')
+      this._wroteVersion = true
+    }
+  }
+
+  pass() {
+    this._passes++
+    this._count++
+  }
+
+  fail() {
+    this._failures++
+    this._count++
+  }
+
+  skip() {
+    this._skips++
+    this._count++
+  }
+
+  write(str = '') {
+    this.stream.write(`${str}\n`)
+  }
+
+  test(name) {
+    const t = new Test(this, name)
+    return t
+  }
+
+  end() {
+    this.write()
+    this.write(`0..${this._count}`)
+    this.write(`# tests ${this._count}`)
+    if (this._passes) {
+      this.write(`# pass  ${this._passes}`)
+    }
+
+    if (this._failures) {
+      this.write(`# fail  ${this._failures}`)
+    }
+  }
+}

package.json

@@ -11,8 +11,7 @@
     "chalk": "~1.1.1",
     "gitlint-parser-node": "^1.0.1",
     "help": "^2.1.3",
-    "nopt": "^3.0.6",
-    "tape": "^4.6.0"
+    "nopt": "^3.0.6"
   },
   "devDependencies": {
     "lintit": "~1.0.1",