rubygems-update 1.3.0 → 1.3.1

data/test/functional.rb

@@ -5,13 +5,14 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require 'rubygems'
+require 'minitest/unit'
 require 'test/insure_session'
 require 'rubygems/format'
 require 'rubygems/command_manager'
 
-class FunctionalTest < Test::Unit::TestCase
+class FunctionalTest < MiniTest::Unit::TestCase
+
   def setup
     @gem_path = File.expand_path("bin/gem")
     lib_path = File.expand_path("lib")
@@ -93,3 +94,6 @@ class FunctionalTest < Test::Unit::TestCase
   end
 
 end
+
+MiniTest::Unit.autorun
+

data/test/gem_installer_test_case.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/installer'
 

data/test/gemutilities.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -9,8 +8,14 @@ at_exit { $SAFE = 1 }
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'rubygems'
 require 'fileutils'
-require 'test/unit'
+begin
+  require 'minitest/unit'
+rescue LoadError
+  warn "Install minitest gem"
+  raise
+end
 require 'tmpdir'
 require 'uri'
 require 'rubygems/package'
@@ -36,7 +41,7 @@ module Gem
   end
 end
 
-class RubyGemTestCase < Test::Unit::TestCase
+class RubyGemTestCase < MiniTest::Unit::TestCase
 
   include Gem::DefaultUserInteraction
 
@@ -57,6 +62,7 @@ class RubyGemTestCase < Test::Unit::TestCase
     @latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache")
     @userhome = File.join @tempdir, 'userhome'
 
+    @orig_ENV_HOME = ENV['HOME']
     ENV['HOME'] = @userhome
     Gem.instance_variable_set :@user_home, nil
 
@@ -131,6 +137,12 @@ class RubyGemTestCase < Test::Unit::TestCase
     ENV.delete 'GEM_PATH'
 
     Gem.clear_paths
+
+    if @orig_ENV_HOME then
+      ENV['HOME'] = @orig_ENV_HOME
+    else
+      ENV.delete 'HOME'
+    end
   end
 
   def install_gem gem
@@ -461,14 +473,16 @@ class RubyGemTestCase < Test::Unit::TestCase
 
   @@ruby = rubybin
   env_rake = ENV['rake']
-  ruby19_rake = @@ruby + " " + File.expand_path("../../../bin/rake", __FILE__)
+  ruby19_rake = File.expand_path("../../../bin/rake", __FILE__)
   @@rake = if env_rake then
              ENV["rake"]
            elsif File.exist? ruby19_rake then
-             ruby19_rake
+             @@ruby + " " + ruby19_rake
            else
              'rake'
            end
 
 end
 
+MiniTest::Unit.autorun
+

data/test/test_config.rb

@@ -1,11 +1,9 @@
-#!/usr/bin/env ruby
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rbconfig'
 require 'rubygems'

data/test/test_gem.rb

@@ -65,8 +65,8 @@ class TestGem < RubyGemTestCase
 
     assert_equal nil, Gem.instance_variable_get(:@gem_home)
     assert_equal nil, Gem.instance_variable_get(:@gem_path)
-    assert_not_equal searcher, Gem.searcher
-    assert_not_equal source_index.object_id, Gem.source_index.object_id
+    refute_equal searcher, Gem.searcher
+    refute_equal source_index.object_id, Gem.source_index.object_id
   end
 
   def test_self_configuration
@@ -214,10 +214,10 @@ class TestGem < RubyGemTestCase
     orig_Gem_ssl_available = Gem.ssl_available?
 
     Gem.ssl_available = true
-    assert_nothing_raised do Gem.ensure_ssl_available end
+    Gem.ensure_ssl_available
 
     Gem.ssl_available = false
-    e = assert_raise Gem::Exception do Gem.ensure_ssl_available end
+    e = assert_raises Gem::Exception do Gem.ensure_ssl_available end
     assert_equal 'SSL is not installed on this system', e.message
   ensure
     Gem.ssl_available = orig_Gem_ssl_available

data/test/test_gem_builder.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/builder'
 

data/test/test_gem_command.rb

@@ -5,7 +5,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/command'
 
@@ -63,7 +62,7 @@ class TestGemCommand < RubyGemTestCase
 
     assert_match %r|-x, --zip|, @cmd.parser.to_s
     assert_match %r|-z, --exe|, @cmd.parser.to_s
-    assert_no_match %r|-x, --exe|, @cmd.parser.to_s
+    refute_match %r|-x, --exe|, @cmd.parser.to_s
   end
 
   def test_basic_accessors
@@ -109,7 +108,7 @@ class TestGemCommand < RubyGemTestCase
     use_ui @ui do
       @cmd.when_invoked do true end
 
-      ex = assert_raise(OptionParser::InvalidOption) do
+      ex = assert_raises OptionParser::InvalidOption do
         @cmd.invoke('-zzz')
       end
 

data/test/test_gem_command_manager.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/command_manager'
 

data/test/test_gem_commands_build_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/build_command'
 require 'rubygems/format'

data/test/test_gem_commands_cert_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 
 require 'rubygems/commands/cert_command'

data/test/test_gem_commands_check_command.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/check_command'
 

data/test/test_gem_commands_contents_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/contents_command'
 
@@ -28,7 +27,7 @@ class TestGemCommandsContentsCommand < RubyGemTestCase
   def test_execute_bad_gem
     @cmd.options[:args] = %w[foo]
 
