diff options
Diffstat (limited to 'lib/rubygems/request_set/lockfile.rb')
-rw-r--r-- | lib/rubygems/request_set/lockfile.rb | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb index 918aa971e5..4f2fa0933f 100644 --- a/lib/rubygems/request_set/lockfile.rb +++ b/lib/rubygems/request_set/lockfile.rb @@ -200,6 +200,8 @@ class Gem::RequestSet::Lockfile platforms = @requests.map { |request| request.spec.platform }.uniq + platforms = platforms.sort_by { |platform| platform.to_s } + platforms.sort.each do |platform| out << " #{platform}" end @@ -277,14 +279,7 @@ class Gem::RequestSet::Lockfile when :bang then get :bang - spec = @set.sets.select { |set| - Gem::Resolver::GitSet === set or - Gem::Resolver::VendorSet === set - }.map { |set| - set.specs[name] - }.compact.first - - requirements << spec.version + requirements << pinned_requirement(name) when :l_paren then get :l_paren @@ -300,6 +295,13 @@ class Gem::RequestSet::Lockfile end get :r_paren + + if peek[0] == :bang then + requirements.clear + requirements << pinned_requirement(name) + + get :bang + end end @set.gem name, *requirements @@ -507,6 +509,17 @@ class Gem::RequestSet::Lockfile @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 end |