rubygems-test 0.1.6 → 0.1.7

data/lib/rubygems/commands/test_command.rb

@@ -1,5 +1,4 @@
 require 'rubygems/version_option'
-require 'rubygems/source_index'
 require 'rubygems/specification'
 require 'rubygems/dependency_installer'
 require 'rubygems/user_interaction'
@@ -44,13 +43,6 @@ class Gem::Commands::TestCommand < Gem::Command
     add_version_option
   end
 
-  #
-  # Retrieve the source index
-  #
-  def source_index 
-    @gsi = Gem::SourceIndex.from_gems_in(*Gem::SourceIndex.installed_spec_directories)
-  end
-  
   #
   # Get the config in our namespace
   #
@@ -62,7 +54,7 @@ class Gem::Commands::TestCommand < Gem::Command
   # find a gem given a name and version
   #
   def find_gem(name, version)
-    spec = source_index.find_name(name, version).last
+    spec = Gem.source_index.find_name(name, version).last
     unless spec and (spec.installation_path rescue nil)
       alert_error "Could not find gem #{name} (#{version})"
       raise Gem::GemNotFoundException, "Could not find gem #{name}, (#{version})"
@@ -106,7 +98,7 @@ class Gem::Commands::TestCommand < Gem::Command
     di = Gem::DependencyInstaller.new
 
     spec.development_dependencies.each do |dep|
-      unless source_index.search(dep).last
+      unless Gem.source_index.search(dep).last
         if config["install_development_dependencies"]
           say "Installing test dependency #{dep.name} (#{dep.requirement})"
           di.install(dep) 
@@ -116,7 +108,7 @@ class Gem::Commands::TestCommand < Gem::Command
             di.install(dep) 
           else
             alert_error "Failed to install dependencies required to run tests. Aborting."
-            raise Gem::TestError
+            raise Gem::TestError, "dependencies not installed"
           end
         end
       end
@@ -195,26 +187,37 @@ class Gem::Commands::TestCommand < Gem::Command
 
       if spec.files.include?(".gemtest")
         open_proc = proc do |pid, stdin, stdout, stderr|
-          loop do
-            if stdout.eof? and stderr.eof?
-              break
-            end
+          reader_proc = proc do |orig_handles|
 
-            buf = ""
+            current_handles = orig_handles.dup
 
-            handles, _, _ = IO.select([stdout, stderr].reject { |x| x.closed? || x.eof? }, nil, nil, 0.1)
+            handles, _, _ = IO.select(current_handles, nil, nil, 0.1)
+            buf = ""
 
             handles.each do |io| 
               begin
                 io.readpartial(16384, buf)
-              rescue EOFError, IOError
-                next
+              rescue EOFError
+                buf += io.read rescue ""
+                current_handles.reject!(io)
+              rescue IOError
+                current_handles.reject!(io)
               end
             end if handles
 
-            output += buf
+            [buf, current_handles]
+          end
 
-            print buf
+          begin
+            loop do
+              handles = [stdout, stderr]
+              buf, handles = reader_proc.call(handles) 
+              output += buf
+              print buf
+              break unless handles
+            end
+          rescue StandardError
+            break
           end
         end
 
@@ -240,7 +243,7 @@ class Gem::Commands::TestCommand < Gem::Command
         if exit_status.exitstatus != 0
           alert_error "Tests did not pass. Examine the output and report it to the author!"
 
-          raise Gem::TestError, "something"
+          raise Gem::TestError, "tests failed"
         end
       else
         alert_warning "This gem has no tests! Please contact the author to gain testing and reporting!"
@@ -259,7 +262,8 @@ class Gem::Commands::TestCommand < Gem::Command
         spec = find_gem(name, version)
 
         unless spec
-          say usage
+          say "unable to find gem #{name} #{version}"
+          next
         end
 
         if spec.files.include?('.gemtest')
@@ -273,13 +277,9 @@ class Gem::Commands::TestCommand < Gem::Command
           run_tests(spec, rake_path)
         end
       end
-    rescue Exception => e 
-      if @on_install
-        raise e
-      else
-        say usage
-        terminate_interaction 1
-      end
+    rescue Gem::TestError
+      raise if @on_install
+      terminate_interaction 1
     end
   end
 end

data/test/helper.rb

@@ -19,18 +19,17 @@ class Test::Unit::TestCase
     path = file.path
     file.close
 
-    pwd = FileUtils.pwd
-    FileUtils.chdir('gems')
-
-    spec = eval File.read(path)
-    filename = Gem::Builder.new(spec).build
-    Gem::Installer.new(filename).install
-
-    FileUtils.chdir(pwd)
+    FileUtils.chdir('gems') do
+      spec = eval File.read(path)
+      filename = Gem::Builder.new(spec).build
+      Gem::Installer.new(filename).install
+      Gem.refresh
+    end
   end
 
   def uninstall_stub_gem
     Gem::Uninstaller.new("test-gem").uninstall
+    Gem.refresh
   end
 
   def template_gemspec(hash)

data/test/test_execute.rb

@@ -21,16 +21,6 @@ class TestExecute < Test::Unit::TestCase
     assert_equal @test.usage, "#{@test.program_name} GEM -v VERSION"
   end
 
-  def test_03_source_index
-    install_stub_gem({ })
-
-    assert @test.source_index
-    assert_kind_of Array, @test.source_index.find_name("test-gem", Gem::Version.new("0.0.0"))
-    assert_kind_of Gem::Specification, @test.source_index.find_name("test-gem", Gem::Version.new("0.0.0")).last
-
-    uninstall_stub_gem
-  end
-
   def test_04_find_gem
     install_stub_gem({ })
 
@@ -38,7 +28,9 @@ class TestExecute < Test::Unit::TestCase
 
     uninstall_stub_gem
 
-    assert_raises(Gem::GemNotFoundException) { @test.find_gem("test-gem", "0.0.0") }
+    assert_raises(Gem::GemNotFoundException) {
+      @test.find_gem("test-gem", "0.0.0")
+    }
   end
 
   def test_05_find_rakefile

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-test
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -05:00
+date: 2011-01-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ files:
 - Rakefile
 - gems/Rakefile
 - gems/template.gemspec
-- gems/test-gem-0.0.0.gem
 - gems/test/test_pass.rb
 - lib/open4.rb
 - lib/rubygems/commands/test_command.rb