-    assert_raise MockGemUi::TermError do
+    assert_raises MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -71,7 +70,7 @@ class TestGemCommandsContentsCommand < RubyGemTestCase
     end
 
     assert_match %r|lib/foo\.rb|, @ui.output
-    assert_no_match %r|Rakefile|, @ui.output
+    refute_match %r|Rakefile|, @ui.output
 
     assert_equal "", @ui.error
   end

data/test/test_gem_commands_dependency_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/dependency_command'
 
@@ -61,7 +60,7 @@ Gem pl-1-x86-linux
   def test_execute_no_match
     @cmd.options[:args] = %w[foo]
 
-    assert_raise MockGemUi::TermError do
+    assert_raises MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -146,7 +145,7 @@ Gem foo-2
     @cmd.options[:reverse_dependencies] = true
     @cmd.options[:domain] = :remote
 
-    assert_raise MockGemUi::TermError do
+    assert_raises MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_environment_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/environment_command'
 
@@ -109,7 +108,7 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
   def test_execute_unknown
     @cmd.send :handle_options, %w[unknown]
 
-    assert_raise Gem::CommandLineError do
+    assert_raises Gem::CommandLineError do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_fetch_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/package'
 require 'rubygems/security'

data/test/test_gem_commands_generate_index_command.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/indexer'
 require 'rubygems/commands/generate_index_command'

data/test/test_gem_commands_install_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/install_command'
 
@@ -16,7 +15,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     @cmd.options[:include_dependencies] = true
     @cmd.options[:args] = []
 
-    assert_raise Gem::CommandLineError do
+    assert_raises Gem::CommandLineError do
       use_ui @ui do
         @cmd.execute
       end
@@ -79,7 +78,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
   def test_execute_no_gem
     @cmd.options[:args] = %w[]
 
-    assert_raise Gem::CommandLineError do
+    assert_raises Gem::CommandLineError do
       @cmd.execute
     end
   end

data/test/test_gem_commands_list_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/list_command'
 
@@ -21,7 +20,7 @@ class TestGemCommandsListCommand < RubyGemTestCase
   def test_execute_installed
     @cmd.handle_options %w[c --installed]
 
-    e = assert_raise Gem::SystemExitException do
+    e = assert_raises Gem::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_lock_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/lock_command'
 
@@ -56,7 +55,7 @@ gem 'd', '= 1'
   def test_execute_strict
     @cmd.handle_options %w[c-1 --strict]
 
-    e = assert_raise Gem::Exception do
+    e = assert_raises Gem::Exception do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_mirror_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/indexer'
 require 'rubygems/commands/mirror_command'

data/test/test_gem_commands_outdated_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/outdated_command'
 

data/test/test_gem_commands_pristine_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/pristine_command'
 
@@ -96,7 +95,7 @@ class TestGemCommandsPristineCommand < RubyGemTestCase
   def test_execute_no_gem
     @cmd.options[:args] = %w[]
 
-    e = assert_raise Gem::CommandLineError do
+    e = assert_raises Gem::CommandLineError do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_query_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/query_command'
 
@@ -99,7 +98,7 @@ pl (1)
   def test_execute_installed
     @cmd.handle_options %w[-n c --installed]
 
-    e = assert_raise Gem::SystemExitException do
+    e = assert_raises Gem::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
@@ -115,7 +114,7 @@ pl (1)
   def test_execute_installed_no_name
     @cmd.handle_options %w[--installed]
 
-    e = assert_raise Gem::SystemExitException do
+    e = assert_raises Gem::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
@@ -130,7 +129,7 @@ pl (1)
   def test_execute_installed_not_installed
     @cmd.handle_options %w[-n not_installed --installed]
 
-    e = assert_raise Gem::SystemExitException do
+    e = assert_raises Gem::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
@@ -145,7 +144,7 @@ pl (1)
   def test_execute_installed_version
     @cmd.handle_options %w[-n c --installed --version 1.2]
 
-    e = assert_raise Gem::SystemExitException do
+    e = assert_raises Gem::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
@@ -160,7 +159,7 @@ pl (1)
   def test_execute_installed_version_not_installed
     @cmd.handle_options %w[-n c --installed --version 2]
 
-    e = assert_raise Gem::SystemExitException do
+    e = assert_raises Gem::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_server_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/server_command'
 

data/test/test_gem_commands_sources_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/sources_command'
 

data/test/test_gem_commands_specification_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/specification_command'
 
@@ -46,7 +45,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
   def test_execute_bad_name
     @cmd.options[:args] = %w[foo]
 
-    assert_raise MockGemUi::TermError do
+    assert_raises MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end

data/test/test_gem_commands_stale_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/commands/stale_command'
 

data/test/test_gem_commands_uninstall_command.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require File.join(File.expand_path(File.dirname(__FILE__)),
                   'gem_installer_test_case')
@@ -12,8 +11,10 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
     ui = MockGemUi.new
     util_setup_gem ui
 
-    use_ui ui do
-      @installer.install
+    build_rake_in do
+      use_ui ui do
+        @installer.install
+      end
     end
 
     @cmd = Gem::Commands::UninstallCommand.new
@@ -46,7 +47,7 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
 
   def test_execute_not_installed
     @cmd.options[:args] = ["foo"]
-    e = assert_raise(Gem::InstallError) do
+    e = assert_raises Gem::InstallError do
       use_ui @ui do
         @cmd.execute
       end