rubygems-update 2.4.8 → 2.5.0

data/test/rubygems/test_gem_commands_server_command.rb

@@ -37,8 +37,8 @@ class TestGemCommandsServerCommand < Gem::TestCase
     @cmd.send :handle_options, %w[-p 65535]
     assert_equal 65535, @cmd.options[:port]
 
-    @cmd.send :handle_options, %w[-p http]
-    assert_equal 80, @cmd.options[:port]
+    @cmd.send :handle_options, %w[-p discard]
+    assert_equal 9, @cmd.options[:port]
 
     e = assert_raises OptionParser::InvalidArgument do
       @cmd.send :handle_options, %w[-p nonexistent]

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -26,8 +26,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_all
-    util_spec 'foo', '0.0.1'
-    util_spec 'foo', '0.0.2'
+    install_specs util_spec 'foo', '0.0.1'
+    install_specs util_spec 'foo', '0.0.2'
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:all] = true
@@ -89,8 +89,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_exact_match
-    util_spec 'foo'
-    util_spec 'foo_bar'
+    install_specs util_spec 'foo'
+    install_specs util_spec 'foo_bar'
 
     @cmd.options[:args] = %w[foo]
 

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -13,10 +13,12 @@ class TestGemCommandsStaleCommand < Gem::TestCase
     foo_bar = util_spec 'foo_bar' do |gem|
       gem.files = files
     end
+    install_specs foo_bar
 
     bar_baz = util_spec 'bar_baz' do |gem|
       gem.files = files
     end
+    install_specs bar_baz
 
     files.each do |file|
       filename = File.join(bar_baz.full_gem_path, file)

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -5,6 +5,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
   def setup
     super
+    common_installer_setup
 
     build_rake_in do
       use_ui @ui do
@@ -24,7 +25,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4 = util_spec 'a', 4
+    a_4, = util_gem 'a', 4
     install_gem a_4, :install_dir => gemhome2
 
     Gem::Specification.dirs = [@gemhome, gemhome2]
@@ -41,7 +42,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
       @cmd.execute
     end
 
-    assert_equal %w[a-4 a_evil-9 b-2 c-1.2 default-1 dep_x-1 pl-1-x86-linux x-1],
+    assert_equal %w[a_evil-9 b-2 c-1.2 default-1 dep_x-1 pl-1-x86-linux x-1],
                  Gem::Specification.all_names.sort
   end
 
@@ -213,7 +214,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4 = util_spec 'a', 4
+    a_4, = util_gem 'a', 4
     install_gem a_4, :install_dir => gemhome2
 
     Gem::Specification.dirs = [@gemhome, gemhome2]
@@ -229,7 +230,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
       @cmd.execute
     end
 
-    assert_equal %w[a-4 default-1], Gem::Specification.all_names.sort
+    assert_equal %w[default-1], Gem::Specification.all_names.sort
   end
 
   def test_handle_options

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -101,10 +101,8 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
   def test_execute_remote
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.gem  'a', 2
-
-      fetcher.clear
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2
     end
 
     Gem.configuration.verbose = :really
@@ -184,8 +182,8 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     foo_path = File.join(@tempdir, "#{foo_spec.full_name}.gem")
     foo_bar_path = File.join(@tempdir, "#{foo_bar_spec.full_name}.gem")
-    Gem::Installer.new(foo_path).install
-    Gem::Installer.new(foo_bar_path).install
+    Gem::Installer.at(foo_path).install
+    Gem::Installer.at(foo_bar_path).install
 
     @cmd.options[:args] = %w[foo]
 

data/test/rubygems/test_gem_commands_update_command.rb

@@ -18,11 +18,9 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.options[:document] = []
 
     @specs = spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
-      fetcher.gem 'a', 2
-      fetcher.gem 'a', '3.a'
-
-      fetcher.clear
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2
+      fetcher.download 'a', '3.a'
     end
 
     @a1_path  = @specs['a-1'].cache_file
@@ -32,10 +30,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-
-      fetcher.clear
-
+      fetcher.download 'a', 2
       fetcher.spec 'a', 1
     end
 
@@ -54,10 +49,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_multiple
     spec_fetcher do |fetcher|
-      fetcher.gem 'a',  2
-      fetcher.gem 'ab', 2
-
-      fetcher.clear
+      fetcher.download 'a',  2
+      fetcher.download 'ab', 2
 
       fetcher.spec 'a',  1
       fetcher.spec 'ab', 1
@@ -78,9 +71,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system
     spec_fetcher do |fetcher|
-      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
-
-      fetcher.clear
+      fetcher.download 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
     end
 
     @cmd.options[:args]          = []
@@ -100,11 +91,9 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_at_latest
     spec_fetcher do |fetcher|
-      fetcher.gem 'rubygems-update', Gem::VERSION do |s|
+      fetcher.download 'rubygems-update', Gem::VERSION do |s|
         s.files = %w[setup.rb]
       end
-
-      fetcher.clear
     end
 
     @cmd.options[:args]          = []
@@ -123,10 +112,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_multiple
     spec_fetcher do |fetcher|
-      fetcher.gem 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
-      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
-
-      fetcher.clear
+      fetcher.download 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
+      fetcher.download 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
     end
 
     @cmd.options[:args]          = []
@@ -146,10 +133,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specific
     spec_fetcher do |fetcher|
-      fetcher.gem 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
-      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
-
-      fetcher.clear
+      fetcher.download 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
+      fetcher.download 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
     end
 
     @cmd.options[:args]          = []
@@ -169,10 +154,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specifically_to_latest_version
     spec_fetcher do |fetcher|
-      fetcher.gem 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
-      fetcher.gem 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
-
-      fetcher.clear
+      fetcher.download 'rubygems-update', 8 do |s| s.files = %w[setup.rb] end
+      fetcher.download 'rubygems-update', 9 do |s| s.files = %w[setup.rb] end
     end
 
     @cmd.options[:args]          = []
@@ -213,11 +196,9 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_dependencies
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2, 'b' => 2, 'c' => 2
-      fetcher.gem 'b', 2
-      fetcher.gem 'c', 2
-
-      fetcher.clear
+      fetcher.download 'a', 2, 'b' => 2, 'c' => 2
+      fetcher.download 'b', 2
+      fetcher.download 'c', 2
 
       fetcher.spec 'a', 1, 'c' => '1.2'
       fetcher.spec 'c', '1.2'
@@ -243,10 +224,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   def test_execute_rdoc
     skip if RUBY_VERSION <= "1.8.7"
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-
-      fetcher.clear
-
+      fetcher.download 'a', 2
       fetcher.spec 'a', 1
     end
 
@@ -269,9 +247,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_named
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-
-      fetcher.clear
+      fetcher.download 'a', 2
 
       fetcher.spec 'a', 1
     end
@@ -292,8 +268,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_named_some_up_to_date
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
       fetcher.spec 'a', 1
 
       fetcher.spec 'b', 2
@@ -334,9 +309,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_named_up_to_date_prerelease
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', '3.a'
-
-      fetcher.clear
+      fetcher.download 'a', '3.a'
 
       fetcher.gem 'a', 2
     end
@@ -376,10 +349,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_user_install
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-
-      fetcher.clear
-
+      fetcher.download 'a', 2
       fetcher.spec 'a', 1
     end
 

data/test/rubygems/test_gem_commands_which_command.rb

@@ -73,6 +73,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     @foo_bar = util_spec 'foo_bar' do |gem|
       gem.files = files
     end
+    install_specs @foo_bar
 
     files.each do |file|
       filename = File.join(@foo_bar.full_gem_path, file)

data/test/rubygems/test_gem_config_file.rb

@@ -416,7 +416,7 @@ if you believe they were disclosed to a third party.
 
   def test_ignore_invalid_config_file
     File.open @temp_conf, 'w' do |fp|
-      fp.puts "some-non-yaml-hash-string"
+      fp.puts "invalid: yaml:"
     end
 
     begin

data/test/rubygems/test_gem_dependency.rb

@@ -294,10 +294,11 @@ class TestGemDependency < Gem::TestCase
   end
 
   def test_to_spec
-          util_spec 'a', '1'
+    a_1 = util_spec 'a', '1'
     a_2 = util_spec 'a', '2'
 
     a_dep = dep 'a', '>= 0'
+    install_specs a_1, a_2
 
     assert_equal a_2, a_dep.to_spec
   end
@@ -307,6 +308,7 @@ class TestGemDependency < Gem::TestCase
     a_1_1_a = util_spec 'a', '1.1.a'
 
     a_dep = dep 'a', '>= 0'
+    install_specs a_1, a_1_1_a
 
     assert_equal a_1, a_dep.to_spec
 
@@ -317,7 +319,8 @@ class TestGemDependency < Gem::TestCase
   end
 
   def test_to_specs_suggests_other_versions
-    a = util_spec 'a', '1.0', 'b' => '>= 1.0'
+    a = util_spec 'a', '1.0'
+    install_specs a
 
     a_file = File.join a.gem_dir, 'lib', 'a_file.rb'
 
@@ -335,7 +338,8 @@ class TestGemDependency < Gem::TestCase
   end
 
   def test_to_specs_indicates_total_gem_set_size
-    a = util_spec 'a', '1.0', 'b' => '>= 1.0'
+    a = util_spec 'a', '1.0'
+    install_specs a
 
     a_file = File.join a.gem_dir, 'lib', 'a_file.rb'
 

data/test/rubygems/test_gem_dependency_installer.rb

@@ -406,7 +406,7 @@ class TestGemDependencyInstaller < Gem::TestCase
   def test_install_dependency_existing
     util_setup_gems
 
-    Gem::Installer.new(@a1_gem).install
+    Gem::Installer.at(@a1_gem).install
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
@@ -437,7 +437,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     _, f1_gem = util_gem 'f', '1', 'e' => nil
 
-    Gem::Installer.new(e1_gem).install
+    Gem::Installer.at(e1_gem).install
     FileUtils.rm_r e1.extension_dir
 
     FileUtils.mv e1_gem, @tempdir
@@ -525,7 +525,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      Gem::Installer.new('a-1.gem').install
+      Gem::Installer.at('a-1.gem').install
 
       inst = Gem::DependencyInstaller.new :domain => :local
       inst.install 'b-1.gem'
@@ -669,7 +669,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
 
-    inst = Gem::Installer.new @a1.file_name
+    inst = Gem::Installer.at @a1.file_name
     inst.install
 
     gemhome2 = File.join @tempdir, 'gemhome2'
@@ -799,7 +799,7 @@ class TestGemDependencyInstaller < Gem::TestCase
   def test_install_reinstall
     util_setup_gems
 
-    Gem::Installer.new(@a1_gem).install
+    Gem::Installer.at(@a1_gem).install
     FileUtils.mv @a1_gem, @tempdir
     inst = nil
 

data/test/rubygems/test_gem_doctor.rb

@@ -157,7 +157,7 @@ This directory does not appear to be a RubyGems repository, skipping
 
     refute doctor.gem_repository?, 'no gems installed'
 
-    util_spec 'a'
+    install_specs util_spec 'a'
 
     doctor = Gem::Doctor.new @gemhome
 

data/test/rubygems/test_gem_ext_builder.rb

@@ -147,6 +147,8 @@ install:
     class << Gem
       alias orig_install_extension_in_lib install_extension_in_lib
 
+      remove_method :install_extension_in_lib
+
       def Gem.install_extension_in_lib
         false
       end

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -29,12 +29,16 @@ class TestGemExtConfigureBuilder < Gem::TestCase
       Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
     end
 
+    assert_match(/^current directory:/, output.shift)
     assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift
     assert_equal "", output.shift
+    assert_match(/^current directory:/, output.shift)
     assert_contains_make_command 'clean', output.shift
     assert_match(/^ok$/m, output.shift)
+    assert_match(/^current directory:/, output.shift)
     assert_contains_make_command '', output.shift
     assert_match(/^ok$/m, output.shift)
+    assert_match(/^current directory:/, output.shift)
     assert_contains_make_command 'install', output.shift
     assert_match(/^ok$/m, output.shift)
   end
@@ -54,6 +58,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
     assert_match 'configure failed', error.message
 
+    assert_match(/^current directory:/, output.shift)
     assert_equal "#{sh_prefix_configure}#{@dest_path}", output.shift
     assert_match %r(#{shell_error_msg}), output.shift
     assert_equal true, output.empty?
@@ -73,10 +78,9 @@ class TestGemExtConfigureBuilder < Gem::TestCase
       Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
     end
 
-    assert_contains_make_command 'clean', output[0]
-    assert_contains_make_command '', output[2]
-    assert_contains_make_command 'install', output[4]
+    assert_contains_make_command 'clean', output[1]
+    assert_contains_make_command '', output[4]
+    assert_contains_make_command 'install', output[7]
   end
 
 end
-

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -33,11 +33,13 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       assert_same result, output
     end
 
-    assert_match(/^#{Gem.ruby}.* extconf.rb/, output[0])
-    assert_equal "creating Makefile\n", output[1]
-    assert_contains_make_command 'clean', output[2]
-    assert_contains_make_command '', output[4]
-    assert_contains_make_command 'install', output[6]
+    assert_match(/^current directory:/, output[0])
+    assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
+    assert_equal "creating Makefile\n", output[2]
+    assert_match(/^current directory:/, output[3])
+    assert_contains_make_command 'clean', output[4]
+    assert_contains_make_command '', output[7]
+    assert_contains_make_command 'install', output[10]
     assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
   end
 
@@ -54,16 +56,16 @@ class TestGemExtExtConfBuilder < Gem::TestCase
         Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
       end
 
-      assert_equal "creating Makefile\n", output[1]
-      assert_contains_make_command 'clean', output[2]
-      assert_contains_make_command '', output[4]
-      assert_contains_make_command 'install', output[6]
+      assert_equal "creating Makefile\n", output[2]
+      assert_contains_make_command 'clean', output[4]
+      assert_contains_make_command '', output[7]
+      assert_contains_make_command 'install', output[10]
     end
   end
 
   def test_class_build_env_make
-    env_make = ENV.delete 'make'
-    ENV['make'] = 'anothermake'
+    env_make = ENV.delete 'MAKE'
+    ENV['MAKE'] = 'anothermake'
 
     configure_args '' do
       File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -78,11 +80,11 @@ class TestGemExtExtConfBuilder < Gem::TestCase
         end
       end
 
-      assert_equal "creating Makefile\n",   output[1]
-      assert_contains_make_command 'clean', output[2]
+      assert_equal "creating Makefile\n",   output[2]
+      assert_contains_make_command 'clean', output[4]
     end
   ensure
-    ENV['make'] = env_make
+    ENV['MAKE'] = env_make
   end
 
   def test_class_build_extconf_fail
@@ -106,7 +108,9 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     assert_equal 'extconf failed, exit code 1', error.message
 
-    assert_match(/^#{Gem.ruby}.* extconf.rb/, output[0])
+    assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
+    assert_match(File.join(@dest_path, 'mkmf.log'), output[4])
+
     assert_path_exists File.join @dest_path, 'mkmf.log'
   end
 
@@ -147,9 +151,9 @@ end
       Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
     end
 
-    assert_contains_make_command 'clean', output[2]
-    assert_contains_make_command '', output[4]
-    assert_contains_make_command 'install', output[6]
+    assert_contains_make_command 'clean', output[4]
+    assert_contains_make_command '', output[7]
+    assert_contains_make_command 'install', output[10]
     assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
   end
 
@@ -173,9 +177,9 @@ end
       Gem::Ext::ExtConfBuilder.make @ext, output
     end
 
-    assert_contains_make_command 'clean', output[0]
-    assert_contains_make_command '', output[2]
-    assert_contains_make_command 'install', output[4]
+    assert_contains_make_command 'clean', output[1]
+    assert_contains_make_command '', output[4]
+    assert_contains_make_command 'install', output[7]
   end
 
   def test_class_make_no_Makefile