spork-testunit 0.0.7 → 0.0.8

data/README.textile

@@ -4,4 +4,4 @@ This includes a plugin for spork to enable Test::Unit support for spork. It also
 
 To use it, install the gem, then fire up spork in your project directory (the file test/test_helper.rb must exist to detect that Test::Unit is being used).
 
-Then, once spork is running, invoke `testdrb test/your_test.rb` to run your tests under Spork.
+Then, once spork is running, invoke @testdrb@ (e.g. @testdrb -Itest test/your_test.rb@) to run your tests under Spork.

data/bin/testdrb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
+# These fix 1.8.7 test/unit results where a DRbUnknown is returned because the testdrb client doesn't have the classes
+# in its local namespace.  (See issue #2)
 begin
-  # MiniTest is Ruby 1.9.
   require 'minitest/unit'
 rescue LoadError
-  # These fix 1.8.7 test/unit results where a DRbUnknown is returned because the testdrb client doesn't have the classes
-  # in its local namespace.  (See issue #2)
+  # MiniTest is Ruby 1.9, and the classes below only exist in the pre 1.9 test/unit
   require 'test/unit/testresult'
   require 'test/unit/failure'
 end

data/lib/spork/test_framework/test_unit.rb

@@ -5,10 +5,11 @@ class Spork::TestFramework::TestUnit < Spork::TestFramework
   def run_tests(argv, stderr, stdout)
     if defined? MiniTest
       # Ruby 1.9
+      stdout = Purdytest::IO.new(stdout) if defined? Purdytest # rewrap
       MiniTest::Unit.output = stdout
 
-      # MiniTest's test/unit does not support -I
-      # Extract it and remove from arguments that are passed to testrb.
+      # MiniTest's test/unit does not support -I, -r, or -e
+      # Extract them and remove from arguments that are passed to testrb.
       argv.each_with_index do |arg, idx|
         if arg =~ /-I(.*)/
           if $1 == ''
@@ -20,26 +21,64 @@ class Spork::TestFramework::TestUnit < Spork::TestFramework
           end
           $LOAD_PATH << include_path
           argv[idx] = nil
+        elsif arg =~ /-r(.*)/
+          if $1 == ''
+            # File is next argument.
+            require_file = argv[idx + 1]
+            argv[idx + 1] = nil # Will be squashed when compact called.
+          else
+            require_file = $1
+          end
+          require require_file
+          argv[idx] = nil
+        elsif arg =~ /^-e$/
+          eval argv[idx + 1]
+          argv[idx] = argv[idx + 1] = nil
         end
       end
       argv.compact!
 
-      # copied from ruby-1.9.2-p136/bin/testrb:
-      require 'test/unit'
-      Test::Unit.setup_argv(argv) {|files|
-        if files.empty?
+      require 'test/unit'                                                                                         
+      if defined? Turn
+        # Use turn's wrapper around minitest
+        if argv.empty?
           puts "Usage: testrb [options] tests..."
           exit 1
         end
-        if files.size == 1
-          $0 = File.basename(files[0])
-        else
-          $0 = files.to_s
+        runner = Turn::MiniRunner.new
+        config = Turn.config do |c|
+          c.tests     = argv
+          c.framework = :minitest
         end
-        files
-      }
+        controller = Turn::Controller.new(config)
+        controller.start
+      elsif Test::Unit.respond_to?(:setup_argv)
+        # copied from ruby-1.9.2-p136/bin/testrb:
+        Test::Unit.setup_argv(argv) {|files|
+          if files.empty?
+            puts "Usage: testrb [options] tests..."
+            exit 1
+          end
+          if files.size == 1
+            $0 = File.basename(files[0])
+          else
+            $0 = files.to_s
+          end
+          files
+        }
 
-      MiniTest::Unit.new.run(argv)
+        MiniTest::Unit.new.run(argv)
+      else
+        # copied from ruby-head/bin/testrb:
+        tests = Test::Unit::AutoRunner.new(true)
+        tests.options.banner.sub!(/\[options\]/, '\& tests...')
+        unless tests.process_args(argv)
+          abort tests.options.banner
+        end
+        files = tests.to_run
+        $0 = files.size == 1 ? File.basename(files[0]) : files.to_s
+        tests.run
+      end
     else
       # Ruby 1.8
       Object.send(:remove_const, :STDOUT); Object.send(:const_set, :STDOUT, stdout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spork-testunit
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2009-09-12 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70093359486340 !ruby/object:Gem::Requirement
+  requirement: &70254965989980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093359486340
+  version_requirements: *70254965989980
 description: Test Unit runner for spork
 email:
 - timcharper+spork@gmail.com
@@ -55,9 +55,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spork-testunit
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: spork-testunit
 test_files: []
-has_rdoc: