rubygems-update 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0bb2181c07efffa060674fa83f662444173e18
-  data.tar.gz: 4435d084f527dd663d15ecdba564b8ebe43792a4
+  metadata.gz: 0859dfcdadf9be0170afcca83b23b0234426ef27
+  data.tar.gz: af835223a2d14abe818b559c1bcb76642dd19259
 SHA512:
-  metadata.gz: 0deecdcea9efcdc0e64ec35651c22b0019df5cf41bdd6a8667392d4e36648117ed512d624b44e4f7d3b388c74a494f0ec5d3f845563b8c67c8fc5ec5b252edac
-  data.tar.gz: e880b4f113c6a6549527c7754307fcf47d501cf7c6876a56ec3ef0cff4a2ade0b47bae7c445edc169778c526af5952ef31bf35606f89fb8e8ac1826b5ce466cf
+  metadata.gz: 07313e5435e5a114cdfbcd097bfb0c94ee5f757232c7101407eb1e40628342fa00d54a38f90491101304bfe2a403f57f8f421ca0375fb8e5c43115f291c3ca83
+  data.tar.gz: 8a13fa1ff299fd1107aaa79150e7c1fab6a6e9ed686ebd4072dc0694556b59898bc2b5d659454f09623a7047d97c7a64a6c3143ffc42ac68098a4b1f70653669

data/History.txt

@@ -1,5 +1,32 @@
 # coding: UTF-8
 
+=== 2.4.6 / 2014-02-05
+
+Bug fixes:
+
+* Fixed resolving gems with both upper and lower requirement boundaries.
+  Issue #1141 by Jakub Jirutka.
+* Moved extension directory after require_paths to fix missing constant bugs
+  in some gems with C extensions.  Issue #784 by André Arko, pull request
+  #1137 by Barry Allard.
+* Use Gem::Dependency#requirement when adding a dependency to an existing
+  dependency instance.  Pull request #1101 by Josh Cheek.
+* Fixed warning of shadowed local variable in Gem::Specification.  Pull request
+  #1109 by Rohit Arondekar
+* Gem::Requirement should always sort requirements before coercion to Hash.
+  Pull request #1139 by Eito Katagiri.
+* The `gem open` command should change the current working directory before
+  opening the editor.  Pull request #1142 by Alex Wood.
+* Ensure quotes are stripped from the Windows launcher script used to install
+  gems.  Pull request #1115 by Youngjun Song.
+* Fixed errors when writing to NFS to to 0444 files.  Issue #1161 by Emmanuel
+  Hadoux.
+* Removed dead code in Gem::StreamUI.  Pull request #1117 by mediaslave24.
+* Fixed typos.  Pull request #1096 by hakeda.
+* Relaxed CMake dependency for RHEL 6 and CentOS 6.  Pull request #1124 by Vít
+  Ondruch.
+* Relaxed Psych dependency.  Pull request #1128 by Vít Ondruch.
+
 === 2.4.5 / 2014-12-03
 
 Bug fixes:

data/Manifest.txt

@@ -107,6 +107,8 @@ lib/rubygems/request/https_pool.rb
 lib/rubygems/request_set.rb
 lib/rubygems/request_set/gem_dependency_api.rb
 lib/rubygems/request_set/lockfile.rb
+lib/rubygems/request_set/lockfile/parser.rb
+lib/rubygems/request_set/lockfile/tokenizer.rb
 lib/rubygems/requirement.rb
 lib/rubygems/resolver.rb
 lib/rubygems/resolver/activation_request.rb
@@ -295,6 +297,8 @@ test/rubygems/test_gem_request_connection_pools.rb
 test/rubygems/test_gem_request_set.rb
 test/rubygems/test_gem_request_set_gem_dependency_api.rb
 test/rubygems/test_gem_request_set_lockfile.rb
+test/rubygems/test_gem_request_set_lockfile_parser.rb
+test/rubygems/test_gem_request_set_lockfile_tokenizer.rb
 test/rubygems/test_gem_requirement.rb
 test/rubygems/test_gem_resolver.rb
 test/rubygems/test_gem_resolver_activation_request.rb

data/lib/rubygems.rb

