diff options
-rw-r--r-- | lib/rubygems/request_set/gem_dependency_api.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/request_set/lockfile.rb | 16 | ||||
-rw-r--r-- | lib/rubygems/request_set/lockfile/tokenizer.rb | 2 |
3 files changed, 10 insertions, 10 deletions
@@ -206,7 +206,7 @@ class Gem::RequestSet::GemDependencyAPI @git_set = @set.git_set @git_sources = {} @installing = false - @requires = Hash.new { |h, name| h[name] = [] } @vendor_set = @set.vendor_set @source_set = @set.source_set @gem_sources = {} @@ -89,7 +89,7 @@ class Gem::RequestSet::Lockfile def add_DEPENDENCIES(out) # :nodoc: out << "DEPENDENCIES" - out.concat @dependencies.sort_by { |name,| name }.map { |name, requirement| " #{name}#{requirement.for_lockfile}" } @@ -103,12 +103,12 @@ class Gem::RequestSet::Lockfile request.spec.source.uri end - source_groups.sort_by { |group,| group.to_s }.map do |group, requests| out << "GEM" out << " remote: #{group}" out << " specs:" - requests.sort_by { |request| request.name }.each do |request| next if request.spec.name == 'bundler' platform = "-#{request.spec.platform}" unless Gem::Platform::RUBY == request.spec.platform @@ -140,10 +140,10 @@ class Gem::RequestSet::Lockfile out << " revision: #{revision}" out << " specs:" - requests.sort_by { |request| request.name }.each do |request| out << " #{request.name} (#{request.version})" - dependencies = request.spec.dependencies.sort_by { |dep| dep.name } dependencies.each do |dep| out << " #{dep.name}#{dep.requirement.for_lockfile}" end @@ -185,9 +185,9 @@ class Gem::RequestSet::Lockfile def add_PLATFORMS(out) # :nodoc: out << "PLATFORMS" - platforms = requests.map { |request| request.spec.platform }.uniq - platforms = platforms.sort_by { |platform| platform.to_s } platforms.each do |platform| out << " #{platform}" @@ -197,7 +197,7 @@ class Gem::RequestSet::Lockfile end def spec_groups - requests.group_by { |request| request.spec.class } end ## @@ -23,7 +23,7 @@ class Gem::RequestSet::Lockfile::Tokenizer end def to_a - @tokens.map { |token| [token.type, token.value, token.column, token.line] } end def skip(type) |