From 1553bd049c83bbe1414249ce4e52b810bf1202e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 28 Jun 2018 18:02:56 +0200
Subject: [PATCH 1/3] Add Spec::Formatter#@io to avoid directly printing to
 stdout

---
 src/spec/formatter.cr       | 35 ++++++++++++++++++-----------------
 src/spec/junit_formatter.cr |  6 +-----
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/spec/formatter.cr b/src/spec/formatter.cr
index 9ad6310e3a9a..e9a45b844756 100644
--- a/src/spec/formatter.cr
+++ b/src/spec/formatter.cr
@@ -1,6 +1,9 @@
 module Spec
   # :nodoc:
   abstract class Formatter
+    def initialize(@io : IO = STDOUT)
+    end
+
     def push(context)
     end
 
@@ -20,11 +23,11 @@ module Spec
   # :nodoc:
   class DotFormatter < Formatter
     def report(result)
-      print Spec.color(LETTERS[result.kind], result.kind)
+      @io << Spec.color(LETTERS[result.kind], result.kind)
     end
 
     def finish
-      puts
+      @io.puts
     end
   end
 
@@ -35,20 +38,18 @@ module Spec
         @printed = false
       end
 
-      def print
+      def print(io)
         return if @printed
         @printed = true
 
-        VerboseFormatter.print_indent(@indent)
-        puts @description
+        VerboseFormatter.print_indent(io, @indent)
+        io.puts @description
       end
     end
 
-    def initialize
-      @indent = 0
-      @last_description = ""
-      @items = [] of Item
-    end
+    @indent = 0
+    @last_description = ""
+    @items = [] of Item
 
     def push(context)
       @items << Item.new(@indent, context.description)
@@ -61,24 +62,24 @@ module Spec
     end
 
     def print_indent
-      self.class.print_indent(@indent)
+      self.class.print_indent(@io, @indent)
     end
 
-    def self.print_indent(indent)
-      indent.times { print "  " }
+    def self.print_indent(io, indent)
+      indent.times { io << "  " }
     end
 
     def before_example(description)
-      @items.each &.print
+      @items.each &.print(@io)
       print_indent
-      print description
+      @io << description
       @last_description = description
     end
 
     def report(result)
-      print '\r'
+      @io << '\r'
       print_indent
-      puts Spec.color(@last_description, result.kind)
+      @io.puts Spec.color(@last_description, result.kind)
     end
   end
 
diff --git a/src/spec/junit_formatter.cr b/src/spec/junit_formatter.cr
index c944490c1328..967363d0a52f 100644
--- a/src/spec/junit_formatter.cr
+++ b/src/spec/junit_formatter.cr
@@ -3,13 +3,9 @@ require "html"
 module Spec
   # :nodoc:
   class JUnitFormatter < Formatter
-    @output : IO
     @results = [] of Spec::Result
     @summary = {} of Symbol => Int32
 
-    def initialize(@output)
-    end
-
     def report(result)
       current = @summary[result.kind]? || 0
       @summary[result.kind] = current + 1
@@ -17,7 +13,7 @@ module Spec
     end
 
     def finish
