rubygems-test 0.3.12 → 0.4.0.rc1

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.4.0.rc1 / 2011-04-17
+
+* Pretty much nailed the reader problem to the wall.
+* Now able to test .gem files directly on the commandline.
+* Use the new hooks to uninstall gems if they fail testing. Bump the rubygems
+  requirement to 1.5 to reflect above changes.
+* Specify the exec_name for Gem.bin_path. [Postmodern]
+
 === 0.3.11 / 2011-03-13
 
 * Now sending :rubygems_test_version which is the version of rubygems-test used for the upload. 

data/Rakefile

@@ -32,7 +32,7 @@ spec = Hoe.spec 'rubygems-test' do
   pluggable!
 
   require_ruby_version ">= 1.8.7"
-  require_rubygems_version ">= 1.3.6"
+  require_rubygems_version ">= 1.5.0"
 
   extra_deps << ['rake', '>= 0.8.7']
 

data/lib/rubygems/commands/test_command.rb

@@ -9,12 +9,13 @@ require 'rbconfig'
 autoload(:YAML, 'yaml')
 require 'net/http'
 require 'uri'
+require 'tempfile'
 
 class Gem::Commands::TestCommand < Gem::Command
   include Gem::VersionOption
   include Gem::DefaultUserInteraction
 
-  VERSION = "0.3.12"
+  VERSION = "0.4.0.rc1"
 
   # taken straight out of rake
   DEFAULT_RAKEFILES = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb']
@@ -82,9 +83,9 @@ class Gem::Commands::TestCommand < Gem::Command
   #
   # Locate the rakefile for a gem name and version
   #
-  def find_rakefile(spec)
+  def find_rakefile(path, spec)
     rakefile = DEFAULT_RAKEFILES.
-      map  { |x| File.join(spec.full_gem_path, x) }.
+      map  { |x| File.join(path, x) }.
       find { |x| File.exist?(x) }
 
     unless(File.exist?(rakefile) rescue nil)
@@ -297,39 +298,60 @@ class Gem::Commands::TestCommand < Gem::Command
   def read_output(stdout, stderr)
     require 'thread'
 
-    STDOUT.sync = true
-    STDERR.sync = true
-    stdout.sync = true
-    stderr.sync = true
+    [STDERR, $stderr, stderr, STDOUT, $stdout, stdout].map { |x| x.sync = true }
 
+    reads = Queue.new
     output = ""
-    mutex = Mutex.new
 
     err_t = Thread.new do
       while !stderr.eof?
-        tmp = stderr.readline
-        mutex.synchronize do
-          output << tmp
-          print tmp
-        end
+        ary = [:stderr, nil, stderr.readline]
+        ary[1] = Time.now.to_f
+        reads << ary
       end
     end
 
     out_t = Thread.new do
       while !stdout.eof?
-        tmp = stdout.read(1)
-        mutex.synchronize do
-          output << tmp
-          print tmp
+        ary = [:stdout, nil, stdout.read(1)]
+        ary[1] = Time.now.to_f
+        reads << ary
+      end
+    end
+
+    tty_t = Thread.new do
+      next_time = nil
+      while true 
+        while reads.length > 0
+          cur_reads = [next_time || reads.shift]
+
+          time = cur_reads[0][1]
+
+          while next_time = reads.shift
+            break if next_time[1] != time
+            cur_reads << next_time
+          end
+
+          stderr_reads, stdout_reads = cur_reads.partition { |x| x[0] == :stderr }
+
+          # stderr wins
+          (stderr_reads + stdout_reads).each do |rec|
+            output << rec[2]
+            print rec[2]
+          end
         end
       end
     end
 
-    while !stderr.eof? or !stdout.eof?
+    while !stderr.eof? or !stdout.eof? or !reads.empty?
       Thread.pass
     end
 
-    return output
+    sleep 1
+    tty_t.kill 
+    puts
+
+    return output + "\n"
   end
 
   #
@@ -403,8 +425,8 @@ class Gem::Commands::TestCommand < Gem::Command
   # 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
+  def run_tests(path, spec, rake_path)
+    Dir.chdir(path) do
       rake_args = get_rake_args(rake_path, 'test')
 
       @trapped = false
@@ -460,22 +482,42 @@ class Gem::Commands::TestCommand < Gem::Command
           terminate_interaction 1
         end
 
-        spec = find_gem(name, version)
-
-        unless spec
-          say "unable to find gem #{name} #{version}"
-          next
-        end
-
-        if File.exist?(File.join(spec.full_gem_path, '.gemtest')) or options[:force]
+        path, spec = if name =~ /\.gem$/
+                       unless File.exist?(name)
+                         say "unable to find gem #{name}"
+                         next
+                       end
+
+                       inst = Gem::Installer.new(name)
+                       tmpdir = Dir.mktmpdir
+                       @created_tmpdir = true
+                       inst.unpack(tmpdir)
+                       unless inst.spec.extensions.empty?
+                         say "gem #{name} has extensions. Due to limitations in rubygems,"
+                         say "the gem must be installed before it can be tested."
+                         next
+                       end
+                       [tmpdir, inst.spec]
+                     else
+                       spec = find_gem(name, version)
+
+                       unless spec
+                         say "unable to find gem #{name} #{version}"
+                         next
+                       end
+
+                       [spec.full_gem_path, spec]
+                     end
+
+        if File.exist?(File.join(path, '.gemtest')) or options[:force]
           # we find rake and the rakefile first to eliminate needlessly installing
           # dependencies.
-          find_rakefile(spec)
+          find_rakefile(path, spec)
           rake_path = find_rake
 
           unless $RG_T_INSTALLING_DEPENDENCIES and !config["test_development_dependencies"]
             install_dependencies(spec)
-            run_tests(spec, rake_path)
+            run_tests(path, spec, rake_path)
           end
         else
           say "Gem '#{name}' (version #{version}) needs to opt-in for testing."
@@ -492,8 +534,12 @@ class Gem::Commands::TestCommand < Gem::Command
           say "For more information, please see the rubygems-test README:"
           say "https://github.com/rubygems/rubygems-test/blob/master/README.txt"
         end
+
+        if @created_tmpdir
+          FileUtils.rm_rf path
+        end
       end
-    rescue Gem::TestError
+    rescue Gem::TestError => e
       raise if @on_install
       terminate_interaction 1
     end

data/lib/rubygems/on_install_test.rb

@@ -3,7 +3,7 @@ Gem::Commands.autoload(:TestCommand, 'rubygems/commands/test_command')
 Gem.autoload(:RakeNotFoundError, 'exceptions')
 Gem.autoload(:TestError, 'exceptions')
 
-Gem.post_install do |gem|
+Gem.post_build do |gem|
   options = Gem.configuration["test_options"] || { }
 
   if options["auto_test_on_install"] or options["test_on_install"]
@@ -12,14 +12,13 @@ Gem.post_install do |gem|
 
       begin
         Gem::Commands::TestCommand.new(gem.spec, true).execute
+        true
       rescue Gem::RakeNotFoundError, Gem::TestError
-        if (options.has_key?("force_install") and !options["force_install"]) or
-            options["force_uninstall_on_failure"] or
-            gem.ui.ask_yes_no("Testing #{gem.spec.name} (#{gem.spec.version}) failed. Uninstall?", false)
-
-          # FIXME ask drbrain how to do this more better.
-          at_exit { Gem::Uninstaller.new(gem.spec.name, :version => gem.spec.version).uninstall }
-        end
+        !(
+          (options.has_key?("force_install") && !options["force_install"]) || 
+          options["force_uninstall_on_failure"] ||  
+          gem.ui.ask_yes_no("Testing #{gem.spec.name} (#{gem.spec.version}) failed. Uninstall?", false)
+         )
       end
     end
   end

data/test/test_execute.rb

@@ -36,12 +36,16 @@ class TestExecute < Test::Unit::TestCase
   def test_05_find_rakefile
     install_stub_gem({ :files => ["Rakefile"] })
 
-    assert_nothing_raised { @test.find_rakefile(@test.find_gem("test-gem", "0.0.0")) }
+    spec = @test.find_gem('test-gem', '0.0.0')
+
+    assert_nothing_raised { @test.find_rakefile(spec.full_gem_path, spec) }
 
     uninstall_stub_gem
     install_stub_gem({ :files => "" })
 
-    assert_raises(Gem::RakeNotFoundError) { @test.find_rakefile(@test.find_gem("test-gem", "0.0.0")) }
+    spec = @test.find_gem('test-gem', '0.0.0')
+
+    assert_raises(Gem::RakeNotFoundError) { @test.find_rakefile(spec.full_gem_path, spec) }
 
     uninstall_stub_gem
   end
@@ -81,5 +85,4 @@ class TestExecute < Test::Unit::TestCase
   ensure
     Gem.configuration.verbose = old_verbose
   end
-
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-test
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.12
+  prerelease: 6
+  version: 0.4.0.rc1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 Z
+date: 2011-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      version: 1.5.0
 requirements: []
 
 rubyforge_project: