turn 0.9.2 → 0.9.3

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.3 / 2012-02-09
+  * Default to pretty reporter.
+  * Can set reporter via `rpt` environment variable.
+  * Fix backtrace filter.
+  * Fix require warning when using cli.
+  * Add skip counts to reporter tallies. (t8)
+  * Improve Pretty reporter output. (t8)
+
 == 0.9.2 / 2012-02-08
   * Fix colorization config issue.
   * Switch to simple dotruby build system.

data/README.md

@@ -2,6 +2,7 @@
     by Tim Pease
     http://codeforpeople.rubyforge.org/turn
 
+
 ## DESCRIPTION:
 
 TURN is a new way to view test results. With longer running tests, it
@@ -9,12 +10,13 @@ can be very frustrating to see a failure (....F...) and then have to wait till
 all the tests finish before you can see what the exact failure was. TURN
 displays each test on a separate line with failures being displayed
 immediately instead of at the end of the tests.
-  
+
 If you have the 'ansi' gem installed, then TURN output will be displayed in
 wonderful technicolor (but only if your terminal supports ANSI color codes).
 Well, the only colors are green and red, but that is still color.
 
-<b>Interested in improving Turn?</b> Please read this[https://github.com/TwP/turn/wiki/Implementation].
+<b>Interested in improving Turn?</b> [Please read this](https://github.com/TwP/turn/wiki/Implementation).
+
 
 ## FEATURES:
 
@@ -42,7 +44,7 @@ General usage provides better test output. Here is some sample output:
 Turn also provides solo and cross test modes when run from the *turn* commandline
 application.
 
-## SYNOPSIS:
+## INSTRUCTION:
 
 Turn can be using from the command-line or via require. The command-line tool
 offers additional options for how one runs tests.
@@ -72,12 +74,12 @@ This will run every pairing of tests in a separate process.
 
 Simply require the TURN package from within your test suite.
 
-    $ require 'turn'
+    $ require 'turn/autorun'
 
 This will configure MiniTest to use TURN formatting for displaying test
-restuls. A better line to use, though, is the following:
+results. A better line to use, though, is the following:
 
-    begin; require 'turn'; rescue LoadError; end
+    begin; require 'turn/autorun'; rescue LoadError; end
 
 When you distribute your code, the test suite can be run without requiring
 the end user to install the TURN package.
@@ -85,39 +87,50 @@ the end user to install the TURN package.
 For a Rails application, put the require line into the 'test/test_helper.rb'
 script. Now your Rails tests will use TURN formatting.
 
+<b>Note:</b> This changed in version 0.9. It used to be just `require 'turn'`,
+but becuase of how `bundle exec` works, it was better to require a subdirectory
+file.
+
+### Configuration
 
-## RAILS/BUNDLER USERS
+You can use `Turn.config` to adjust turn configuration.
 
-Bundler automatically requires everything listed in your Gemfile, e.g.
-when using `bundle exec`. This means `turn` will get automatically
-required too, which in turn means the Turn's test autorunner is doing
-to kick in. Obviously we don't want that to happen unless we are actually
-running tests.
+Options are following:
 
-Turn was created well before Bundler existed, and the use of `require 'turn'`
-as the autorunner was the obvious convenience. Unfortunately Bundler's choice
-to force require all requirements by defualt can have unexpected consequences,
-as is the case here.
+    tests           List of file names or glob patterns of tests to run. Default: ["test/**/{test,}*{,test}.rb"]
+    exclude         List of file names or globs to exclude from tests list. Default: []
+    pattern         Regexp pattern that all test names must match to be eligible to run. Default: /.*/ (all)
+    matchcase       Regexp pattern that all test cases must match to be eligible to run. Default: nil (all)
+    loadpath        Add these folders to the $LOAD_PATH. Default: ['lib']
+    requires        Libs to require when running tests. Default: []
+    format          Reporter type (:pretty, :dot, :cue, :marshal, :outline, :progress). Default: :pretty
+    live            Test against live install (i.e. Don't use loadpath option). Default: false
+    verbose         Verbose output? Default: false
+    trace           Number of backtrace lines to display. Default: set from ENV or nil (all)
+    natural         Use natural language case names.  Default: false
+    ansi            Force colorized output (requires 'ansi' gem). Default: set from ENV or nil (auto)
 
-Thankfully there is a work around. In your Gemfile add:
+To set option just call the desired method:
 
-    gem 'turn', :require => false
+    Turn.config.format = :progress
 
-The `:require` option will prevent Turn from trying to autorun tests.
+Also, you can use following environment variables to adjust settings:
 
-In the future we will change turn to use `require 'turn/autorun'` instead,
-but that will require a lot of people to update a lot of tests, so it's not
-something to do lightly. Full change over will wait until the 1.0 release.
-In the mean time Turn will just put out a warning.
+    backtrace       Number of backtrace lines to display. Default: set from ENV or nil
+    ansi            Force colorize output (requires 'ansi' gem).
 
 
 ## REQUIREMENTS:
 
 * ansi 1.1+ (for colorized output and progress bar output mode)
 
-## INSTALL:
 
-* sudo gem install turn
+## INSTALLATION:
+
+Follow the ususal procedure:
+
+    $ sudo gem install turn
+
 
 ## LICENSE:
 

data/Version.txt

@@ -1 +1 @@
-0.9.2
+0.9.3

data/bin/turn

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'turn/command'
+require 'turn'
 begin
   Turn::Command.main(*ARGV)
 rescue StandardError => e

data/lib/turn.rb

@@ -9,5 +9,6 @@ require 'turn/configuration'
 require 'turn/colorize'
 require 'turn/components'
 require 'turn/controller'
+require 'turn/command'
 require 'turn/minitest'
 

data/lib/turn/bin.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(File.dirname(__FILE__)))
-require 'turn/command'
+require 'turn'
 #begin
   Turn::Command.main(*ARGV)
 #rescue StandardError => e

data/lib/turn/command.rb

@@ -1,5 +1,4 @@
 require 'optparse'
-require 'turn'
 
 module Turn
 
@@ -207,10 +206,13 @@ module Turn
         opts.separator "COMMAND OPTIONS"
 
         opts.on('--debug', "turn debug mode on") do
-          $VERBOSE = true
           $DEBUG   = true
         end
 
+        opts.on('--warn', "turn warnings on") do
+          $VERBOSE = true
+        end
+
         opts.on_tail('--version', "display version") do
           puts VERSION
           exit
@@ -252,9 +254,9 @@ module Turn
       result = controller.start
 
       if result
-        exit result.passed?
+        exit (result.passed? ? 0 : -1)
       else # no tests
-        exit
+        exit -1
       end
     end
 

data/lib/turn/components/case.rb

@@ -86,9 +86,14 @@ module Turn
       sum = 0; tests.each{ |t| sum += 1 if t.pass? }; sum
     end
 
+    def count_skips
+      # Why not use tests.select(&:skip?).size ?
+      sum = 0; tests.each{ |t| sum += 1 if t.skip? }; sum
+    end
+
     #
     def counts
-      return count_tests, count_assertions, count_failures, count_errors
+      return count_tests, count_assertions, count_failures, count_errors, count_skips
     end
 
     def message

data/lib/turn/components/suite.rb

@@ -64,9 +64,13 @@ module Turn
       #)
     end
 
+    def count_skips
+      sum = 0; each{ |c| sum += c.count_skips }; sum
+    end
+
     # Convenience methods --this is what is typcially wanted.
     def counts
-      return count_tests, count_assertions, count_failures, count_errors #,count_skips
+      return count_tests, count_assertions, count_failures, count_errors ,count_skips
     end
 
     def each(&block)
@@ -87,5 +91,4 @@ module Turn
     end
   end
 
-end
-
+end

data/lib/turn/configuration.rb

@@ -89,11 +89,11 @@ module Turn
       @requires  ||= []
       @live      ||= false
       @log       ||= true
-      #@format   ||= nil
       #@runner   ||= RUBY_VERSION >= "1.9" ? MiniRunner : TestRunner
       @matchcase ||= nil
       @pattern   ||= /.*/
       @natural   ||= false
+      @format    ||= environment_format
       @trace     ||= environment_trace
       @ansi      ||= environment_ansi
 
@@ -186,19 +186,27 @@ module Turn
         when :dotted, :dot
           require 'turn/reporters/dot_reporter'
           Turn::DotReporter.new($stdout, opts)
-        when :pretty
-          require 'turn/reporters/pretty_reporter'
-          Turn::PrettyReporter.new($stdout, opts)
+        when :outline
+          require 'turn/reporters/outline_reporter'
+          Turn::OutlineReporter.new($stdout, opts)
         when :cue
           require 'turn/reporters/cue_reporter'
           Turn::CueReporter.new($stdout, opts)
+        when :pretty
+          require 'turn/reporters/pretty_reporter'
+          Turn::PrettyReporter.new($stdout, opts)
         else
-          require 'turn/reporters/outline_reporter'
-          Turn::OutlineReporter.new($stdout, opts)
+          require 'turn/reporters/pretty_reporter'
+          Turn::PrettyReporter.new($stdout, opts)
         end
       )
     end
 
+    #
+    def environment_format
+      ENV['rpt']
+    end
+
     #
     def environment_trace
       (ENV['backtrace'] ? ENV['backtrace'].to_i : nil)

data/lib/turn/reporter.rb

@@ -74,9 +74,9 @@ module Turn
 
     $RUBY_IGNORE_CALLERS ||= []
     $RUBY_IGNORE_CALLERS.concat([
-      /\/turn.*\.rb/,
+      /\/lib\/turn.*\.rb/,
       /\/bin\/turn/,
-      /\/minitest.*\.rb/,
+      /\/lib\/minitest.*\.rb/,
       /\/test\/unit.*\.rb/
     ])
 
@@ -87,7 +87,7 @@ module Turn
     def filter_backtrace(backtrace)
       return [] unless backtrace
       bt = backtrace.dup
-      bt.reject!{ |line| $RUBY_IGNORE_CALLERS.any?{ |re| re =~ line } } unless $DEBUG
+      bt = bt.reject{ |line| $RUBY_IGNORE_CALLERS.any?{ |re| re =~ line } } unless $DEBUG
       #bt.reject!{ |line| line.rindex('minitest') }
       #bt.reject!{ |line| line.rindex('test/unit') }
       #bt.reject!{ |line| line.rindex('lib/turn') }
@@ -105,7 +105,7 @@ module Turn
     #
     def naturalized_name(test)
       if @natural
-        " #{test.name.gsub("test_", "").gsub(/_/, " ")}" 
+        " #{test.name.gsub("test_", "").gsub(/_/, " ")}"
       else
         " #{test.name}"
       end
@@ -119,7 +119,7 @@ module Turn
       s = t.truncate
       f = ((t - s) * 1000).to_i
 
-      "%01d:%02d:%02d:%03d" % [h,m,s,f]
+      "%01d:%02d:%02d.%03d" % [h,m,s,f]
     end
   end
 

data/lib/turn/reporters/cue_reporter.rb

@@ -108,22 +108,26 @@ module Turn
     #end
 
     def finish_suite(suite)
-      total   = suite.count_tests
-      failure = suite.count_failures
-      error   = suite.count_errors
-      pass    = total - failure - error
+      total      = suite.count_tests
+      passes     = suite.count_passes
+      assertions = suite.count_assertions
+      failures   = suite.count_failures
+      errors     = suite.count_errors
+      skips      = suite.count_skips
 
       bar = '=' * 78
+      # @FIXME: Remove this, since Colorize already take care of colorize?
       if colorize?
         bar = if pass == total then Colorize.green(bar)
               else Colorize.red(bar) end
       end
 
-      tally = [total, suite.count_assertions]
+      # @FIXME: Should we add suite.runtime, instead if this lame time calculations?
+      tally = [total, assertions, (Time.new - @time)]
 
       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 "  pass: %d,  fail: %d,  error: %d, skip: %d" % [passes, failures, errors, skips]
+      io.puts "  total: %d tests with %d assertions in %f seconds" % tally
       io.puts bar
     end
 

data/lib/turn/reporters/dot_reporter.rb

@@ -68,31 +68,22 @@ module Turn
 
       io.puts report
 
-      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
-
-    def test_tally(suite)
-      counts = suite.collect{ |tr| tr.counts }
-      tally  = [0,0,0,0]
-      counts.each do |count|
-        4.times{ |i| tally[i] += count[i] }
-      end
-      return tally
+      # @TODO: Add something like suite.count(:tests, :passes) or
+      #        suite.count(tests: "%d tests", passes: "%d passes")
+      #        to cleanup, which will return something handy
+      #        (suite.count(:test, :passes).test proxy maybe?)
+      total      = "%d tests" % suite.count_tests
+      passes     = "%d passed" % suite.count_passes
+      assertions = "%d assertions" % suite.count_assertions
+      failures   = "%s failures" % suite.count_failures
+      errors     = "%s errors" % suite.count_errors
+      skips      = "%s skips" % suite.count_skips
+
+      tally = [total, passes, assertions, failures, errors, skips].join(", ")
+
+      io.puts suite.passed? ? Colorize.green(tally) : Colorize.red(tally)
     end
 
   end
 
-end
-
+end

data/lib/turn/reporters/outline_reporter.rb

@@ -7,7 +7,10 @@ module Turn
   #
   #--
   # TODO: Should we fit reporter output to width of console?
+  #       y8: Yes. we should, but it's a kinda tricky, if you want to make it
+  #           cross-platform. (See https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb#L61)
   # TODO: Running percentages?
+  # TODO: Cleanup me!
   #++
   class OutlineReporter < Reporter
 
@@ -18,6 +21,7 @@ module Turn
     def start_suite(suite)
       @suite  = suite
       @time   = Time.now
+      # @FIXME (y8): Why we need to capture stdout and stderr?
       @stdout = StringIO.new
       @stderr = StringIO.new
       #files  = suite.collect{ |s| s.file }.join(' ')
@@ -32,7 +36,7 @@ module Turn
 
     #
     def start_case(kase)
-      io.puts(Colorize.bold("#{kase.name}"))
+      io.puts(Colorize.bold("#{kase.name}")) if kase.size > 0
     end
 
     #
@@ -42,6 +46,7 @@ module Turn
       #  io.puts(test.file)
       #end
 
+      # @FIXME: Should we move naturalized_name to test itself?
       name = naturalized_name(test)
 
       io.print "    %-57s" % name
@@ -152,26 +157,29 @@ module Turn
 
     # TODO: pending (skip) counts
     def finish_suite(suite)
-      total   = suite.count_tests
-      failure = suite.count_failures
-      error   = suite.count_errors
-      pass    = total - failure - error
+      total      = suite.count_tests
+      passes     = suite.count_passes
+      assertions = suite.count_assertions
+      failures   = suite.count_failures
+      errors     = suite.count_errors
+      skips      = suite.count_skips
 
       bar = '=' * 78
+      # @FIXME: Remove this, since Colorize already take care of colorize?
       if colorize?
         bar = if pass == total then Colorize.green(bar)
               else Colorize.red(bar) end
       end
 
-      tally = [total, suite.count_assertions]
+      # @FIXME: Should we add suite.runtime, instead if this lame time calculations?
+      tally = [total, assertions, (Time.new - @time)]
 
       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 "  pass: %d,  fail: %d,  error: %d, skip: %d" % [passes, failures, errors, skips]
+      io.puts "  total: %d tests with %d assertions in %f seconds" % tally
       io.puts bar
     end
 
   end
 
-end
-
+end

data/lib/turn/reporters/pretty_reporter.rb

@@ -1,204 +1,146 @@
 require 'turn/reporter'
 
 module Turn
-
   # = Pretty Reporter (by Paydro)
   #
+  # Example output:
+  #    TestCaseName:
+  #         PASS test: Succesful test case.  (0:00:02:059)
+  #        ERROR test: Bogus test case.  (0:00:02:059)
+  #         FAIL test: Failed test case.  (0:00:02:059)
+  #
   class PrettyReporter < Reporter
-    #
-    PADDING_SIZE = 4
-
-    #
+    # Second column left padding in chars.
     TAB_SIZE = 10
 
-    #
+    # Character to put in front of backtrace.
+    TRACE_MARK = '@ '
+
+    # TODO: solo and cross runners do not have name or seed, need to fix.
+
+    # At the very start, before any testcases are run, this is called.
     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 (#{suite.seed})"
+
+      io.puts Colorize.bold("Loaded Suite #{suite.name}")
+      io.puts
+      if suite.seed
+        io.puts "Started at #{Time.now} w/ seed #{suite.seed}."
+      else
+        io.puts "Started at #{Time.now}."
+      end
+      io.puts
     end
 
-    #
+    # Invoked before a testcase is run.
     def start_case(kase)
-      #if kase.size > 0  # TODO: Don't have size yet?
-        io.print "\n#{kase.name}:\n"
-      #end
+      # Print case name if there any tests in suite
+      # TODO: Add option which will show all test cases, even without tests?
+      io.puts kase.name if kase.size > 0
     end
 
-    #
+    # Invoked before a test is run.
     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
 
-    #
+    # Invoked when a test passes.
     def pass(message=nil)
-      io.print pad_with_size("#{PASS}")
-      io.print " #{@test}"
-      io.print " (%.2fs) " % (Time.now - @test_time)
+      banner PASS
+
       if message
         message = Colorize.magenta(message)
-        message = message.to_s.tabto(10)
+        message = message.to_s.tabto(TAB_SIZE)
+
         io.puts(message)
       end
     end
 
-    #
+    # Invoked when a test raises an assertion.
     def fail(assertion, message=nil)
-      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
-
-      _trace = if assertion.respond_to?(:backtrace)
-                 filter_backtrace(assertion.backtrace)
-               else
-                 filter_backtrace(assertion.location).first
-               end
-
-      io.puts
-      #io.puts pad(message, tabsize)
-      io.puts message.tabto(TAB_SIZE)
-
-      cnt = @trace ? @trace.to_i : _trace.size
-      io.puts _trace[0, cnt].map{|l| l.tabto(TAB_SIZE) }.join("\n")
+      banner FAIL
 
-      #show_captured_output
+      prettify(message, assertion)
     end
 
-    #
+    # Invoked when a test raises an exception.
     def error(exception, message=nil)
-      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")
+      banner ERROR
 
-      message ||= exception.message
-
-      _trace = if exception.respond_to?(:backtrace)
-                 clean_backtrace(exception.backtrace)
-               else
-                 clean_backtrace(exception.location)
-               end
-
-      io.puts
-      io.puts message.tabto(TAB_SIZE)
-      io.puts _trace.map{|l| l.tabto(TAB_SIZE) }.join("\n")
+      prettify(message, exception)
     end
 
-    #
+    # Invoked when a test is skipped.
     def skip(exception, message=nil)
-      io.print pad_with_size("#{SKIP}")
-      io.print " #{@test}"
-      io.print " (%.2fs) " % (Time.now - @test_time)
-
-      message ||= exception.message
-
-      _trace = if exception.respond_to?(:backtrace)
-                 clean_backtrace(exception.backtrace)
-               else
-                 clean_backtrace(exception.location)
-               end
-
-      io.puts
-      io.puts message.tabto(TAB_SIZE)
-      io.puts _trace.map{|l| l.tabto(TAB_SIZE) }.join("\n")
-    end
+      banner SKIP
 
-    #
-    def finish_test(test)
-      io.puts
-      #@test_count += 1
-      #@assertion_count += inst._assertions
-      #$stdout = STDOUT
-      #$stderr = STDERR
+      prettify(message, exception)
     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
-
+    # Invoked after all tests in a testcase have ben run.
     def finish_case(kase)
-      if kase.size == 0
-        io.puts pad("(No Tests)")
-      end
+      # Print newline is there any tests in suite
+      io.puts if kase.size > 0
     end
 
-    #
+    # After all tests are run, this is the last observable action.
     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."
+      total      = "%d tests" % suite.count_tests
+      passes     = "%d passed" % suite.count_passes
+      assertions = "%d assertions" % suite.count_assertions
+      failures   = "%d failures" % suite.count_failures
+      errors     = "%d errors" % suite.count_errors
+      skips      = "%d skips" % suite.count_skips
+
+      io.puts "Finished in %.6f seconds." % (Time.now - @time)
       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 [ Colorize.bold(total),
+                Colorize.pass(passes),
+                Colorize.fail(failures),
+                Colorize.error(errors),
+                Colorize.skip(skips),
+                assertions
+              ].join(", ")
+
+      # Please keep this newline, since it will be useful when after test case
+      # there will be other lines. For example "rake aborted!" or kind of.
       io.puts
     end
 
   private
-
+    # Outputs test case header for given event (error, fail & etc)
     #
-    def pad(str, size=PADDING_SIZE)
-      " " * size + str
+    # Example:
+    #    PASS test: Test decription.  (0:00:02:059)
+    def banner(event)
+      io.puts "%18s %s (%s)" % [event, @test, ticktock]
     end
 
+    # Cleanups and prints test payload
     #
-    def pad_with_size(str)
-      " " * (18 - str.size) + str
-    end
+    # Example:
+    #         fail is not 1
+    #       @ test/test_runners.rb:46:in `test_autorun_with_trace'
+    #         bin/turn:4:in `<main>'
+    def prettify(message=nil, raised)
+      # Get message from raised, if not given
+      message ||= raised.message
 
-  end
+      backtrace = raised.respond_to?(:backtrace) ? raised.backtrace : raised.location
 
-end
+      # Filter and clean backtrace
+      backtrace = clean_backtrace(backtrace)
 
+      # Add trace mark to first line.
+      backtrace.first.insert(0, TRACE_MARK)
+
+      io.puts Colorize.bold(message.tabto(TAB_SIZE))
+      io.puts backtrace.shift.tabto(TAB_SIZE - TRACE_MARK.length)
+      io.puts backtrace.join("\n").tabto(TAB_SIZE)
+      io.puts
+    end
+  end
+end

data/lib/turn/reporters/progress_reporter.rb

@@ -55,10 +55,10 @@ module Turn
 
       width = suite.collect{ |tr| tr.name.to_s.size }.max
 
-      headers = [ 'TESTCASE  ', '  TESTS   ', 'ASSERTIONS', ' FAILURES ', '  ERRORS   ' ]
-      io.puts "\n\n%-#{width}s       %10s %10s %10s %10s\n" % headers
+      headers = [ 'TESTCASE  ', '  TESTS   ', 'ASSERTIONS', ' FAILURES ', '  ERRORS   ', 'SKIPS    ' ]
+      io.puts "\n\n%-#{width}s       %10s %10s %10s %10s %10s\n" % headers
 
-      io.puts ("-" * (width + 50))
+      io.puts ("-" * (width + 60))
 
       files = nil
       suite.each do |testrun|
@@ -73,9 +73,9 @@ module Turn
 
       #puts("\n%i tests, %i assertions, %i failures, %i errors\n\n" % tally)
 
-      tally_line = ("-" * (width + 50))
+      tally_line = ("-" * (width + 60))
       tally_line << "\n%-#{width}s  " % "TOTAL"
-      tally_line << "%10s %10s %10s %10s" % tally
+      tally_line << "%10s %10s %10s %10s %10s" % tally
 
       io.puts(tally_line + "\n\n\n")
 
@@ -127,7 +127,7 @@ module Turn
     def paint_line(testrun, width)
       line = ''
       line << "%-#{width}s  " % [testrun.name]
-      line << "%10s %10s %10s %10s" % testrun.counts
+      line << "%10s %10s %10s %10s %10s" % testrun.counts
       line << " " * 8
       if testrun.fail?
         line << "[#{FAIL}]"
@@ -141,14 +141,13 @@ module Turn
 
     def test_tally(suite)
       counts = suite.collect{ |tr| tr.counts }
-      tally  = [0,0,0,0]
+      tally  = [0,0,0,0,0]
       counts.each do |count|
-        4.times{ |i| tally[i] += count[i] }
+        5.times{ |i| tally[i] += count[i] }
       end
       return tally
     end
 
   end
 
-end
-
+end

data/lib/turn/runners/isorunner.rb

@@ -80,6 +80,7 @@ module Turn
         #err = ''
 
         out, err = nil, nil
+p cmd
         Open3.popen3(cmd) do |stdin, stdout, stderr|
           stdin.close
           out = stdout.read.chomp
@@ -96,7 +97,7 @@ module Turn
         files = kase.files
 
         # remove any unexpected output injected at the beginning
-        b = out.index(/^---/)
+        b = out.index(/^---/m)
         yaml = out[b..-1]
         sub_suite = YAML.load(yaml)
 

data/lib/turn/version.rb

@@ -1,3 +1,3 @@
 module Turn
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/test/test_runners.rb

@@ -5,17 +5,17 @@ class TestRunners < Test::Unit::TestCase
   def test_solo
     file = setup_testunit(false, 'test_solo.rb')
     result = turn2 '--solo', file
-    assert result.index('pass: 1'),  "ACTUAL RESULT --->\n #{result}"
-    assert result.index('fail: 0'),  "ACTUAL RESULT --->\n #{result}"
-    assert result.index('error: 0'), "ACTUAL RESULT --->\n #{result}"
+    assert result.index('1 passed'),  "ACTUAL RESULT:\n #{result}"
+    assert result.index('0 failures'),  "ACTUAL RESULT:\n #{result}"
+    assert result.index('0 errors'), "ACTUAL RESULT:\n #{result}"
   end
 
   def test_cross
     file1 = setup_testunit(false, 'test1.rb')
     file2 = setup_testunit(false, 'test2.rb')
     result = turn2 '--cross', file1, file2
-    assert result.index('pass: 2'),  "ACTUAL RESULT --->\n #{result}"
-    assert result.index('error: 0'), "ACTUAL RESULT --->\n #{result}"
+    assert result.index('2 passed'),  "ACTUAL RESULT:\n #{result}"
+    assert result.index('0 errors'), "ACTUAL RESULT:\n #{result}"
   end
 
   # autorun
@@ -25,9 +25,9 @@ class TestRunners < Test::Unit::TestCase
     def test_autorun_testunit
       file = setup_testunit('turn/autorun', 'test_autorun.rb')
       result = `ruby -Ilib #{file} 2>&1`
-      assert(result.index('pass: 1'),  "ACTUAL RESULT:\n #{result}")
-      assert(result.index('fail: 0'),  "ACTUAL RESULT:\n #{result}")
-      assert(result.index('error: 0'), "ACTUAL RESULT:\n #{result}")
+      assert(result.index('1 passed'),  "ACTUAL RESULT:\n #{result}")
+      assert(result.index('0 failures'),  "ACTUAL RESULT:\n #{result}")
+      assert(result.index('0 errors'), "ACTUAL RESULT:\n #{result}")
     end
 
   #else
@@ -35,16 +35,16 @@ class TestRunners < Test::Unit::TestCase
     def test_autorun
       file = setup_minitest_autorun
       result = `ruby -Ilib #{file} 2>&1`
-      assert result.index('fail: 0'),  "ACTUAL RESULT --->\n #{result}"
-      assert result.index('error: 0'), "ACTUAL RESULT --->\n #{result}"
+      assert result.index('0 failures'),  "ACTUAL RESULT:\n #{result}"
+      assert result.index('0 errors'), "ACTUAL RESULT:\n #{result}"
     end
 
     def test_autorun_with_trace
       file = setup_minitest_autorun_with_trace
 
       result = `ruby -Ilib #{file} 2>&1`
-      assert result.index('fail: 1'), 'fail is not 1'
-      assert result.index('error: 0'), 'error is not 0'
+      assert result.index('1 failures'), 'fail is not 1'
+      assert result.index('0 errors'), 'error is not 0'
 
       # TODO: the backtrace is empty, why?
       #assert result.scan(/\.rb:\d+:in/).length > 1

data/try/test_autorun_minitest.rb

@@ -1,5 +1,4 @@
-require 'minitest/unit'
-require 'turn'
+require 'turn/autorun'
 
 Turn.config do |c|
   c.natural = true

data/try/test_autorun_testunit.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'turn'
+require 'turn/testunit'
 
 class SampleCase1 < Test::Unit::TestCase
   def test_sample_pass1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turn
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &14008240 !ruby/object:Gem::Requirement
+  requirement: &7615200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14008240
+  version_requirements: *7615200
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &14007520 !ruby/object:Gem::Requirement
+  requirement: &7613840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14007520
+  version_requirements: *7613840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14006980 !ruby/object:Gem::Requirement
+  requirement: &7566920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14006980
+  version_requirements: *7566920
 description: Turn provides a set of alternative runners for MiniTest, both colorful
   and informative.
 email: