turn 0.9.3 → 0.9.4

data/History.txt

@@ -1,10 +1,15 @@
-== 0.9.3 / 2012-02-09
+== 0.9.4 / 2012-03-16
+  * Fix dot reporter to use `.` instead of `S` for passed tests.
+  * Do not filter backtraces of local directory.
+  * Do not colourize zero counts in pretty reporter.
+
+== 0.9.3 / 2012-02-17
   * 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)
+  * Add skip counts to reporter tallies. (y8)
+  * Improve Pretty reporter output. (y8)
 
 == 0.9.2 / 2012-02-08
   * Fix colorization config issue.

data/Release.txt

@@ -1,4 +1,24 @@
-= Turn 0.8.0
+= Release Notes
+
+== 0.9.x
+
+The main departure of the 0.9.x series form older version of Turn,
+is that the old TestUnit library (1.x series) is no longer supported.
+Turn is now a MiniTest only library.[1]
+
+Among other imporvements, the default reporter is now the Pretty reporter
+instead of the orginal Outline reporter, and MiniTest skips are finally
+supported.
+
+Big thanks to y8, Alexey Bondar and others for helpig to get this series
+up to snuff.
+
+[1] Note that the old testunit runner is still included in the package
+if it is needed, but no longer will be actively maintained and it
+must be directly required to be used.
+
+
+== 0.8.x
 
 Version 0.8.0 is a fairly significant release for Turn. This release
 adds support for Ruby 1.9's Minitest framework. You can even use

data/Version.txt

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/turn/reporter.rb

@@ -72,12 +72,15 @@ module Turn
       limit_backtrace(filter_backtrace(backtrace))
     end
 
+    # TODO: Is the text/unit line needed any more now that Dir.pwd is excluded
+    #       from filtering?
+
     $RUBY_IGNORE_CALLERS ||= []
     $RUBY_IGNORE_CALLERS.concat([
       /\/lib\/turn.*\.rb/,
       /\/bin\/turn/,
       /\/lib\/minitest.*\.rb/,
-      /\/test\/unit.*\.rb/
+      /\/test\/unit(?!(\/.*\_test.rb)|.*\/test_.*).*\.rb.*/
     ])
 
     # Filter backtrace of unimportant entries, and applies count limit if set in
@@ -86,14 +89,14 @@ module Turn
     # as that probably means there was an issue with the test harness itself.
     def filter_backtrace(backtrace)
       return [] unless backtrace
-      bt = backtrace.dup
-      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') }
-      #bt.reject!{ |line| line.rindex('bin/turn') }
+      bt, pwd = backtrace.dup, Dir.pwd
+      unless $DEBUG
+        bt = bt.reject do |line|
+          $RUBY_IGNORE_CALLERS.any?{|re| re =~ line} unless line.start_with?(pwd)
+        end
+      end
       bt = backtrace if bt.empty?  # if empty just dump the whole thing
-      bt.map{ |line| line.sub(Dir.pwd+'/', '') }
+      bt.map{ |line| line.sub(pwd+'/', '') }
     end
 
     # Limit backtrace to number of lines if `trace` configuration option is set.

data/lib/turn/reporters/dot_reporter.rb

@@ -19,7 +19,7 @@ module Turn
     end
 
     def pass(message=nil)
-      io.print Colorize.pass('S'); io.flush
+      io.print Colorize.pass('.'); io.flush
     end
 
     def fail(assertion, message=nil)
@@ -31,7 +31,7 @@ module Turn
     end
 
     def skip(exception, message=nil)
-      io.print Colorize.skip('-'); io.flush
+      io.print Colorize.skip('S'); io.flush
     end
 
     def finish_test(test)

data/lib/turn/reporters/pretty_reporter.rb

@@ -87,23 +87,17 @@ module Turn
 
     # After all tests are run, this is the last observable action.
     def finish_suite(suite)
-      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
+      total      = colorize_count("%d tests", suite.count_tests, :bold)
+      passes     = colorize_count("%d passed", suite.count_passes, :pass)
+      assertions = colorize_count("%d assertions", suite.count_assertions, nil)
+      failures   = colorize_count("%d failures", suite.count_failures, :fail)
+      errors     = colorize_count("%d errors", suite.count_errors, :error)
+      skips      = colorize_count("%d skips", suite.count_skips, :skip)
 
       io.puts "Finished in %.6f seconds." % (Time.now - @time)
       io.puts
 
-      io.puts [ Colorize.bold(total),
-                Colorize.pass(passes),
-                Colorize.fail(failures),
-                Colorize.error(errors),
-                Colorize.skip(skips),
-                assertions
-              ].join(", ")
+      io.puts [ total, passes, failures, errors, 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.
@@ -111,6 +105,18 @@ module Turn
     end
 
   private
+    # Creates an optionally-colorized string describing the number of occurances an event occurred.
+    #
+    # @param [String] str A printf-style string that expects an integer argument (i.e. the count)
+    # @param [Integer] count The number of occurances of the event being described.
+    # @param [nil, Symbol] colorize_method The method on Colorize to call in order to apply color to the result, or nil
+    #   to not apply any coloring at all.
+    def colorize_count(str, count, colorize_method)
+      str= str % [count]
+      str= Colorize.send(colorize_method, str) if colorize_method and count != 0
+      str
+    end
+
     # Outputs test case header for given event (error, fail & etc)
     #
     # Example:

data/lib/turn/runners/minirunner.rb

@@ -66,7 +66,7 @@ module Turn
       # suites are cases in minitest
       @turn_case = @turn_suite.new_case(suite.name)
 
-      filter = @turn_config.pattern || /./
+      filter = @options[:filter] || @turn_config.pattern || /./
 
       suite.send("#{type}_methods").grep(filter).each do |test|
         @turn_case.new_test(test)

data/lib/turn/version.rb

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

data/test/reporter_test.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__)) + '/helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/..') + '/lib/turn/reporter'
+
+class TestReporter < Turn::Reporter
+end
+
+class TestReporters < Test::Unit::TestCase
+  def test_unit_test_files_are_not_filtered_out_if_ending_in_test
+    reporter = TestReporter.new(nil)
+    
+    # If you follow the convention of naming your test files with _test.rb, do not filter that
+    # test file from the stack trace
+    filtered_lines = ["/Users/testman/.rvm/rubies/ruby-1.9.3-p0/lib/ruby/1.9.1/test/unit/assertions.rb:185:in `assert_equal'"]
+    unfiltered_lines = ["/Users/testman/source/campaign_manager/test/unit/omg_test.rb:145:in `block in <class:OmgTest>'", 
+      "/Users/testman/source/campaign_manager/app/models/omg.rb:145:in `in double_rainbows'" ]
+    stack_trace = filtered_lines + unfiltered_lines
+
+    assert_equal unfiltered_lines, reporter.send(:filter_backtrace, stack_trace)
+  end
+
+  def test_unit_test_files_are_not_filtered_out_if_file_name_starts_with_test_underscore
+    reporter = TestReporter.new(nil)
+    
+    # If you follow the convention of naming your test files with _test.rb, do not filter that
+    # test file from the stack trace
+    filtered_lines = ["/Users/testman/.rvm/rubies/ruby-1.9.3-p0/lib/ruby/1.9.1/test/unit/assertions.rb:185:in `assert_equal'"]
+    unfiltered_lines = ["/Users/testman/source/campaign_manager/test/unit/test_omgs.rb:145:in `block in <class:OmgTest>'", 
+      "/Users/testman/source/campaign_manager/app/models/omg.rb:145:in `in double_rainbows'" ]
+    stack_trace = filtered_lines + unfiltered_lines
+
+    assert_equal unfiltered_lines, reporter.send(:filter_backtrace, stack_trace)
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turn
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &7615200 !ruby/object:Gem::Requirement
+  requirement: &21312540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7615200
+  version_requirements: *21312540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &7613840 !ruby/object:Gem::Requirement
+  requirement: &21308780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7613840
+  version_requirements: *21308780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7566920 !ruby/object:Gem::Requirement
+  requirement: &21307780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7566920
+  version_requirements: *21307780
 description: Turn provides a set of alternative runners for MiniTest, both colorful
   and informative.
 email:
@@ -94,6 +94,7 @@ files:
 - lib/turn/version.rb
 - lib/turn.rb
 - test/helper.rb
+- test/reporter_test.rb
 - test/runner
 - test/test_framework.rb
 - test/test_reporters.rb
@@ -136,5 +137,6 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Test Reporters (New) -- new output formats for Testing
-test_files: []
+test_files:
+- test/reporter_test.rb
 has_rdoc: