rubygems-update 1.7.2 → 1.8.0

data/test/rubygems/test_gem_path_support.rb

@@ -0,0 +1,58 @@
+require 'rubygems/test_case'
+require 'rubygems'
+require 'fileutils'
+
+class TestGemPathSupport < Gem::TestCase
+  def setup
+    super
+
+    ENV["GEM_HOME"] = @tempdir
+    ENV["GEM_PATH"] = [@tempdir, "something"].join(File::PATH_SEPARATOR)
+  end
+
+  def test_initialize
+    ps = Gem::PathSupport.new
+
+    assert_equal ENV["GEM_HOME"], ps.home
+
+    expected = util_path
+    assert_equal expected, ps.path, "defaults to GEM_PATH"
+  end
+
+  def test_initialize_home
+    ps = Gem::PathSupport.new "GEM_HOME" => "#{@tempdir}/foo"
+
+    assert_equal File.join(@tempdir, "foo"), ps.home
+
+    expected = util_path + [File.join(@tempdir, 'foo')]
+    assert_equal expected, ps.path
+  end
+
+  def test_initialize_path
+    ps = Gem::PathSupport.new "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar]
+
+    assert_equal ENV["GEM_HOME"], ps.home
+
+    expected = [
+                File.join(@tempdir, 'foo'),
+                File.join(@tempdir, 'bar'),
+                ENV["GEM_HOME"],
+               ]
+
+    assert_equal expected, ps.path
+  end
+
+  def test_initialize_home_path
+    ps = Gem::PathSupport.new("GEM_HOME" => "#{@tempdir}/foo",
+                              "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar])
+
+    assert_equal File.join(@tempdir, "foo"), ps.home
+
+    expected = [File.join(@tempdir, 'foo'), File.join(@tempdir, 'bar')]
+    assert_equal expected, ps.path
+  end
+
+  def util_path
+    ENV["GEM_PATH"].split(File::PATH_SEPARATOR)
+  end
+end

data/test/rubygems/test_gem_platform.rb

@@ -138,7 +138,7 @@ class TestGemPlatform < Gem::TestCase
   def test_empty
     platform = Gem::Platform.new 'cpu-other_platform1'
     assert_respond_to platform, :empty?
-    assert_equal false, platform.empty?
+    assert_equal false, Deprecate.skip_during { platform.empty? }
   end
 
   def test_to_s
@@ -229,7 +229,7 @@ class TestGemPlatform < Gem::TestCase
     util_set_arch 'java'
     assert_match 'java',  Gem::Platform.local
     assert_match 'jruby', Gem::Platform.local
-      
+
     util_set_arch 'universal-dotnet2.0'
     assert_match 'universal-dotnet',     Gem::Platform.local
     assert_match 'universal-dotnet-2.0', Gem::Platform.local
@@ -237,13 +237,13 @@ class TestGemPlatform < Gem::TestCase
     assert_match 'dotnet',               Gem::Platform.local
     assert_match 'dotnet-2.0',           Gem::Platform.local
     refute_match 'dotnet-4.0',           Gem::Platform.local
-    
+
     util_set_arch 'universal-dotnet4.0'
     assert_match 'universal-dotnet',      Gem::Platform.local
-    refute_match 'universal-dotnet-2.0',  Gem::Platform.local  
+    refute_match 'universal-dotnet-2.0',  Gem::Platform.local
     assert_match 'universal-dotnet-4.0',  Gem::Platform.local
     assert_match 'dotnet',                Gem::Platform.local
-    refute_match 'dotnet-2.0',            Gem::Platform.local  
+    refute_match 'dotnet-2.0',            Gem::Platform.local
     assert_match 'dotnet-4.0',            Gem::Platform.local
 
     util_set_arch 'powerpc-darwin'

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -93,7 +93,7 @@ gems:
 
     # REFACTOR: copied from test_gem_dependency_installer.rb
     @gems_dir = File.join @tempdir, 'gems'
-    @cache_dir = Gem.cache_dir(@gemhome)
+    @cache_dir = File.join @gemhome, "cache"
     FileUtils.mkdir @gems_dir
 
     # TODO: why does the remote fetcher need it written to disk?
@@ -203,7 +203,7 @@ gems:
 
     fetcher = util_fuck_with_fetcher a1_data
 
-    a1_cache_gem = Gem.cache_gem(@a1.file_name, @gemhome)
+    a1_cache_gem = @a1.cache_file
     assert_equal a1_cache_gem, fetcher.download(@a1, 'http://gems.example.com')
     assert_equal("http://gems.example.com/gems/a-1.gem",
                  fetcher.instance_variable_get(:@test_arg).to_s)
@@ -215,8 +215,7 @@ gems:
 
     inst = Gem::RemoteFetcher.fetcher
 
-    assert_equal Gem.cache_gem(@a1.file_name, @gemhome),
-                 inst.download(@a1, 'http://gems.example.com')
+    assert_equal @a1.cache_file, inst.download(@a1, 'http://gems.example.com')
   end
 
   def test_download_local
@@ -228,8 +227,7 @@ gems:
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    assert_equal Gem.cache_gem(@a1.file_name, @gemhome),
-                 inst.download(@a1, local_path)
+    assert_equal @a1.cache_file, inst.download(@a1, local_path)
   end
 
   def test_download_local_space
@@ -243,21 +241,19 @@ gems:
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    assert_equal Gem.cache_gem(@a1.file_name, @gemhome),
-                 inst.download(@a1, local_path)
+    assert_equal @a1.cache_file, inst.download(@a1, local_path)
   end
 
   def test_download_install_dir
-    a1_data = nil
-    File.open @a1_gem, 'rb' do |fp|
-      a1_data = fp.read
+    a1_data = File.open @a1_gem, 'rb' do |fp|
+      fp.read
     end
 
     fetcher = util_fuck_with_fetcher a1_data
 
     install_dir = File.join @tempdir, 'more_gems'
 
-    a1_cache_gem = Gem.cache_gem(@a1.file_name, install_dir)
+    a1_cache_gem = File.join install_dir, "cache", @a1.file_name
     FileUtils.mkdir_p(File.dirname(a1_cache_gem))
     actual = fetcher.download(@a1, 'http://gems.example.com', install_dir)
 
@@ -273,7 +269,7 @@ gems:
       FileUtils.mv @a1_gem, @tempdir
       local_path = File.join @tempdir, @a1.file_name
       inst = nil
-      File.chmod 0555, Gem.cache_dir(@gemhome)
+      FileUtils.chmod 0555, @a1.cache_dir
 
       Dir.chdir @tempdir do
         inst = Gem::RemoteFetcher.fetcher
@@ -282,19 +278,20 @@ gems:
       assert_equal File.join(@tempdir, @a1.file_name),
         inst.download(@a1, local_path)
     ensure
-      File.chmod 0755, Gem.cache_dir(@gemhome)
+      FileUtils.chmod 0755, @a1.cache_dir
     end
 
     def test_download_read_only
-      File.chmod 0555, Gem.cache_dir(@gemhome)
-      File.chmod 0555, File.join(@gemhome)
+      FileUtils.chmod 0555, @a1.cache_dir
+      FileUtils.chmod 0555, @gemhome
 
       fetcher = util_fuck_with_fetcher File.read(@a1_gem)
       fetcher.download(@a1, 'http://gems.example.com')
-      assert File.exist?(Gem.cache_gem(@a1.file_name, Gem.user_dir))
+      a1_cache_gem = File.join Gem.user_dir, "cache", @a1.file_name
+      assert File.exist? a1_cache_gem
     ensure
-      File.chmod 0755, @gemhome
-      File.chmod 0755, Gem.cache_dir(@gemhome)
+      FileUtils.chmod 0755, @gemhome
+      FileUtils.chmod 0755, @a1.cache_dir
     end
   end
 
@@ -313,7 +310,7 @@ gems:
 
     fetcher = util_fuck_with_fetcher e1_data, :blow_chunks
 
-    e1_cache_gem = Gem.cache_gem(e1.file_name, @gemhome)
+    e1_cache_gem = e1.cache_file
 
     assert_equal e1_cache_gem, fetcher.download(e1, 'http://gems.example.com')
 
@@ -331,7 +328,7 @@ gems:
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    cache_path = Gem.cache_gem(@a1.file_name, @gemhome)
+    cache_path = @a1.cache_file
     FileUtils.mv local_path, cache_path
 
     gem = Gem::Format.from_file_by_path cache_path

data/test/rubygems/test_gem_server.rb

@@ -3,12 +3,10 @@ require 'rubygems/server'
 require 'stringio'
 
 class Gem::Server
-  attr_accessor :source_index
   attr_reader :server
 end
 
 class TestGemServer < Gem::TestCase
-
   def setup
     super
 
@@ -35,52 +33,64 @@ class TestGemServer < Gem::TestCase
     data = StringIO.new "GET /Marshal.#{Gem.marshal_version} HTTP/1.0\r\n\r\n"
     @req.parse data
 
-    @server.Marshal @req, @res
+    Deprecate.skip_during do
+      @server.Marshal @req, @res
+    end
 
     assert_equal 200, @res.status, @res.body
     assert_match %r| \d\d:\d\d:\d\d |, @res['date']
     assert_equal 'application/octet-stream', @res['content-type']
 
-    si = Gem::SourceIndex.new
-    si.add_specs @a1, @a2
+    Deprecate.skip_during do
+      si = Gem::SourceIndex.new
+      si.add_specs @a1, @a2
 
-    assert_equal si, Marshal.load(@res.body)
+      assert_equal si, Marshal.load(@res.body)
+    end
   end
 
   def test_Marshal_Z
     data = StringIO.new "GET /Marshal.#{Gem.marshal_version}.Z HTTP/1.0\r\n\r\n"
     @req.parse data
 
-    @server.Marshal @req, @res
+    Deprecate.skip_during do
+      @server.Marshal @req, @res
+    end
 
     assert_equal 200, @res.status, @res.body
     assert_match %r| \d\d:\d\d:\d\d |, @res['date']
     assert_equal 'application/x-deflate', @res['content-type']
 
-    si = Gem::SourceIndex.new
-    si.add_specs @a1, @a2
+    Deprecate.skip_during do
+      si = Gem::SourceIndex.new
+      si.add_specs @a1, @a2
 
-    assert_equal si, Marshal.load(Gem.inflate(@res.body))
+      assert_equal si, Marshal.load(Gem.inflate(@res.body))
+    end
   end
 
   def test_latest_specs
     data = StringIO.new "GET /latest_specs.#{Gem.marshal_version} HTTP/1.0\r\n\r\n"
     @req.parse data
 
-    @server.latest_specs @req, @res
+    Deprecate.skip_during do
+      @server.latest_specs @req, @res
+    end
 
     assert_equal 200, @res.status, @res.body
     assert_match %r| \d\d:\d\d:\d\d |, @res['date']
     assert_equal 'application/octet-stream', @res['content-type']
     assert_equal [['a', Gem::Version.new(2), Gem::Platform::RUBY]],
-                 Marshal.load(@res.body)
+    Marshal.load(@res.body)
   end
 
   def test_latest_specs_gz
     data = StringIO.new "GET /latest_specs.#{Gem.marshal_version}.gz HTTP/1.0\r\n\r\n"
     @req.parse data
 
-    @server.latest_specs @req, @res
+    Deprecate.skip_during do
+      @server.latest_specs @req, @res
+    end
 
     assert_equal 200, @res.status, @res.body
     assert_match %r| \d\d:\d\d:\d\d |, @res['date']
@@ -221,6 +231,4 @@ class TestGemServer < Gem::TestCase
 
     @server.instance_variable_set :@server, webrick
   end
-
 end
-

data/test/rubygems/test_gem_source_index.rb

@@ -4,209 +4,247 @@ require 'rubygems/config_file'
 require 'rubygems/deprecate'
 
 class TestGemSourceIndex < Gem::TestCase
-
   def setup
     super
 
     util_setup_fake_fetcher
+
+    @source_index = Deprecate.skip_during { Gem.source_index }
   end
 
   def test_find_name
-    assert_equal [@a1, @a2, @a3a], @source_index.find_name('a')
-    assert_equal [@a2], @source_index.find_name('a', '= 2')
-    assert_equal [], @source_index.find_name('bogusstring')
-    assert_equal [], @source_index.find_name('a', '= 3')
+    Deprecate.skip_during do
+      assert_equal [@a1, @a2, @a3a], @source_index.find_name('a')
+      assert_equal [@a2], @source_index.find_name('a', '= 2')
+      assert_equal [], @source_index.find_name('bogusstring')
+      assert_equal [], @source_index.find_name('a', '= 3')
 
-    source_index = Gem::SourceIndex.new
-    source_index.add_spec @a1
-    source_index.add_spec @a2
+      source_index = Gem::SourceIndex.new
+      source_index.add_spec @a1
+      source_index.add_spec @a2
 
-    assert_equal [@a1], source_index.find_name(@a1.name, '= 1')
+      assert_equal [@a1], source_index.find_name(@a1.name, '= 1')
 
-    r1 = Gem::Requirement.create '= 1'
-    assert_equal [@a1], source_index.find_name(@a1.name, r1)
+      r1 = Gem::Requirement.create '= 1'
+      assert_equal [@a1], source_index.find_name(@a1.name, r1)
+    end
   end
 
   def test_find_name_empty_cache
-    empty_source_index = Gem::SourceIndex.new
-    assert_equal [], empty_source_index.find_name("foo")
+    Deprecate.skip_during do
+      empty_source_index = Gem::SourceIndex.new
+      assert_equal [], empty_source_index.find_name("foo")
+    end
   end
 
+  # HACK: deprecated impl is failing tests, but I may want to port it over
   def test_latest_specs
-    p1_ruby = quick_spec 'p', '1'
-    p1_platform = quick_spec 'p', '1' do |spec|
-      spec.platform = Gem::Platform::CURRENT
+    Deprecate.skip_during do
+      p1_ruby = quick_spec 'p', '1'
+      p1_platform = quick_spec 'p', '1' do |spec|
+        spec.platform = Gem::Platform::CURRENT
+      end
+
+      a1_platform = quick_spec @a1.name, (@a1.version) do |s|
+        s.platform = Gem::Platform.new 'x86-my_platform1'
+      end
+
+      a2_platform = quick_spec @a2.name, (@a2.version) do |s|
+        s.platform = Gem::Platform.new 'x86-my_platform1'
+      end
+
+      a2_platform_other = quick_spec @a2.name, (@a2.version) do |s|
+        s.platform = Gem::Platform.new 'x86-other_platform1'
+      end
+
+      a3_platform_other = quick_spec @a2.name, (@a2.version.bump) do |s|
+        s.platform = Gem::Platform.new 'x86-other_platform1'
+      end
+
+      @source_index.add_spec p1_ruby
+      @source_index.add_spec p1_platform
+      @source_index.add_spec a1_platform
+      @source_index.add_spec a2_platform
+      @source_index.add_spec a2_platform_other
+      @source_index.add_spec a3_platform_other
+
+      expected = [
+                  @a2.full_name,
+                  a2_platform.full_name,
+                  a3_platform_other.full_name,
+                  @b2.full_name,
+                  @c1_2.full_name,
+                  @a_evil9.full_name,
+                  p1_ruby.full_name,
+                  p1_platform.full_name,
+                  @pl1.full_name
+                 ].sort
+
+      latest_specs = @source_index.latest_specs.map { |s| s.full_name }.sort
+
+      assert_equal expected, latest_specs
     end
-
-    a1_platform = quick_spec @a1.name, (@a1.version) do |s|
-      s.platform = Gem::Platform.new 'x86-my_platform1'
-    end
-
-    a2_platform = quick_spec @a2.name, (@a2.version) do |s|
-      s.platform = Gem::Platform.new 'x86-my_platform1'
-    end
-
-    a2_platform_other = quick_spec @a2.name, (@a2.version) do |s|
-      s.platform = Gem::Platform.new 'x86-other_platform1'
-    end
-
-    a3_platform_other = quick_spec @a2.name, (@a2.version.bump) do |s|
-      s.platform = Gem::Platform.new 'x86-other_platform1'
-    end
-
-    @source_index.add_spec p1_ruby
-    @source_index.add_spec p1_platform
-    @source_index.add_spec a1_platform
-    @source_index.add_spec a2_platform
-    @source_index.add_spec a2_platform_other
-    @source_index.add_spec a3_platform_other
-
-    expected = [
-      @a2.full_name,
-      a2_platform.full_name,
-      a3_platform_other.full_name,
-      @c1_2.full_name,
-      @a_evil9.full_name,
-      p1_ruby.full_name,
-      p1_platform.full_name,
-    ].sort
-
-    latest_specs = @source_index.latest_specs.map { |s| s.full_name }.sort
-
-    assert_equal expected, latest_specs
   end
 
   def test_load_gems_in
-    spec_dir1 = File.join @gemhome, 'specifications'
-    spec_dir2 = File.join @tempdir, 'gemhome2', 'specifications'
+    Deprecate.skip_during do
+      spec_dir1 = File.join @gemhome, 'specifications'
+      spec_dir2 = File.join @tempdir, 'gemhome2', 'specifications'
 
-    FileUtils.rm_r spec_dir1
+      FileUtils.rm_r spec_dir1
 
-    FileUtils.mkdir_p spec_dir1
-    FileUtils.mkdir_p spec_dir2
+      FileUtils.mkdir_p spec_dir1
+      FileUtils.mkdir_p spec_dir2
 
-    a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
-    a2 = quick_spec 'a', '1' do |spec| spec.author = 'author 2' end
+      a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
+      a2 = quick_spec 'a', '1' do |spec| spec.author = 'author 2' end
 
-    File.open File.join(spec_dir1, a1.spec_name), 'w' do |fp|
-      fp.write a1.to_ruby
-    end
+      path1 = File.join(spec_dir1, a1.spec_name)
+      path2 = File.join(spec_dir2, a2.spec_name)
 
-    File.open File.join(spec_dir2, a2.spec_name), 'w' do |fp|
-      fp.write a2.to_ruby
-    end
+      File.open path1, 'w' do |fp|
+        fp.write a1.to_ruby
+      end
 
-    @source_index.load_gems_in spec_dir1, spec_dir2
+      File.open path2, 'w' do |fp|
+        fp.write a2.to_ruby
+      end
 
-    assert_equal a1.author, @source_index.specification(a1.full_name).author
+      @source_index.load_gems_in File.dirname(path1), File.dirname(path2)
+
+      assert_equal a1.author, @source_index.specification(a1.full_name).author
+    end
   end
 
+  # REFACTOR: move to test_gem_commands_outdated_command.rb
   def test_outdated
-    util_setup_spec_fetcher
+    Deprecate.skip_during do
+      util_setup_spec_fetcher
 
-    assert_equal [], @source_index.outdated
+      assert_equal [], @source_index.outdated
 
-    updated = quick_spec @a2.name, (@a2.version.bump)
-    util_setup_spec_fetcher updated
+      updated = quick_spec @a2.name, (@a2.version.bump)
+      util_setup_spec_fetcher updated
 
-    assert_equal [updated.name], @source_index.outdated
+      assert_equal [updated.name], @source_index.outdated
 
-    updated_platform = quick_spec @a2.name, (updated.version.bump) do |s|
-      s.platform = Gem::Platform.new 'x86-other_platform1'
-    end
+      updated_platform = quick_spec @a2.name, (updated.version.bump) do |s|
+        s.platform = Gem::Platform.new 'x86-other_platform1'
+      end
 
-    util_setup_spec_fetcher updated, updated_platform
+      util_setup_spec_fetcher updated, updated_platform
 
-    assert_equal [updated_platform.name], @source_index.outdated
+      assert_equal [updated_platform.name], @source_index.outdated
+    end
   end
 
   def test_prerelease_specs_kept_in_right_place
-    gem_a1_alpha = quick_spec 'abba', '1.a'
-    @source_index.add_spec gem_a1_alpha
-
-    refute @source_index.latest_specs.include?(gem_a1_alpha)
-    assert @source_index.latest_specs(true).include?(gem_a1_alpha)
-    assert @source_index.find_name(gem_a1_alpha.full_name).empty?
-    assert @source_index.prerelease_specs.include?(gem_a1_alpha)
+    Deprecate.skip_during do
+      gem_a1_alpha = quick_spec 'abba', '1.a'
+      @source_index.add_spec gem_a1_alpha
+
+      refute_includes @source_index.latest_specs,       gem_a1_alpha
+      assert_includes @source_index.latest_specs(true), gem_a1_alpha
+      assert_empty    @source_index.find_name           gem_a1_alpha.full_name
+      assert_includes @source_index.prerelease_specs,   gem_a1_alpha
+    end
   end
 
   def test_refresh_bang
-    a1_spec = File.join @gemhome, "specifications", @a1.spec_name
+    Deprecate.skip_during do
+      a1_spec = File.join @gemhome, "specifications", @a1.spec_name
 
-    FileUtils.mv a1_spec, @tempdir
+      FileUtils.mv a1_spec, @tempdir
 
-    source_index = Gem.source_index
+      Gem::Specification.reset
+      Gem.send :class_variable_set, :@@source_index, nil
+      source_index = Gem.source_index
 
-    refute source_index.gems.include?(@a1.full_name)
+      refute_includes source_index.gems.keys.sort, @a1.full_name
 
-    FileUtils.mv File.join(@tempdir, @a1.spec_name), a1_spec
+      FileUtils.mv File.join(@tempdir, @a1.spec_name), a1_spec
 
-    source_index.refresh!
+      source_index.refresh!
 
-    assert source_index.gems.include?(@a1.full_name)
+      assert source_index.gems.include?(@a1.full_name)
+    end
   end
 
   def test_remove_spec
-    deleted = @source_index.remove_spec 'a-1'
+    Deprecate.skip_during do
+      si = Gem.source_index
 
-    assert_equal %w[a-2 a-3.a a_evil-9 c-1.2],
-                 @source_index.gems.values.map { |s| s.full_name }.sort
+      expected = si.gems.keys.sort
 
-    deleted = @source_index.remove_spec 'a-3.a'
+      expected.delete "a-1"
+      @source_index.remove_spec 'a-1'
 
-    assert_equal %w[a-2 a_evil-9 c-1.2],
-                 @source_index.gems.values.map { |s| s.full_name }.sort
+      assert_equal expected, si.gems.keys.sort
+
+      expected.delete "a-3.a"
+      @source_index.remove_spec 'a-3.a'
+
+      assert_equal expected, si.gems.keys.sort
+    end
   end
 
   def test_search
-    requirement = Gem::Requirement.create '= 9'
-    with_version = Gem::Dependency.new(/^a/, requirement)
-    assert_equal [@a_evil9], @source_index.search(with_version)
+    Deprecate.skip_during do
+      requirement = Gem::Requirement.create '= 9'
+      with_version = Gem::Dependency.new(/^a/, requirement)
+      assert_equal [@a_evil9], @source_index.search(with_version)
 
-    with_default = Gem::Dependency.new(/^a/, Gem::Requirement.default)
-    assert_equal [@a1, @a2, @a3a, @a_evil9], @source_index.search(with_default)
+      with_default = Gem::Dependency.new(/^a/, Gem::Requirement.default)
+      assert_equal [@a1, @a2, @a3a, @a_evil9], @source_index.search(with_default)
 
-    c1_1_dep = Gem::Dependency.new 'c', '~> 1.1'
-    assert_equal [@c1_2], @source_index.search(c1_1_dep)
+      c1_1_dep = Gem::Dependency.new 'c', '~> 1.1'
+      assert_equal [@c1_2], @source_index.search(c1_1_dep)
+    end
   end
 
   def test_search_platform
-    util_set_arch 'x86-my_platform1'
+    Deprecate.skip_during do
+      util_set_arch 'x86-my_platform1'
 
-    a1 = quick_spec 'a', '1'
-    a1_mine = quick_spec 'a', '1' do |s|
-      s.platform = Gem::Platform.new 'x86-my_platform1'
-    end
-    a1_other = quick_spec 'a', '1' do |s|
-      s.platform = Gem::Platform.new 'x86-other_platform1'
-    end
+      a1 = quick_spec 'a', '1'
+      a1_mine = quick_spec 'a', '1' do |s|
+        s.platform = Gem::Platform.new 'x86-my_platform1'
+      end
+      a1_other = quick_spec 'a', '1' do |s|
+        s.platform = Gem::Platform.new 'x86-other_platform1'
+      end
 
-    si = Gem::SourceIndex.new
-    si.add_specs a1, a1_mine, a1_other
+      si = Gem::SourceIndex.new
+      si.add_specs a1, a1_mine, a1_other
 
-    dep = Gem::Dependency.new 'a', Gem::Requirement.new('1')
+      dep = Gem::Dependency.new 'a', Gem::Requirement.new('1')
 
-    gems = si.search dep, true
+      gems = si.search dep, true
 
-    assert_equal [a1, a1_mine], gems.sort
+      assert_equal [a1, a1_mine], gems.sort
+    end
   end
 
   def test_signature
-    sig = @source_index.gem_signature('foo-1.2.3')
-    assert_equal 64, sig.length
-    assert_match(/^[a-f0-9]{64}$/, sig)
+    Deprecate.skip_during do
+      sig = @source_index.gem_signature('foo-1.2.3')
+      assert_equal 64, sig.length
+      assert_match(/^[a-f0-9]{64}$/, sig)
+    end
   end
 
   def test_specification
-    assert_equal @a1, @source_index.specification(@a1.full_name)
+    Deprecate.skip_during do
+      assert_equal @a1, @source_index.specification(@a1.full_name)
 
-    assert_nil @source_index.specification("foo-1.2.4")
+      assert_nil @source_index.specification("foo-1.2.4")
+    end
   end
 
   def test_index_signature
-    sig = @source_index.index_signature
-    assert_match(/^[a-f0-9]{64}$/, sig)
+    Deprecate.skip_during do
+      sig = @source_index.index_signature
+      assert_match(/^[a-f0-9]{64}$/, sig)
+    end
   end
-
 end
-