rubygems-test 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.1 / 2011-04-26
+
+* Fix for situations during on-install testing where the gem dir is not available (f.e., on a new installation)
+
 === 0.4.0 / 2011-04-23
 
 * Make rc1 official 0.4.0

data/lib/rubygems/commands/test_command.rb

@@ -15,7 +15,7 @@ class Gem::Commands::TestCommand < Gem::Command
   include Gem::VersionOption
   include Gem::DefaultUserInteraction
 
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   # taken straight out of rake
   DEFAULT_RAKEFILES = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb']
@@ -32,7 +32,7 @@ class Gem::Commands::TestCommand < Gem::Command
     "#{program_name} GEM [-v VERSION] [--force] [--dep-user-install]"
   end
   
-  def initialize(spec=nil, on_install=false)
+  def initialize(spec=nil, on_install=false, gem_dir=nil)
     options = { } 
 
     if spec
@@ -40,6 +40,8 @@ class Gem::Commands::TestCommand < Gem::Command
       options[:version] = spec.version
     end
 
+    @spec = spec
+    @gem_dir = gem_dir
     @on_install = on_install
 
     super 'test', description, options
@@ -499,14 +501,20 @@ class Gem::Commands::TestCommand < Gem::Command
                        end
                        [tmpdir, inst.spec]
                      else
-                       spec = find_gem(name, version)
 
-                       unless spec
-                         say "unable to find gem #{name} #{version}"
-                         next
-                       end
+                       if @spec and @gem_dir and File.directory?(@gem_dir)
+                         [@gem_dir, @spec]
+                       else
+
+                        spec = find_gem(name, version)
 
-                       [spec.full_gem_path, spec]
+                        unless spec
+                          say "unable to find gem #{name} #{version}"
+                          next
+                        end
+
+                        [spec.full_gem_path, spec]
+                       end
                      end
 
         if File.exist?(File.join(path, '.gemtest')) or options[:force]

data/lib/rubygems/on_install_test.rb

@@ -11,7 +11,8 @@ Gem.post_build do |gem|
         gem.ui.ask_yes_no("Test #{gem.spec.name} (#{gem.spec.version})?", true)
 
       begin
-        Gem::Commands::TestCommand.new(gem.spec, true).execute
+        # HACK: request gem_dir be exposed in rubygems
+        Gem::Commands::TestCommand.new(gem.spec, true, gem.instance_variable_get(:@gem_dir) || gem.instance_variable_get("@gem_dir")).execute
         true
       rescue Gem::RakeNotFoundError, Gem::TestError
         !(

metadata

@@ -2,7 +2,7 @@
 name: rubygems-test
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 Z
+date: 2011-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake