turn 0.8.3 → 0.9.0

data/lib/turn/testunit.rb

@@ -0,0 +1,5 @@
+require 'turn/runners/testrunner'
+
+# need to turn this off unless autorun mode
+Test::Unit.run = false
+

data/test/helper.rb

@@ -1,3 +1,6 @@
+$:.unshift './lib'
+
+#require 'turn/colorize'
 require 'fileutils'
 
 if RUBY_VERSION < "1.9"
@@ -7,6 +10,10 @@ else
   require 'test/unit'
 end
 
+require 'turn'
+
+#
+#Turn.config.format = :pretty
 
 #
 def turn(*args)
@@ -39,7 +46,7 @@ end
 #
 def save_test(text, name=nil)
   file = File.join('tmp', name || 'test.rb')
-  FileUtils.mkdir_p('tmp')
+  FileUtils.mkdir_p('tmp') unless File.directory?('tmp')
   File.open(file, 'w'){ |f| f << text }
   return file
 end
@@ -91,6 +98,7 @@ end
 def setup_minitest_autorun
   text = <<-HERE
 require 'turn'
+MiniTest::Unit.runner = Turn::MiniRunner.new
 MiniTest::Unit.autorun
 #require 'minitest/unit'
 class TestTest < MiniTest::Unit::TestCase
@@ -108,9 +116,10 @@ def setup_minitest_autorun_with_trace
 #require 'minitest/unit'
 #require 'rubygems'
 require 'turn'
+MiniTest::Unit.runner = Turn::MiniRunner.new
 MiniTest::Unit.autorun
 Turn.config do |c|
-  c.trace = true
+  c.trace = 1
 end
 class TestTest < MiniTest::Unit::TestCase
   def test_sample_pass

data/test/test_framework.rb

@@ -13,30 +13,40 @@ if RUBY_VERSION >= '1.9'
 
     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.colorize?
+      assert_equal true, Turn::Colorize.color_supported?
       ENV['TERM'] = 'dumb'
-      assert_equal false, Turn::Colorize.colorize?
+      assert_equal false, Turn::Colorize.color_supported?
       ENV['TERM'] = nil
-      assert_equal false, Turn::Colorize.colorize?
+      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.colorize?
+      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
-      setup_test('MiniTest')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
-    end
+    #def test_ruby19_minitest_force
+    #  setup_test('MiniTest')
+    #  result = turn '--minitest tmp/test.rb'
+    #  assert result.index('PASS')
+    #end
 
     def test_ruby19_minitest_required
       setup_test('MiniTest', 'minitest/unit')
@@ -44,11 +54,11 @@ if RUBY_VERSION >= '1.9'
       assert result.index('PASS')
     end
 
-    def test_ruby19_minitest_required_force
-      setup_test('MiniTest', 'minitest/unit')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
-    end
+    #def test_ruby19_minitest_required_force
+    #  setup_test('MiniTest', 'minitest/unit')
+    #  result = turn '--minitest tmp/test.rb'
+    #  assert result.index('PASS')
+    #end
 
     def test_ruby19_minitest_mocking
       setup_test('Test')
@@ -56,11 +66,11 @@ if RUBY_VERSION >= '1.9'
       assert result.index('PASS')
     end
 
-    def test_ruby19_minitest_mocking_force
-      setup_test('Test')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
-    end
+    #def test_ruby19_minitest_mocking_force
+    #  setup_test('Test')
+    #  result = turn '--minitest tmp/test.rb'
+    #  assert result.index('PASS')
+    #end
 
     def test_ruby19_minitest_mocking_required
       setup_test('Test', 'minitest/unit')
@@ -68,19 +78,19 @@ if RUBY_VERSION >= '1.9'
       assert result.index('PASS')
     end
 
-    def test_ruby19_minitest_mocking_required_force
-      setup_test('Test', 'minitest/unit')
-      result = turn '--minitest tmp/test.rb'
-      assert result.index('PASS')
-    end
-
-    # Ruby 1.9 users must remove ++require 'test/unit'++ from their tests.
-    #def test_ruby19_testunit_required
-    #  setup_test('Test', 'test/unit')
-    #  result = turn 'turn tmp/test.rb'
+    #def test_ruby19_minitest_mocking_required_force
+    #  setup_test('Test', 'minitest/unit')
+    #  result = turn '--minitest tmp/test.rb'
     #  assert result.index('PASS')
     #end
 