@@ -9,7 +9,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = '2.4.5'
+  VERSION = '2.4.6'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -598,7 +598,7 @@ module Gem
 
     unless test_syck
       begin
-        gem 'psych', '~> 1.2', '>= 1.2.1'
+        gem 'psych', '>= 1.2.1'
       rescue Gem::LoadError
         # It's OK if the user does not have the psych gem installed.  We will
         # attempt to require the stdlib version

data/lib/rubygems/basic_specification.rb

@@ -61,8 +61,7 @@ class Gem::BasicSpecification
     @contains_requirable_file ||= {}
     @contains_requirable_file[file] ||=
     begin
-      if instance_variable_defined?(:@ignored) or
-         instance_variable_defined?('@ignored') then
+      if instance_variable_defined?(:@ignored) then
         return false
       elsif missing_extensions? then
         @ignored = true
@@ -145,7 +144,7 @@ class Gem::BasicSpecification
         File.join full_gem_path, path
       end
 
-      full_paths.unshift extension_dir unless @extensions.nil? || @extensions.empty?
+      full_paths << extension_dir unless @extensions.nil? || @extensions.empty?
 
       full_paths
     end

data/lib/rubygems/commands/help_command.rb

@@ -176,7 +176,7 @@ dependencies file.:
 Ruby Version and Engine Dependency
 ==================================
 
-You can specifiy the version, engine and engine version of ruby to use with
+You can specify the version, engine and engine version of ruby to use with
 your gem dependencies file.  If you are not running the specified version
 RubyGems will raise an exception.
 
@@ -223,7 +223,7 @@ The #group method can also be used to place gems in groups:
 The #group method allows multiple groups.
 
 The #gemspec development dependencies are placed in the :development group by
-default.  This may be overriden with the :development_group option:
+default.  This may be overridden with the :development_group option:
 
   gemspec development_group: :other
 

data/lib/rubygems/commands/open_command.rb

@@ -61,7 +61,9 @@ class Gem::Commands::OpenCommand < Gem::Command
   end
 
   def open_editor path
-    system(*@editor.split(/\s+/) + [path])
+    Dir.chdir(path) do
+      system(*@editor.split(/\s+/) + [path])
+    end
   end
 
   def spec_for name

data/lib/rubygems/commands/yank_command.rb

@@ -21,7 +21,7 @@ via the webhooks.  If you accidentally pushed passwords or other sensitive
 data you will need to change them immediately and yank your gem.
 
 If you are yanking a gem due to intellectual property reasons contact
-http://help.rubygems.org for permanant removal.  Be sure to mention this
+http://help.rubygems.org for permanent removal.  Be sure to mention this
 as the reason for the removal request.
     EOF
   end

data/lib/rubygems/compatibility.rb

@@ -20,8 +20,7 @@ if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
 
   $LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
 
-  if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then
-    # TODO path does not exist here
+  if path = $LOADED_FEATURES.find {|n| n.end_with? '/rubygems.rb'} then
     raise LoadError, "another rubygems is already loaded from #{path}"
   end
 

data/lib/rubygems/dependency_installer.rb

@@ -218,7 +218,17 @@ class Gem::DependencyInstaller
         tuples, errors = Gem::SpecFetcher.fetcher.search_for_dependency dep
 
         if best_only && !tuples.empty?
-          tuples.sort! { |a,b| b[0].version <=> a[0].version }
+          tuples.sort! do |a,b|
+            if b[0].version == a[0].version
+              if b[0].platform != Gem::Platform::RUBY
+                1
+              else
+                -1
+              end
+            else
+              b[0].version <=> a[0].version
+            end
+          end
           tuples = [tuples.first]
         end
 

data/lib/rubygems/installer.rb

@@ -681,7 +681,7 @@ TEXT
   # return the stub script text used to launch the true Ruby script
 
   def windows_stub_script(bindir, bin_file_name)
-    ruby = Gem.ruby.chomp('"').tr(File::SEPARATOR, "\\")
+    ruby = Gem.ruby.gsub(/^\"|\"$/, "").tr(File::SEPARATOR, "\\")
     return <<-TEXT
 @ECHO OFF
 IF NOT "%~f0" == "~f0" GOTO :WinNT

data/lib/rubygems/package.rb

@@ -366,8 +366,9 @@ EOM
 
         FileUtils.mkdir_p mkdir, mkdir_options
 
-        open destination, 'wb', entry.header.mode do |out|
+        open destination, 'wb' do |out|
           out.write entry.read
+          FileUtils.chmod entry.header.mode, destination
         end if entry.file?
 
         verbose destination

data/lib/rubygems/package/tar_writer.rb

@@ -291,7 +291,7 @@ class Gem::Package::TarWriter
 
   def split_name(name) # :nodoc:
     if name.bytesize > 256
-      raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)") 
+      raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)")
     end
 
     if name.bytesize <= 100 then
@@ -311,11 +311,11 @@ class Gem::Package::TarWriter
       name = newname
 
       if name.bytesize > 100
-        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)") 
+        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)")
       end
-    
+
       if prefix.bytesize > 155 then
-        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)") 
+        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)")
       end
     end
 

data/lib/rubygems/path_support.rb

@@ -42,13 +42,6 @@ class Gem::PathSupport
 
   private
 
-  ##
-  # Set the Gem home directory (as reported by Gem.dir).
-
-  def home=(home)
-    @home = home.to_s
-  end
-
   ##
   # Set the Gem search path (as reported by Gem.path).
 

data/lib/rubygems/psych_additions.rb

@@ -1,4 +1,4 @@
-# This exists just to satify bugs in marshal'd gemspecs that
+# This exists just to satisfy bugs in marshal'd gemspecs that
 # contain a reference to YAML::PrivateType. We prune these out
 # in Specification._load, but if we don't have the constant, Marshal
 # blows up.

data/lib/rubygems/remote_fetcher.rb

@@ -103,7 +103,7 @@ class Gem::RemoteFetcher
   # filename. Returns nil if the gem cannot be located.
   #--
   # Should probably be integrated with #download below, but that will be a
-  # larger, more emcompassing effort. -erikh
+  # larger, more encompassing effort. -erikh
 
   def download_to_cache dependency
     found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency

data/lib/rubygems/request_set.rb

@@ -116,7 +116,7 @@ class Gem::RequestSet
     if dep = @dependency_names[name] then
       dep.requirement.concat reqs
     else
-      dep = Gem::Dependency.new name, reqs
+      dep = Gem::Dependency.new name, *reqs
       @dependency_names[name] = dep
       @dependencies << dep
     end
@@ -223,7 +223,7 @@ class Gem::RequestSet
 
       if options.fetch :lock, true then
         lockfile =
-          Gem::RequestSet::Lockfile.new self, gemdeps, gem_deps_api.dependencies
+          Gem::RequestSet::Lockfile.build self, gemdeps, gem_deps_api.dependencies
         lockfile.write
       end
 
@@ -275,8 +275,13 @@ class Gem::RequestSet
 
     @git_set.root_dir = @install_dir
 
-    lockfile = Gem::RequestSet::Lockfile.new self, path
-    lockfile.parse
+    lock_file = "#{File.expand_path(path)}.lock".untaint
+    begin
+      tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file lock_file
+      parser = tokenizer.make_parser self, []
+      parser.parse
+    rescue Errno::ENOENT
+    end
 
     gf = Gem::RequestSet::GemDependencyAPI.new self, path
     gf.installing = installing
@@ -411,3 +416,4 @@ end
 
 require 'rubygems/request_set/gem_dependency_api'
 require 'rubygems/request_set/lockfile'
+require 'rubygems/request_set/lockfile/tokenizer'

data/lib/rubygems/request_set/gem_dependency_api.rb

@@ -367,11 +367,11 @@ class Gem::RequestSet::GemDependencyAPI
 
     @dependencies[name] =
       if requirements.empty? and not source_set then
-        nil
+        Gem::Requirement.default
       elsif source_set then
-        '!'
+        Gem::Requirement.source_set
       else
-        requirements
+        Gem::Requirement.create requirements
       end
 
     return unless gem_platforms options
@@ -601,7 +601,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
     add_dependencies groups, [self_dep]
     add_dependencies groups, spec.runtime_dependencies
 
-    @dependencies[spec.name] = '!'
+    @dependencies[spec.name] = Gem::Requirement.source_set
 
     spec.dependencies.each do |dep|
       @dependencies[dep.name] = dep.requirement

data/lib/rubygems/request_set/lockfile.rb

@@ -1,12 +1,9 @@
-require 'strscan'
-
 ##
 # Parses a gem.deps.rb.lock file and constructs a LockSet containing the
 # dependencies found inside.  If the lock file is missing no LockSet is
 # constructed.
 
 class Gem::RequestSet::Lockfile
-
   ##
   # Raised when a lockfile cannot be parsed
 
@@ -37,7 +34,35 @@ class Gem::RequestSet::Lockfile
       @path   = path
       super "#{message} (at line #{line} column #{column})"
     end
+  end
+
+  ##
+  # Creates a new Lockfile for the given +request_set+ and +gem_deps_file+
+  # location.
+
+  def self.build request_set, gem_deps_file, dependencies = nil
+    request_set.resolve
+    dependencies ||= requests_to_deps request_set.sorted_requests
+    new request_set, gem_deps_file, dependencies
+  end
+
+  def self.requests_to_deps requests # :nodoc:
+    deps = {}
+
+    requests.each do |request|
+      spec        = request.spec
+      name        = request.name
+      requirement = request.request.dependency.requirement
+
+      deps[name] = if [Gem::Resolver::VendorSpecification,
+                       Gem::Resolver::GitSpecification].include? spec.class then
+                     Gem::Requirement.source_set
+                   else
+                     requirement
+                   end
+    end
 
+    deps
   end
 
   ##
@@ -45,11 +70,7 @@ class Gem::RequestSet::Lockfile
 
   attr_reader :platforms
 
-  ##
-  # Creates a new Lockfile for the given +request_set+ and +gem_deps_file+
-  # location.
-
-  def initialize request_set, gem_deps_file, dependencies = nil
+  def initialize request_set, gem_deps_file, dependencies
     @set           = request_set
     @dependencies  = dependencies
     @gem_deps_file = File.expand_path(gem_deps_file)
@@ -57,59 +78,23 @@ class Gem::RequestSet::Lockfile
 
     @gem_deps_file.untaint unless gem_deps_file.tainted?
 
-    @current_token  = nil
-    @line           = 0
-    @line_pos       = 0
     @platforms      = []
-    @tokens         = []
   end
 
   def add_DEPENDENCIES out # :nodoc:
     out << "DEPENDENCIES"
 
-    dependencies =
-      if @dependencies then
-        @dependencies.sort_by { |name,| name }.map do |name, requirement|
-          requirement_string =
-            if '!' == requirement then
-              requirement
-            else
-              Gem::Requirement.new(requirement).for_lockfile
-            end
-
-          [name, requirement_string]
-        end
-      else
-        @requests.sort_by { |r| r.name }.map do |request|
-          spec        = request.spec
-          name        = request.name
-          requirement = request.request.dependency.requirement
-
-          requirement_string =
-            if [Gem::Resolver::VendorSpecification,
-                Gem::Resolver::GitSpecification].include? spec.class then
-              "!"
-            else
-              requirement.for_lockfile
-            end
-
-          [name, requirement_string]
-        end
-      end
-
-    dependencies = dependencies.map do |name, requirement_string|
-      "  #{name}#{requirement_string}"
-    end
-
-    out.concat dependencies
+    out.concat @dependencies.sort_by { |name,| name }.map { |name, requirement|
+      "  #{name}#{requirement.for_lockfile}"
+    }
 
     out << nil
   end
 
-  def add_GEM out # :nodoc:
-    return if @spec_groups.empty?
+  def add_GEM out, spec_groups # :nodoc:
+    return if spec_groups.empty?
 
-    source_groups = @spec_groups.values.flatten.group_by do |request|
+    source_groups = spec_groups.values.flatten.group_by do |request|
       request.spec.source.uri
     end
 
@@ -136,9 +121,8 @@ class Gem::RequestSet::Lockfile
     end
   end
 
-  def add_GIT out
-    return unless git_requests =
-      @spec_groups.delete(Gem::Resolver::GitSpecification)
+  def add_GIT out, git_requests
+    return if git_requests.empty?
 
     by_repository_revision = git_requests.group_by do |request|
       source = request.spec.source
@@ -179,9 +163,8 @@ class Gem::RequestSet::Lockfile
     end
   end
 
-  def add_PATH out # :nodoc:
-    return unless path_requests =
-      @spec_groups.delete(Gem::Resolver::VendorSpecification)
+  def add_PATH out, path_requests # :nodoc:
+    return if path_requests.empty?
 
     out << "PATH"
     path_requests.each do |request|
@@ -198,7 +181,7 @@ class Gem::RequestSet::Lockfile
   def add_PLATFORMS out # :nodoc:
     out << "PLATFORMS"
 
-    platforms = @requests.map { |request| request.spec.platform }.uniq
+    platforms = requests.map { |request| request.spec.platform }.uniq
 
     platforms = platforms.sort_by { |platform| platform.to_s }
 
@@ -209,340 +192,23 @@ class Gem::RequestSet::Lockfile
     out << nil
   end
 
-  ##
-  # Gets the next token for a Lockfile
-
-  def get expected_types = nil, expected_value = nil # :nodoc:
-    @current_token = @tokens.shift
-
-    type, value, column, line = @current_token
-
-    if expected_types and not Array(expected_types).include? type then
-      unget
-
-      message = "unexpected token [#{type.inspect}, #{value.inspect}], " +
-                "expected #{expected_types.inspect}"
-
-      raise ParseError.new message, column, line, "#{@gem_deps_file}.lock"
-    end
-
-    if expected_value and expected_value != value then
-      unget
-
-      message = "unexpected token [#{type.inspect}, #{value.inspect}], " +
-                "expected [#{expected_types.inspect}, " +
-                "#{expected_value.inspect}]"
-
-      raise ParseError.new message, column, line, "#{@gem_deps_file}.lock"
-    end
-
-    @current_token
-  end
-
-  def parse # :nodoc:
-    tokenize
-
-    until @tokens.empty? do
-      type, data, column, line = get
-
-      case type
-      when :section then
-        skip :newline
-
-        case data
-        when 'DEPENDENCIES' then
-          parse_DEPENDENCIES
-        when 'GIT' then
-          parse_GIT
-        when 'GEM' then
-          parse_GEM
-        when 'PATH' then
-          parse_PATH
-        when 'PLATFORMS' then
-          parse_PLATFORMS
-        else
-          type, = get until @tokens.empty? or peek.first == :section
-        end
-      else
-        raise "BUG: unhandled token #{type} (#{data.inspect}) at line #{line} column #{column}"
-      end
-    end
-  end
-
-  def parse_DEPENDENCIES # :nodoc:
-    while not @tokens.empty? and :text == peek.first do
-      _, name, = get :text
-
-      requirements = []
-
-      case peek[0]
-      when :bang then
-        get :bang
-
-        requirements << pinned_requirement(name)
-      when :l_paren then
-        get :l_paren
-
-        loop do
-          _, op,      = get :requirement
-          _, version, = get :text
-
-          requirements << "#{op} #{version}"
-
-          break unless peek[0] == :comma
-
-          get :comma
-        end
-
-        get :r_paren
-
-        if peek[0] == :bang then
-          requirements.clear
-          requirements << pinned_requirement(name)
-
-          get :bang
-        end
-      end
-
-      @set.gem name, *requirements
-
-      skip :newline
-    end
-  end
-
-  def parse_GEM # :nodoc:
-    sources = []
-
-    while [:entry, 'remote'] == peek.first(2) do
-      get :entry, 'remote'
-      _, data, = get :text
-      skip :newline
-
-      sources << Gem::Source.new(data)
-    end
-
-    sources << Gem::Source.new(Gem::DEFAULT_HOST) if sources.empty?
-
-    get :entry, 'specs'
-
-    skip :newline
-
-    set = Gem::Resolver::LockSet.new sources
-    last_specs = nil
-
-    while not @tokens.empty? and :text == peek.first do
-      _, name, column, = get :text
-
-      case peek[0]
-      when :newline then
-        last_specs.each do |spec|
-          spec.add_dependency Gem::Dependency.new name if column == 6
-        end
-      when :l_paren then
-        get :l_paren
-
-        type, data, = get [:text, :requirement]
-
-        if type == :text and column == 4 then
-          version, platform = data.split '-', 2
-
-          platform =
-            platform ? Gem::Platform.new(platform) : Gem::Platform::RUBY
-
-          last_specs = set.add name, version, platform
-        else
-          dependency = parse_dependency name, data
-
-          last_specs.each do |spec|
-            spec.add_dependency dependency
-          end
-        end
-
-        get :r_paren
-      else
-        raise "BUG: unknown token #{peek}"
-      end
-
-      skip :newline
-    end
-
-    @set.sets << set
-  end
-
-  def parse_GIT # :nodoc:
-    get :entry, 'remote'
-    _, repository, = get :text
-
-    skip :newline
-
-    get :entry, 'revision'
-    _, revision, = get :text
-
-    skip :newline
-
-    type, value = peek.first 2
-    if type == :entry and %w[branch ref tag].include? value then
-      get
-      get :text
-
-      skip :newline
-    end
-
-    get :entry, 'specs'
-
-    skip :newline
-
-    set = Gem::Resolver::GitSet.new
-    set.root_dir = @set.install_dir
-
-    last_spec = nil
-
-    while not @tokens.empty? and :text == peek.first do
-      _, name, column, = get :text
-
-      case peek[0]
-      when :newline then
-        last_spec.add_dependency Gem::Dependency.new name if column == 6
-      when :l_paren then
-        get :l_paren
-
-        type, data, = get [:text, :requirement]
-
-        if type == :text and column == 4 then
-          last_spec = set.add_git_spec name, data, repository, revision, true
-        else
-          dependency = parse_dependency name, data
-
-          last_spec.add_dependency dependency
-        end
-
-        get :r_paren
-      else
-        raise "BUG: unknown token #{peek}"
-      end
-
-      skip :newline
-    end
-
-    @set.sets << set
-  end
-
-  def parse_PATH # :nodoc:
-    get :entry, 'remote'
-    _, directory, = get :text
-
-    skip :newline
-
-    get :entry, 'specs'
-
-    skip :newline
-
-    set = Gem::Resolver::VendorSet.new
-    last_spec = nil
-
-    while not @tokens.empty? and :text == peek.first do
-      _, name, column, = get :text
-
-      case peek[0]
-      when :newline then
-        last_spec.add_dependency Gem::Dependency.new name if column == 6
-      when :l_paren then
-        get :l_paren
-
-        type, data, = get [:text, :requirement]
-
-        if type == :text and column == 4 then
-          last_spec = set.add_vendor_gem name, directory
-        else
-          dependency = parse_dependency name, data
-
-          last_spec.dependencies << dependency
-        end
-
-        get :r_paren
-      else
-        raise "BUG: unknown token #{peek}"
-      end
-
-      skip :newline
-    end
-
-    @set.sets << set
-  end
-
-  def parse_PLATFORMS # :nodoc:
-    while not @tokens.empty? and :text == peek.first do
-      _, name, = get :text
-
-      @platforms << name
-
-      skip :newline
-    end
-  end
-
-  ##
-  # Parses the requirements following the dependency +name+ and the +op+ for
-  # the first token of the requirements and returns a Gem::Dependency object.
-
-  def parse_dependency name, op # :nodoc:
-    return Gem::Dependency.new name, op unless peek[0] == :text
-
-    _, version, = get :text
-
-    requirements = ["#{op} #{version}"]
-
-    while peek[0] == :comma do
-      get :comma
-      _, op,      = get :requirement
-      _, version, = get :text
-
-      requirements << "#{op} #{version}"
-    end
-
-    Gem::Dependency.new name, requirements
-  end
-
-  ##
-  # Peeks at the next token for Lockfile
-
-  def peek # :nodoc:
-    @tokens.first || [:EOF]
-  end
-
-  def pinned_requirement name # :nodoc:
-    spec = @set.sets.select { |set|
-      Gem::Resolver::GitSet    === set or
-        Gem::Resolver::VendorSet === set
-    }.map { |set|
-      set.specs[name]
-    }.compact.first
-
-    spec.version
-  end
-
-  def skip type # :nodoc:
-    get while not @tokens.empty? and peek.first == type
+  def spec_groups
+    requests.group_by { |request| request.spec.class }
   end
 
   ##
   # The contents of the lock file.
 
   def to_s
-    @set.resolve
-
     out = []
 
-    @requests = @set.sorted_requests
-
-    @spec_groups = @requests.group_by do |request|
-      request.spec.class
-    end
+    groups = spec_groups
 
-    add_PATH out
+    add_PATH out, groups.delete(Gem::Resolver::VendorSpecification) { [] }
 
-    add_GIT out
+    add_GIT out, groups.delete(Gem::Resolver::GitSpecification) { [] }
 
-    add_GEM out
+    add_GEM out, groups
 
     add_PLATFORMS out
 
@@ -551,90 +217,6 @@ class Gem::RequestSet::Lockfile
     out.join "\n"
   end
 
-  ##
-  # Calculates the column (by byte) and the line of the current token based on
-  # +byte_offset+.
-
-  def token_pos byte_offset # :nodoc:
-    [byte_offset - @line_pos, @line]
-  end
-
-  ##
-  # Converts a lock file into an Array of tokens.  If the lock file is missing
-  # an empty Array is returned.
-
-  def tokenize # :nodoc:
-    @line     = 0
-    @line_pos = 0
-
-    @platforms     = []
-    @tokens        = []
-    @current_token = nil
-
-    lock_file = "#{@gem_deps_file}.lock"
-
-    @input = File.read lock_file
-    s      = StringScanner.new @input
-
-    until s.eos? do
-      pos = s.pos
-
-      pos = s.pos if leading_whitespace = s.scan(/ +/)
-
-      if s.scan(/[<|=>]{7}/) then
-        message = "your #{lock_file} contains merge conflict markers"
-        column, line = token_pos pos
-
-        raise ParseError.new message, column, line, lock_file
-      end
-
-      @tokens <<
-        case
-        when s.scan(/\r?\n/) then
-          token = [:newline, nil, *token_pos(pos)]
-          @line_pos = s.pos
-          @line += 1
-          token
-        when s.scan(/[A-Z]+/) then
-          if leading_whitespace then
-            text = s.matched
-            text += s.scan(/[^\s)]*/).to_s # in case of no match
-            [:text, text, *token_pos(pos)]
-          else
-            [:section, s.matched, *token_pos(pos)]
-          end
-        when s.scan(/([a-z]+):\s/) then
-          s.pos -= 1 # rewind for possible newline
-          [:entry, s[1], *token_pos(pos)]
-        when s.scan(/\(/) then
-          [:l_paren, nil, *token_pos(pos)]
-        when s.scan(/\)/) then
-          [:r_paren, nil, *token_pos(pos)]
-        when s.scan(/<=|>=|=|~>|<|>|!=/) then
-          [:requirement, s.matched, *token_pos(pos)]
-        when s.scan(/,/) then
-          [:comma, nil, *token_pos(pos)]
-        when s.scan(/!/) then
-          [:bang, nil, *token_pos(pos)]
-        when s.scan(/[^\s),!]*/) then
-          [:text, s.matched, *token_pos(pos)]
-        else
-          raise "BUG: can't create token for: #{s.string[s.pos..-1].inspect}"
-        end
-    end
-
-    @tokens
-  rescue Errno::ENOENT
-    @tokens
-  end
-
-  ##
-  # Ungets the last token retrieved by #get
-
-  def unget # :nodoc:
-    @tokens.unshift @current_token
-  end
-
   ##
   # Writes the lock file alongside the gem dependencies file
 
@@ -646,5 +228,11 @@ class Gem::RequestSet::Lockfile
     end
   end
 
+  private
+
+  def requests
+    @set.sorted_requests
+  end
 end
 
+require 'rubygems/request_set/lockfile/tokenizer'