rubygems-update 2.4.8 → 2.5.0

data/test/rubygems/simple_gem.rb

@@ -16,7 +16,7 @@ SIMPLE_GEM = <<-GEMDATA
           @directory = options[:directory] || Gem.dir
           @force = options[:force]
 
-          gem = Gem::Installer.new(__FILE__).install(@force, @directory)
+          gem = Gem::Installer.at(__FILE__).install(@force, @directory)
           if options[:gen_rdoc]
             Gem::DocManager.new(gem).generate_rdoc
           end

data/test/rubygems/test_config.rb

@@ -10,5 +10,14 @@ class TestConfig < Gem::TestCase
     assert_equal "#{spec.full_gem_path}/data/a", Gem.datadir('a')
   end
 
-end
+  def test_good_rake_path_is_escaped
+    path = Gem::TestCase.class_eval('@@good_rake')
+    assert_match(/#{Gem.ruby} "[^"]*good_rake.rb"/, path)
+  end
 
+  def test_bad_rake_path_is_escaped
+    path = Gem::TestCase.class_eval('@@bad_rake')
+    assert_match(/#{Gem.ruby} "[^"]*bad_rake.rb"/, path)
+  end
+
+end

data/test/rubygems/test_gem.rb

@@ -37,7 +37,7 @@ class TestGem < Gem::TestCase
       c1 = new_spec "c", "1"
       c2 = new_spec "c", "2"
 
-      install_specs a1, b1, b2, c1, c2
+      install_specs c1, c2, b1, b2, a1
 
       a1.activate
 
@@ -61,7 +61,7 @@ class TestGem < Gem::TestCase
       d1 = new_spec "d", "1", { "c" => "< 2" },  "lib/d.rb"
       d2 = new_spec "d", "2", { "c" => "< 2" },  "lib/d.rb" # this
 
-      install_specs a1, b1, b2, c1, c2, d1, d2
+      install_specs c1, c2, b1, b2, d1, d2, a1
 
       a1.activate
 
@@ -90,6 +90,23 @@ class TestGem < Gem::TestCase
     assert_path_exists File.join(gemhome2, 'gems', 'a-1')
   end
 
+  def test_self_install_in_rescue
+    spec_fetcher do |f|
+      f.gem  'a', 1
+      f.spec 'a', 2
+    end
+
+    gemhome2 = "#{@gemhome}2"
+
+    installed =
+      begin
+        raise 'Error'
+      rescue StandardError
+        Gem.install 'a', '= 1', :install_dir => gemhome2
+      end
+    assert_equal %w[a-1], installed.map { |spec| spec.full_name }
+  end
+
   def test_require_missing
     save_loaded_features do
       assert_raises ::LoadError do
@@ -135,12 +152,12 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_bin_path_bin_name
-    util_exec_gem
+    install_specs util_exec_gem
     assert_equal @abin_path, Gem.bin_path('a', 'abin')
   end
 
   def test_self_bin_path_bin_name_version
-    util_exec_gem
+    install_specs util_exec_gem
     assert_equal @abin_path, Gem.bin_path('a', 'abin', '4')
   end
 
@@ -167,10 +184,11 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_bin_path_bin_file_gone_in_latest
-    util_exec_gem
-    util_spec 'a', '10' do |s|
+    install_specs util_exec_gem
+    spec = util_spec 'a', '10' do |s|
       s.executables = []
     end
+    install_specs spec
     # Should not find a-10's non-abin (bug)
     assert_equal @abin_path, Gem.bin_path('a', 'abin')
   end
@@ -881,9 +899,23 @@ class TestGem < Gem::TestCase
     assert_equal %w[http://gems.example.com/], Gem.sources
   end
 
+  def test_try_activate_returns_true_for_activated_specs
+    b = util_spec 'b', '1.0' do |spec|
+      spec.files << 'lib/b.rb'
+    end
+    install_specs b
+
+    assert Gem.try_activate('b'), 'try_activate should return true'
+    assert Gem.try_activate('b'), 'try_activate should still return true'
+  end
+
   def test_self_try_activate_missing_dep
+    b = util_spec 'b', '1.0'
     a = util_spec 'a', '1.0', 'b' => '>= 1.0'
 
+    install_specs b, a
+    uninstall_gem b
+
     a_file = File.join a.gem_dir, 'lib', 'a_file.rb'
 
     write_file a_file do |io|
@@ -898,12 +930,17 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_try_activate_missing_extensions
-    util_spec 'ext', '1' do |s|
+    spec = util_spec 'ext', '1' do |s|
       s.extensions = %w[ext/extconf.rb]
       s.mark_version
       s.installed_by_version = v('2.2')
     end
 
+    # write the spec without install to simulate a failed install
+    write_file spec.spec_file do |io|
+      io.write spec.to_ruby_for_cache
+    end
+
     _, err = capture_io do
       refute Gem.try_activate 'nonexistent'
     end
@@ -944,7 +981,7 @@ class TestGem < Gem::TestCase
     b = util_spec "b", "1", "c" => nil
     c = util_spec "c", "2"
 
-    install_specs a, b, c
+    install_specs a, c, b
 
     Gem.needs do |r|
       r.gem "a"
@@ -966,7 +1003,7 @@ class TestGem < Gem::TestCase
       d =  new_spec "d", "1", {'e' => '= 1'}, "lib/d.rb"
       e = util_spec "e", "1"
 
-      install_specs a, b, c, d, e
+      install_specs a, c, b, e, d
 
       Gem.needs do |r|
         r.gem "a"
@@ -1274,7 +1311,7 @@ class TestGem < Gem::TestCase
     ENV['GEM_PATH'] = path
     ENV['RUBYGEMS_GEMDEPS'] = "-"
 
-    out = `#{Gem.ruby.dup.untaint} -I #{LIB_PATH.untaint} -rubygems -e "p Gem.loaded_specs.values.map(&:full_name).sort"`
+    out = `#{Gem.ruby.dup.untaint} -I "#{LIB_PATH.untaint}" -rubygems -e "p Gem.loaded_specs.values.map(&:full_name).sort"`
 
     assert_equal '["a-1", "b-1", "c-1"]', out.strip
   end
@@ -1306,7 +1343,7 @@ class TestGem < Gem::TestCase
 
     Dir.mkdir "sub1"
     out = Dir.chdir "sub1" do
-      `#{Gem.ruby.dup.untaint} -I #{LIB_PATH.untaint} -rubygems -e "p Gem.loaded_specs.values.map(&:full_name).sort"`
+      `#{Gem.ruby.dup.untaint} -I "#{LIB_PATH.untaint}" -rubygems -e "p Gem.loaded_specs.values.map(&:full_name).sort"`
     end
 
     Dir.rmdir "sub1"
@@ -1372,16 +1409,21 @@ class TestGem < Gem::TestCase
   def test_use_gemdeps
     gem_deps_file = 'gem.deps.rb'.untaint
     spec = util_spec 'a', 1
+    install_specs spec
 
+    spec = Gem::Specification.find { |s| s == spec }
     refute spec.activated?
 
     open gem_deps_file, 'w' do |io|
       io.write 'gem "a"'
     end
 
+    assert_nil Gem.gemdeps
+
     Gem.use_gemdeps gem_deps_file
 
     assert spec.activated?
+    refute_nil Gem.gemdeps
   end
 
   def test_use_gemdeps_ENV
@@ -1430,6 +1472,8 @@ class TestGem < Gem::TestCase
     rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], '-'
 
     spec = util_spec 'a', 1
+    install_specs spec
+    spec = Gem::Specification.find { |s| s == spec }
 
     refute spec.activated?
 
@@ -1499,7 +1543,9 @@ You may need to `gem install -g` to install missing gems
     rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], 'x'
 
     spec = util_spec 'a', 1
+    install_specs spec
 
+    spec = Gem::Specification.find { |s| s == spec }
     refute spec.activated?
 
     open 'x', 'w' do |io|
@@ -1560,6 +1606,7 @@ You may need to `gem install -g` to install missing gems
 
     @exec_path = File.join spec.full_gem_path, spec.bindir, 'exec'
     @abin_path = File.join spec.full_gem_path, spec.bindir, 'abin'
+    spec
   end
 
   def util_remove_interrupt_command

data/test/rubygems/test_gem_available_set.rb

@@ -79,7 +79,8 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_remove_installed_bang
-    a1, _ = util_gem 'a', '1'
+    a1, _ = util_spec 'a', '1'
+    install_specs a1
 
     a1.activate
 

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/cleanup_command'
+require 'rubygems/installer'
 
 class TestGemCommandsCleanupCommand < Gem::TestCase
 
@@ -78,8 +79,8 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_execute_all_user
-    @a_1_1 = util_spec 'a', '1.1'
-    @a_1_1 = install_gem_user @a_1_1 # pick up user install path
+    @a_1_1, = util_gem 'a', '1.1'
+    @a_1_1 = install_gem @a_1_1 # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
 
@@ -97,8 +98,8 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   def test_execute_all_user_no_sudo
     FileUtils.chmod 0555, @gemhome
 
-    @a_1_1 = util_spec 'a', '1.1'
-    @a_1_1 = install_gem_user @a_1_1 # pick up user install path
+    @a_1_1, = util_gem 'a', '1.1'
+    @a_1_1 = install_gem @a_1_1, :user_install => true # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
 
@@ -132,9 +133,9 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
       s.add_dependency 'b', '1'
     end
 
-    install_gem @c
     install_gem @b_1
     install_gem @b_2
+    install_gem @c
 
     @cmd.options[:args] = []
 

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -28,6 +28,8 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
   end
 
   def test_execute_no_args
+    install_specs new_spec 'x', '2'
+
     spec_fetcher do |fetcher|
       fetcher.spec 'a', 1
       fetcher.spec 'a', '2.a'
@@ -51,6 +53,8 @@ Gem dep_x-1
 
 Gem pl-1-x86-linux
 
+Gem x-2
+
     EOF
 
     assert_equal expected, @ui.output
@@ -71,9 +75,11 @@ Gem pl-1-x86-linux
   end
 
   def test_execute_pipe_format
-    util_spec 'foo' do |gem|
+    spec = util_spec 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
     end
+    install_specs util_spec 'bar', 2
+    install_specs spec
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:pipe_format] = true
@@ -164,6 +170,8 @@ ERROR:  Only reverse dependencies for local gems are supported.
   end
 
   def test_execute_remote
+    install_specs new_spec 'bar', '2'
+
     spec_fetcher do |fetcher|
       fetcher.spec 'foo', 2, 'bar' => '> 1'
     end

data/test/rubygems/test_gem_commands_install_command.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/install_command'
+require 'rubygems/request_set'
 require 'rubygems/rdoc'
 
 class TestGemCommandsInstallCommand < Gem::TestCase
@@ -251,8 +252,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
     correctly_spelled = "nonexistent-with_hint"
 
     spec_fetcher do |fetcher|
-      fetcher.spec correctly_spelled, 2
-      fetcher.clear
+      fetcher.download correctly_spelled, 2
     end
 
     @cmd.options[:args] = [misspelled]
@@ -310,9 +310,8 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_prerelease_wins_over_previous_ver
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
-      fetcher.gem 'a', '2.a'
-      fetcher.clear
+      fetcher.download 'a', 1
+      fetcher.download 'a', '2.a'
     end
 
     @cmd.options[:prerelease] = true
@@ -535,9 +534,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_conservative
     spec_fetcher do |fetcher|
-      fetcher.gem 'b', 2
-
-      fetcher.clear
+      fetcher.download 'b', 2
 
       fetcher.gem 'a', 2
     end
@@ -665,8 +662,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_show_source_problems_even_on_success
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
     end
 
     Gem.sources << "http://nonexistent.example"
@@ -738,8 +734,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_installs_from_a_gemdeps_with_conservative
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
       fetcher.gem 'a', 1
     end
 
@@ -763,8 +758,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_installs_from_a_gemdeps
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
     end
 
     File.open @gemdeps, "w" do |f|
@@ -786,9 +780,8 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_installs_deps_a_gemdeps
     spec_fetcher do |fetcher|
-      fetcher.gem 'q', '1.0'
-      fetcher.gem 'r', '2.0', 'q' => nil
-      fetcher.clear
+      fetcher.download 'q', '1.0'
+      fetcher.download 'r', '2.0', 'q' => nil
     end
 
     File.open @gemdeps, "w" do |f|
@@ -813,9 +806,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_uses_deps_a_gemdeps
     spec_fetcher do |fetcher|
-      fetcher.gem 'r', '2.0', 'q' => nil
-
-      fetcher.clear
+      fetcher.download 'r', '2.0', 'q' => nil
 
       fetcher.spec 'q', '1.0'
     end
@@ -842,9 +833,8 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_installs_deps_a_gemdeps_into_a_path
     spec_fetcher do |fetcher|
-      fetcher.gem 'q', '1.0'
-      fetcher.gem 'r', '2.0', 'q' => nil
-      fetcher.clear
+      fetcher.download 'q', '1.0'
+      fetcher.download 'r', '2.0', 'q' => nil
     end
 
     File.open @gemdeps, "w" do |f|
@@ -873,12 +863,11 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_with_gemdeps_path_ignores_system
     specs = spec_fetcher do |fetcher|
-      fetcher.gem 'q', '1.0'
-      fetcher.gem 'r', '2.0', 'q' => nil
-      fetcher.clear
+      fetcher.download 'q', '1.0'
+      fetcher.download 'r', '2.0', 'q' => nil
     end
 
-    Gem::Specification.add_specs specs['q-1.0']
+    install_specs specs['q-1.0']
 
     File.open @gemdeps, "w" do |f|
       f << "gem 'r'"
@@ -910,7 +899,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       fetcher.gem 'r', '2.0', 'q' => nil
     end
 
-    i = Gem::Installer.new specs['q-1.0'].cache_file, :install_dir => "gf-path"
+    i = Gem::Installer.at specs['q-1.0'].cache_file, :install_dir => "gf-path"
     i.install
 
     assert File.file?("gf-path/specifications/q-1.0.gemspec"), "not installed"

data/test/rubygems/test_gem_commands_mirror.rb

@@ -2,23 +2,10 @@ require 'rubygems/test_case'
 require 'rubygems/commands/mirror_command'
 
 class TestGemCommandsMirrorCommand < Gem::TestCase
-
   def setup
     super
 
     @cmd = Gem::Commands::MirrorCommand.new
-
-    @mirror_specs = Gem::Specification.find_all_by_name('rubygems-mirror').each do |spec|
-      Gem::Specification.remove_spec spec
-    end
-  end
-
-  def teardown
-    @mirror_specs.each do |spec|
-      Gem::Specification.add_spec spec
-    end
-
-    super
   end
 
   def test_execute