turn 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.1 / 2012-02-01
+  * MiniTest Only
+  * Fix issues with 1.8.7 support.
+
 == 0.9.0 / 2012-01-30
   * Fix bundle exec issue, which means...
   * Developer's must require `turn/autorun` instead fo just `turn`.

data/Version.txt

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/turn.rb

@@ -1,9 +1,4 @@
-#
 module Turn
-  # Are we using Test::Unit (1.x)?
-  def self.testunit?
-    defined?(Test::Unit) && !defined?(MiniTest)
-  end
 end
 
 require 'fileutils'
@@ -14,15 +9,5 @@ require 'turn/configuration'
 require 'turn/colorize'
 require 'turn/components'
 require 'turn/controller'
-
-if Turn.testunit?
-  require 'turn/testunit'
-else
-  require 'turn/minitest'
-end
-
-#if ENV['autorun']
-#  warn "Use `require 'turn/autorun'` instead of `require 'turn'` for future versions."
-#  MiniTest::Unit.autorun
-#end
+require 'turn/minitest'
 

data/lib/turn/autoload.rb

@@ -1,6 +1,6 @@
 # This is a "dirty trick" to load `test/unit` or `minitest/unit` if sought.
 # Eventually a way to handle this more robustly (without autoreload) 
 # should be worked out. But how?
-autoload "Test",     'test/unit'
-autoload "MiniTest", 'minitest/unit'
+#autoload "Test",     'test/unit'
+#autoload "MiniTest", 'minitest/unit'
 

data/lib/turn/autorun.rb

@@ -1,8 +1,4 @@
 require 'turn'
 
-if Turn.testunit?
-  Test::Unit.run = true
-else
-  MiniTest::Unit.autorun
-end
+MiniTest::Unit.autorun
 

data/lib/turn/command.rb

@@ -16,7 +16,6 @@ module Turn
   #   -c --case=PATTERN     only run testcases that match regexp PATTERN
   #   -I --loadpath=PATHS   add given PATHS to the $LOAD_PATH
   #   -r --requires=LIBS    require given LIBS before running tests
-  #   -m --minitest         Force use of MiniTest framework.
   #   -b --backtrace=INT    Set the number of lines to show in backtrace.
   #
   # RUN MODES
@@ -85,7 +84,6 @@ module Turn
       @requires  = []
       @runmode   = nil
       @outmode   = nil
-      #@framework = RUBY_VERSION >= "1.9" ? :minitest : :testunit
       @trace     = nil
       @natural   = false
       @ansi      = nil
@@ -128,10 +126,6 @@ module Turn
           end
         end
 
-        #opts.on('-m', '--minitest', "Force use of MiniTest framework") do
-        #  @framework = :minitest
-        #end
-
         opts.on('-b', '--backtrace', '--trace INT', "Limit the number of lines of backtrace.") do |int|
           @trace = int
         end
@@ -242,7 +236,6 @@ module Turn
         c.format    = outmode
         c.pattern   = pattern
         c.matchcase = matchcase
-        #c.framework = framework
         c.trace     = trace
         c.natural   = natural
         c.ansi      = ansi unless ansi.nil?

data/lib/turn/controller.rb

@@ -35,20 +35,11 @@ module Turn
     # Insatance of Runner, selected based on format and runmode.
     def runner
       @runner ||= (
-        #case config.framework
-        #when :minitest
-          require 'turn/runners/minirunner'
-        #else
-        #  require 'turn/runners/testrunner'
-        #end
+        require 'turn/runners/minirunner'
 
         case config.runmode
         when :marshal
-          #if config.framework == :minitest
-            Turn::MiniRunner
-          #else
-          #  Turn::TestRunner
-          #end
+          Turn::MiniRunner
         when :solo
           require 'turn/runners/solorunner'
           Turn::SoloRunner
@@ -56,11 +47,7 @@ module Turn
           require 'turn/runners/crossrunner'
           Turn::CrossRunner
         else
-          #if config.framework == :minitest
-            Turn::MiniRunner
-          #else
-          #  Turn::TestRunner
-          #end
+          Turn::MiniRunner
         end
       )
     end

data/lib/turn/minitest.rb

@@ -1,5 +1,3 @@
-#require 'turn'
-
 # make sure latest verison is used, rather than ruby's built-in
 begin; gem 'minitest'; rescue Exception; end
 
@@ -7,6 +5,9 @@ begin; gem 'minitest'; rescue Exception; end
 require 'minitest/unit'
 require 'minitest/spec'
 
+# compatability with old Test::Unit
+Test = MiniTest unless defined?(Test)
+
 # load Turn's minitest runner
 require 'turn/runners/minirunner'
 

data/lib/turn/runners/minirunner.rb

@@ -41,7 +41,8 @@ module Turn
     # Override #_run_suite to setup Turn.
     def _run_suites suites, type
       # Someone want to explain to me why these are fucking here?
-      suites = suites - [MiniTest::Spec, Test::Unit::TestCase]
+      suites = suites - [MiniTest::Spec]
+      suites = suites - [Test::Unit::TestCase] if defined?(Test::Unit::TestCase)
 
       @turn_suite = Turn::TestSuite.new(@turn_config.suite_name)
       @turn_suite.size = suites.size  #::MiniTest::Unit::TestCase.test_suites.size

data/lib/turn/testunit.rb

@@ -1,5 +1,24 @@
-require 'turn/runners/testrunner'
+module Turn
 
-# need to turn this off unless autorun mode
-Test::Unit.run = false
+  # For TestUnit 1.x, completely outdated.
+  def self.bootstrap_legacy(autorun=false)
+    require 'fileutils'
+
+    require 'turn/version'
+    require 'turn/autoload'
+    require 'turn/configuration'
+    require 'turn/colorize'
+    require 'turn/components'
+    require 'turn/controller'
+
+    require 'test/unit'
+    require 'turn/runners/testrunner'
+
+    # need to turn this off unless autorun mode
+    Test::Unit.run = autorun
+  end
+
+end
+
+Turn.bootstrap_legacy(true)
 

data/test/helper.rb

@@ -17,14 +17,23 @@ require 'turn'
 
 #
 def turn(*args)
-  `ruby -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
+  if RUBY_VERSION < '1.9'
+    `ruby1.8 -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
+  else
+    `ruby -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
+  end
 end
 
 #
 def turn2(*args)
-  `ruby -Ilib bin/turn -Ilib #{args.join(' ')}`
+  if RUBY_VERSION < '1.9'
+    `ruby1.8 -Ilib bin/turn -Ilib #{args.join(' ')}`
+  else
+    `ruby -Ilib bin/turn -Ilib #{args.join(' ')}`
+  end
 end
 
+#
 def turn_with_term(term, *args)
   `TERM="#{term}" ruby -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
 end
@@ -43,6 +52,20 @@ end
   save_test(text, name)
 end
 
+#
+def setup_testunit(required=false, name=nil)
+  text = ''
+  text << "require '#{required}'\n" if required
+  text << <<-HERE
+class TestTest < Test::Unit::TestCase
+#{standard_test_body}
+end
+  HERE
+  #name = framwwork.downcase
+  #name = name + '_required' if requires
+  save_test(text, name)
+end
+
 #
 def save_test(text, name=nil)
   file = File.join('tmp', name || 'test.rb')
@@ -78,7 +101,7 @@ HERE
 end
 
 #
-def setup_outline_test
+def setup_testunit_outline
   text = <<-HERE
 class OutlineTest < Test::Unit::TestCase
   def test_sample_pass

data/test/test_framework.rb

@@ -12,34 +12,41 @@ if RUBY_VERSION >= '1.9'
     end
 
     def test_ruby19_minitest_color
-      term, stdout = ENV['TERM'], $stdout
-      host_os, ansicon, = ::RbConfig::CONFIG['host_os'], ENV['ANSICON']
-      $stdout = $stdout.dup
-      def $stdout.tty?
-        true
-      end
-      ENV['ANSICON'] = nil
-      ENV['TERM'] = 'xterm'
-      assert_equal true, Turn::Colorize.color_supported?
-      ENV['TERM'] = 'dumb'
-      assert_equal false, Turn::Colorize.color_supported?
-      ENV['TERM'] = nil
-      assert_equal false, Turn::Colorize.color_supported?
-      ['mingw32', 'mswin32'].each do |os|
-        ::RbConfig::CONFIG['host_os'] = os
-        ENV['ANSICON'] = '120x5000 (120x50)'
-        assert_equal true, Turn::Colorize.color_supported?
+      unless defined?(ANSI)
+        assert true   # skip ?
+        return
+      end  
+  
+      begin
+        term, stdout = ENV['TERM'], $stdout
+        host_os, ansicon, = ::RbConfig::CONFIG['host_os'], ENV['ANSICON']
+        $stdout = $stdout.dup
+        def $stdout.tty?
+          true
+        end
         ENV['ANSICON'] = nil
+        ENV['TERM'] = 'xterm'
+        assert_equal true, Turn::Colorize.color_supported?
+        ENV['TERM'] = 'dumb'
         assert_equal false, Turn::Colorize.color_supported?
+        ENV['TERM'] = nil
+        assert_equal false, Turn::Colorize.color_supported?
+        ['mingw32', 'mswin32'].each do |os|
+          ::RbConfig::CONFIG['host_os'] = os
+          ENV['ANSICON'] = '120x5000 (120x50)'
+          assert_equal true, Turn::Colorize.color_supported?
+          ENV['ANSICON'] = nil
+          assert_equal false, Turn::Colorize.color_supported?
+        end
+        ENV['TERM'] = 'xterm'
+        def $stdout.tty?
+          false
+        end
+        assert_equal false, Turn::Colorize.color_supported?
+      ensure
+        ENV['TERM'], $stdout = term, stdout
+        ::RbConfig::CONFIG['host_os'], ENV['ANSICON'] = host_os, ansicon
       end
-      ENV['TERM'] = 'xterm'
-      def $stdout.tty?
-        false
-      end
-      assert_equal false, Turn::Colorize.color_supported?
-    ensure
-      ENV['TERM'], $stdout = term, stdout
-      ::RbConfig::CONFIG['host_os'], ENV['ANSICON'] = host_os, ansicon
     end
 
     #def test_ruby19_minitest_force
@@ -61,7 +68,7 @@ if RUBY_VERSION >= '1.9'
     #end
 
     def test_ruby19_minitest_mocking
-      setup_test('Test')
+      setup_testunit
       result = turn 'tmp/test.rb'
       assert result.index('PASS')
     end
@@ -86,7 +93,7 @@ if RUBY_VERSION >= '1.9'
 
     #
     def test_ruby19_testunit_required
-      setup_test('Test', 'test/unit')
+      setup_testunit
       result = turn 'turn tmp/test.rb'
       assert result.index('PASS')
     end
@@ -112,27 +119,27 @@ else
   class TestRuby18Framework < Test::Unit::TestCase
 
     def test_ruby18_testunit
-      setup_test('Test')
+      setup_testunit
       result = turn 'tmp/test.rb'
-      assert result.index('PASS')
+      assert result.index('PASS'), "ACTUAL RESULT:\n#{result}"
     end
 
     def test_ruby18_testunit_required
-      setup_test('Test', 'test/unit')
+      setup_testunit
       result = turn 'tmp/test.rb'
-      assert result.index('PASS')
+      assert result.index('PASS'), "ACTUAL RESULT:\n#{result}"
     end
 
     def test_ruby18_minitest
       setup_test('MiniTest')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
+      result = turn 'tmp/test.rb'
+      assert result.index('PASS'), "ACTUAL RESULT:\n#{result}"
     end
 
     def test_ruby18_minitest_mocking_testunit
       setup_test('Test')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
+      result = turn 'tmp/test.rb'
+      assert result.index('PASS'), "ACTUAL RESULT:\n#{result}"
     end
 
     # You can't use minitest and have ++require 'test/unit'++ in your tests.
@@ -152,8 +159,8 @@ else
 
     def test_ruby18_minitest_required_force
       setup_test('MiniTest', 'minitest/unit')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
+      result = turn 'tmp/test.rb'
+      assert result.index('PASS'), "ACTUAL RESULT:\n#{result}"
     end
 
   end

data/test/test_reporters.rb

@@ -5,7 +5,7 @@ class TestReporters < Test::Unit::TestCase
   begin
     require 'ansi'
     def test_progress
-      file = setup_test('Test')
+      file = setup_testunit
       result = turn '--progress', file
       assert(result.index('PASS'), result)
     end
@@ -13,31 +13,31 @@ class TestReporters < Test::Unit::TestCase
   end
 
   def test_dotted
-    file = setup_test('Test')
+    file = setup_testunit
     result = turn '--dotted', file
-    assert result.index('0 failures')
-    assert result.index('0 errors')
+    assert result.index('0 failures'), "ACTUAL RESULT:\n#{result}"
+    assert result.index('0 errors'), "ACTUAL RESULT:\n#{result}"
   end
 
   def test_marshal
-    file = setup_test('Test')
+    file = setup_testunit
     result = turn '--marshal', file
-    assert !result.index('error: true')
-    assert !result.index('fail: true')
+    assert !result.index('error: true'), "ACTUAL RESULT:\n#{result}"
+    assert !result.index('fail: true'),  "ACTUAL RESULT:\n#{result}"
   end
 
   def test_outline
-    file = setup_outline_test
+    file = setup_testunit_outline
     result = turn '--outline', file
-    assert result.index('You should see me')
-    assert !result.index('You should not see me')
+    assert result.index('You should see me'), "ACTUAL RESULT:\n#{result}"
+    assert !result.index('You should not see me'), "ACTUAL RESULT:\n#{result}"
   end
 
   def test_pretty
-    file = setup_test('Test')
+    file = setup_testunit
     result = turn '--pretty', file
-    assert result.index('0 errors')
-    assert result.index('0 failures')
+    assert result.index('0 errors'), "ACTUAL RESULT:\n#{result}"
+    assert result.index('0 failures'), "ACTUAL RESULT:\n#{result}"
   end
 
 end

data/test/test_runners.rb

@@ -3,19 +3,19 @@ require File.expand_path(File.dirname(__FILE__)) + '/helper.rb'
 class TestRunners < Test::Unit::TestCase
 
   def test_solo
-    file = setup_test('Test', false, 'test_solo.rb')
+    file = setup_testunit(false, 'test_solo.rb')
     result = turn2 '--solo', file
-    assert result.index('pass: 1')
-    assert result.index('fail: 0')
-    assert result.index('error: 0')
+    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}"
   end
 
   def test_cross
-    file1 = setup_test('Test', false, 'test1.rb')
-    file2 = setup_test('Test', false, 'test2.rb')
+    file1 = setup_testunit(false, 'test1.rb')
+    file2 = setup_testunit(false, 'test2.rb')
     result = turn2 '--cross', file1, file2
-    assert result.index('pass: 2')
-    assert result.index('error: 0')
+    assert result.index('pass: 2'),  "ACTUAL RESULT --->\n #{result}"
+    assert result.index('error: 0'), "ACTUAL RESULT --->\n #{result}"
   end
 
   # autorun
@@ -23,11 +23,11 @@ class TestRunners < Test::Unit::TestCase
   #if RUBY_VERSION < '1.9'
 
     def test_autorun_testunit
-      file = setup_test('Test', 'turn/autorun', 'test_autorun.rb')
+      file = setup_testunit('turn/autorun', 'test_autorun.rb')
       result = `ruby -Ilib #{file} 2>&1`
-      assert(result.index('pass: 1'))
-      assert(result.index('fail: 0'))
-      assert(result.index('error: 0'))
+      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}")
     end
 
   #else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turn
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &23349740 !ruby/object:Gem::Requirement
+  requirement: &15635820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23349740
+  version_requirements: *15635820
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &23349320 !ruby/object:Gem::Requirement
+  requirement: &15635380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23349320
+  version_requirements: *15635380
 - !ruby/object:Gem::Dependency
   name: bones-git
-  requirement: &23348880 !ruby/object:Gem::Requirement
+  requirement: &15634880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23348880
+  version_requirements: *15634880
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &23348420 !ruby/object:Gem::Requirement
+  requirement: &15634400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *23348420
+  version_requirements: *15634400
 description: ''
 email: tim.pease@gmail.com
 executables: