rubygems-update 1.7.2 → 1.8.0

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -19,12 +19,12 @@ class TestGemCommandsStaleCommand < Gem::TestCase
     end
 
     files.each do |file|
-      filename = bar_baz.full_gem_path + "/#{file}"
-      FileUtils.mkdir_p(File.dirname(filename))
+      filename = File.join(bar_baz.full_gem_path, file)
+      FileUtils.mkdir_p File.dirname filename
       FileUtils.touch(filename, :mtime => Time.now)
 
-      filename = foo_bar.full_gem_path + "/#{file}"
-      FileUtils.mkdir_p(File.dirname(filename))
+      filename = File.join(foo_bar.full_gem_path, file)
+      FileUtils.mkdir_p File.dirname filename
       FileUtils.touch(filename, :mtime => Time.now - 86400)
     end
 

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -15,38 +15,38 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
     util_make_gems
 
     assert_equal(
-      @cmd.find_in_cache(@a1.file_name), 
-      Gem.cache_gem(@a1.file_name, @gemhome),
+      @cmd.find_in_cache(File.basename @a1.cache_file),
+      @a1.cache_file,
       'found a-1.gem in the cache'
     )
   end
 
   def test_get_path
-    util_make_gems
     util_setup_fake_fetcher
+    util_clear_gems
     util_setup_spec_fetcher @a1
-    
+
     a1_data = nil
 
-    open Gem.cache_gem(@a1.file_name, @gemhome), 'rb' do |fp|
+    open @a1.cache_file, 'rb' do |fp|
       a1_data = fp.read
     end
 
     Gem::RemoteFetcher.fetcher.data['http://gems.example.com/gems/a-1.gem'] =
       a1_data
-    
+
     dep = Gem::Dependency.new(@a1.name, @a1.version)
     assert_equal(
-      @cmd.get_path(dep), 
-      Gem.cache_gem(@a1.file_name, @gemhome), 
+      @cmd.get_path(dep),
+      @a1.cache_file,
       'fetches a-1 and returns the cache path'
     )
 
-    FileUtils.rm Gem.cache_gem(@a1.file_name, @gemhome)
+    FileUtils.rm @a1.cache_file
 
     assert_equal(
-      @cmd.get_path(dep), 
-      Gem.cache_gem(@a1.file_name, @gemhome), 
+      @cmd.get_path(dep),
+      @a1.cache_file,
       'when removed from cache, refetches a-1'
     )
   end
@@ -67,16 +67,14 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_gem_path
-    util_make_gems
-    util_setup_spec_fetcher
     util_setup_fake_fetcher
+    util_setup_spec_fetcher
 
     Gem.clear_paths
 
     gemhome2 = File.join @tempdir, 'gemhome2'
 
-    Gem.send :set_paths, [gemhome2, @gemhome].join(File::PATH_SEPARATOR)
-    Gem.send :set_home, gemhome2
+    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
 
     @cmd.options[:args] = %w[a]
 
@@ -90,15 +88,14 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_gem_path_missing
-    util_make_gems
+    util_setup_fake_fetcher
     util_setup_spec_fetcher
 
     Gem.clear_paths
 
     gemhome2 = File.join @tempdir, 'gemhome2'
 
-    Gem.send :set_paths, [gemhome2, @gemhome].join(File::PATH_SEPARATOR)
-    Gem.send :set_home, gemhome2
+    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
 
     @cmd.options[:args] = %w[z]
 
@@ -117,7 +114,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
     util_clear_gems
 
     a2_data = nil
-    open Gem.cache_gem(@a2.file_name, @gemhome), 'rb' do |fp|
+    open @a2.cache_file, 'rb' do |fp|
       a2_data = fp.read
     end
 
@@ -153,9 +150,11 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_sudo
+    skip 'Cannot perform this test on windows (chmod)' if win_platform?
+
     util_make_gems
 
-    File.chmod 0555, @gemhome
+    FileUtils.chmod 0555, @gemhome
 
     @cmd.options[:args] = %w[b]
 
@@ -167,7 +166,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     assert File.exist?(File.join(@tempdir, 'b-2')), 'b should be unpacked'
   ensure