+    #
+    def test_ruby19_testunit_required
+      setup_test('Test', 'test/unit')
+      result = turn 'turn tmp/test.rb'
+      assert result.index('PASS')
+    end
+
     # Turn does not support Test::Unit 2.0+.
     #def test_ruby19_testunit_force
     #  setup_test('Test')
@@ -149,4 +159,3 @@ else
   end
 
 end
-

data/test/test_runners.rb

@@ -20,23 +20,23 @@ class TestRunners < Test::Unit::TestCase
 
   # autorun
 
-  if RUBY_VERSION < '1.9'
+  #if RUBY_VERSION < '1.9'
 
-    def test_autorun
-      file = setup_test('Test', 'turn', 'test_autorun.rb')
+    def test_autorun_testunit
+      file = setup_test('Test', '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'))
     end
 
-  else
+  #else
 
     def test_autorun
       file = setup_minitest_autorun
       result = `ruby -Ilib #{file} 2>&1`
-      assert result.index('fail: 0')
-      assert result.index('error: 0')
+      assert result.index('fail: 0'),  "ACTUAL RESULT --->\n #{result}"
+      assert result.index('error: 0'), "ACTUAL RESULT --->\n #{result}"
     end
 
     def test_autorun_with_trace
@@ -49,6 +49,8 @@ class TestRunners < Test::Unit::TestCase
       # TODO: the backtrace is empty, why?
       #assert result.scan(/\.rb:\d+:in/).length > 1
     end
-  end
+
+  #end
+
 end
 

data/turn.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{turn}
-  s.version = "0.8.3"
+  s.version = "0.8.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Tim Pease}]
-  s.date = %q{2011-10-10}
+  s.date = %q{2011-10-26}
   s.description = %q{}
   s.email = %q{tim.pease@gmail.com}
   s.executables = [%q{turn}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turn
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2153736940 !ruby/object:Gem::Requirement
+  requirement: &23349740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,29 +21,40 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153736940
+  version_requirements: *23349740
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &23349320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *23349320
 - !ruby/object:Gem::Dependency
   name: bones-git
-  requirement: &2153735960 !ruby/object:Gem::Requirement
+  requirement: &23348880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153735960
+  version_requirements: *23348880
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &2153735420 !ruby/object:Gem::Requirement
+  requirement: &23348420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *2153735420
+  version_requirements: *23348420
 description: ''
 email: tim.pease@gmail.com
 executables:
@@ -51,42 +62,41 @@ executables:
 extensions: []
 extra_rdoc_files:
 - History.txt
-- NOTICE.txt
+- LICENSE-GPL2.txt
+- LICENSE-MIT.txt
+- LICENSE-RUBY.txt
+- LICENSE.txt
 - Release.txt
 - Version.txt
 - bin/turn
-- license/GPLv2.txt
-- license/MIT-LICENSE.txt
-- license/RUBY-LICENSE.txt
 files:
+- .gitignore
 - .travis.yml
 - Gemfile
 - History.txt
-- NOTICE.txt
+- LICENSE-GPL2.txt
+- LICENSE-MIT.txt
+- LICENSE-RUBY.txt
+- LICENSE.txt
 - README.md
 - Rakefile
 - Release.txt
 - Version.txt
 - 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
 - lib/turn/autoload.rb
-- lib/turn/autorun/minitest.rb
-- lib/turn/autorun/minitest0.rb
-- lib/turn/autorun/testunit.rb
-- lib/turn/autorun/testunit0.rb
+- lib/turn/autorun.rb
 - lib/turn/bin.rb
 - lib/turn/colorize.rb
 - lib/turn/command.rb
+- lib/turn/components.rb
 - lib/turn/components/case.rb
 - lib/turn/components/method.rb
 - lib/turn/components/suite.rb
+- lib/turn/configuration.rb
 - lib/turn/controller.rb
 - lib/turn/core_ext.rb
+- lib/turn/minitest.rb
 - lib/turn/reporter.rb
 - lib/turn/reporters/cue_reporter.rb
 - lib/turn/reporters/dot_reporter.rb
@@ -100,15 +110,18 @@ files:
 - lib/turn/runners/minirunner.rb
 - lib/turn/runners/solorunner.rb
 - lib/turn/runners/testrunner.rb
+- lib/turn/testunit.rb
 - lib/turn/version.rb
-- license/GPLv2.txt
-- license/MIT-LICENSE.txt
-- license/RUBY-LICENSE.txt
 - test/helper.rb
 - test/runner
 - test/test_framework.rb
 - test/test_reporters.rb
 - test/test_runners.rb
+- try/test_autorun_minitest.rb
+- try/test_autorun_testunit.rb
+- try/test_counts.rb
+- try/test_sample.rb
+- try/test_sample2.rb
 - turn.gemspec
 homepage: http://gemcutter.org/gems/turn
 licenses: []
@@ -132,11 +145,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: turn
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Test::Unit Reporter (New) -- new output format for Test::Unit
 test_files:
-- test/test_framework.rb
 - test/test_reporters.rb
+- test/test_framework.rb
 - test/test_runners.rb

data/lib/turn/autorun/minitest0.rb

@@ -1,163 +0,0 @@
-require 'minitest/unit'
-require 'minitest/spec'
-#require 'rubygems'
-require 'turn/colorize'
-
-class MiniTest::Unit
-  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
-    options = args.getopts("n:t", "name:", "trace")
-    filter = if name = options["n"] || options["name"]
-               if name =~ /\/(.*)\//
-                 Regexp.new($1)
-               elsif MiniTest::Unit.use_natural_language_case_names?
-                 # Turn 'sample error1' into 'test_sample_error1'
-                 name[0..4] == "test_" ? name.gsub(" ", "_") : "test_" + name.gsub(" ", "_")
-               else
-                 name
-               end
-             else
-               /./ # anything - ^test_ already filtered by #tests
-             end
-
-    @trace = options['t'] || options['trace']
-
-    @@out.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
-
-    start = Time.now
-    run_test_suites filter
-
-    @@out.puts
-    @@out.puts "Finished in #{'%.6f' % (Time.now - start)} seconds."
-
-    @@out.puts
-
-    @@out.print "%d tests, " % test_count
-    @@out.print "%d assertions, " % assertion_count
-    @@out.print Turn::Colorize.fail("%d failures, " % failures)
-    @@out.print Turn::Colorize.error("%d errors, " % errors)
-    @@out.puts Turn::Colorize.skip("%d skips" % skips)
-
-    return failures + errors if @test_count > 0 # or return nil...
-  end
-
-  # Overwrite #run_test_suites so that it prints out reports
-  # as errors are generated.
-  def run_test_suites(filter = /./)
-    @test_count, @assertion_count = 0, 0
-    old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync=
-    TestCase.test_suites.each do |suite|
-      test_cases = suite.test_methods.grep(filter)
-      if test_cases.size > 0
-        @@out.print "\n#{suite}:\n"
-      end
-
-      test_cases.each do |test|
-        inst = suite.new test
-        inst._assertions = 0
-
-        t = Time.now
-
-        @broken = nil
-
-        @@out.print(case run_testcase(inst, self)
-                    when :pass
-                      @broken = false
-                      Turn::Colorize.pass(pad_with_size "PASS")
-                    when :error
-                      @broken = true
-                      Turn::Colorize.error(pad_with_size "ERROR")
-                    when :fail
-                      @broken = true
-                      Turn::Colorize.fail(pad_with_size "FAIL")
-                    when :skip
-                      @broken = false
-                      Turn::Colorize.skip(pad_with_size "SKIP")
-                    end)
-
-
-        @@out.print MiniTest::Unit.use_natural_language_case_names? ? 
-          " #{test.gsub("test_", "").gsub(/_/, " ")}" : " #{test}"
-        @@out.print " (%.2fs) " % (Time.now - t)
-
-        if @broken
-          @@out.puts
-
-          report = @report.last
-          @@out.puts pad(report[:message], 10)
-
-          trace = MiniTest::filter_backtrace(report[:exception].backtrace)
-          if @trace
-            @@out.print trace.map{|t| pad(t, 10) }.join("\n")
-          else
-            @@out.print pad(trace.first, 10)
-          end
-
-          @@out.puts
-        end
-
-        @@out.puts
-        @test_count += 1
-        @assertion_count += inst._assertions
-      end
-    end
-    @@out.sync = old_sync if @@out.respond_to? :sync=
-    [@test_count, @assertion_count]
-  end
-
-  def pad(str, size=PADDING_SIZE)
-    " " * size + str
-  end
-
-  def pad_with_size(str)
-    pad("%5s" % str)
-  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 << {:message => msg, :exception => e}
-    result
-  end
-
-private
-  # A wrapper over MiniTest::Unit::TestCase.run() that returns
-  # :pass whenever the test succeeds (i.e. run() returns "" or ".")
-  def run_testcase(testcase, runner)
-    original_result = testcase.run(runner)
-    if original_result == "" || original_result == "."
-        :pass
-    else
-        original_result
-    end
-  end
-end
-