turn 0.7.0 → 0.8.0

data/lib/turn/reporters/cue_reporter.rb

@@ -0,0 +1,167 @@
+require 'turn/reporter'
+
+module Turn
+
+  # = Cue Reporter
+  #
+  # Inspired by Shindo.
+  #
+  class CueReporter < Reporter
+
+    def start_suite(suite)
+      @suite = suite
+      @time  = Time.now
+      @stdout = StringIO.new
+      @stderr = StringIO.new
+      #files = suite.collect{ |s| s.file }.join(' ')
+      io.puts "Loaded suite #{suite.name}"
+      #io.puts "Started"
+    end
+
+    def start_case(kase)
+      io.puts(kase.name)
+    end
+
+    def start_test(test)
+      #if @file != test.file
+      #  @file = test.file
+      #  io.puts(test.file)
+      #end
+      io.print Colorize.blue("    %-69s" % test.name)
+      $stdout = @stdout
+      $stderr = @stderr
+      $stdout.rewind
+      $stderr.rewind
+    end
+
+    def pass(message=nil)
+      io.puts " #{PASS}"
+      if message
+        message = Colorize.green(message)
+        message = message.to_s.tabto(8)
+        io.puts(message)
+      end
+    end
+
+    def fail(assertion, message=nil)
+      io.puts(" #{FAIL}")
+      #message = assertion.location[0] + "\n" + assertion.message #.gsub("\n","\n")
+      message = message || assertion.to_s
+      #if message
+        message = Colorize.red(message)
+        message = message.to_s.tabto(8)
+        io.puts(message)
+      #end
+
+      show_captured_output
+
+      prompt
+    end
+
+    def error(exception, message=nil)
+      #message = exception.to_s.split("\n")[2..-1].join("\n")
+      message = message || exception.to_s
+      io.puts("#{ERROR}")
+      io.puts(message) #if message
+
+      prompt
+    end
+
+    def finish_test(test)
+      $stdout = STDOUT
+      $stderr = STDERR
+    end
+
+    def show_captured_output
+      show_captured_stdout
+      show_captured_stderr
+    end
+
+    def show_captured_stdout
+      @stdout.rewind
+      return if @stdout.eof?
+      STDOUT.puts(<<-output.tabto(8))
+\nSTDOUT:
+#{@stdout.read}
+      output
+    end
+
+    def show_captured_stderr
+      @stderr.rewind
+      return if @stderr.eof?
+      STDOUT.puts(<<-output.tabto(8))
+\nSTDERR:
+#{@stderr.read}
+      output
+    end
+
+    #def finish_case(kase)
+    #end
+
+    def finish_suite(suite)
+      total   = suite.count_tests
+      failure = suite.count_failures
+      error   = suite.count_errors
+      pass    = total - failure - error
+
+      bar = '=' * 78
+      if COLORIZE
+        bar = if pass == total then Colorize.green(bar)
+              else Colorize.red(bar) end
+      end
+
+      tally = [total, suite.count_assertions]
+
+      io.puts bar
+      io.puts "  pass: %d,  fail: %d,  error: %d" % [pass, failure, error]
+      io.puts "  total: %d tests with %d assertions in #{Time.new - @time} seconds" % tally
+      io.puts bar
+    end
+
+    private
+
+    def prompt
+      begin
+        io << "  [c,i,q,r,t,#,?] "
+        io.flush
+        until inp = $stdin.gets ; sleep 1 ; end
+        answer = inp.strip
+        case answer
+        when 'c', ''
+        when 'r'
+          # how to reload and start over?
+        when 'i'
+          # how to drop into an interactive console?
+        when 't'
+          io.puts $@
+          raise ArgumentError
+        when /^\d+$/
+          io.puts $@[0..answer.to_i]
+          raise ArgumentError
+        when 'q'
+          exit -1
+        when '?'
+          io.puts HELP
+          raise ArgumentError #prompt
+        else
+          raise ArgumentError
+        end
+      rescue ArgumentError
+        retry
+      end
+    end
+
+    HELP = %{
+      c continue
+      r restart
+      i irb
+      t backtrace
+      # backtrace lines
+      q quit
+      ? help
+    }
+
+  end
+
+end
+

data/lib/turn/reporters/dot_reporter.rb

@@ -19,15 +19,15 @@ module Turn
     end
 
     def pass(message=nil)
-      io.print '.'; io.flush
+      io.print Colorize.pass('.'); io.flush
     end
 
     def fail(message=nil)
-      io.print 'F'; io.flush
+      io.print Colorize.fail('F'); io.flush
     end
 
     def error(message=nil)
-      io.print 'E'; io.flush
+      io.print Colorize.error('E'); io.flush
     end
 
     def finish_test(test)
@@ -38,27 +38,42 @@ module Turn
 
     def finish_suite(suite)
       io.puts("\nFinished in %.5f seconds." % [Time.now - @time])
-      io.puts
 
       report = ''
 
-      fails = suite.select do |testrun|
-        testrun.fail? || testrun.error?
+      list = []
+      suite.each do |testcase|
+        testcase.each do |testunit|
+          if testunit.fail? || testunit.error?
+            list << testunit
+          end
+        end
       end
 
-      unless fails.empty? # or verbose?
+      unless list.empty? # or verbose?
         #report << "\n\n-- Failures and Errors --\n\n"
-        fails.uniq.each do |testrun|
-          message = testrun.message.tabto(0)
-          message = ::ANSICode.magenta(message) if COLORIZE
-          report << message << "\n"
+        list.uniq.each do |testunit|
+          message = testunit.fail? ? ' '+FAIL : ERROR
+          message = message + ' ' + testunit.message.tabto(0)
+          message << "\n" + filter_backtrace(testunit.backtrace).first
+          report << "\n" << message << "\n"
         end
         report << "\n"
       end
 
       io.puts report
 
-      io.puts "%s tests, %s assetions, %s failures, %s errors" % test_tally(suite)
+      count = test_tally(suite)
+
+      tally = "%s tests, %s assertions, %s failures, %s errors" % count
+ 
+      if count[-1] > 0 or count[-2] > 0
+        tally = Colorize.red(tally)
+      else
+        tally = Colorize.green(tally)
+      end
+
+      io.puts tally
     end
 
   private

data/lib/turn/reporters/marshal_reporter.rb

@@ -1,59 +1,12 @@
+require 'turn/reporter'
 require 'yaml'
 
 module Turn
-  require 'turn/reporter'
 
   # = Marshal Reporter
   #
   class MarshalReporter < Reporter
 
-    #def start_suite(suite)
-    #  #@suite = suite
-    #  #@time  = Time.now
-    #  #files = suite.collect{ |s| s.file }.join(' ')
-    #  #io.puts "Loaded suite #{suite.name}"
-    #  #io.puts "Started"
-    #end
-
-    #def start_test(test)
-    #  #if @file != test.file
-    #  #  @file = test.file
-    #  #  io.puts(test.file)
-    #  #end
-    #  io.print "    %-69s" % test.name
-    #end
-
-    #def start_case(kase)
-    #  io.puts(kase.name)
-    #end
-
-    #def pass(message=nil)
-    #  io.puts " #{PASS}"
-    #  if message
-    #    message = ::ANSI::Code.magenta(message) if COLORIZE
-    #    io.puts(message.to_s)
-    #  end
-    #end
-
-    #def fail(message=nil)
-    #  io.puts(" #{FAIL}")
-    #  if message
-    #    message = ::ANSI::Code.magenta(message) if COLORIZE
-    #    io.puts(message.to_s)
-    #  end
-    #end
-
-    #def error(message=nil)
-    #  io.puts("#{ERROR}")
-    #  io.puts(message.to_s) if message
-    #end
-
-    #def finish_test(test)
-    #end
-
-    #def finish_case(kase)
-    #end
-
     def finish_suite(suite)    
       $stdout << suite.to_yaml
     end

data/lib/turn/reporters/outline_reporter.rb

@@ -1,4 +1,5 @@
 require 'turn/reporter'
+require 'stringio'
 
 module Turn
 
@@ -10,55 +11,112 @@ module Turn
   #++
   class OutlineReporter < Reporter
 
+    #
     def start_suite(suite)
       @suite = suite
       @time  = Time.now
+      @stdout = StringIO.new
+      @stderr = StringIO.new
       #files = suite.collect{ |s| s.file }.join(' ')
-      io.puts "Loaded suite #{suite.name}"
+      io.puts "LOADED SUITE #{suite.name}"
       #io.puts "Started"
     end
 
+    #
     def start_case(kase)
-      io.puts(kase.name)
+      io.puts(Colorize.bold("#{kase.name}"))
     end
 
+    #
     def start_test(test)
       #if @file != test.file
       #  @file = test.file
       #  io.puts(test.file)
       #end
       io.print "    %-69s" % test.name
+
+      $stdout = @stdout
+      $stderr = @stderr
+      $stdout.rewind
+      $stderr.rewind
     end
 
+    #
     def pass(message=nil)
       io.puts " #{PASS}"
       if message
-        message = ::ANSI::Code.magenta(message) if COLORIZE
+        message = Colorize.magenta(message)
         message = message.to_s.tabto(8)
         io.puts(message)
       end
     end
 
-    def fail(message=nil)
+    #
+    def fail(assertion)
+      message   = assertion.message.to_s
+      backtrace = filter_backtrace(assertion.backtrace)
+
       io.puts(" #{FAIL}")
-      if message
-        message = ::ANSI::Code.magenta(message) if COLORIZE
-        message = message.to_s.tabto(8)
-        io.puts(message)
+      io.puts Colorize.bold(message).tabto(8)
+      unless backtrace.empty?
+        backtrace = "Assertion at " + filter_backtrace(assertion.backtrace).first
+        io.puts "STDERR:".tabto(8)
+        io.puts(backtrace.tabto(8))
       end
+      show_captured_output
     end
 
-    def error(message=nil)
+    #
+    def error(exception)
+      message   = exception.message
+      backtrace = "Exception `#{exception.class}' at " + filter_backtrace(exception.backtrace).join("\n")
+      message = Colorize.bold(message)
       io.puts("#{ERROR}")
-      io.puts(message.to_s) if message
+      io.puts(message.tabto(8))
+      io.puts "STDERR:".tabto(8)
+      io.puts(backtrace.tabto(8))
+      show_captured_output
     end
 
+    #
     def finish_test(test)
+      $stdout = STDOUT
+      $stderr = STDERR
+    end
+
+    #
+    def show_captured_output
+      show_captured_stdout
+      #show_captured_stderr
+    end
+
+    #
+    def show_captured_stdout
+      @stdout.rewind
+      return if @stdout.eof?
+      STDOUT.puts(<<-output.tabto(8))
+\nSTDOUT:
+#{@stdout.read}
+      output
+    end
+
+# No longer used b/c of error messages are fairly extraneous.
+=begin
+    def show_captured_stderr
+      @stderr.rewind
+      return if @stderr.eof?
+      STDOUT.puts(<<-output.tabto(8))
+\nSTDERR:
+#{@stderr.read}
+      output
     end
+=end
 
+    #
     #def finish_case(kase)
     #end
 
+    #
     def finish_suite(suite)
       total   = suite.count_tests
       failure = suite.count_failures
@@ -67,8 +125,8 @@ module Turn
 
       bar = '=' * 78
       if COLORIZE
-        bar = if pass == total then ::ANSI::Code.green bar
-              else ::ANSI::Code.red bar end
+        bar = if pass == total then Colorize.green(bar)
+              else Colorize.red(bar) end
       end
 
       tally = [total, suite.count_assertions]

data/lib/turn/reporters/pretty_reporter.rb

