rubygems-test 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.6 / 2011-01-15
+
+* Big refactor of rake locating to get running on mswin32
+
 === 0.2.5 / 1/15/2011
 
 * use the input record separator instead of straight newlines - windows!

data/Rakefile

@@ -12,7 +12,7 @@ Hoe.spec 'rubygems-test' do
 
   # doin' it wrong because we're a gem plugin
   # that means I can be "special"!
-  self.version = '0.2.5'
+  self.version = '0.2.6'
   
   self.rubyforge_name = nil
 

data/lib/rubygems/commands/test_command.rb

@@ -95,11 +95,20 @@ class Gem::Commands::TestCommand < Gem::Command
   # Locate rake itself, prefer gems version.
   #
   def find_rake
-    rake_path = Gem.bin_path('rake') rescue File.join(RbConfig::CONFIG["bindir"], 'rake')
+
+    rake_finder = proc do |rake_name|
+      Gem.bin_path('rake') rescue File.join(RbConfig::CONFIG["bindir"], rake_name || 'rake')
+    end
+   
+    rake_path = rake_finder.call(nil)
 
     unless File.exist?(rake_path)
-      alert_error "Couldn't find rake; rubygems-test will not work without it. Aborting."
-      raise Gem::RakeNotFoundError, "Couldn't find rake; rubygems-test will not work without it."
+      rake_path = rake_finder.call('rake.bat')
+
+      unless File.exist?(rake_path)
+        alert_error "Couldn't find rake; rubygems-test will not work without it. Aborting."
+        raise Gem::RakeNotFoundError, "Couldn't find rake; rubygems-test will not work without it."
+      end
     end
 
     return rake_path
@@ -262,6 +271,23 @@ class Gem::Commands::TestCommand < Gem::Command
 
       rake_args = [rake_path, 'test', '--trace']
 
+      rake_args_concatenator = proc do |ra|
+        ra.unshift(File.join(RbConfig::CONFIG["bindir"], 'ruby'))
+      end
+
+      case RUBY_PLATFORM
+      when /mingw/
+        rake_args_concatenator.call(rake_args)
+        rake_args = rake_args.join(' ')
+      when /mswin/
+        # if we don't run rake.bat (system rake for 1.9 as opposed to gems),
+        # run it with ruby.
+        if rake_args[0] =~ /rake$/
+          rake_args_concatenator.call(rake_args)
+        end
+        rake_args = rake_args.join(' ')
+      end
+
       # jruby stuffs it under IO, so we'll use that if it's available
       # if we're on 1.9, use open3 regardless of platform.
       # If we're not:
@@ -279,10 +305,10 @@ class Gem::Commands::TestCommand < Gem::Command
             outer_reader_proc.call(stdout, stderr)
             thr.value
           end
-        elsif RUBY_PLATFORM =~ /mingw/
+        elsif RUBY_PLATFORM =~ /mingw|mswin/
           begin
             require 'win32/open3'
-            Open3.popen3([File.join(RbConfig::CONFIG["bindir"], 'ruby'), *rake_args].join(' ')) do |stdin, stdout, stderr|
+            Open3.popen3(*rake_args) do |stdin, stdout, stderr|
               outer_reader_proc.call(stdout, stderr)
             end
             exit_status = $?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Erik Hollensbe