rubygems-update 1.3.0 → 1.3.1

data/test/test_gem_commands_unpack_command.rb

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

data/test/test_gem_commands_update_command.rb

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

data/test/test_gem_config_file.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 'rubygems/config_file'
 

data/test/test_gem_dependency.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/version'
 
@@ -70,7 +69,7 @@ class TestGemDependency < RubyGemTestCase
   end
 
   def test_type_is_restricted
-    assert_raise(ArgumentError) do
+    assert_raises ArgumentError do
       Gem::Dependency.new("pkg", [:sometimes])
     end
   end
@@ -79,21 +78,21 @@ class TestGemDependency < RubyGemTestCase
     assert_equal @pkg1_0, @pkg1_0.dup
     assert_equal @pkg1_0.dup, @pkg1_0
 
-    assert_not_equal @pkg1_0, @pkg1_1, "requirements different"
-    assert_not_equal @pkg1_1, @pkg1_0, "requirements different"
+    refute_equal @pkg1_0, @pkg1_1, "requirements different"
+    refute_equal @pkg1_1, @pkg1_0, "requirements different"
 
-    assert_not_equal @pkg1_0, @oth1_0, "names different"
-    assert_not_equal @oth1_0, @pkg1_0, "names different"
+    refute_equal @pkg1_0, @oth1_0, "names different"
+    refute_equal @oth1_0, @pkg1_0, "names different"
 
-    assert_not_equal @pkg1_0, Object.new
-    assert_not_equal Object.new, @pkg1_0
+    refute_equal @pkg1_0, Object.new
+    refute_equal Object.new, @pkg1_0
   end
 
   def test_equals2_type
     runtime = Gem::Dependency.new("pkg", [])
     development = Gem::Dependency.new("pkg", [], :development)
 
-    assert_not_equal(runtime, development)
+    refute_equal(runtime, development)
   end
 
   def test_equals_tilde
@@ -123,18 +122,18 @@ class TestGemDependency < RubyGemTestCase
     assert_equal @pkg1_0.hash, @pkg1_0.dup.hash
     assert_equal @pkg1_0.dup.hash, @pkg1_0.hash
 
-    assert_not_equal @pkg1_0.hash, @pkg1_1.hash, "requirements different"
-    assert_not_equal @pkg1_1.hash, @pkg1_0.hash, "requirements different"
+    refute_equal @pkg1_0.hash, @pkg1_1.hash, "requirements different"
+    refute_equal @pkg1_1.hash, @pkg1_0.hash, "requirements different"
 
-    assert_not_equal @pkg1_0.hash, @oth1_0.hash, "names different"
-    assert_not_equal @oth1_0.hash, @pkg1_0.hash, "names different"
+    refute_equal @pkg1_0.hash, @oth1_0.hash, "names different"
+    refute_equal @oth1_0.hash, @pkg1_0.hash, "names different"
   end
 
   def test_hash_type
     runtime = Gem::Dependency.new("pkg", [])
     development = Gem::Dependency.new("pkg", [], :development)
 
-    assert_not_equal(runtime.hash, development.hash)
+    refute_equal(runtime.hash, development.hash)
   end
 end
 

data/test/test_gem_dependency_installer.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/dependency_installer'
 
@@ -360,7 +359,7 @@ class TestGemDependencyInstaller < RubyGemTestCase
     Gem.source_index.gems.delete @a1.full_name
 
     Dir.chdir @tempdir do
-      e = assert_raise Gem::InstallError do
+      e = assert_raises Gem::InstallError do
         inst = Gem::DependencyInstaller.new :domain => :local
         inst.install 'b'
       end
@@ -498,7 +497,7 @@ class TestGemDependencyInstaller < RubyGemTestCase
       policy = Gem::Security::HighSecurity
       inst = Gem::DependencyInstaller.new :security_policy => policy
 
-      e = assert_raise Gem::Exception do
+      e = assert_raises Gem::Exception do
         inst.install 'b'
       end
 
@@ -516,8 +515,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
       inst = Gem::DependencyInstaller.new :wrappers => false
       inst.install 'a'
 
-      assert_no_match(%r|This file was generated by RubyGems.|,
-                      File.read(File.join(@gemhome, 'bin', 'a_bin')))
+      refute_match(%r|This file was generated by RubyGems.|,
+                   File.read(File.join(@gemhome, 'bin', 'a_bin')))
     end
   end
 

data/test/test_gem_dependency_list.rb

@@ -1,12 +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 'rubygems/dependency_list'
 

data/test/test_gem_digest.rb

@@ -1,44 +1,46 @@
-#!/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 "rubygems/digest/md5"
 require "rubygems/digest/sha1"
 require "rubygems/digest/sha2"
 
-class TestRubygemsGemDigest < Test::Unit::TestCase
+class TestRubygemsGemDigest < RubyGemTestCase
+
   def test_sha256_hex_digest_works
     digester = Gem::SHA256.new
     assert_equal "b5d4045c3f466fa91fe2cc6abe79232a1a57cdf104f7a26e716e0a1e2789df78", digester.hexdigest("ABC")
   end
-  
+
   def test_sha256_digest_works
     digester = Gem::SHA256.new
-    assert_equal "\265\324\004\\?Fo\251\037\342\314j\276y#*\032W\315\361\004\367\242nqn\n\036'\211\337x", 
+    assert_equal "\265\324\004\\?Fo\251\037\342\314j\276y#*\032W\315\361\004\367\242nqn\n\036'\211\337x",
       digester.digest("ABC")
   end
-  
+
   def test_sha1_hex_digest_works
     digester = Gem::SHA1.new
     assert_equal "3c01bdbb26f358bab27f267924aa2c9a03fcfdb8", digester.hexdigest("ABC")
   end
-  
+
   def test_sha1_digest_works
     digester = Gem::SHA1.new
     assert_equal "<\001\275\273&\363X\272\262\177&y$\252,\232\003\374\375\270", digester.digest("ABC")
   end
-  
+
   def test_md5_hex_digest_works
     digester = Gem::MD5.new
     assert_equal "902fbdd2b1df0c4f70b4a5d23525e932", digester.hexdigest("ABC")
   end
-  
+
   def test_md5_digest_works
     digester = Gem::MD5.new
     assert_equal "\220/\275\322\261\337\fOp\264\245\3225%\3512", digester.digest("ABC")
   end
-end
+
+end
+

data/test/test_gem_doc_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/doc_manager'
 
@@ -21,7 +20,7 @@ class TestGemDocManager < RubyGemTestCase
     orig_mode = File.stat(@spec.installation_path).mode
     File.chmod 0, @spec.installation_path
 
-    assert_raise Gem::FilePermissionError do
+    assert_raises Gem::FilePermissionError do
       @manager.uninstall_doc
     end
   ensure

data/test/test_gem_ext_configure_builder.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/ext'
 
@@ -41,7 +40,7 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
     return if RUBY_PLATFORM =~ /mswin/ # HACK
     output = []
 
-    error = assert_raise Gem::InstallError do
+    error = assert_raises Gem::InstallError do
       Dir.chdir @ext do
         Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
       end

data/test/test_gem_ext_ext_conf_builder.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/ext'
 
@@ -55,7 +54,7 @@ class TestGemExtExtConfBuilder < RubyGemTestCase
 
     output = []
 
-    error = assert_raise Gem::InstallError do
+    error = assert_raises Gem::InstallError do
       Dir.chdir @ext do
         Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
       end
@@ -103,7 +102,7 @@ install:
   end
 
   def test_class_make_no_Makefile
-    error = assert_raise Gem::InstallError do
+    error = assert_raises Gem::InstallError do
       Dir.chdir @ext do
         Gem::Ext::ExtConfBuilder.make @ext, ['output']
       end

data/test/test_gem_ext_rake_builder.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/ext'
 
@@ -41,7 +40,7 @@ class TestGemExtRakeBuilder < RubyGemTestCase
       "(in #{realdir})\n"
     ]
 
-    assert_no_match %r%^rake failed:%, output
+    refute_match %r%^rake failed:%, output
     assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
     assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
   end
@@ -57,7 +56,7 @@ class TestGemExtRakeBuilder < RubyGemTestCase
 
     output = []
 
-    error = assert_raise Gem::InstallError do
+    error = assert_raises Gem::InstallError do
       build_rake_in do
         Dir.chdir @ext do
           Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output

data/test/test_gem_format.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'simple_gem')
 require 'rubygems/format'
@@ -36,27 +35,27 @@ class TestGemFormat < RubyGemTestCase
   end
 
   def test_from_file_by_path_nonexistent
-    assert_raise Gem::Exception do
+    assert_raises Gem::Exception do
       Gem::Format.from_file_by_path '/nonexistent'
     end
   end
 
   def test_from_io_garbled
-    e = assert_raise Gem::Package::FormatError do
+    e = assert_raises Gem::Package::FormatError do
       # subtly bogus input
       Gem::Format.from_io(StringIO.new(@simple_gem.upcase))
     end
 
     assert_equal 'No metadata found!', e.message
 
-    e = assert_raise Gem::Package::FormatError do
+    e = assert_raises Gem::Package::FormatError do
       # Totally bogus input
       Gem::Format.from_io(StringIO.new(@simple_gem.reverse))
     end
 
     assert_equal 'No metadata found!', e.message
 
-    e = assert_raise Gem::Package::FormatError do
+    e = assert_raises Gem::Package::FormatError do
       # This was intentionally screws up YAML parsing.
       Gem::Format.from_io(StringIO.new(@simple_gem.gsub(/:/, "boom")))
     end
@@ -66,4 +65,3 @@ class TestGemFormat < RubyGemTestCase
 
 end
 
-

data/test/test_gem_gem_path_searcher.rb

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