@@ -0,0 +1,184 @@
+require 'turn/reporter'
+
+module Turn
+
+  # = Pretty Reporter (by Paydro)
+  #
+  class PrettyReporter < Reporter
+    #
+    PADDING_SIZE = 4
+
+    #
+    def start_suite(suite)
+      #old_sync, @@out.sync = @@out.sync, true if io.respond_to? :sync=
+      @suite  = suite
+      @time   = Time.now
+      #@stdout = StringIO.new
+      #@stderr = StringIO.new
+      #files = suite.collect{ |s| s.file }.join(' ')
+      io.puts "Loaded suite #{suite.name}"
+      #io.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
+      io.puts "Started"
+    end
+
+    #
+    def start_case(kase)
+      #if kase.size > 0  # TODO: Don't have size yet?
+        io.print "\n#{kase.name}:\n"
+      #end
+    end
+
+    #
+    def start_test(test)
+      @test_time = Time.now
+      @test = test
+      #if @file != test.file
+      #  @file = test.file
+      #  io.puts(test.file)
+      #end
+      #io.print "    %-69s" % test.name
+      #$stdout = @stdout
+      #$stderr = @stderr
+      #$stdout.rewind
+      #$stderr.rewind
+    end
+
+    #
+    def pass(message=nil)
+      io.print pad_with_size("#{PASS}")
+      io.print " #{@test}"
+      io.print " (%.2fs) " % (Time.now - @test_time)
+      if message
+        message = Colorize.magenta(message)
+        message = message.to_s.tabto(10)
+        io.puts(message)
+      end
+    end
+
+    #
+    def fail(assertion)
+      io.print pad_with_size("#{FAIL}")
+      io.print " #{@test}"
+      io.print " (%.2fs) " % (Time.now - @test_time)
+
+      #message = assertion.location[0] + "\n" + assertion.message #.gsub("\n","\n")
+      #trace   = MiniTest::filter_backtrace(report[:exception].backtrace).first
+
+      message = assertion.message
+
+      if assertion.respond_to?(:backtrace)
+        trace = filter_backtrace(assertion.backtrace).first
+      else
+        trace = filter_backtrace(assertion.location).first
+      end
+
+      io.puts
+      #io.puts pad(message, 10)
+      io.puts message.tabto(10)
+      io.puts trace.tabto(10)
+      #show_captured_output
+    end
+
+    #
+    def error(exception)
+      io.print pad_with_size("#{ERROR}")
+      io.print " #{@test}"
+      io.print " (%.2fs) " % (Time.now - @test_time)
+
+      #message = exception.to_s.split("\n")[2..-1].join("\n")
+
+      message = exception.message
+
+      if exception.respond_to?(:backtrace)
+        trace = filter_backtrace(exception.backtrace).first
+      else
+        trace = filter_backtrace(exception.location).first
+      end
+
+      io.puts
+      io.puts message.tabto(10)
+      io.puts trace.tabto(10)
+    end
+
+    # TODO: skip support
+    #def skip
+    #  io.puts(pad_with_size("#{SKIP}"))
+    #end
+
+    #
+    def finish_test(test)
+      io.puts
+      #@test_count += 1
+      #@assertion_count += inst._assertions
+      #$stdout = STDOUT
+      #$stderr = STDERR
+    end
+
+=begin
+    def show_captured_output
+      show_captured_stdout
+      show_captured_stderr
+    end
+
+    def show_captured_stdout
+      @stdout.rewind
+      return if @stdout.eof?
+      STDOUT.puts(<<-output.tabto(8))
+\nSTDOUT:
+#{@stdout.read}
+      output
+    end
+
+    def show_captured_stderr
+      @stderr.rewind
+      return if @stderr.eof?
+      STDOUT.puts(<<-output.tabto(8))
+\nSTDERR:
+#{@stderr.read}
+      output
+    end
+=end
+
+    def finish_case(kase)
+      if kase.size == 0
+        io.puts pad("(No Tests)")
+      end
+    end
+
+    #
+    def finish_suite(suite)
+      #@@out.sync = old_sync if @@out.respond_to? :sync=
+
+      total   = suite.count_tests
+      failure = suite.count_failures
+      error   = suite.count_errors
+      #pass    = total - failure - error
+
+      io.puts
+      io.puts "Finished in #{'%.6f' % (Time.now - @time)} seconds."
+      io.puts
+
+      io.print "%d tests, " % total
+      io.print "%d assertions, " % suite.count_assertions
+      io.print Colorize.fail( "%d failures" % failure) + ', '
+      io.print Colorize.error("%d errors" % error) #+ ', '
+      #io.puts  Colorize.cyan( "%d skips" % skips ) #TODO
+      io.puts
+    end
+
+  private
+
+    #
+    def pad(str, size=PADDING_SIZE)
+      " " * size + str
+    end
+
+    #
+    def pad_with_size(str)
+      " " * (18 - str.size) + str
+    end
+
+  end
+
+end
+

data/lib/turn/reporters/progress_reporter.rb

@@ -1,6 +1,5 @@
 require 'turn/reporter'
 require 'ansi/progressbar'
-require 'facets/string/tab'
 
 module Turn
 
@@ -53,7 +52,7 @@ module Turn
       suite.each do |testrun|
         if testrun.files != [testrun.name] && testrun.files != files
           label = testrun.files.join(' ')
-          label = ::ANSI::Code.magenta(label) if COLORIZE
+          label = Colorize.magenta(label)
           io.puts(label + "\n")
           files = testrun.files
         end
@@ -77,7 +76,7 @@ module Turn
           io.puts "\n\n-- Failures and Errors --\n\n"
           fails.uniq.each do |testrun|
             message = testrun.message.tabto(0).strip
-            message = ::ANSI::Code.red(message) if COLORIZE
+            message = Colorize.red(message)
             io.puts(message+"\n\n")
           end
           io.puts

data/lib/turn/runners/crossrunner.rb

@@ -16,19 +16,21 @@ module Turn
       suite = TestSuite.new
 
       files = @controller.files
-      viles = @controller.files # TODO: viles this selectable
+      viles = @controller.files # TODO: make selectable ?
 
       #files = files.select{ |f| File.extname(f) == '.rb' and File.file?(f) }
       #viles = viles.select{ |f| File.extname(f) == '.rb' and File.file?(f) }
 
-      max = (files+viles).collect{ |f| f.size }.max
-
       pairs = files.inject([]){ |m, f| viles.collect{ |v| m << [f,v] }; m }
       pairs = pairs.reject{ |f,v| f == v }
 
-      testruns = pairs.collect do |file, versus|
-        name = "%-#{max}s %-#{max}s" % [file, versus]
-        suite.new_case(name, file, versus)
+      max = files.collect{ |f| f.sub(Dir.pwd+'/','').size }.max
+
+      testruns = pairs.collect do |file1, file2|
+        name1 = file1.sub(Dir.pwd+'/','')
+        name2 = file2.sub(Dir.pwd+'/','')
+        name = "%-#{max}s %-#{max}s" % [name1, name2]
+        suite.new_case(name, file1, file2)
       end
 
       test_loop_runner(suite)