squash: move the tap logic to util

* This moves the tap logic out of cmd.js and into a separate function in utils

Author: lholmquist

bin/cmd.js

@@ -2,12 +2,9 @@
 
 'use strict'
 
-const fs = require('fs')
 const nopt = require('nopt')
 const path = require('path')
-const formatTap = require('../lib/format-tap')
 const Validator = require('../lib')
-const Tap = require('../lib/tap')
 const utils = require('../lib/utils')
 const subsystem = require('../lib/rules/subsystem')
 const knownOpts = { help: Boolean
@@ -76,37 +73,8 @@ if (parsed.list) {
 
 // The --tap or -t flag was used
 if (parsed.tap) {
-  const tap = new Tap()
-  tap.pipe(process.stdout)
-  if (parsed.out) tap.pipe(fs.createWriteStream(parsed.out))
-  let count = 0
-  let total = args.length
-
-  v.on('commit', (c) => {
-    count++
-    const test = tap.test(c.commit.sha)
-    formatTap(test, c.commit, c.messages, v)
-    if (count === total) {
-      setImmediate(() => {
-        tap.end()
-        if (tap.status === 'fail')
-          process.exitCode = 1
-      })
-    }
-  })
-
-  function run() {
-    if (!args.length) return
-    const sha = args.shift()
-    utils.load(sha, (err, data) => {
-      if (err) throw err
-      v.lint(data)
-      run()
-    })
-  }
-
-  run()
-
+  utils.parseTap(v, parsed, args)
+  return
 } else {
   // no --flags used,  defaults to --validate-metadata
   utils.validateMetadata(v, args)

lib/utils.js

@@ -1,9 +1,12 @@
 'use strict'
 
+const fs = require('fs')
 const exec = require('child_process').exec
 const http = require('http')
 const https = require('https')
 const url = require('url')
+const formatTap = require('../lib/format-tap')
+const Tap = require('../lib/tap')
 const pretty = require('../lib/format-pretty')
 const chalk = require('chalk')
 const CHECK = chalk.green('✔')
@@ -124,3 +127,36 @@ exports.validateMetadata = function(validator, args) {
 
   run()
 }
+
+exports.parseTap = function(validator, parsed, args) {
+  const tap = new Tap()
+  tap.pipe(process.stdout)
+  if (parsed.out) tap.pipe(fs.createWriteStream(parsed.out))
+  let count = 0
+  let total = args.length
+
+  validator.on('commit', (c) => {
+    count++
+    const test = tap.test(c.commit.sha)
+    formatTap(test, c.commit, c.messages, validator)
+    if (count === total) {
+      setImmediate(() => {
+        tap.end()
+        if (tap.status === 'fail')
+          process.exitCode = 1
+      })
+    }
+  })
+
+  function run() {
+    if (!args.length) return
+    const sha = args.shift()
+    exports.load(sha, (err, data) => {
+      if (err) throw err
+      validator.lint(data)
+      run()
+    })
+  }
+
+  run()
+}