diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-08 19:32:07 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-08 19:32:07 +0000 |
| commit | da3e610adf617503b20b34def31e89b3cc709dcd () | |
| tree | df1b4202e88936f7132fc077d66847cbd66e41d1 | |
| parent | fe57c5d49e138601cc415a541b49afa90d2f77d4 (diff) | |
* lib/rubygems: Update to RubyGems master 096db36. Changes include
support for PATH in Gemfile.lock and a typo fix from Akira Matsuda. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/request_set/lockfile.rb | 52 | ||||
| -rw-r--r-- | lib/rubygems/resolver/vendor_set.rb | 18 | ||||
| -rw-r--r-- | test/rubygems/test_gem_request_set_lockfile.rb | 32 | ||||
| -rw-r--r-- | test/rubygems/test_gem_resolver_vendor_set.rb | 2 |
6 files changed, 98 insertions, 14 deletions
@@ -1,3 +1,9 @@ Mon Dec 9 02:10:32 2013 NARUSE, Yui <[email protected]> * lib/net/http/responses.rb: @@ -1103,7 +1103,7 @@ module Gem end ## - # Clear default gem related varibles. It is for test def clear_default_specs @path_to_default_spec_map.clear @@ -222,6 +222,8 @@ class Gem::RequestSet::Lockfile parse_GIT when 'GEM' then parse_GEM when 'PLATFORMS' then parse_PLATFORMS else @@ -243,13 +245,14 @@ class Gem::RequestSet::Lockfile when :bang then get :bang - git_spec = @set.sets.select { |set| - Gem::Resolver::GitSet === set }.map { |set| set.specs[name] }.first - requirements << git_spec.version when :l_paren then get :l_paren @@ -366,6 +369,49 @@ class Gem::RequestSet::Lockfile @set.sets << set end def parse_PLATFORMS # :nodoc: while not @tokens.empty? and :text == peek.first do _, name, = get :text @@ -15,6 +15,11 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set def initialize # :nodoc: @directories = {} @specs = {} @@ -34,9 +39,7 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set spec.full_gem_path = File.expand_path directory - key = "#{spec.name}-#{spec.version}-#{spec.platform}" - - @specs[key] = spec @directories[spec] = directory end @@ -54,14 +57,11 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set end ## - # Loads a spec with the given +name+, +version+ and +platform+. Since the - # +source+ is defined when the specification was added to index it is not - # used. def load_spec name, version, platform, source # :nodoc: - key = "#{name}-#{version}-#{platform}" - - @specs.fetch key end def pretty_print q # :nodoc: @@ -176,6 +176,38 @@ DEPENDENCIES assert_equal [dep('b', '>= 3')], git_set.specs.values.first.dependencies end def test_parse_gem_specs_dependency write_lockfile <<-LOCKFILE GEM @@ -59,7 +59,7 @@ class TestGemResolverVendorSet < Gem::TestCase error = Object.const_defined?(:KeyError) ? KeyError : IndexError assert_raises error do - @set.load_spec 'a', v(1), Gem::Platform::RUBY, nil end end |