-      io = @output
+      io = @io
       io.puts %(<?xml version="1.0"?>)
       io << %(<testsuite tests=") << @results.size
       io << %(" errors=") << (@summary[:error]? || 0)

From e82a2134673f51c27d08025fb6252822719ce757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 28 Jun 2018 18:15:25 +0200
Subject: [PATCH 2/3] Refactor Spec finish reporting to use formatter method

---
 src/spec/context.cr   |  9 ++++++++-
 src/spec/dsl.cr       |  2 +-
 src/spec/formatter.cr | 11 +++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/spec/context.cr b/src/spec/context.cr
index beb9c7d877d9..f59a3005bacb 100644
--- a/src/spec/context.cr
+++ b/src/spec/context.cr
@@ -50,9 +50,16 @@ module Spec
       @@instance.succeeded
     end
 
-    def print_results(elapsed_time, aborted = false)
+    def self.finish(elapsed_time, aborted = false)
+      @@instance.finish(elapsed_time, aborted)
+    end
+
+    def finish(elapsed_time, aborted = false)
       Spec.formatters.each(&.finish)
+      Spec.formatters.each(&.print_results(elapsed_time, aborted))
+    end
 
+    def print_results(elapsed_time, aborted = false)
       pendings = @results[:pending]
       unless pendings.empty?
         puts
diff --git a/src/spec/dsl.cr b/src/spec/dsl.cr
index 885707bcb21d..8c7b90826cc7 100644
--- a/src/spec/dsl.cr
+++ b/src/spec/dsl.cr
@@ -170,7 +170,7 @@ module Spec
     start_time = Time.monotonic
     at_exit do
       elapsed_time = Time.monotonic - start_time
-      Spec::RootContext.print_results(elapsed_time, @@aborted)
+      Spec::RootContext.finish(elapsed_time, @@aborted)
       exit 1 unless Spec::RootContext.succeeded && !@@aborted
     end
   end
diff --git a/src/spec/formatter.cr b/src/spec/formatter.cr
index e9a45b844756..6e8b2994f295 100644
--- a/src/spec/formatter.cr
+++ b/src/spec/formatter.cr
@@ -18,6 +18,9 @@ module Spec
 
     def finish
     end
+
+    def print_results(elapsed_time : Time::Span, aborted : Bool)
+    end
   end
 
   # :nodoc:
@@ -29,6 +32,10 @@ module Spec
     def finish
       @io.puts
     end
+
+    def print_results(elapsed_time : Time::Span, aborted : Bool)
+      Spec::RootContext.print_results(elapsed_time, aborted)
+    end
   end
 
   # :nodoc:
@@ -81,6 +88,10 @@ module Spec
       print_indent
       @io.puts Spec.color(@last_description, result.kind)
     end
+
+    def print_results(elapsed_time : Time::Span, aborted : Bool)
+      Spec::RootContext.print_results(elapsed_time, aborted)
+    end
   end
 
   @@formatters = [Spec::DotFormatter.new] of Spec::Formatter

From 0659babedacc398a6ce10d862f9a2cd6bd89fdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 28 Jun 2018 18:23:12 +0200
Subject: [PATCH 3/3] Add Spec::TAPFormatter

---
 spec/std/spec/tap_formatter_spec.cr | 85 +++++++++++++++++++++++++++++
 src/spec.cr                         |  3 +
 src/spec/tap_formatter.cr           | 30 ++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 spec/std/spec/tap_formatter_spec.cr
 create mode 100644 src/spec/tap_formatter.cr

diff --git a/spec/std/spec/tap_formatter_spec.cr b/spec/std/spec/tap_formatter_spec.cr
new file mode 100644
index 000000000000..569253e15b5b
--- /dev/null
+++ b/spec/std/spec/tap_formatter_spec.cr
@@ -0,0 +1,85 @@
+require "spec"
+require "xml"
+
+private def build_report
+  String.build do |io|
+    formatter = Spec::TAPFormatter.new(io)
+    yield formatter
+    formatter.finish
+  end
+end
+
+private def exception_with_backtrace(msg)
+  begin
+    raise Exception.new(msg)
+  rescue e
+    e
+  end
+end
+
+describe Spec::TAPFormatter do
+  it "reports successful results" do
+    output = build_report do |f|
+      f.report Spec::Result.new(:success, "should do something", "spec/some_spec.cr", 33, nil, nil)
+      f.report Spec::Result.new(:success, "should do something else", "spec/some_spec.cr", 50, nil, nil)
+    end
+
+    output.chomp.should eq <<-TAP
+      ok 1 - should do something
+      ok 2 - should do something else
+      1..2
+      TAP
+  end
+
+  it "reports failures" do
+    output = build_report do |f|
+      f.report Spec::Result.new(:fail, "should do something", "spec/some_spec.cr", 33, nil, nil)
+    end
+
+    output.chomp.should eq <<-TAP
+      not ok 1 - should do something
+      1..1
+      TAP
+  end
+
+  it "reports errors" do
+    output = build_report do |f|
+      f.report Spec::Result.new(:error, "should do something", "spec/some_spec.cr", 33, nil, nil)
+    end
+
+    output.chomp.should eq <<-TAP
+      not ok 1 - should do something
+      1..1
+      TAP
+  end
+
+  it "reports pending" do
+    output = build_report do |f|
+      f.report Spec::Result.new(:pending, "should do something", "spec/some_spec.cr", 33, nil, nil)
+    end
+
+    output.chomp.should eq <<-TAP
+      ok 1 - # SKIP should do something
+      1..1
+      TAP
+  end
+
+  it "reports mixed results" do
+    output = build_report do |f|
+      f.report Spec::Result.new(:success, "should do something1", "spec/some_spec.cr", 33, 2.seconds, nil)
+      f.report Spec::Result.new(:fail, "should do something2", "spec/some_spec.cr", 50, 0.5.seconds, nil)
+      f.report Spec::Result.new(:error, "should do something3", "spec/some_spec.cr", 65, nil, nil)
+      f.report Spec::Result.new(:error, "should do something4", "spec/some_spec.cr", 80, nil, nil)
+      f.report Spec::Result.new(:pending, "should do something5", "spec/some_spec.cr", 33, nil, nil)
+    end
+
+    output.chomp.should eq <<-TAP
+      ok 1 - should do something1
+      not ok 2 - should do something2
+      not ok 3 - should do something3
+      not ok 4 - should do something4
+      ok 5 - # SKIP should do something5
+      1..5
+      TAP
+  end
+end
diff --git a/src/spec.cr b/src/spec.cr
index d1b113ea9b6b..37c09de62964 100644
--- a/src/spec.cr
+++ b/src/spec.cr
@@ -99,6 +99,9 @@ OptionParser.parse! do |opts|
   opts.on("-v", "--verbose", "verbose output") do
     Spec.override_default_formatter(Spec::VerboseFormatter.new)
   end
+  opts.on("--tap", "Generate TAP output (Test Anything Protocol)") do
+    Spec.override_default_formatter(Spec::TAPFormatter.new)
+  end
   opts.on("--no-color", "Disable colored output") do
     Spec.use_colors = false
   end
diff --git a/src/spec/tap_formatter.cr b/src/spec/tap_formatter.cr
new file mode 100644
index 000000000000..d78b85350e83
--- /dev/null
+++ b/src/spec/tap_formatter.cr
@@ -0,0 +1,30 @@
+# :nodoc:
+class Spec::TAPFormatter < Spec::Formatter
+  @counter = 0
+
+  def report(result)
+    case result.kind
+    when :success
+      @io << "ok"
+    when :fail, :error
+      @io << "not ok"
+    when :pending
+      @io << "ok"
+    end
+
+    @counter += 1
+
+    @io << ' ' << @counter << " -"
+    if result.kind == :pending
+      @io << " # SKIP"
+    end
+    @io << ' ' << result.description
+
+    @io.puts
+  end
+
+  def finish
+    @io << "1.." << @counter
+    @io.puts
+  end
+end