rubygems-test 0.2.0 → 0.2.1

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.0'
+  self.version = '0.2.1'
   
   self.rubyforge_name = nil
 

data/gems/template.gemspec

@@ -22,11 +22,5 @@ Gem::Specification.new do |s|
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
   end
 end
-

data/lib/rubygems/commands/test_command.rb

@@ -1,9 +1,9 @@
-require 'rubygems/version_option'
-require 'rubygems/specification'
-require 'rubygems/dependency_installer'
-require 'rubygems/user_interaction'
+Gem.autoload(:VersionOption, 'rubygems/version_option')
+Gem.autoload(:Specification, 'rubygems/specification')
+Gem.autoload(:DependencyInstaller, 'rubygems/dependency_installer')
+Gem.autoload(:DefaultUserInteraction, 'rubygems/user_interaction')
 require 'rbconfig'
-require 'yaml'
+autoload(:YAML, 'yaml')
 require 'net/http'
 require 'uri'
 
@@ -14,8 +14,6 @@ class Gem::Commands::TestCommand < Gem::Command
   include Gem::VersionOption
   include Gem::DefaultUserInteraction
 
-  VERSION = "0.1.9"
-
   # taken straight out of rake
   DEFAULT_RAKEFILES = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb']
 
@@ -194,23 +192,23 @@ class Gem::Commands::TestCommand < Gem::Command
           handles, _, _ = IO.select(current_handles, nil, nil, 0.1)
           buf = ""
 
-          handles.each do |io| 
-            begin
-              io.readpartial(16384, buf)
-            rescue EOFError
-              buf += io.read rescue ""
-              current_handles.reject! { |x| x == io }
-            rescue IOError
-              current_handles.reject! { |x| x == io }
-            end
-          end if handles
+          if handles
+            handles.compact.each do |io| 
+              begin
+                buf += io.readline
+              rescue EOFError
+                buf += io.read rescue ""
+                current_handles.reject! { |x| x == io }
+              end
+            end 
+          end
 
           [buf, current_handles]
         end
 
         outer_reader_proc = proc do |stdout, stderr|
           loop do
-            handles = [stdout, stderr]
+            handles = [stderr, stdout]
             buf, handles = reader_proc.call(handles) 
             output += buf
             print buf
@@ -218,22 +216,24 @@ class Gem::Commands::TestCommand < Gem::Command
           end
         end
 
+        rake_args = [rake_path, 'test', '--trace']
+
         # jruby stuffs it under IO, so we'll use that if it's available
         klass = 
           if IO.respond_to?(:popen4)
-            IO.popen4(rake_path, 'test', '--trace') do |pid, stdin, stdout, stderr|
+            IO.popen4(*rake_args) do |pid, stdin, stdout, stderr|
               outer_reader_proc.call(stdout, stderr)
             end
             exit_status = $?
           elsif RUBY_VERSION > '1.9'
             require 'open3'
-            exit_status = Open3.popen3(rake_path, 'test', '--trace') do |stdin, stdout, stderr, thr|
+            exit_status = Open3.popen3(*rake_args) do |stdin, stdout, stderr, thr|
               outer_reader_proc.call(stdout, stderr)
               thr.value
             end
           else
             require 'open4-vendor'
-            exit_status = Open4.popen4(rake_path, 'test', '--trace') do |pid, stdin, stdout, stderr|
+            exit_status = Open4.popen4(*rake_args) do |pid, stdin, stdout, stderr|
               outer_reader_proc.call(stdout, stderr)
             end
           end

data/lib/rubygems/on_install_test.rb

@@ -1,5 +1,5 @@
-require 'rubygems/uninstaller'
-require 'rubygems/commands/test_command'
+Gem.autoload(:Uninstaller, 'rubygems/uninstaller')
+Gem.autoload(:Commands, 'rubygems/commands/test_command')
 
 Gem.post_install do |gem|
   options = Gem.configuration["test_options"] || { }
@@ -9,7 +9,7 @@ Gem.post_install do |gem|
         gem.ui.ask_yes_no("Test #{gem.spec.name} (#{gem.spec.version})?", true)
 
       begin
-        Gem::Commands::TestCommand.new(gem.spec, true).execute
+        Gem::Command::TestCommand.new(gem.spec, true).execute
       rescue Gem::RakeNotFoundError, Gem::TestError
         if (options.has_key?("force_install") and !options["force_install"]) or
             options["force_uninstall_on_failure"] or
@@ -19,7 +19,6 @@ Gem.post_install do |gem|
           at_exit { Gem::Uninstaller.new(gem.spec.name, :version => gem.spec.version).uninstall }
         end
       end
-
     end
   end
 end

data/lib/rubygems_plugin.rb

@@ -1,9 +1,7 @@
 require 'rubygems/command_manager'
 require 'rubygems/on_install_test'
 
-# shamelessly taken from gemcutter.
-
-if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.3.6')
+if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.3.1')
   %w[test].each do |command|
     Gem::CommandManager.instance.register_command command.to_sym
   end

data/test/helper.rb

@@ -1,7 +1,7 @@
-require 'rubygems'
-require 'rubygems/builder'
-require 'rubygems/installer'
-require 'rubygems/uninstaller'
+require 'rubygems' unless defined? Gem
+require 'rubygems/builder' unless defined? Gem::Builder
+require 'rubygems/installer' unless defined? Gem::Installer
+require 'rubygems/uninstaller' unless defined? Gem::Uninstaller
 require 'test/unit'
 require 'erb'
 require 'tempfile'
@@ -10,7 +10,7 @@ require 'fileutils'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'rubygems/commands/test_command'
+require 'rubygems/commands/test_command' unless defined? Gem::Command::TestCommand
 
 class Test::Unit::TestCase
   def install_stub_gem(hash)
@@ -36,6 +36,7 @@ class Test::Unit::TestCase
     erb = ERB.new(File.read(File.join('gems', 'template.gemspec')))
 
     @development_dependencies = ""
+
     (hash[:development_dependencies] || []).each do |dep|
       @development_dependencies += "s.add_development_dependency '#{dep}'\n"
     end
@@ -58,17 +59,3 @@ class Test::Unit::TestCase
     set_configuration({ })
   end
 end
-
-class Test::Unit::TestCase::Interactive < Test::Unit::TestCase
-  def setup
-    super
-
-    require 'rubygems/on_install_test'
-    puts
-    puts "----- This test is interactive -----"
-    puts
-  end
-
-  def test_01_null
-  end
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -05:00
+date: 2011-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency