rubygems-update 2.4.5 → 2.4.6

data/lib/rubygems/security/signer.rb

@@ -122,7 +122,7 @@ class Gem::Security::Signer
   #   ~/.gem/gem-public_cert.pem.expired.%Y%m%d%H%M%S
   #
   # If the signing certificate can be re-signed the expired certificate will
-  # be saved as ~/.gem/gem-pubilc_cert.pem.expired.%Y%m%d%H%M%S where the
+  # be saved as ~/.gem/gem-public_cert.pem.expired.%Y%m%d%H%M%S where the
   # expiry time (not after) is used for the timestamp.
 
   def re_sign_key # :nodoc:

data/lib/rubygems/specification.rb

@@ -1028,8 +1028,8 @@ class Gem::Specification < Gem::BasicSpecification
     file = file.dup.untaint
     return unless File.file?(file)
 
-    spec = LOAD_CACHE[file]
-    return spec if spec
+    _spec = LOAD_CACHE[file]
+    return _spec if _spec
 
     code = if defined? Encoding
              File.read file, :mode => 'r:UTF-8:-'
@@ -1040,15 +1040,15 @@ class Gem::Specification < Gem::BasicSpecification
     code.untaint
 
     begin
-      spec = eval code, binding, file
+      _spec = eval code, binding, file
 
-      if Gem::Specification === spec
-        spec.loaded_from = File.expand_path file.to_s
-        LOAD_CACHE[file] = spec
-        return spec
+      if Gem::Specification === _spec
+        _spec.loaded_from = File.expand_path file.to_s
+        LOAD_CACHE[file] = _spec
+        return _spec
       end
 
-      warn "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
+      warn "[#{file}] isn't a Gem::Specification (#{_spec.class} instead)."
     rescue SignalException, SystemExit
       raise
     rescue SyntaxError, Exception => e
@@ -1350,7 +1350,7 @@ class Gem::Specification < Gem::BasicSpecification
                    end
 
     unless dependency.respond_to?(:name) &&
-           dependency.respond_to?(:version_requirements)
+           dependency.respond_to?(:requirement)
       dependency = Gem::Dependency.new(dependency.to_s, requirements, type)
     end
 
@@ -1932,7 +1932,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Singular accessor for #licenses
 
   def license
-    val = licenses and val.first
+    licenses.first
   end
 
   ##
@@ -2456,8 +2456,8 @@ class Gem::Specification < Gem::BasicSpecification
     extend Gem::UserInteraction
     normalize
 
-    nil_attributes = self.class.non_nil_attributes.find_all do |name|
-      instance_variable_get("@#{name}").nil?
+    nil_attributes = self.class.non_nil_attributes.find_all do |attrname|
+      instance_variable_get("@#{attrname}").nil?
     end
 
     unless nil_attributes.empty? then

data/lib/rubygems/test_case.rb

@@ -1426,5 +1426,22 @@ Also, a list:
 
 end
 
-require 'rubygems/test_utilities'
+# require dependencies that are not discoverable once GEM_HOME and GEM_PATH
+# are wiped
+begin
+  gem 'rake'
+rescue Gem::LoadError
+end
+
+require 'rake/packagetask'
 
+begin
+  gem 'rdoc'
+  require 'rdoc'
+rescue LoadError, Gem::LoadError
+end
+
+require 'rubygems/test_utilities'
+ENV['GEM_HOME'] = Dir.mktmpdir "home"
+ENV['GEM_PATH'] = Dir.mktmpdir "path"
+Gem.clear_paths

data/lib/rubygems/user_interaction.rb

@@ -396,10 +396,6 @@ class Gem::StreamUI
   # Return a progress reporter object chosen from the current verbosity.
 
   def progress_reporter(*args)
-    if self.kind_of?(Gem::SilentUI)
-      return SilentProgressReporter.new(@outs, *args)
-    end
-
     case Gem.configuration.verbose
     when nil, false
       SilentProgressReporter.new(@outs, *args)
@@ -533,10 +529,6 @@ class Gem::StreamUI
   # Return a download reporter object chosen from the current verbosity
 
   def download_reporter(*args)
-    if self.kind_of?(Gem::SilentUI)
-      return SilentDownloadReporter.new(@outs, *args)
-    end
-
     case Gem.configuration.verbose
     when nil, false
       SilentDownloadReporter.new(@outs, *args)

data/test/rubygems/test_gem.rb

@@ -1145,7 +1145,7 @@ class TestGem < Gem::TestCase
     ]
 
     tests.each do |_name, _paths, expected|
-      Gem.paths = { 'GEM_HOME' => _paths.first, 'GEM_PATH' => _paths }
+      Gem.use_paths _paths.first, _paths
       Gem::Specification.reset
       Gem.searcher = nil
 
@@ -1192,10 +1192,7 @@ class TestGem < Gem::TestCase
     install_gem m, :install_dir => Gem.dir
     install_gem m, :install_dir => Gem.user_dir
 
-    Gem.paths = {
-      'GEM_HOME' => Gem.dir,
-      'GEM_PATH' => [ Gem.dir, Gem.user_dir]
-    }
+    Gem.use_paths Gem.dir, [ Gem.dir, Gem.user_dir]
 
     assert_equal \
       File.join(Gem.dir, "gems", "m-1"),

data/test/rubygems/test_gem_commands_open_command.rb

@@ -15,18 +15,24 @@ class TestGemCommandsOpenCommand < Gem::TestCase
     end
     write_file File.join(*%W[gems #{spec.full_name} lib #{name}.rb])
     write_file File.join(*%W[gems #{spec.full_name} Rakefile])
+    spec
   end
 
   def test_execute
     @cmd.options[:args] = %w[foo]
     @cmd.options[:editor] = "#{Gem.ruby} -e0 --"
 
-    gem 'foo'
+    spec = gem 'foo'
+    mock = MiniTest::Mock.new
+    mock.expect(:call, true, [spec.full_gem_path])
 
-    use_ui @ui do
-      @cmd.execute
+    Dir.stub(:chdir, mock) do
+      use_ui @ui do
+        @cmd.execute
+      end
     end
 
+    assert mock.verify
     assert_equal "", @ui.error
   end
 

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -231,7 +231,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     Gem.clear_paths
     gemhome2 = File.join @tempdir, 'gemhome2'
-    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+    Gem.use_paths gemhome2, [gemhome2, @gemhome]
 
     b = util_spec 'b'
     install_gem b
@@ -301,7 +301,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     Gem.clear_paths
     gemhome2 = File.join(@tempdir, 'gemhome2')
-    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+    Gem.use_paths gemhome2, [gemhome2, @gemhome]
 
     install_gem specs["b-1"]
     FileUtils.rm File.join(gemhome2, 'cache', 'b-1.gem')

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -66,7 +66,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     gemhome2 = File.join @tempdir, 'gemhome2'
 
-    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+    Gem.use_paths gemhome2, [gemhome2, @gemhome]
 
     @cmd.options[:args] = %w[a]
 
@@ -86,7 +86,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     gemhome2 = File.join @tempdir, 'gemhome2'
 
-    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+    Gem.use_paths gemhome2, [gemhome2, @gemhome]
 
     @cmd.options[:args] = %w[z]
 

data/test/rubygems/test_gem_dependency_installer.rb

@@ -14,6 +14,14 @@ class TestGemDependencyInstaller < Gem::TestCase
     FileUtils.mkdir @gems_dir
 
     Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
+
+    @original_platforms = Gem.platforms
+    Gem.platforms = []
+  end
+
+  def teardown
+    Gem.platforms = @original_platforms
+    super
   end
 
   def util_setup_gems
@@ -272,7 +280,7 @@ class TestGemDependencyInstaller < Gem::TestCase
   # This asserts that if a gem's dependency is satisfied by an
   # already installed gem, RubyGems doesn't installed a newer
   # version
-  def test_install_doesnt_upgrade_installed_depedencies
+  def test_install_doesnt_upgrade_installed_dependencies
     util_setup_gems
 
     a2, a2_gem = util_gem 'a', '2'
@@ -1084,6 +1092,24 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal [@a1_pre, @a1], prereleases
   end
 
+  def test_find_gems_with_sources_with_best_only_and_platform
+    util_setup_gems
+    a1_x86_mingw32, = util_gem 'a', '1' do |s|
+      s.platform = 'x86-mingw32'
+    end
+    util_setup_spec_fetcher @a1, a1_x86_mingw32
+    Gem.platforms << Gem::Platform.new('x86-mingw32')
+
+    installer = Gem::DependencyInstaller.new
+
+    dependency = Gem::Dependency.new('a', Gem::Requirement.default)
+
+    releases =
+      installer.find_gems_with_sources(dependency, true).all_specs
+
+    assert_equal [a1_x86_mingw32], releases
+  end
+
   def test_find_gems_with_sources_with_bad_source
     Gem.sources.replace ["http://not-there.nothing"]
 

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -20,7 +20,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
   def test_self_build
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
       cmakelists.write <<-eo_cmake
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 install (FILES test.txt DESTINATION bin)
       eo_cmake
     end

data/test/rubygems/test_gem_installer.rb

@@ -319,7 +319,7 @@ gem 'other', version
 
     options = {
       :bin_dir => bin_dir,
-      :install_dir => "/non/existant"
+      :install_dir => "/non/existent"
     }
 
     inst = Gem::Installer.new '', options

data/test/rubygems/test_gem_package.rb

@@ -298,7 +298,7 @@ class TestGemPackage < Gem::Package::TarTestCase
     assert_equal %w[lib/code.rb], reader.contents
   end
 
-  def test_build_signed_encryped_key
+  def test_build_signed_encrypted_key
     skip 'openssl is missing' unless defined?(OpenSSL::SSL)
 
     spec = Gem::Specification.new 'build', '1'

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -50,6 +50,25 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
       Gem.instance_variables.include? :@ruby_version
   end
 
+  def test_gempspec_with_multiple_runtime_deps
+    gda = Class.new(@GDA) do
+      # implement find_gemspec so we don't need one on the FS
+      def find_gemspec name, path
+        Gem::Specification.new do |s|
+          s.name = 'foo'
+          s.version = '1.0'
+          s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4'
+        end
+      end
+    end
+    instance = gda.new @set, __FILE__
+    instance.gemspec
+    assert_equal %w{ foo bar }.sort, @set.dependencies.map(&:name).sort
+    bar = @set.dependencies.find { |d| d.name == 'bar' }
+    assert_equal [[">=", Gem::Version.create('1.6.0')],
+                  ["<", Gem::Version.create('1.6.4')]], bar.requirement.requirements
+  end
+
   def test_gemspec_without_group
     @gda.send :add_dependencies, [:development], [dep('a', '= 1')]
 
@@ -69,7 +88,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal %w[a], @gda.requires['a']
 
-    expected = { 'a' => nil }
+    expected = { 'a' => Gem::Requirement.default }
 
     assert_equal expected, @gda.dependencies
   end
@@ -93,7 +112,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal %w[git/a master], @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -106,7 +125,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[https://example@bitbucket.org/example/repository.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -119,7 +138,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[https://example@bitbucket.org/example/example.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -174,7 +193,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[git://github.com/example/repository.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -187,7 +206,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[git://github.com/example/example.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -205,7 +224,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_empty @set.dependencies
 
-    expected = { 'a' => nil }
+    expected = { 'a' => Gem::Requirement.default }
 
     assert_equal expected, @gda.dependencies
   end
@@ -227,7 +246,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal "#{name}-#{version}", loaded.full_name
 
-    expected = { name => '!' }
+    expected = { name => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -386,7 +405,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep('a', '~> 1.0')], @set.dependencies
 
-    expected = { 'a' => ['~> 1.0'] }
+    expected = { 'a' => Gem::Requirement.create(['~> 1.0']) }
 
     assert_equal expected, @gda.dependencies
   end
@@ -396,7 +415,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep('b', '~> 1.0', '>= 1.0.2')], @set.dependencies
 
-    expected = { 'b' => ['~> 1.0', '>= 1.0.2'] }
+    expected = { 'b' => Gem::Requirement.create(['~> 1.0', '>= 1.0.2']) }
 
     assert_equal expected, @gda.dependencies
   end
@@ -466,7 +485,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[a], @gda.requires['a']
 
     expected = {
-      'a' => '!',
+      'a' => Gem::Requirement.create('!'),
       'b' => req('= 2'),
       'c' => req('= 3'),
     }

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -21,13 +21,10 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     @gem_deps_file = 'gem.deps.rb'
 
-    @lockfile = Gem::RequestSet::Lockfile.new @set, @gem_deps_file
   end
 
-  def write_gem_deps gem_deps
-    open @gem_deps_file, 'w' do |io|
-      io.write gem_deps
-    end
+  def lockfile
+    Gem::RequestSet::Lockfile.build @set, @gem_deps_file
   end
 
   def write_lockfile lockfile
@@ -47,11 +44,10 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     @set.gem 'a'
     @set.resolve
-    @lockfile.instance_variable_set :@requests, @set.sorted_requests
 
     out = []
 
-    @lockfile.add_DEPENDENCIES out
+    lockfile.add_DEPENDENCIES out
 
     expected = [
       'DEPENDENCIES',
@@ -69,13 +65,12 @@ class TestGemRequestSetLockfile < Gem::TestCase
       end
     end
 
-    dependencies = { 'a' => '~> 2.0' }
+    dependencies = { 'a' => Gem::Requirement.new('~> 2.0') }
 
     @set.gem 'a'
     @set.resolve
     @lockfile =
       Gem::RequestSet::Lockfile.new @set, @gem_deps_file, dependencies
-    @lockfile.instance_variable_set :@requests, @set.sorted_requests
 
     out = []
 
@@ -105,17 +100,10 @@ class TestGemRequestSetLockfile < Gem::TestCase
     @set.gem 'a'
     @set.gem 'bundler'
     @set.resolve
-    @lockfile.instance_variable_set :@requests, @set.sorted_requests
-
-    spec_groups = @set.sorted_requests.group_by do |request|
-      request.spec.class
-    end
-    @lockfile.instance_variable_set :@spec_groups, spec_groups
-
 
     out = []
 
-    @lockfile.add_GEM out
+    lockfile.add_GEM out, lockfile.spec_groups
 
     expected = [
       'GEM',
@@ -143,11 +131,10 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     @set.gem 'a'
     @set.resolve
-    @lockfile.instance_variable_set :@requests, @set.sorted_requests
 
     out = []
 
-    @lockfile.add_PLATFORMS out
+    lockfile.add_PLATFORMS out
 
     expected = [
       'PLATFORMS',
@@ -159,798 +146,16 @@ class TestGemRequestSetLockfile < Gem::TestCase
     assert_equal expected, out
   end
 
-  def test_get
-    @lockfile.instance_variable_set :@tokens, [:token]
-
-    assert_equal :token, @lockfile.get
-  end
-
-  def test_get_type_mismatch
-    @lockfile.instance_variable_set :@tokens, [[:section, 'x', 5, 1]]
-
-    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
-      @lockfile.get :text
-    end
-
-    expected =
-      'unexpected token [:section, "x"], expected :text (at line 1 column 5)'
-
-    assert_equal expected, e.message
-
-    assert_equal 1, e.line
-    assert_equal 5, e.column
-    assert_equal File.expand_path("#{@gem_deps_file}.lock"), e.path
-  end
-
-  def test_get_type_multiple
-    @lockfile.instance_variable_set :@tokens, [[:section, 'x', 5, 1]]
-
-    assert @lockfile.get [:text, :section]
-  end
-
-  def test_get_type_value_mismatch
-    @lockfile.instance_variable_set :@tokens, [[:section, 'x', 5, 1]]
-
-    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
-      @lockfile.get :section, 'y'
-    end
-
-    expected =
-      'unexpected token [:section, "x"], expected [:section, "y"] (at line 1 column 5)'
-
-    assert_equal expected, e.message
-
-    assert_equal 1, e.line
-    assert_equal 5, e.column
-    assert_equal File.expand_path("#{@gem_deps_file}.lock"), e.path
-  end
-
-  def test_parse
-    write_lockfile <<-LOCKFILE.strip
-GEM
-  remote: #{@gem_repo}
-  specs:
-    a (2)
-
-PLATFORMS
-  #{Gem::Platform::RUBY}
-
-DEPENDENCIES
-  a
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a')], @set.dependencies
-
-    assert_equal [Gem::Platform::RUBY], @lockfile.platforms
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    assert lockfile_set, 'could not find a LockSet'
-
-    assert_equal %w[a-2], lockfile_set.specs.map { |tuple| tuple.full_name }
-  end
-
-  def test_parse_dependencies
-    write_lockfile <<-LOCKFILE
-GEM
-  remote: #{@gem_repo}
-  specs:
-    a (2)
-
-PLATFORMS
-  #{Gem::Platform::RUBY}
-
-DEPENDENCIES
-  a (>= 1, <= 2)
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '>= 1', '<= 2')], @set.dependencies
-
-    assert_equal [Gem::Platform::RUBY], @lockfile.platforms
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    assert lockfile_set, 'could not find a LockSet'
-
-    assert_equal %w[a-2], lockfile_set.specs.map { |tuple| tuple.full_name }
-  end
-
-  def test_parse_DEPENDENCIES_git
-    write_lockfile <<-LOCKFILE
-GIT
-  remote: git://git.example/josevalim/rails-footnotes.git
-  revision: 3a6ac1971e91d822f057650cc5916ebfcbd6ee37
-  specs:
-    rails-footnotes (3.7.9)
-      rails (>= 3.0.0)
-
-GIT
-  remote: git://git.example/svenfuchs/i18n-active_record.git
-  revision: 55507cf59f8f2173d38e07e18df0e90d25b1f0f6
-  specs:
-    i18n-active_record (0.0.2)
-      i18n (>= 0.5.0)
-
-GEM
-  remote: http://gems.example/
-  specs:
-    i18n (0.6.9)
-    rails (4.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  i18n-active_record!
-  rails-footnotes!
-    LOCKFILE
-
-    @lockfile.parse
-
-    expected = [
-      dep('i18n-active_record', '= 0.0.2'),
-      dep('rails-footnotes',    '= 3.7.9'),
-    ]
-
-    assert_equal expected, @set.dependencies
-  end
-
-  def test_parse_DEPENDENCIES_git_version
-    write_lockfile <<-LOCKFILE
-GIT
-  remote: git://github.com/progrium/ruby-jwt.git
-  revision: 8d74770c6cd92ea234b428b5d0c1f18306a4f41c
-  specs:
-    jwt (1.1)
-
-GEM
-  remote: http://gems.example/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jwt (= 1.1)!
-    LOCKFILE
-
-    @lockfile.parse
-
-    expected = [
-      dep('jwt', '= 1.1'),
-    ]
-
-    assert_equal expected, @set.dependencies
-  end
-
-  def test_parse_GEM
-    write_lockfile <<-LOCKFILE
-GEM
-  specs:
-    a (2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  a
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '>= 0')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    assert lockfile_set, 'found a LockSet'
-
-    assert_equal %w[a-2], lockfile_set.specs.map { |s| s.full_name }
-  end
-
-  def test_parse_GEM_remote_multiple
-    write_lockfile <<-LOCKFILE
-GEM
-  remote: https://gems.example/
-  remote: https://other.example/
-  specs:
-    a (2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  a
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '>= 0')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    assert lockfile_set, 'found a LockSet'
-
-    assert_equal %w[a-2 a-2], lockfile_set.specs.map { |s| s.full_name }
-
-    assert_equal %w[https://gems.example/ https://other.example/],
-                 lockfile_set.specs.map { |s| s.source.uri.to_s }
-  end
-
-  def test_parse_GIT
-    @set.instance_variable_set :@install_dir, 'install_dir'
-
-    write_lockfile <<-LOCKFILE
-GIT
-  remote: git://example/a.git
-  revision: master
-  specs:
-    a (2)
-      b (>= 3)
-      c
-
-DEPENDENCIES
-  a!
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '= 2')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    refute lockfile_set, 'fount a LockSet'
-
-    git_set = @set.sets.find do |set|
-      Gem::Resolver::GitSet === set
-    end
-
-    assert git_set, 'could not find a GitSet'
-
-    assert_equal %w[a-2], git_set.specs.values.map { |s| s.full_name }
-
-    assert_equal [dep('b', '>= 3'), dep('c')],
-                 git_set.specs.values.first.dependencies
-
-    expected = {
-      'a' => %w[git://example/a.git master],
-    }
-
-    assert_equal expected, git_set.repositories
-    assert_equal 'install_dir', git_set.root_dir
-  end
-
-  def test_parse_GIT_branch
-    write_lockfile <<-LOCKFILE
-GIT
-  remote: git://example/a.git
-  revision: 1234abc
-  branch: 0-9-12-stable
-  specs:
-    a (2)
-      b (>= 3)
-
-DEPENDENCIES
-  a!
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '= 2')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    refute lockfile_set, 'fount a LockSet'
-
-    git_set = @set.sets.find do |set|
-      Gem::Resolver::GitSet === set
-    end
-
-    assert git_set, 'could not find a GitSet'
-
-    expected = {
-      'a' => %w[git://example/a.git 1234abc],
-    }
-
-    assert_equal expected, git_set.repositories
-  end
-
-  def test_parse_GIT_ref
-    write_lockfile <<-LOCKFILE
-GIT
-  remote: git://example/a.git
-  revision: 1234abc
-  ref: 1234abc
-  specs:
-    a (2)
-      b (>= 3)
-
-DEPENDENCIES
-  a!
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '= 2')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    refute lockfile_set, 'fount a LockSet'
-
-    git_set = @set.sets.find do |set|
-      Gem::Resolver::GitSet === set
-    end
-
-    assert git_set, 'could not find a GitSet'
-
-    expected = {
-      'a' => %w[git://example/a.git 1234abc],
-    }
-
-    assert_equal expected, git_set.repositories
-  end
-
-  def test_parse_GIT_tag
-    write_lockfile <<-LOCKFILE
-GIT
-  remote: git://example/a.git
-  revision: 1234abc
-  tag: v0.9.12
-  specs:
-    a (2)
-      b (>= 3)
-
-DEPENDENCIES
-  a!
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '= 2')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    refute lockfile_set, 'fount a LockSet'
-
-    git_set = @set.sets.find do |set|
-      Gem::Resolver::GitSet === set
-    end
-
-    assert git_set, 'could not find a GitSet'
-
-    expected = {
-      'a' => %w[git://example/a.git 1234abc],
-    }
-
-    assert_equal expected, git_set.repositories
-  end
-
-  def test_parse_PATH
-    _, _, directory = vendor_gem
-
-    write_lockfile <<-LOCKFILE
-PATH
-  remote: #{directory}
-  specs:
-    a (1)
-      b (2)
-
-DEPENDENCIES
-  a!
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a', '= 1')], @set.dependencies
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    refute lockfile_set, 'found a LockSet'
-
-    vendor_set = @set.sets.find do |set|
-      Gem::Resolver::VendorSet === set
-    end
-
-    assert vendor_set, 'could not find a VendorSet'
-
-    assert_equal %w[a-1], vendor_set.specs.values.map { |s| s.full_name }
-
-    spec = vendor_set.load_spec 'a', nil, nil, nil
-
-    assert_equal [dep('b', '= 2')], spec.dependencies
-  end
-
-  def test_parse_dependency
-    write_lockfile ' 1)'
-
-    @lockfile.tokenize
-
-    parsed = @lockfile.parse_dependency 'a', '='
-
-    assert_equal dep('a', '= 1'), parsed
-
-    write_lockfile ')'
-
-    @lockfile.tokenize
-
-    parsed = @lockfile.parse_dependency 'a', '2'
-
-    assert_equal dep('a', '= 2'), parsed
-  end
-
-  def test_parse_gem_specs_dependency
-    write_lockfile <<-LOCKFILE
-GEM
-  remote: #{@gem_repo}
-  specs:
-    a (2)
-      b (= 3)
-      c (~> 4)
-      d
-      e (~> 5.0, >= 5.0.1)
-    b (3-x86_64-linux)
-
-PLATFORMS
-  #{Gem::Platform::RUBY}
-
-DEPENDENCIES
-  a
-    LOCKFILE
-
-    @lockfile.parse
-
-    assert_equal [dep('a')], @set.dependencies
-
-    assert_equal [Gem::Platform::RUBY], @lockfile.platforms
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    assert lockfile_set, 'could not find a LockSet'
-
-    assert_equal %w[a-2 b-3], lockfile_set.specs.map { |tuple| tuple.full_name }
-
-    expected = [
-      Gem::Platform::RUBY,
-      Gem::Platform.new('x86_64-linux'),
-    ]
-
-    assert_equal expected, lockfile_set.specs.map { |tuple| tuple.platform }
-
-    spec = lockfile_set.specs.first
-
-    expected = [
-      dep('b', '= 3'),
-      dep('c', '~> 4'),
-      dep('d'),
-      dep('e', '~> 5.0', '>= 5.0.1'),
-    ]
-
-    assert_equal expected, spec.dependencies
-  end
-
-  def test_parse_missing
-    @lockfile.parse
-
-    lockfile_set = @set.sets.find do |set|
-      Gem::Resolver::LockSet === set
-    end
-
-    refute lockfile_set
-  end
-
-  def test_peek
-    @lockfile.instance_variable_set :@tokens, [:token]
-
-    assert_equal :token, @lockfile.peek
-
-    assert_equal :token, @lockfile.get
-
-    assert_equal [:EOF], @lockfile.peek
-  end
-
   def test_relative_path_from
-    path = @lockfile.relative_path_from '/foo', '/foo/bar'
+    path = lockfile.relative_path_from '/foo', '/foo/bar'
 
     assert_equal File.expand_path('/foo'), path
 
-    path = @lockfile.relative_path_from '/foo', '/foo'
+    path = lockfile.relative_path_from '/foo', '/foo'
 
     assert_equal '.', path
   end
 
-  def test_skip
-    tokens = [[:token]]
-
-    @lockfile.instance_variable_set :@tokens, tokens
-
-    @lockfile.skip :token
-
-    assert_empty tokens
-  end
-
-  def test_token_pos
-    assert_equal [5, 0], @lockfile.token_pos(5)
-
-    @lockfile.instance_variable_set :@line_pos, 2
-    @lockfile.instance_variable_set :@line, 1
-
-    assert_equal [3, 1], @lockfile.token_pos(5)
-  end
-
-  def test_tokenize
-    write_lockfile <<-LOCKFILE
-GEM
-  remote: #{@gem_repo}
-  specs:
-    a (2)
-      b (= 2)
-      c (!= 3)
-      d (> 4)
-      e (< 5)
-      f (>= 6)
-      g (<= 7)
-      h (~> 8)
-
-PLATFORMS
-  #{Gem::Platform::RUBY}
-
-DEPENDENCIES
-  a
-    LOCKFILE
-
-    expected = [
-      [:section,     'GEM',                0,  0],
-      [:newline,     nil,                  3,  0],
-
-      [:entry,       'remote',             2,  1],
-      [:text,        @gem_repo,           10,  1],
-      [:newline,     nil,                 34,  1],
-
-      [:entry,       'specs',              2,  2],
-      [:newline,     nil,                  8,  2],
-
-      [:text,        'a',                  4,  3],
-      [:l_paren,     nil,                  6,  3],
-      [:text,        '2',                  7,  3],
-      [:r_paren,     nil,                  8,  3],
-      [:newline,     nil,                  9,  3],
-
-      [:text,        'b',                  6,  4],
-      [:l_paren,     nil,                  8,  4],
-      [:requirement, '=',                  9,  4],
-      [:text,        '2',                 11,  4],
-      [:r_paren,     nil,                 12,  4],
-      [:newline,     nil,                 13,  4],
-
-      [:text,        'c',                  6,  5],
-      [:l_paren,     nil,                  8,  5],
-      [:requirement, '!=',                 9,  5],
-      [:text,        '3',                 12,  5],
-      [:r_paren,     nil,                 13,  5],
-      [:newline,     nil,                 14,  5],
-
-      [:text,        'd',                  6,  6],
-      [:l_paren,     nil,                  8,  6],
-      [:requirement, '>',                  9,  6],
-      [:text,        '4',                 11,  6],
-      [:r_paren,     nil,                 12,  6],
-      [:newline,     nil,                 13,  6],
-
-      [:text,        'e',                  6,  7],
-      [:l_paren,     nil,                  8,  7],
-      [:requirement, '<',                  9,  7],
-      [:text,        '5',                 11,  7],
-      [:r_paren,     nil,                 12,  7],
-      [:newline,     nil,                 13,  7],
-
-      [:text,        'f',                  6,  8],
-      [:l_paren,     nil,                  8,  8],
-      [:requirement, '>=',                 9,  8],
-      [:text,        '6',                 12,  8],
-      [:r_paren,     nil,                 13,  8],
-      [:newline,     nil,                 14,  8],
-
-      [:text,        'g',                  6,  9],
-      [:l_paren,     nil,                  8,  9],
-      [:requirement, '<=',                 9,  9],
-      [:text,        '7',                 12,  9],
-      [:r_paren,     nil,                 13,  9],
-      [:newline,     nil,                 14,  9],
-
-      [:text,        'h',                  6, 10],
-      [:l_paren,     nil,                  8, 10],
-      [:requirement, '~>',                 9, 10],
-      [:text,        '8',                 12, 10],
-      [:r_paren,     nil,                 13, 10],
-      [:newline,     nil,                 14, 10],
-
-      [:newline,     nil,                  0, 11],
-
-      [:section,     'PLATFORMS',          0, 12],
-      [:newline,     nil,                  9, 12],
-
-      [:text,        Gem::Platform::RUBY,  2, 13],
-      [:newline,     nil,                  6, 13],
-
-      [:newline,     nil,                  0, 14],
-
-      [:section,     'DEPENDENCIES',       0, 15],
-      [:newline,     nil,                 12, 15],
-
-      [:text,        'a',                  2, 16],
-      [:newline,     nil,                  3, 16],
-    ]
-
-    assert_equal expected, @lockfile.tokenize
-  end
-
-  def test_tokenize_capitals
-    write_lockfile <<-LOCKFILE
-GEM
-  remote: #{@gem_repo}
-  specs:
-    Ab (2)
-
-PLATFORMS
-  #{Gem::Platform::RUBY}
-
-DEPENDENCIES
-  Ab
-    LOCKFILE
-
-    expected = [
-      [:section, 'GEM',                0, 0],
-      [:newline, nil,                  3, 0],
-      [:entry,   'remote',             2, 1],
-      [:text,    @gem_repo,           10, 1],
-      [:newline, nil,                 34, 1],
-      [:entry,   'specs',              2, 2],
-      [:newline, nil,                  8, 2],
-      [:text,    'Ab',                 4, 3],
-      [:l_paren, nil,                  7, 3],
-      [:text,    '2',                  8, 3],
-      [:r_paren, nil,                  9, 3],
-      [:newline, nil,                 10, 3],
-      [:newline, nil,                  0, 4],
-      [:section, 'PLATFORMS',          0, 5],
-      [:newline, nil,                  9, 5],
-      [:text,    Gem::Platform::RUBY,  2, 6],
-      [:newline, nil,                  6, 6],
-      [:newline, nil,                  0, 7],
-      [:section, 'DEPENDENCIES',       0, 8],
-      [:newline, nil,                 12, 8],
-      [:text,    'Ab',                 2, 9],
-      [:newline, nil,                  4, 9],
-    ]
-
-    assert_equal expected, @lockfile.tokenize
-  end
-
-  def test_tokenize_conflict_markers
-    write_lockfile '<<<<<<<'
-
-    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
-      @lockfile.tokenize
-    end
-
-    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
-                 e.message
-
-    write_lockfile '|||||||'
-
-    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
-      @lockfile.tokenize
-    end
-
-    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
-                 e.message
-
-    write_lockfile '======='
-
-    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
-      @lockfile.tokenize
-    end
-
-    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
-                 e.message
-
-    write_lockfile '>>>>>>>'
-
-    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
-      @lockfile.tokenize
-    end
-
-    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
-                 e.message
-  end
-
-  def test_tokenize_git
-    write_lockfile <<-LOCKFILE
-DEPENDENCIES
-  a!
-    LOCKFILE
-
-    expected = [
-      [:section, 'DEPENDENCIES',  0,  0],
-      [:newline, nil,            12,  0],
-
-      [:text,    'a',             2,  1],
-      [:bang,    nil,             3,  1],
-      [:newline, nil,             4,  1],
-    ]
-
-    assert_equal expected, @lockfile.tokenize
-  end
-
-  def test_tokenize_missing
-    tokens = @lockfile.tokenize
-
-    assert_empty tokens
-  end
-
-  def test_tokenize_multiple
-    write_lockfile <<-LOCKFILE
-GEM
-  remote: #{@gem_repo}
-  specs:
-    a (2)
-      b (~> 3.0, >= 3.0.1)
-    LOCKFILE
-
-    expected = [
-      [:section,     'GEM',      0,  0],
-      [:newline,     nil,        3,  0],
-
-      [:entry,       'remote',   2,  1],
-      [:text,        @gem_repo, 10,  1],
-      [:newline,     nil,       34,  1],
-
-      [:entry,       'specs',    2,  2],
-      [:newline,     nil,        8,  2],
-
-      [:text,        'a',        4,  3],
-      [:l_paren,     nil,        6,  3],
-      [:text,        '2',        7,  3],
-      [:r_paren,     nil,        8,  3],
-      [:newline,     nil,        9,  3],
-
-      [:text,        'b',        6,  4],
-      [:l_paren,     nil,        8,  4],
-      [:requirement, '~>',       9,  4],
-      [:text,        '3.0',     12,  4],
-      [:comma,       nil,       15,  4],
-      [:requirement, '>=',      17,  4],
-      [:text,        '3.0.1',   20,  4],
-      [:r_paren,     nil,       25,  4],
-      [:newline,     nil,       26,  4],
-    ]
-
-    assert_equal expected, @lockfile.tokenize
-  end
-
   def test_to_s_gem
     spec_fetcher do |fetcher|
       fetcher.spec 'a', 2
@@ -971,7 +176,7 @@ DEPENDENCIES
   a
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_dependency
@@ -1002,7 +207,7 @@ DEPENDENCIES
   c
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_dependency_non_default
@@ -1030,7 +235,7 @@ DEPENDENCIES
   b
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_dependency_requirement
@@ -1057,7 +262,7 @@ DEPENDENCIES
   b
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_path
@@ -1080,7 +285,7 @@ DEPENDENCIES
   a!
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_path_absolute
@@ -1103,7 +308,7 @@ DEPENDENCIES
   a!
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_platform
@@ -1128,7 +333,7 @@ DEPENDENCIES
   a
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_source
@@ -1166,7 +371,7 @@ DEPENDENCIES
   b
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_git
@@ -1233,19 +438,11 @@ DEPENDENCIES
   c!
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
-  end
-
-  def test_unget
-    @lockfile.instance_variable_set :@current_token, :token
-
-    @lockfile.unget
-
-    assert_equal :token, @lockfile.get
+    assert_equal expected, lockfile.to_s
   end
 
   def test_write
-    @lockfile.write
+    lockfile.write
 
     gem_deps_lock_file = "#{@gem_deps_file}.lock"
 
@@ -1264,13 +461,11 @@ DEPENDENCIES
     end
 
     assert_raises Gem::UnsatisfiableDependencyError do
-      @lockfile.write
+      lockfile.write
     end
 
     assert_path_exists gem_deps_lock_file
 
     assert_equal 'hello', File.read(gem_deps_lock_file)
   end
-
 end
-