data/test/test_gem_gem_runner.rb

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

data/test/test_gem_indexer.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/indexer'
@@ -217,8 +216,8 @@ Compressing indicies
     assert_same specs[0].last, specs[1].last,
                 'identical platforms not identical'
 
-    assert_not_same specs[1][1], specs[5][1],
-                    'different versions not different'
+    refute_same specs[1][1], specs[5][1],
+                'different versions not different'
   end
 
   def test_generate_index_latest_specs

data/test/test_gem_install_update_options.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')
@@ -31,7 +30,7 @@ class TestGemInstallUpdateOptions < GemInstallerTestCase
   def test_security_policy_unknown
     @cmd.add_install_update_options
 
-    assert_raise OptionParser::InvalidArgument do
+    assert_raises OptionParser::InvalidArgument do
       @cmd.handle_options %w[-P UnknownSecurity]
     end
   end

data/test/test_gem_installer.rb

@@ -52,7 +52,7 @@ load 'my_exec'
   def test_build_extensions_extconf_bad
     @spec.extensions << 'extconf.rb'
 
-    e = assert_raise Gem::Installer::ExtensionBuildError do
+    e = assert_raises Gem::Installer::ExtensionBuildError do
       use_ui @ui do
         @installer.build_extensions
       end
@@ -79,7 +79,7 @@ load 'my_exec'
   def test_build_extensions_unsupported
     @spec.extensions << nil
 
-    e = assert_raise Gem::Installer::ExtensionBuildError do
+    e = assert_raises Gem::Installer::ExtensionBuildError do
       use_ui @ui do
         @installer.build_extensions
       end
@@ -101,7 +101,7 @@ load 'my_exec'
     assert @installer.ensure_dependency(@spec, dep)
 
     dep = Gem::Dependency.new 'b', '> 2'
-    e = assert_raise Gem::InstallError do
+    e = assert_raises Gem::InstallError do
       @installer.ensure_dependency @spec, dep
     end
 
@@ -142,7 +142,7 @@ load 'my_exec'
   def test_extract_files_bad_dest
     @installer.gem_dir = 'somedir'
     @installer.format = nil
-    e = assert_raise ArgumentError do
+    e = assert_raises ArgumentError do
       @installer.extract_files
     end
 
@@ -157,7 +157,7 @@ load 'my_exec'
 
     @installer.format = format
 
-    e = assert_raise Gem::InstallError do
+    e = assert_raises Gem::InstallError do
       @installer.extract_files
     end
 
@@ -175,7 +175,7 @@ load 'my_exec'
 
     @installer.format = format
 
-    e = assert_raise Gem::InstallError do
+    e = assert_raises Gem::InstallError do
       @installer.extract_files
     end
 
@@ -342,8 +342,8 @@ load 'my_exec'
 
     assert_match %r|generated by RubyGems|, File.read(installed_exec)
 
-    assert_no_match %r|generated by RubyGems|, File.read(real_exec),
-                    'real executable overwritten'
+    refute_match %r|generated by RubyGems|, File.read(real_exec),
+                 'real executable overwritten'
   end
 
   def test_generate_bin_symlink
@@ -581,7 +581,7 @@ load 'my_exec'
     gem_data = File.open gem, 'rb' do |fp| fp.read 1024 end
     File.open gem, 'wb' do |fp| fp.write gem_data end
 
-    e = assert_raise Gem::InstallError do
+    e = assert_raises Gem::InstallError do
       use_ui @ui do
         @installer = Gem::Installer.new gem
         @installer.install
@@ -596,7 +596,7 @@ load 'my_exec'
     util_setup_gem
 
     use_ui @ui do
-      assert_raise Gem::InstallError do
+      assert_raises Gem::InstallError do
         @installer.install
       end
     end
@@ -618,8 +618,10 @@ load 'my_exec'
     @installer = Gem::Installer.new @gem, :install_dir => gemhome2,
                                     :source_index => source_index
 
-    use_ui @ui do
-      @installer.install
+    build_rake_in do
+      use_ui @ui do
+        @installer.install
+      end
     end
 
     assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name))
@@ -711,7 +713,6 @@ load 'my_exec'
 
       build_rake_in do
         use_ui @ui do
-          setup
           util_setup_gem
           @installer.install
         end
@@ -738,7 +739,7 @@ load 'my_exec'
   def test_install_wrong_ruby_version
     use_ui @ui do
       installer = Gem::Installer.new old_ruby_required
-      e = assert_raise Gem::InstallError do
+      e = assert_raises Gem::InstallError do
         installer.install
       end
       assert_equal 'old_ruby_required requires Ruby version = 1.4.6',
@@ -757,7 +758,7 @@ load 'my_exec'
 
     use_ui @ui do
       @installer = Gem::Installer.new gem
-      e = assert_raise Gem::InstallError do
+      e = assert_raises Gem::InstallError do
         @installer.install
       end
       assert_equal 'old_rubygems_required requires RubyGems version < 0',