Move markdown to tap-markdown

Author: zoubin

README.md

@@ -28,7 +28,6 @@ or in `package.json`
 ```
   --no-ansi        Disable ANSI formatting
   --no-progress    Disable progress output during tests
-  --markdown       Format output as markdown
 ```
 
 ## Example

bin/cmd.js

@@ -5,22 +5,14 @@ var program = new Command('tap-summary')
 
 program
   .version(require('../package.json').version)
-  .option('--no-ansi', 'Disable ANSI formatting. Only valid for the default formatter.')
-  .option('--no-progress', 'Disable progress output during tests. Only valid for the default formatter.')
-  .option('-m, --markdown', 'Use the markdown formatter.')
-  .option('-f, --formatter <formatter>', 'Specify how to format the output. `markdown` and `default` are available.')
+  .option('--no-ansi', 'Disable ANSI formatting.')
+  .option('--no-progress', 'Disable progress output during tests.')
   .parse(process.argv)
 
-var reporter
-if (program.markdown || program.formatter === 'markdown') {
-  reporter = require('../lib/markdown')()
-} else {
-  reporter = require('..')({
-    ansi: program.ansi,
-    progress: program.progress,
-  })
-}
-
+var reporter = require('..')({
+  ansi: program.ansi,
+  progress: program.progress,
+})
 
 process.stdin
   .pipe(reporter)

index.js

@@ -1 +1,10 @@
-module.exports = require('./lib/screen')
+var reporter = require('./lib/reporter')
+var Formatter = require('./lib/formatter')
+
+module.exports = function (opts) {
+  return reporter(new Formatter(opts))
+}
+module.exports.Formatter = Formatter
+module.exports.reporter = reporter
+module.exports.parser = require('./lib/parser')
+

lib/screen.js renamed to lib/formatter.js

@@ -3,12 +3,7 @@ var symbols = require('figures')
 var prettyMs = require('pretty-ms')
 var LF = '\n'
 
-var reporter = require('./reporter')
-
-module.exports = function (opts) {
-  return reporter(new Formatter(opts))
-}
-module.exports.Formatter = Formatter
+module.exports = Formatter
 
 function Formatter(opts) {
   opts = opts || {}

lib/markdown.js

@@ -1,7 +1,7 @@
-var summarize = require('./summarize')
+var parser = require('./parser')
 
 module.exports = function (formatter) {
-  var reporter = summarize()
+  var reporter = parser()
 
   if (formatter.init) {
     formatter.init(reporter)

lib/summarize.js renamed to lib/parser.js

@@ -1,12 +1,12 @@
 var test = require('tape')
-var summarize = require('../lib/summarize')
+var parser = require('../lib/parser')
 var fs = require('fs')
 var path = require('path')
 var fixtures = path.resolve.bind(path, __dirname, 'fixtures')
 
-test('summarize.summary', function (t) {
-  fs.createReadStream(fixtures('tape.summary.tap'))
-    .pipe(summarize())
+test('parser.summary', function (t) {
+  fs.createReadStream(fixtures('summary.tap'))
+    .pipe(parser())
     .on('summary', function (summary) {
       t.equal(summary.planned, 3, 'planned')
       t.equal(summary.assertions, 3, 'assertions')
@@ -17,9 +17,9 @@ test('summarize.summary', function (t) {
     })
 })
 
-test('summarize.summary, unnamed', function (t) {
-  fs.createReadStream(fixtures('tape.summary.unnamed.tap'))
-    .pipe(summarize())
+test('parser.summary, unnamed', function (t) {
+  fs.createReadStream(fixtures('summary.unnamed.tap'))
+    .pipe(parser())
     .on('summary', function (summary) {
       t.equal(summary.planned, 3, 'planned')
       t.equal(summary.assertions, 3, 'assertions')
@@ -30,9 +30,9 @@ test('summarize.summary, unnamed', function (t) {
     })
 })
 
-test('summarize.fail', function (t) {
-  fs.createReadStream(fixtures('tape.fail.tap'))
-    .pipe(summarize())
+test('parser.fail', function (t) {
+  fs.createReadStream(fixtures('fail.tap'))
+    .pipe(parser())
     .on('summary', function (summary, fails) {
       t.equal(summary.planned, 4, 'planned')
       t.equal(summary.assertions, 4, 'assertions')
@@ -44,9 +44,9 @@ test('summarize.fail', function (t) {
     })
 })
 
-test('summarize.comment', function (t) {
-  fs.createReadStream(fixtures('tape.comment.tap'))
-    .pipe(summarize())
+test('parser.comment', function (t) {
+  fs.createReadStream(fixtures('comment.tap'))
+    .pipe(parser())
     .on('summary', function (summary, fails, comments) {
       t.equal(summary.planned, 2, 'planned')
       t.equal(summary.assertions, 2, 'assertions')

lib/reporter.js

@@ -0,0 +1,49 @@
+var test = require('tape')
+var summarize = require('..')
+var fs = require('fs')
+var path = require('path')
+var fixtures = path.resolve.bind(path, __dirname, 'fixtures')
+var concat = require('concat-stream')
+
+test('summary ansi', function (t) {
+  fs.createReadStream(fixtures('summary.tap'))
+    .pipe(summarize({ duration: false, progress: false }))
+    .pipe(concat({ encoding: 'string' }, function (s) {
+      t.equal(s, fs.readFileSync(fixtures('summary.ansi.expected'), 'utf8'))
+      t.end()
+    }))
+})
+
+test('summary no ansi', function (t) {
+  fs.createReadStream(fixtures('summary.tap'))
+    .pipe(summarize({ duration: false, progress: false, ansi: false }))
+    .pipe(concat({ encoding: 'string' }, function (s) {
+      t.equal(s, fs.readFileSync(fixtures('summary.noansi.expected'), 'utf8'))
+      t.end()
+    }))
+})
+
+test('fail', function (t) {
+  var formatter = new summarize.Formatter({ duration: false, progress: false })
+  formatter.prettifyError = function (assertion) {
+    var lines = assertion.error.raw.split('\n')
+    lines.pop()
+    return lines.join('\n')
+  }
+  fs.createReadStream(fixtures('fail.tap'))
+    .pipe(summarize.reporter(formatter))
+    .pipe(concat({ encoding: 'string' }, function (s) {
+      t.equal(s, fs.readFileSync(fixtures('fail.expected'), 'utf8'))
+      t.end()
+    }))
+})
+
+test('comment', function (t) {
+  fs.createReadStream(fixtures('comment.tap'))
+    .pipe(summarize({ duration: false, progress: false }))
+    .pipe(concat({ encoding: 'string' }, function (s) {
+      t.equal(s, fs.readFileSync(fixtures('comment.expected'), 'utf8'))
+      t.end()
+    }))
+})
+