rubygems-test 0.2.1 → 0.2.2

data/History.txt

@@ -1 +1,11 @@
+=== 0.2.2 / 1/10/2011
+
+* Windows + 1.8 support. Requires the 'win32-open3' gem.
+
+* --force option - run tests even if the gem author hasn't opted in. Do not
+  upload these results ever. 
+
+* --dep-user-install option - install any development dependencies to
+  Gem.user_dir
+
 === 0.1.9 / Sometime before hoe

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

data/lib/rubygems/commands/test_command.rb

@@ -26,7 +26,7 @@ class Gem::Commands::TestCommand < Gem::Command
   end
   
   def usage
-    "#{program_name} GEM -v VERSION"
+    "#{program_name} GEM [-v VERSION] [--force] [--dep-user-install]"
   end
   
   def initialize(spec=nil, on_install=false)
@@ -41,6 +41,20 @@ class Gem::Commands::TestCommand < Gem::Command
 
     super 'test', description, options
     add_version_option
+
+    add_option(
+      '--force', 
+      'ignore opt-in testing and just run the tests'
+    ) do |v,o| 
+      o[:force] = true 
+    end
+
+    add_option(
+      '--dep-user-install', 
+      'force installing the dependencies into the user path'
+    ) do |v,o| 
+      o[:dep_user_install] = true 
+    end
   end
 
   #
@@ -95,7 +109,13 @@ class Gem::Commands::TestCommand < Gem::Command
   # Install development dependencies for the gem we're about to test.
   #
   def install_dependencies(spec)
-    di = Gem::DependencyInstaller.new
+    di = nil
+
+    if options[:dep_user_install]
+      di = Gem::DependencyInstaller.new(:install_dir => Gem.user_dir)
+    else
+      di = Gem::DependencyInstaller.new
+    end
 
     spec.development_dependencies.each do |dep|
       unless Gem.source_index.search(dep).last
@@ -132,8 +152,14 @@ class Gem::Commands::TestCommand < Gem::Command
       case response
       when Net::HTTPSuccess
         body = YAML::load(response.body)
-        url = body[:data][0] if body[:data]
-        say "Test results posted successfully! \n\t#{url}"
+        if body[:success]
+          url = body[:data][0] if body[:data]
+          say "Test results posted successfully! \n\t#{url}"
+        else
+          body[:errors].each do |error|
+            say error
+          end if body[:errors]
+        end
       when Net::HTTPRedirection
         location = response.fetch('Location')
         if !location or URI.parse(location) == url
@@ -184,78 +210,95 @@ class Gem::Commands::TestCommand < Gem::Command
     exit_status = nil
 
     Dir.chdir(spec.full_gem_path) do
-
-      if spec.files.include?(".gemtest")
-        reader_proc = proc do |orig_handles|
-          current_handles = orig_handles.dup
-
-          handles, _, _ = IO.select(current_handles, nil, nil, 0.1)
-          buf = ""
-
-          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]
+      reader_proc = proc do |orig_handles|
+        current_handles = orig_handles.dup
+
+        handles, _, _ = IO.select(current_handles, nil, nil, 0.1)
+        buf = ""
+
+        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
 
-        outer_reader_proc = proc do |stdout, stderr|
-          loop do
-            handles = [stderr, stdout]
-            buf, handles = reader_proc.call(handles) 
-            output += buf
-            print buf
-            break if handles.empty?
-          end
+        [buf, current_handles]
+      end
+
+      outer_reader_proc = proc do |stdout, stderr|
+        loop do
+          handles = [stderr, stdout]
+          buf, handles = reader_proc.call(handles) 
+          output += buf
+          print buf
+          break if handles.empty?
         end
+      end
 
-        rake_args = [rake_path, 'test', '--trace']
+      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_args) do |pid, stdin, stdout, stderr|
+      # jruby stuffs it under IO, so we'll use that if it's available
+      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/
+          begin
+            require 'win32/open3'
+            Open3.popen3([File.join(RbConfig::CONFIG["bindir"], 'ruby'), *rake_args].join(' ')) do |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
-          else
-            require 'open4-vendor'
-            exit_status = Open4.popen4(*rake_args) do |pid, stdin, stdout, stderr|
-              outer_reader_proc.call(stdout, stderr)
-            end
+          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
-
-
-        if config["upload_results"] or
-          (!config.has_key?("upload_results") and ask_yes_no("Upload these results?", true))
-
-          upload_results(gather_results(spec, output, exit_status.exitstatus == 0))
         end
 
-        if exit_status.exitstatus != 0
-          alert_error "Tests did not pass. Examine the output and report it to the author!"
+      if upload_results?
+        upload_results(gather_results(spec, output, exit_status.exitstatus == 0))
+      end
 
-          raise Gem::TestError, "tests failed"
-        end
-      else
-        alert_warning "This gem has no tests! Please contact the author to gain testing and reporting!"
+      if exit_status.exitstatus != 0
+        alert_error "Tests did not pass. Examine the output and report it to the author!"
+
+        raise Gem::TestError, "tests failed"
       end
     end
   end
 
+  #
+  # Convenience predicate for upload_results option
+  #
+  def upload_results?
+    !options[:force] and (
+      config["upload_results"] or
+      (
+        !config.has_key?("upload_results") and 
+          ask_yes_no("Upload these results?", true)
+      )
+    )
+  end
+  
+
   #
   # Execute routine. This is where the magic happens.
   #
@@ -271,7 +314,7 @@ class Gem::Commands::TestCommand < Gem::Command
           next
         end
 
-        if spec.files.include?('.gemtest')
+        if spec.files.include?('.gemtest') or options[:force]
           # we find rake and the rakefile first to eliminate needlessly installing
           # dependencies.
           find_rakefile(spec)
@@ -280,6 +323,20 @@ class Gem::Commands::TestCommand < Gem::Command
           install_dependencies(spec)
 
           run_tests(spec, rake_path)
+        else
+          say "Gem '#{name}' (version #{version}) needs to opt-in for testing."
+          say ""
+          say "Locally available testing helps gems maintain high quality by"
+          say "ensuring they work correctly on a wider array of platforms than the"
+          say "original developer can access."
+          say ""
+          say "If you are the author: "
+          say " * Add the file '.gemtest' to your spec.files"
+          say " * Ensure 'rake test' works and doesn't do system damage"
+          say " * Add your tests and Rakefile to your gem."
+          say "" 
+          say "For more information, please see the rubygems-test README:"
+          say "https://github.com/rubygems/rubygems-test/blob/master/README.txt"
         end
       end
     rescue Gem::TestError

data/test/helper.rb

@@ -58,4 +58,8 @@ class Test::Unit::TestCase
   def setup
     set_configuration({ })
   end
+
+  def teardown
+    uninstall_stub_gem rescue nil
+  end
 end

data/test/test_execute.rb

@@ -18,7 +18,7 @@ class TestExecute < Test::Unit::TestCase
   def test_02_gem_command_attributes
     assert_equal @test.description, "Run the tests for a specific gem"
     assert_equal @test.arguments, "GEM: name of gem"
-    assert_equal @test.usage, "#{@test.program_name} GEM -v VERSION"
+    assert_equal @test.usage, "#{@test.program_name} GEM [-v VERSION] [--force] [--dep-user-install]"
   end
 
   def test_04_find_gem
@@ -76,4 +76,8 @@ 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

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