turn 0.9.4 → 0.9.5

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.5 / 2012-04-15
+  * Add -m/-mark option to flag tests with high runtimes.
+  * Show per-test runtime in Pretty reporter. (#83)
+  * Fix colorization of result box. (Don Wilson) (#81, #85)
+  * Add support for natural test names in pretty format. (Don Wilson) (#86)
+  * Fix test rake task on Windows. (Don Wilson) (#88)
+
 == 0.9.4 / 2012-03-16
   * Fix dot reporter to use `.` instead of `S` for passed tests.
   * Do not filter backtraces of local directory.

data/README.md

@@ -88,7 +88,7 @@ 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
+but because of how `bundle exec` works, it was better to require a subdirectory
 file.
 
 ### Configuration

data/Version.txt

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/turn/colorize.rb

@@ -65,6 +65,10 @@ module Turn
       colorize? ? ::ANSI::Code.bold{ string } : string
     end
 
+    def self.mark(string)
+      colorize? ? ::ANSI::Code.yellow{ string } : string
+    end
+
     def self.pass(string)
       colorize? ? ::ANSI::Code.green{ string } : string
     end

data/lib/turn/command.rb

@@ -76,6 +76,12 @@ module Turn
     # Use natural test case names.
     attr :natural
 
+    # Show extra information.
+    attr :verbose
+
+    # Show extra information.
+    attr :mark
+
     # Force ANSI use on or off.
     attr :ansi
 
@@ -91,6 +97,8 @@ module Turn
       @outmode   = nil
       @trace     = nil
       @natural   = false
+      @verbose   = false
+      @mark      = nil
       @ansi      = nil
     end
 
@@ -131,6 +139,10 @@ module Turn
           end
         end
 
+        opts.on('-m', '--mark=SECONDS', "Mark test if it exceeds runtime threshold.") do |int|
+          @mark = int.to_i
+        end
+
         opts.on('-b', '--backtrace', '--trace INT', "Limit the number of lines of backtrace.") do |int|
           @trace = int
         end
@@ -139,6 +151,10 @@ module Turn
           @natural = bool
         end
 
+        opts.on('-v', '--verbose', "Show extra information.") do |bool|
+          @verbose = bool
+        end
+
         opts.on('--[no-]ansi', "Force use of ANSI codes on or off.") do |bool|
           @ansi = bool
         end
@@ -218,7 +234,7 @@ module Turn
           exit
         end
 
-        opts.on_tail('--help', '-h', "display this help information") do
+        opts.on_tail('-h', '--help', "display this help information") do
           puts opts
           exit
         end
@@ -246,6 +262,8 @@ module Turn
         c.matchcase = matchcase
         c.trace     = trace
         c.natural   = natural
+        c.verbose   = verbose
+        c.mark      = mark
         c.ansi      = ansi unless ansi.nil?
       end
 

data/lib/turn/configuration.rb

@@ -48,7 +48,11 @@ module Turn
     # Verbose output?
     attr_accessor :verbose
 
-    # Test framework, either :minitest or :testunit
+    # Runtime threshold.
+    attr_accessor :mark
+
+    # Test framework, either `:minitest` or `:testunit`.
+    # @todo Is this used any more?
     attr_accessor :framework
 
     # Enable full backtrace
@@ -93,6 +97,7 @@ module Turn
       @matchcase ||= nil
       @pattern   ||= /.*/
       @natural   ||= false
+      @verbose   ||= false
       @format    ||= environment_format
       @trace     ||= environment_trace
       @ansi      ||= environment_ansi
@@ -175,7 +180,7 @@ module Turn
     # Select reporter based on output mode.
     def reporter
       @reporter ||= (
-        opts = { :trace=>trace, :natural=>natural? }
+        opts = reporter_options
         case format
         when :marshal
           require 'turn/reporters/marshal_reporter'
@@ -202,6 +207,11 @@ module Turn
       )
     end
 
+    #
+    def reporter_options
+      { :trace=>trace, :natural=>natural?, :verbose=>verbose?, :mark=>mark }
+    end
+
     #
     def environment_format
       ENV['rpt']

data/lib/turn/reporter.rb

@@ -21,6 +21,8 @@ module Turn
       @io      = io || $stdout
       @trace   = opts[:trace]
       @natural = opts[:natural]
+      @verbose = opts[:verbose]
+      @mark    = opts[:mark].to_i
     end
 
     # These methods are called in the process of running the tests.
@@ -105,12 +107,12 @@ module Turn
       @trace ? backtrace[0, @trace.to_i] : backtrace
     end
 
-    #
+    # Returns a more readable test name with spaces instead of underscores
     def naturalized_name(test)
       if @natural
-        " #{test.name.gsub("test_", "").gsub(/_/, " ")}"
+        test.name.gsub("test_", "").gsub(/_/, " ")
       else
-        " #{test.name}"
+        test.name
       end
     end
 

data/lib/turn/reporters/cue_reporter.rb

@@ -27,7 +27,8 @@ module Turn
       #  @file = test.file
       #  io.puts(test.file)
       #end
-      io.print Colorize.blue("    %-69s" % test.name)
+      name = naturalized_name(test)
+      io.print Colorize.blue("    %-69s" % name)
       $stdout = @stdout
       $stderr = @stderr
       $stdout.rewind

data/lib/turn/reporters/outline_reporter.rb

@@ -49,7 +49,7 @@ module Turn
       # @FIXME: Should we move naturalized_name to test itself?
       name = naturalized_name(test)
 
-      io.print "    %-57s" % name
+      io.print "     %-57s" % name
 
       @stdout.rewind
       @stderr.rewind
@@ -165,11 +165,7 @@ module Turn
       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
+      bar = passes == total ? Colorize.green(bar) : Colorize.red(bar)
 
       # @FIXME: Should we add suite.runtime, instead if this lame time calculations?
       tally = [total, assertions, (Time.new - @time)]
@@ -182,4 +178,4 @@ module Turn
 
   end
 
-end
+end

data/lib/turn/reporters/pretty_reporter.rb

@@ -62,21 +62,21 @@ module Turn
     def fail(assertion, message=nil)
       banner FAIL
 
-      prettify(message, assertion)
+      prettify(assertion, message)
     end
 
     # Invoked when a test raises an exception.
     def error(exception, message=nil)
       banner ERROR
 
-      prettify(message, exception)
+      prettify(exception, message)
     end
 
     # Invoked when a test is skipped.
     def skip(exception, message=nil)
       banner SKIP
 
-      prettify(message, exception)
+      prettify(exception, message)
     end
 
     # Invoked after all tests in a testcase have ben run.
@@ -117,12 +117,25 @@ module Turn
       str
     end
 
+    # TODO: Could also provide % done with time info. But it's already taking up
+    #       a lot of screen realestate. Maybe use --verbose flag to offer two forms.
+
     # Outputs test case header for given event (error, fail & etc)
     #
     # Example:
-    #    PASS test: Test decription.  (0:00:02:059)
+    #    PASS test: Test decription.  (0.15s 0:00:02:059)
     def banner(event)
-      io.puts "%18s %s (%s)" % [event, @test, ticktock]
+      name = naturalized_name(@test)
+      delta = Time.now - @test_time  # test runtime
+      if @verbose
+        out = "%18s (%0.5fs) (%s) %s" % [event, delta, ticktock, name]
+      else
+        out = "%18s (%s) %s" % [event, ticktock, name]
+      end
+      if @mark > 0 && delta > @mark
+        out[1] = Colorize.mark('*')
+      end
+      io.puts out
     end
 
     # Cleanups and prints test payload
@@ -131,7 +144,7 @@ module Turn
     #         fail is not 1
     #       @ test/test_runners.rb:46:in `test_autorun_with_trace'
     #         bin/turn:4:in `<main>'
-    def prettify(message=nil, raised)
+    def prettify(raised, message=nil)
       # Get message from raised, if not given
       message ||= raised.message
 

data/lib/turn/runners/minirunner.rb

@@ -1,6 +1,6 @@
 require 'stringio'
 
-# Becuase of some wierdness in MiniTest
+# Because of some wierdness in MiniTest
 #debug, $DEBUG = $DEBUG, false
 #require 'minitest/unit'
 #$DEBUG = debug

data/lib/turn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turn
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &21312540 !ruby/object:Gem::Requirement
+  requirement: &13272920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21312540
+  version_requirements: *13272920
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &21308780 !ruby/object:Gem::Requirement
+  requirement: &13268840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21308780
+  version_requirements: *13268840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21307780 !ruby/object:Gem::Requirement
+  requirement: &13301200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21307780
+  version_requirements: *13301200
 description: Turn provides a set of alternative runners for MiniTest, both colorful
   and informative.
 email: