turn 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.8.2 / 2011-03-31
+  * Add version in code and cli option to diplay it.
+  * Fix for files lookup controller bug
+  * Limit default test matching to *.rb files.
+  * Show first line from the test file when showing stack traces [F. Morgan Whitney]
+  * Make minitest output compatible with natural language case naming [David Heinemeier Hansson]
+
 == 0.8.1 / 2010-09-10
   * Fix misspelling of "raised" which prevented proper recording of errors.
   * Fix IsoRunner so it passes error, not just error message.

data/Rakefile

@@ -14,7 +14,6 @@ Bones {
   url          'http://gemcutter.org/gems/turn'
   version      File.read('Version.txt').strip
   ignore_file  '.gitignore'
-  rubyforge.name 'codeforpeople'
 
   exclude      << '^work'
   rdoc.exclude << '^lib'

data/Version.txt

@@ -1 +1 @@
-0.8.1
+0.8.2

data/demo/test_autorun_minitest.rb

@@ -1,6 +1,8 @@
 require 'minitest/unit'
 require 'turn'
 
+MiniTest::Unit.use_natural_language_case_names = true
+
 class SampleCase1 < MiniTest::Unit::TestCase
   def test_sample_pass1
     assert_equal(1,1)

data/demo/test_counts.rb

@@ -0,0 +1,17 @@
+class FooTest < MiniTest::Unit::TestCase
+  def test_t1
+    assert true
+  end
+end
+
+class BarTest < MiniTest::Unit::TestCase
+  def test_t2
+    assert true
+    assert true
+  end
+  def test_t3
+    assert true
+    assert false
+  end
+end
+

data/lib/turn/autorun/minitest.rb

@@ -7,6 +7,16 @@ class MiniTest::Unit
   include ANSI::Code
 
   PADDING_SIZE = 4
+  
+  @@use_natural_language_case_names = false
+  def self.use_natural_language_case_names=(boolean)
+    @use_natural_language_case_names = boolean
+  end
+  
+  def self.use_natural_language_case_names?
+    @use_natural_language_case_names
+  end
+  
 
   def run(args = [])
     @verbose = true
@@ -14,7 +24,14 @@ class MiniTest::Unit
     filter = if args.first =~ /^(-n|--name)$/ then
                args.shift
                arg = args.shift
-               arg =~ /\/(.*)\// ? Regexp.new($1) : arg
+               if arg =~ /\/(.*)\//
+                 Regexp.new($1)
+               elsif MiniTest::Unit.use_natural_language_case_names?
+                 # Turn 'sample error1' into 'test_sample_error1'
+                 arg[0..4] == "test_" ? arg.gsub(" ", "_") : "test_" + arg.gsub(" ", "_")
+               else
+                 arg
+               end
              else
                /./ # anything - ^test_ already filtered by #tests
              end
@@ -73,7 +90,8 @@ class MiniTest::Unit
                     end)
 
 
-        @@out.print " #{test}"
+        @@out.print MiniTest::Unit.use_natural_language_case_names? ? 
+          " #{test.gsub("test_", "").gsub(/_/, " ")}" : " #{test}"
         @@out.print " (%.2fs) " % (Time.now - t)
 
         if @broken

data/lib/turn/autorun/testunit.rb

@@ -35,8 +35,8 @@ module Console
 
       bar = '=' * 78
       if COLORIZE
-        bar = if pass == total then ::ANSI::Code.green bar
-              else ::ANSI::Code.red bar end
+        bar = if pass == total then ::ANSI::Code.green{bar}
+              else ::ANSI::Code.red{bar} end
       end
 
       turn_out.puts bar
@@ -49,7 +49,7 @@ module Console
       method, file = name.scan(%r/^([^\(]+)\(([^\)]+)\)/o).flatten!
       if @t_cur_file != file
         @t_cur_file = file
-        file = COLORIZE ? ::ANSI::Code.yellow(file) : file
+        file = COLORIZE ? ::ANSI::Code.yellow{file} : file
         turn_out.puts file
       end
       turn_out.print "    %-69s" % method
@@ -69,16 +69,30 @@ module Console
         turn_out.puts ERROR
         msg << fault.to_s.split("\n")[2..-1].join("\n\t")
       when ::Test::Unit::Failure
+        test_name =  underscore(fault.test_name.match(/\((.*)\)/)[1])
+        better_location = fault.location.detect{|line|line.include?(test_name)} || fault.location[0]
         turn_out.puts " #{FAIL}"
-        msg << fault.location[0].to_s << "\n\t"
+        msg << better_location.to_s << "\n\t"
         msg << fault.message.gsub("\n","\n\t")
       end
 
-      msg = ::ANSI::Code.magenta msg if COLORIZE
+      msg = ::ANSI::Code.magenta{msg} if COLORIZE
       turn_out.puts msg
     end
 
     private
+
+    # Taken from ActiveSupport::Inflector
+    def underscore(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+
     def setup_mediator
        @mediator = create_mediator(@suite)
        suite_name = @suite.to_s

data/lib/turn/command.rb

@@ -1,7 +1,7 @@
 require 'optparse'
-require 'turn/controller'
 
 module Turn
+  require 'turn/controller'
 
   # Turn - Pretty Unit Test Runner for Ruby
   #
@@ -46,6 +46,9 @@ module Turn
     # Only run tests matching this pattern.
     attr :pattern
 
+    # Only run testcases matching this pattern.
+    attr :matchcase
+
     # List of paths to add to $LOAD_PATH
     attr :loadpath
 
@@ -66,6 +69,7 @@ module Turn
       @live      = nil
       @log       = nil
       @pattern   = nil
+      @matchcase = nil
       @loadpath  = []
       @requires  = []
       @runmode   = nil
@@ -95,7 +99,19 @@ module Turn
         end
 
         opts.on('-n', '--name=PATTERN', "only run tests that match PATTERN") do |pattern|
-          @pattern = Regexp.new(pattern, Regexp::IGNORECASE)
+          if pattern =~ /\/(.*)\//
+            @pattern = Regexp.new($1)
+          else
+            @pattern = Regexp.new(pattern, Regexp::IGNORECASE)
+          end
+        end
+
+        opts.on('-t', '--testcase=PATTERN', "only run testcases that match PATTERN") do |pattern|
+          if pattern =~ /\/(.*)\//
+            @matchcase = Regexp.new($1)
+          else
+            @matchcase = Regexp.new(pattern, Regexp::IGNORECASE)
+          end
         end
 
         opts.on('-m', '--minitest', "Force use of MiniTest framework") do
@@ -169,6 +185,11 @@ module Turn
           $DEBUG   = true
         end
 
+        opts.on_tail('--version', "display version") do
+          puts VERSION
+          exit
+        end
+
         opts.on_tail('--help', '-h', "display this help information") do
           puts opts
           exit
@@ -193,6 +214,7 @@ module Turn
         c.runmode   = runmode
         c.format    = outmode
         c.pattern   = pattern
+        c.matchcase = matchcase
         c.framework = framework
       end
 

data/lib/turn/controller.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 
 module Turn
+  require 'turn/version'
   require 'turn/components/suite.rb'
   require 'turn/components/case.rb'
   require 'turn/components/method.rb'
@@ -12,17 +13,20 @@ module Turn
   #++
   class Controller
 
-    # File glob pattern of tests to run.
-    # Can be an array of files/globs.
+    # List of if file names or glob pattern of tests to run.
     attr_accessor :tests
 
-    # Files globs to specially exclude.
+    # List of file names or globs to exclude from +tests+ list.
     attr_accessor :exclude
 
     # Regexp pattern that all test name's must
     # match to be eligible to run.
     attr_accessor :pattern
 
+    # Regexp pattern that all test cases must
+    # match to be eligible to run.
+    attr_accessor :matchcase
+
     # Add these folders to the $LOAD_PATH.
     attr_accessor :loadpath
 
@@ -60,12 +64,12 @@ module Turn
     #
     def initialize_defaults
       @loadpath ||= ['lib']
-      @tests    ||= "test/**/{test,}*{,test}"
+      @tests    ||= ["test/**/{test,}*{,test}.rb"]
       @exclude  ||= []
       @requires ||= []
       @live     ||= false
       @log      ||= true
-      #@reporter ||= OutlineReporter.new($stdout)
+      #@format  ||= nil
       #@runner   ||= RUBY_VERSION >= "1.9" ? MiniRunner : TestRunner
       @pattern  ||= /.*/
     end
@@ -100,6 +104,10 @@ module Turn
 
   public
 
+    def tests=(paths)
+      @tests = list_option(paths)
+    end
+
     def loadpath=(paths)
       @loadpath = list_option(paths)
     end
@@ -112,16 +120,19 @@ module Turn
       @requires = list_option(paths)
     end
 
+    # Test files.
     def files
       @files ||= (
         fs = tests.map do |t|
           File.directory?(t) ? Dir[File.join(t, '**', '*')] : Dir[t]
         end
         fs = fs.flatten.reject{ |f| File.directory?(f) }
+
         ex = exclude.map do |x|
           File.directory?(x) ? Dir[File.join(x, '**', '*')] : Dir[x]
         end
         ex = ex.flatten.reject{ |f| File.directory?(f) }
+
         (fs - ex).uniq.map{ |f| File.expand_path(f) }
       )
     end

data/lib/turn/runners/minirunner.rb

@@ -1,4 +1,4 @@
-#
+require 'stringio'
 
 # Becuase of some wierdness in MiniTest
 debug, $DEBUG = $DEBUG, false
@@ -13,8 +13,9 @@ module Turn
   #
   class MiniRunner < ::MiniTest::Unit
 
-    #
+    # Override initialize to take controller argument.
     def initialize(controller)
+      @turn_controller = controller
 
       controller.loadpath.each{ |path| $: << path } unless controller.live?
       controller.requires.each{ |path| require(path) }
@@ -44,146 +45,121 @@ module Turn
       @turn_logger = controller.reporter
 
       super()
+
+      # route minitests traditional output to nowhere
+      # (instead of overriding #puts and #print)
+      @@out = ::StringIO.new
     end
 
-    #
+    # Turn calls this method to start the test run.
     def start(args=[])
       run(args)
       return @turn_suite
     end
 
-    #
-    def run(args = [])
-      @verbose = true
+    # Override #_run_suite to setup Turn.
+    def _run_suites suites, type
+      @turn_suite = Turn::TestSuite.new(@turn_suite_name)
+      @turn_suite.size = ::MiniTest::Unit::TestCase.test_suites.size
 
-      filter = if args.first =~ /^(-n|--name)$/ then
-                 args.shift
-                 arg = args.shift
-                 arg =~ /\/(.*)\// ? Regexp.new($1) : arg
-               else
-                 /./ # anything - ^test_ already filtered by #tests
-               end
+      @turn_logger.start_suite(@turn_suite)
 
-      #@@out.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
+      if @turn_controller.matchcase
+        suites = suites.select{ |suite| @turn_controller.matchcase =~ suite.name }
+      end
 
-      start = Time.now
+      result = suites.map { |suite| _run_suite(suite, type) }
 
-      run_test_suites(filter)
+      @turn_logger.finish_suite(@turn_suite)
 
-      return failures + errors if @test_count > 0 # or return nil...
+      return result
     end
 
-    #
-    def run_test_suites(filter = /./)
-      @test_count, @assertion_count = 0, 0
-      old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync=
+    # Override #_run_suite to iterate tests via Turn.
+    def _run_suite suite, type
+      # suites are cases in minitest
+      @turn_case = @turn_suite.new_case(suite.name)
 
-      @turn_suite = Turn::TestSuite.new(@turn_suite_name)
-      @turn_suite.size = ::MiniTest::Unit::TestCase.test_suites.size
-      @turn_logger.start_suite(@turn_suite)
+      filter = @turn_controller.pattern || /./
+
+      suite.send("#{type}_methods").grep(filter).each do |test|
+        @turn_case.new_test(test)
+      end
 
-      ::MiniTest::Unit::TestCase.test_suites.each do |kase|
+      @turn_logger.start_case(@turn_case)
 
-        test_cases = kase.test_methods.grep(filter)
+      header = "#{type}_suite_header"
+      puts send(header, suite) if respond_to? header
 
-        @turn_case = @turn_suite.new_case(kase.name)
+      assertions = @turn_case.tests.map do |test|
+        @turn_test = test
+        @turn_logger.start_test(@turn_test)
 
-        turn_cases = test_cases.map do |test|
-          @turn_case.new_test(test)
-        end
+        inst = suite.new(test.name) #method
+        inst._assertions = 0
 
-        @turn_logger.start_case(@turn_case)
-
-        turn_cases.each do |test|
-          #methname, tcase = name.scan(%r/^([^\(]+)\(([^\)]+)\)/o).flatten!
-          @turn_test = test #@turn_case.new_test(test)
-          @turn_logger.start_test(@turn_test)
-
-          inst = kase.new(test.name)
-          inst._assertions = 0
-
-          result = inst.run(self)
-          report = @report.last
-
-          case result
-          when :pass
-            @turn_logger.pass
-          when :error
-            #trace = ::MiniTest::filter_backtrace(report[:exception].backtrace).first
-            @turn_test.error!(report)
-            @turn_logger.error(report)
-          when :fail
-            #trace = ::MiniTest::filter_backtrace(report[:exception].backtrace).first
-            @turn_test.fail!(report)
-            @turn_logger.fail(report)
-          when :skip
-            @turn_test.skip! #(report)
-            @turn_logger.skip #(report)
-          end
-
-          @turn_logger.finish_test(@turn_test)
-
-          @test_count += 1
-          @assertion_count += inst._assertions
+        result = inst.run self
+
+        if result == "."
+          @turn_logger.pass
         end
-        @turn_case.count_assertions = @assertion_count  # for lack of a better appraoch
-        @turn_logger.finish_case(@turn_case)
+
+        @turn_logger.finish_test(@turn_test)
+
+        inst._assertions
       end
-      @turn_logger.finish_suite(@turn_suite)
-      @@out.sync = old_sync if @@out.respond_to? :sync=
-      [@test_count, @assertion_count]
+
+      @turn_case.count_assertions = assertions.inject(0) { |sum, n| sum + n }
+
+      @turn_logger.finish_case(@turn_case)
+
+      return assertions.size, assertions.inject(0) { |sum, n| sum + n }
     end
 
-    # Overwrite #puke method so that is stores a hash
-    # with :message and :exception keys.
-    def puke(klass, meth, e)
-      result = nil
-      msg = case e
-          when ::MiniTest::Skip
-            @skips += 1
-            result = :skip
-            e.message
-          when ::MiniTest::Assertion
-            @failures += 1
-            result = :fail
-            e.message
-          else
-            @errors += 1
-            result = :error
-            "#{e.class}: #{e.message}\n"
-          end
-
-      @report << e #{:message => msg, :exception => e}
-      result
+    # Override #puke to update Turn's internals and reporter.
+    def puke(klass, meth, err)
+      case err
+      when MiniTest::Skip
+        @turn_test.skip!
+        @turn_logger.skip #(e)
+      when MiniTest::Assertion
+        @turn_test.fail!(err)
+        @turn_logger.fail(err)
+      else
+        @turn_test.error!(err)
+        @turn_logger.error(err)
+      end
+      super(klass, meth, err)
     end
 
-  end
+    # To maintain compatibility with old versions of MiniTest.
+    if ::MiniTest::Unit::VERSION < '2.0'
 
-end
+      #attr_accessor :options
+
+      #
+      def run(args=[])
+        suites = ::MiniTest::Unit::TestCase.test_suites
+        return if suites.empty?
+
+        @test_count, @assertion_count = 0, 0
+        sync = @@out.respond_to? :"sync=" # stupid emacs
+        old_sync, @@out.sync = @@out.sync, true if sync
 
-class ::MiniTest::Unit::TestCase
-  old_verbose, $VERBOSE = $VERBOSE, false
-  # Overwrite #run method so that is uses symbols
-  # as return values rather than characters.
-  def run(runner)
-    result = :pass
-    begin
-      @passed = nil
-      self.setup
-      self.__send__(self.__name__.to_s)
-      @passed = true
-    rescue Exception => e
-      @passed = false
-      result = runner.puke(self.class, self.__name__.to_s, e)
-    ensure
-      begin
-        self.teardown
-      rescue Exception => e
-        result = runner.puke(self.class, self.__name__.to_s, e)
+        results = _run_suites suites, :test #type
+
+        @test_count      = results.inject(0) { |sum, (tc, _)| sum + tc }
+        @assertion_count = results.inject(0) { |sum, (_, ac)| sum + ac }
+
+        @@out.sync = old_sync if sync
+
+        return failures + errors if @test_count > 0 # or return nil...
+      rescue Interrupt
+        abort 'Interrupted'
       end
+
     end
-    result
+
   end
-  $VERBOSE = old_verbose
-end
 
+end

data/lib/turn/runners/testrunner.rb

@@ -38,11 +38,16 @@ module Turn
       end
       suite = Test::Unit::TestSuite.new(name)
 
+      matchcase = controller.matchcase
+      pattern   = controller.pattern
+
+      if matchcase
+        sub_suites = sub_suites.select{|s| matchcase =~ s.name}
+      end
       sub_suites.sort_by{|s|s.name}.each{|s| suite << s}
 
       suite.tests.each do |c|
-        pattern = controller.pattern
-        c.tests.reject! { |t| pattern !~ t.method_name }
+        c.tests.reject!{ |t| pattern !~ t.method_name }
       end
 
       @t_reporter = controller.reporter
@@ -118,7 +123,7 @@ module Turn
       @t_reporter.finish_test(@t_test)
     end
 
-      def t_case_finished(name)
+    def t_case_finished(name)
       # Err.. why is testunit running this on the suite?
       return if name=='' # FIXME skip suite call
 

data/lib/turn/version.rb

@@ -0,0 +1,3 @@
+module Turn
+  VERSION = "0.8.2"
+end

data/turn.gemspec

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{turn}
+  s.version = "0.8.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tim Pease"]
+  s.date = %q{2010-09-09}
+  s.default_executable = %q{turn}
+  s.description = %q{TURN is a new way to view Test::Unit results. With longer running tests, it
+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.}
+  s.email = %q{tim.pease@gmail.com}
+  s.executables = ["turn"]
+  s.extra_rdoc_files = ["History.txt", "README.txt", "Release.txt", "Version.txt", "bin/turn"]
+  s.files = ["History.txt", "README.txt", "Rakefile", "Release.txt", "Version.txt", "bin/turn", "demo/test_autorun_minitest.rb", "demo/test_autorun_testunit.rb", "demo/test_sample.rb", "demo/test_sample2.rb", "lib/turn.rb", "lib/turn/autorun/minitest.rb", "lib/turn/autorun/testunit.rb", "lib/turn/bin.rb", "lib/turn/colorize.rb", "lib/turn/command.rb", "lib/turn/components/case.rb", "lib/turn/components/method.rb", "lib/turn/components/suite.rb", "lib/turn/controller.rb", "lib/turn/core_ext.rb", "lib/turn/reporter.rb", "lib/turn/reporters/cue_reporter.rb", "lib/turn/reporters/dot_reporter.rb", "lib/turn/reporters/marshal_reporter.rb", "lib/turn/reporters/outline_reporter.rb", "lib/turn/reporters/pretty_reporter.rb", "lib/turn/reporters/progress_reporter.rb", "lib/turn/runners/crossrunner.rb", "lib/turn/runners/isorunner.rb", "lib/turn/runners/loadrunner.rb", "lib/turn/runners/minirunner.rb", "lib/turn/runners/solorunner.rb", "lib/turn/runners/testrunner.rb", "test/helper.rb", "test/runner", "test/test_framework.rb", "test/test_reporters.rb", "test/test_runners.rb"]
+  s.homepage = %q{http://gemcutter.org/gems/turn}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{codeforpeople}
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{Test::Unit Reporter (New) -- new output format for Test::Unit}
+  s.test_files = ["test/test_framework.rb", "test/test_reporters.rb", "test/test_runners.rb"]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ansi>, [">= 1.2.2"])
+      s.add_development_dependency(%q<bones-git>, [">= 1.2.0"])
+      s.add_development_dependency(%q<bones>, [">= 3.4.7"])
+    else
+      s.add_dependency(%q<ansi>, [">= 1.2.2"])
+      s.add_dependency(%q<bones-git>, [">= 1.2.0"])
+      s.add_dependency(%q<bones>, [">= 3.4.7"])
+    end
+  else
+    s.add_dependency(%q<ansi>, [">= 1.2.2"])
+    s.add_dependency(%q<bones-git>, [">= 1.2.0"])
+    s.add_dependency(%q<bones>, [">= 3.4.7"])
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: turn
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 -06:00
+date: 2011-03-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 4
+        version: 1.2.4
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 21
         segments: 
         - 3
-        - 4
-        - 7
-        version: 3.4.7
+        - 6
+        - 5
+        version: 3.6.5
   type: :development
   version_requirements: *id003
 description: |-
@@ -96,6 +96,7 @@ files:
 - bin/turn
 - demo/test_autorun_minitest.rb
 - demo/test_autorun_testunit.rb
+- demo/test_counts.rb
 - demo/test_sample.rb
 - demo/test_sample2.rb
 - lib/turn.rb
@@ -122,11 +123,13 @@ files:
 - lib/turn/runners/minirunner.rb
 - lib/turn/runners/solorunner.rb
 - lib/turn/runners/testrunner.rb
+- lib/turn/version.rb
 - test/helper.rb
 - test/runner
 - test/test_framework.rb
 - test/test_reporters.rb
 - test/test_runners.rb
+- turn.gemspec
 has_rdoc: true
 homepage: http://gemcutter.org/gems/turn
 licenses: []
@@ -157,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: codeforpeople
+rubyforge_project: turn
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3