-    File.chmod 0755, @gemhome
+    FileUtils.chmod 0755, @gemhome
   end
 
   def test_execute_with_target_option

data/test/rubygems/test_gem_commands_update_command.rb

@@ -18,15 +18,15 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.options[:generate_ri]   = false
 
     util_setup_fake_fetcher
-
-    @a1_path = Gem.cache_gem(@a1.file_name, @gemhome)
-    @a2_path = Gem.cache_gem(@a2.file_name, @gemhome)
-
+    util_clear_gems
     util_setup_spec_fetcher @a1, @a2
 
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
+    @a1_path = @a1.cache_file
+    @a2_path = @a2.cache_file
+
+    @fetcher.data["#{@gem_repo}gems/#{File.basename @a1_path}"] =
       read_binary @a1_path
-    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+    @fetcher.data["#{@gem_repo}gems/#{File.basename @a2_path}"] =
       read_binary @a2_path
   end
 
@@ -75,18 +75,19 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def util_add_to_fetcher *specs
     specs.each do |spec|
-      gem_file = Gem.cache_gem(spec.file_name, @gemhome)
+      gem_file = spec.cache_file
+      file_name = File.basename gem_file
 
-      @fetcher.data["http://gems.example.com/gems/#{spec.file_name}"] =
+      @fetcher.data["http://gems.example.com/gems/#{file_name}"] =
         Gem.read_binary gem_file
     end
   end
 
   def test_execute_system
+    util_clear_gems
     util_setup_rubygem9
     util_setup_spec_fetcher @rubygem9
     util_add_to_fetcher @rubygem9
-    util_clear_gems
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
@@ -107,10 +108,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_system_at_latest
+    util_clear_gems
     util_setup_rubygem_current
     util_setup_spec_fetcher @rubygem_current
     util_add_to_fetcher @rubygem_current
-    util_clear_gems
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
@@ -129,11 +130,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   end
 
   def test_execute_system_multiple
+    util_clear_gems
     util_setup_rubygem9
     util_setup_rubygem8
     util_setup_spec_fetcher @rubygem8, @rubygem9
     util_add_to_fetcher @rubygem8, @rubygem9
-    util_clear_gems
 
     @cmd.options[:args]          = []
     @cmd.options[:system]        = true
@@ -237,16 +238,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @a2.add_dependency 'c', '2'
     @a2.add_dependency 'b', '2'
 
-    @b2_path   = Gem.cache_gem(@b2.file_name, @gemhome)
-    @c1_2_path = Gem.cache_gem(@c1_2.file_name, @gemhome)
-    @c2_path   = Gem.cache_gem(@c2.file_name, @gemhome)
+    @b2_path   = @b2.cache_file
+    @c1_2_path = @c1_2.cache_file
+    @c2_path   = @c2.cache_file
 
-    @source_index = Gem::SourceIndex.new
-    @source_index.add_spec @a1
-    @source_index.add_spec @a2
-    @source_index.add_spec @b2
-    @source_index.add_spec @c1_2
-    @source_index.add_spec @c2
+    install_specs @a1, @a2, @b2, @c1_2, @c2
 
     util_build_gem @a1
     util_build_gem @a2
@@ -255,16 +251,16 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] = read_binary @a1_path
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] = read_binary @a2_path
     @fetcher.data["#{@gem_repo}gems/#{@b2.file_name}"] = read_binary @b2_path
-    @fetcher.data["#{@gem_repo}gems/#{@c1_2.file_name}"] =
-      read_binary @c1_2_path
+    @fetcher.data["#{@gem_repo}gems/#{@c1_2.file_name}"] = read_binary @c1_2_path
     @fetcher.data["#{@gem_repo}gems/#{@c2.file_name}"] = read_binary @c2_path
 
     util_setup_spec_fetcher @a1, @a2, @b2, @c1_2, @c2
-    util_clear_gems
 
     Gem::Installer.new(@c1_2_path).install
     Gem::Installer.new(@a1_path).install
 
+    Gem::Specification.reset
+
     @cmd.options[:args] = []
 
     use_ui @ui do

data/test/rubygems/test_gem_commands_which_command.rb

@@ -5,6 +5,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
 
   def setup
     super
+    Gem::Specification.reset
     @cmd = Gem::Commands::WhichCommand.new
   end
 
@@ -22,6 +23,8 @@ class TestGemCommandsWhichCommand < Gem::TestCase
   end
 
   def test_execute_one_missing
+    # TODO: this test fails in isolation
+
     util_foo_bar
 
     @cmd.handle_options %w[foo_bar missing]
@@ -31,7 +34,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
-    assert_match %r%Can't find ruby library file or shared library missing\n%,
+    assert_match %r%Can.t find ruby library file or shared library missing\n%,
                  @ui.error
   end
 
@@ -45,7 +48,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_match %r%Can't find ruby library file or shared library missing\n%,
+    assert_match %r%Can.t find ruby library file or shared library missing\n%,
                  @ui.error
   end
 
@@ -56,8 +59,8 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     files.each do |file|
-      filename = @foo_bar.full_gem_path + "/#{file}"
-      FileUtils.mkdir_p File.dirname(filename)
+      filename = File.join(@foo_bar.full_gem_path, file)
+      FileUtils.mkdir_p File.dirname filename
       FileUtils.touch filename
     end
   end

data/test/rubygems/test_gem_dependency.rb

@@ -61,16 +61,20 @@ class TestGemDependency < Gem::TestCase
     assert_match d,                  d,             "match self"
     assert_match dep("a", ">= 0"),   d,             "match version exact"
     assert_match dep("a", ">= 0"),   dep("a", "1"), "match version"
-    assert_match dep(/a/, ">= 0"),   d,             "match simple regexp"
-    assert_match dep(/a|b/, ">= 0"), d,             "match scary regexp"
-
-    refute_match dep(/a/), dep("b")
     refute_match dep("a"), Object.new
+
+    Deprecate.skip_during do
+      assert_match dep(/a/, ">= 0"),   d,             "match simple regexp"
+      assert_match dep(/a|b/, ">= 0"), d,             "match scary regexp"
+      refute_match dep(/a/), dep("b")
+    end
   end
 
   def test_equals_tilde_escape
     refute_match dep("a|b"), dep("a", "1")
-    assert_match dep(/a|b/), dep("a", "1")
+    Deprecate.skip_during do
+      assert_match dep(/a|b/), dep("a", "1")
+    end
   end
 
   def test_equals_tilde_object
@@ -84,9 +88,11 @@ class TestGemDependency < Gem::TestCase
   def test_equals_tilde_spec
     assert_match dep("a", ">= 0"),   spec("a", "0")
     assert_match dep("a", "1"),      spec("a", "1")
-    assert_match dep(/a/, ">= 0"),   spec("a", "0")
-    assert_match dep(/a|b/, ">= 0"), spec("b", "0")
-    refute_match dep(/a/, ">= 0"),   spec("b", "0")
+    Deprecate.skip_during do
+      assert_match dep(/a/, ">= 0"),   spec("a", "0")
+      assert_match dep(/a|b/, ">= 0"), spec("b", "0")
+      refute_match dep(/a/, ">= 0"),   spec("b", "0")
+    end
   end
 
   def test_hash

data/test/rubygems/test_gem_dependency_installer.rb

@@ -8,10 +8,14 @@ class TestGemDependencyInstaller < Gem::TestCase
     super
 
     @gems_dir  = File.join @tempdir, 'gems'
-    @cache_dir = Gem.cache_dir(@gemhome)
+    @cache_dir = File.join @gemhome, 'cache'
 
     FileUtils.mkdir @gems_dir
 
+    Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
+  end
+
+  def util_setup_gems
     @a1, @a1_gem         = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
     @a1_pre, @a1_pre_gem = util_gem 'a', '1.a'
     @b1, @b1_gem         = util_gem 'b', '1' do |s|
@@ -19,12 +23,13 @@ class TestGemDependencyInstaller < Gem::TestCase
       s.add_development_dependency 'aa'
     end
 
-    Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
-
+    util_clear_gems
     util_reset_gems
   end
 
   def test_install
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     inst = nil
 
@@ -33,15 +38,13 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a'
     end
 
-    si = Gem::SourceIndex.new
-    si.add_spec @a1
-
-    assert_equal Gem.source_index, si
-
+    assert_equal %w[a-1], Gem::Specification.map(&:full_name)
     assert_equal [@a1], inst.installed_gems
   end
 
   def test_install_all_dependencies
+    util_setup_gems
+
     _, e1_gem = util_gem 'e', '1' do |s|
       s.add_dependency 'b'
     end
@@ -67,6 +70,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_cache_dir
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
@@ -78,15 +83,18 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
 
-    assert Gem.cache_gem(@a1.file_name, @gemhome)
-    assert Gem.cache_gem(@b1.file_name, @gemhome)
+    assert File.exist? File.join(@gemhome, "cache", @a1.file_name)
+    assert File.exist? File.join(@gemhome, "cache", @b1.file_name)
   end
 
   def test_install_dependencies_satisfied
+    util_setup_gems
+
     a2, a2_gem = util_gem 'a', '2'
 
     FileUtils.rm_rf File.join(@gemhome, 'gems')
-    Gem.source_index.refresh!
+
+    Gem::Specification.reset
 
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv a2_gem, @tempdir # not in index
@@ -105,14 +113,13 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    installed = Gem.source_index.map { |n,s| s.full_name }
-
-    assert_equal %w[a-2 b-1], installed.sort
-
+    assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
   end
 
   def test_install_dependency
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
@@ -126,6 +133,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_dependency_development
+    util_setup_gems
+
     @aa1, @aa1_gem = util_gem 'aa', '1'
 
     util_reset_gems
@@ -144,6 +153,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_dependency_existing
+    util_setup_gems
+
     Gem::Installer.new(@a1_gem).install
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
@@ -176,6 +187,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_local
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     inst = nil
 
@@ -188,6 +201,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_local_dependency
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
 
@@ -202,6 +217,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_local_dependency_installed
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
 
@@ -218,6 +235,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_local_subdir
+    util_setup_gems
+
     inst = nil
 
     Dir.chdir @tempdir do
@@ -229,6 +248,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_env_shebang
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     inst = nil
 
@@ -244,6 +265,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_force
+    util_setup_gems
+
     FileUtils.mv @b1_gem, @tempdir
     si = util_setup_spec_fetcher @b1
     @fetcher.data['http://gems.example.com/gems/yaml'] = si.to_yaml
@@ -258,6 +281,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_ignore_dependencies
+    util_setup_gems
+
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
 
@@ -270,6 +295,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_install_dir
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     gemhome2 = File.join @tempdir, 'gemhome2'
     Dir.mkdir gemhome2
@@ -283,10 +310,12 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
 
     assert File.exist?(File.join(gemhome2, 'specifications', @a1.spec_name))
-    assert File.exist?(Gem.cache_gem(@a1.file_name, gemhome2))
+    assert File.exist?(File.join(gemhome2, 'cache', @a1.file_name))
   end
 
   def test_install_domain_both
+    util_setup_gems
+
     a1_data = nil
     File.open @a1_gem, 'rb' do |fp|
       a1_data = fp.read
@@ -305,14 +334,13 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
     a1, b1 = inst.installed_gems
 
-    a1_expected = File.join(@gemhome, 'specifications', a1.spec_name)
-    b1_expected = File.join(@gemhome, 'specifications', b1.spec_name)
-
-    assert_equal a1_expected, a1.loaded_from
-    assert_equal b1_expected, b1.loaded_from
+    assert_equal a1.spec_file, a1.loaded_from
+    assert_equal b1.spec_file, b1.loaded_from
   end
 
   def test_install_domain_both_no_network
+    util_setup_gems
+
     @fetcher.data["http://gems.example.com/gems/Marshal.#{@marshal_version}"] =
       proc do
         raise Gem::RemoteFetcher::FetchError
@@ -331,12 +359,11 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_domain_local
+    util_setup_gems
+
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
 
-    Gem.source_index.remove_spec @a1.full_name
-    Gem.source_index.remove_spec @a1_pre.full_name
-
     Dir.chdir @tempdir do
       e = assert_raises Gem::DependencyError do
         inst = Gem::DependencyInstaller.new :domain => :local
@@ -351,6 +378,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_domain_remote
+    util_setup_gems
+
     a1_data = nil
     File.open @a1_gem, 'rb' do |fp|
       a1_data = fp.read
@@ -365,6 +394,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_dual_repository
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
@@ -389,6 +420,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_reinstall
+    util_setup_gems
+
     Gem::Installer.new(@a1_gem).install
     FileUtils.mv @a1_gem, @tempdir
     inst = nil
@@ -398,15 +431,13 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a'
     end
 
-    si = Gem::SourceIndex.new
-    si.add_spec @a1
-
-    assert_equal Gem.source_index, si
-
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], Gem::Specification.map(&:full_name)
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_remote
+    util_setup_gems
+
     a1_data = nil
     File.open @a1_gem, 'rb' do |fp|
       a1_data = fp.read
@@ -424,6 +455,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_remote_dep
+    util_setup_gems
+
     a1_data = nil
     File.open @a1_gem, 'rb' do |fp|
       a1_data = fp.read
@@ -442,6 +475,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_remote_platform_newer
+    util_setup_gems
+
     a2_o, a2_o_gem = util_gem 'a', '2' do |s|
       s.platform = Gem::Platform.new %w[cpu other_platform 1]
     end
@@ -471,6 +506,8 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   if defined? OpenSSL then
     def test_install_security_policy
+      util_setup_gems
+
       data = File.open(@a1_gem, 'rb') { |f| f.read }
       @fetcher.data['http://gems.example.com/gems/a-1.gem'] = data
 
@@ -493,6 +530,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   # Wrappers don't work on mswin
   unless win_platform? then
     def test_install_no_wrappers
+      util_setup_gems
+
       @fetcher.data['http://gems.example.com/gems/a-1.gem'] = read_binary(@a1_gem)
 
       inst = Gem::DependencyInstaller.new :wrappers => false
@@ -535,14 +574,19 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_find_gems_gems_with_sources
+    util_setup_gems
+
     inst = Gem::DependencyInstaller.new
     dep = Gem::Dependency.new 'b', '>= 0'
 
-    assert_equal [[@b1, @gem_repo]],
-                 inst.find_gems_with_sources(dep)
+    Gem::Specification.reset
+
+    assert_equal [[@b1, @gem_repo]], inst.find_gems_with_sources(dep)
   end
 
   def test_find_gems_with_sources_local
+    util_setup_gems
+
     FileUtils.mv @a1_gem, @tempdir
     inst = Gem::DependencyInstaller.new
     dep = Gem::Dependency.new 'a', '>= 0'
@@ -564,6 +608,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_find_gems_with_sources_prerelease
+    util_setup_gems
+
     installer = Gem::DependencyInstaller.new
 
     dependency = Gem::Dependency.new('a', Gem::Requirement.default)
@@ -584,8 +630,8 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   def assert_resolve expected, *specs
     util_clear_gems
-
     util_setup_spec_fetcher(*specs)
+    Gem::Specification.reset
 
     inst = Gem::DependencyInstaller.new
     inst.find_spec_by_name_and_version specs.first.name
@@ -599,6 +645,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_clear_gems
 
     util_setup_spec_fetcher(*specs)
+    Gem::Specification.reset
 
     spec = specs.first
 
@@ -611,6 +658,9 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_gather_dependencies
+    util_setup_gems
+    util_reset_gems
+
     inst = Gem::DependencyInstaller.new
     inst.find_spec_by_name_and_version 'b'
     inst.gather_dependencies
@@ -723,6 +773,7 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_gather_dependencies_prerelease
+    util_setup_gems
     util_setup_c1_pre
 
     assert_resolve_pre %w[a-1.a b-1 c-1.a], @c1_pre, @a1_pre, @b1
@@ -780,6 +831,9 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def util_reset_gems
+    @a1     ||= nil
+    @b1     ||= nil
+    @a1_pre ||= nil
     @c1_pre ||= nil
     @d1     ||= nil
     @d2     ||= nil