rubygems-test 0.2.6 → 0.3.0

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.3.0 / 2011-01-30
+
+* More fixes for garbagecollect
+* Removed --trace. It was buggy and didn't work as expected.
+* Reworked I/O loop. Some testing to do still but it's looking good for most cases.
+* Fixed issue with on_install_test.rb, solves issue #11
+* Fixes for Rake; should be a little cleaner and run in a few more places.
+* Use temporary paths rather than system paths during tests. [James Tucker]
+* Clarify predicates.
+
 === 0.2.6 / 2011-01-15
 
 * Big refactor of rake locating to get running on mswin32

data/Manifest.txt

@@ -1,12 +1,13 @@
 .gemtest
-LICENSE
-README.txt
 History.txt
+LICENSE
 Manifest.txt
+README.txt
 Rakefile
 gems/Rakefile
 gems/template.gemspec
 gems/test/test_pass.rb
+lib/exceptions.rb
 lib/open4-vendor.rb
 lib/rubygems/commands/test_command.rb
 lib/rubygems/on_install_test.rb

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

data/lib/exceptions.rb

@@ -0,0 +1,2 @@
+class Gem::TestError < Gem::Exception; end
+class Gem::RakeNotFoundError < Gem::Exception; end

data/lib/rubygems/commands/test_command.rb

@@ -2,14 +2,13 @@ Gem.autoload(:VersionOption, 'rubygems/version_option')
 Gem.autoload(:Specification, 'rubygems/specification')
 Gem.autoload(:DefaultUserInteraction, 'rubygems/user_interaction')
 Gem.autoload(:DependencyInstaller, 'rubygems/dependency_installer')
+Gem.autoload(:RakeNotFoundError, 'exceptions')
+Gem.autoload(:TestError, 'exceptions')
 require 'rbconfig'
 autoload(:YAML, 'yaml')
 require 'net/http'
 require 'uri'
 
-class Gem::TestError < Gem::Exception; end
-class Gem::RakeNotFoundError < Gem::Exception; end
-
 class Gem::Commands::TestCommand < Gem::Command
   include Gem::VersionOption
   include Gem::DefaultUserInteraction
@@ -95,23 +94,27 @@ class Gem::Commands::TestCommand < Gem::Command
   # Locate rake itself, prefer gems version.
   #
   def find_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)
-      rake_path = rake_finder.call('rake.bat')
-
-      unless File.exist?(rake_path)
+    begin
+      rake_path = Gem.bin_path('rake') 
+    rescue
+      unless RUBY_VERSION > '1.9'
         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
+    if RUBY_VERSION > '1.9'
+      if RUBY_PLATFORM =~ /mswin/
+        #
+        # XXX GarbageCollect breaks ruby -S with rake.
+        #
+        return File.join(RbConfig::CONFIG["bindir"], 'rake.bat')
+      else
+        return rake_path || 'rake'
+      end
+    else
+      return rake_path
+    end
   end
 
   #
@@ -209,119 +212,123 @@ class Gem::Commands::TestCommand < Gem::Command
     }.to_yaml
   end
 
-
   #
-  # Run the tests with the appropriate spec and rake_path, and capture all
-  # output.
+  # Inner loop for platform_reader
   #
-  def run_tests(spec, rake_path)
-    output = ""
-    exit_status = nil
+  def read_output(stdout, stderr)
+    require 'thread'
 
-    [STDOUT, STDERR, $stdout, $stderr].map { |x| x.sync = true }
+    STDOUT.sync = true
+    STDERR.sync = true
+    stdout.sync = true
+    stderr.sync = true
 
-    Dir.chdir(spec.full_gem_path) do
-      reader_proc = proc do |orig_handles|
-        current_handles = orig_handles.dup
-
-        handles, _, _ = IO.select(current_handles, nil, nil, 0.1)
-        bufs = Hash.new { |h, k| h[k] = "" }
-
-        if handles
-          handles.compact.each do |io| 
-            begin
-              bufs[io] += io.readpartial(8)
-            rescue EOFError
-              bufs[io] += io.read rescue ""
-              current_handles.reject! { |x| x == io }
-            end
-          end 
+    output = ""
+    mutex = Mutex.new
+
+    err_t = Thread.new do
+      while !stderr.eof?
+        tmp = stderr.readline
+        mutex.synchronize do
+          output << tmp
+          print tmp
         end
+      end
+    end
 
-        [bufs, current_handles]
+    out_t = Thread.new do
+      while !stdout.eof?
+        tmp = stdout.read(1)
+        mutex.synchronize do
+          output << tmp
+          print tmp
+        end
       end
+    end
 
-      outer_reader_proc = proc do |stdout, stderr|
-        stderr_buf = ""
-
-        loop do
-          tmp_output = ""
-          handles = [stderr, stdout]
-          bufs, handles = reader_proc.call(handles)
-
-          # hello mom, I've rewritten unix i/o and it probably sucks.
-          # basically, we only "flush" stderr on newline and stdout 
-          # "flushes" immediately. and by "flush" I mean "concatenates".
-          if bufs.has_key?(stderr)
-            stderr_buf += bufs[stderr] 
-            buf_ary = stderr_buf.split($/)
-            if buf_ary.length > 1
-              tmp_output += buf_ary[0..-2].join($/) + $/
-              stderr_buf = buf_ary[-1] 
-            end
-          end
+    while !stderr.eof? or !stdout.eof?
+      Thread.pass
+    end
 
-          tmp_output += bufs[stdout] if bufs.has_key?(stdout)
+    return output
+  end
 
-          print tmp_output
-          output += tmp_output
-          break if handles.empty?
+  #
+  # platform-specific reading routines.
+  #
+  def platform_reader(rake_args)
+    # 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:
+    #   * on windows use win32/open3 from win32-open3 gem
+    #   * on unix use open4-vendor
+
+    output, exit_status = *[]
+
+    if IO.respond_to?(:popen4)
+      IO.popen4(*rake_args) do |pid, stdin, stdout, stderr|
+        output = read_output(stdout, stderr)
+      end
+      exit_status = $?
+    elsif RUBY_VERSION > '1.9'
+      require 'open3'
+      Open3.popen3(*rake_args) do |stdin, stdout, stderr, thr|
+        output = read_output(stdout, stderr)
+        exit_status = thr.value
+      end
+    elsif RUBY_PLATFORM =~ /mingw|mswin/
+      begin
+        require 'win32/open3'
+        Open3.popen3(*rake_args) do |stdin, stdout, stderr|
+          output = read_output(stdout, stderr)
         end
+        exit_status = $?
+      rescue LoadError
+        say "1.8/Windows users must install the 'win32-open3' gem to run tests"
+        terminate_interaction 1
       end
+    else
+      require 'open4-vendor'
+      exit_status = Open4.popen4(*rake_args) do |pid, stdin, stdout, stderr|
+        output = read_output(stdout, stderr)
+      end
+    end
 
-      rake_args = [rake_path, 'test', '--trace']
+    return output, exit_status
+  end
 
-      rake_args_concatenator = proc do |ra|
-        ra.unshift(File.join(RbConfig::CONFIG["bindir"], 'ruby'))
-      end
+  #
+  # obtain the rake arguments for a specific platform and environment.
+  #
+  def get_rake_args(rake_path, *args)
+    if RUBY_PLATFORM =~ /mswin/ and RUBY_VERSION > '1.9'
+      #
+      # XXX GarbageCollect breaks ruby -S with rake on 1.9.
+      #
+     
+      rake_args = [ rake_path ] + args
+    else
+      rake_args = [ Gem.ruby, '-rubygems', '-S' ] + [ rake_path, '--' ] + args
+    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
+    if RUBY_PLATFORM =~ /mswin|mingw/
+      # we don't use shellwords for the rest because they use execve().
+      require 'shellwords'
+      rake_args.map { |x| Shellwords.shellescape(x) }.join(' ')
+    else
+      rake_args
+    end
+  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:
-      #   * on windows use win32/open3 from win32-open3 gem
-      #   * on unix use open4-vendor
-      klass = 
-        if IO.respond_to?(:popen4)
-          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_args) do |stdin, stdout, stderr, thr|
-            outer_reader_proc.call(stdout, stderr)
-            thr.value
-          end
-        elsif RUBY_PLATFORM =~ /mingw|mswin/
-          begin
-            require 'win32/open3'
-            Open3.popen3(*rake_args) do |stdin, stdout, stderr|
-              outer_reader_proc.call(stdout, stderr)
-            end
-            exit_status = $?
-          rescue LoadError
-            say "1.8/Windows users must install the 'win32-open3' gem to run tests"
-            terminate_interaction 1
-          end
-        else
-          require 'open4-vendor'
-          exit_status = Open4.popen4(*rake_args) do |pid, stdin, stdout, stderr|
-            outer_reader_proc.call(stdout, stderr)
-          end
-        end
+  #
+  # Run the tests with the appropriate spec and rake_path, and capture all
+  # output.
+  #
+  def run_tests(spec, rake_path)
+    Dir.chdir(spec.full_gem_path) do
+      rake_args = get_rake_args(rake_path, 'test')
+
+      output, exit_status = platform_reader(rake_args)
 
       if upload_results?
         upload_results(gather_results(spec, output, exit_status.exitstatus == 0))

data/lib/rubygems/on_install_test.rb

@@ -1,5 +1,7 @@
 Gem.autoload(:Uninstaller, 'rubygems/uninstaller')
-Gem.autoload(:Commands, 'rubygems/commands/test_command')
+Gem::Commands.autoload(:TestCommand, 'rubygems/commands/test_command')
+Gem.autoload(:RakeNotFoundError, 'exceptions')
+Gem.autoload(:TestError, 'exceptions')
 
 Gem.post_install do |gem|
   options = Gem.configuration["test_options"] || { }
@@ -9,7 +11,7 @@ Gem.post_install do |gem|
         gem.ui.ask_yes_no("Test #{gem.spec.name} (#{gem.spec.version})?", true)
 
       begin
-        Gem::Command::TestCommand.new(gem.spec, true).execute
+        Gem::Commands::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

data/test/helper.rb

@@ -56,11 +56,42 @@ class Test::Unit::TestCase
     Gem.configuration.verbose = false
   end
 
+  def set_gem_temp_paths
+    @gem_temp_path = Dir.mktmpdir('rubygems-test')
+    @gem_home = Gem.dir
+    @gem_paths = Gem.path
+
+    Gem.clear_paths
+    if Gem.path.kind_of?(String)
+      Gem.path.replace @gem_temp_path
+    else
+      Gem.path.replace [@gem_temp_path]
+    end
+    Gem.send :set_home, @gem_temp_path
+
+    Gem.refresh
+  end
+
+  def unset_gem_temp_paths
+    FileUtils.rm_rf @gem_temp_path if @gem_temp_path
+    Gem.clear_paths
+    
+    if Gem.path.kind_of?(String)
+      Gem.path.replace @gem_paths.join(File::PATH_SEPARATOR)
+    else
+      Gem.path.replace @gem_paths
+    end
+    Gem.send :set_home, @gem_home
+    Gem.refresh
+  end
+
   def setup
     set_configuration({ })
+    set_gem_temp_paths
   end
 
   def teardown
     uninstall_stub_gem rescue nil
+    unset_gem_temp_paths
   end
 end

data/test/test_execute.rb

@@ -46,13 +46,7 @@ class TestExecute < Test::Unit::TestCase
     uninstall_stub_gem
   end
 
-  def test_06_find_rake
-    # XXX how do I test this fully without nuking rake?
-    assert_nothing_raised { @test.find_rake }
-    assert_not_nil @test.find_rake
-  end
-
-  def test_07_gather_results
+  def test_06_gather_results
     install_stub_gem({})
 
     spec = @test.find_gem("test-gem", "0.0.0")
@@ -76,8 +70,4 @@ class TestExecute < Test::Unit::TestCase
 
     assert_equal YAML.load(@test.gather_results(spec, output, true)), hash
   end
-
-  def test_08_print_errors_from_server
-    
-  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,19 +57,20 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
 - History.txt
 - Manifest.txt
+- README.txt
 files: 
 - .gemtest
-- LICENSE
-- README.txt
 - History.txt
+- LICENSE
 - Manifest.txt
+- README.txt
 - Rakefile
 - gems/Rakefile
 - gems/template.gemspec
 - gems/test/test_pass.rb
+- lib/exceptions.rb
 - lib/open4-vendor.rb
 - lib/rubygems/commands/test_command.rb
 - lib/rubygems/on_install_test.rb