diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-10 17:51:40 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-10 17:51:40 +0000 |
commit | 4f6779bac7b4e294bc473782d60cbd071f0d0f8d (patch) | |
tree | d37b54da20f8c0adf2d98e810aacc8259b0602ff /lib/rubygems/dependency_resolver/vendor_set.rb | |
parent | 31d355aaa9436e2b24efd5e6501cabd876267c46 (diff) | |
download | ruby-4f6779bac7b4e294bc473782d60cbd071f0d0f8d.tar.gz |
* lib/rubygems: Update to RubyGems master 4bdc4f2. Important changes
in this commit:
RubyGems now chooses the test server port reliably. Patch by akr.
Partial implementation of bundler's Gemfile format.
Refactorings to improve the new resolver.
Fixes bugs in the resolver.
* test/rubygems: Tests for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_resolver/vendor_set.rb')
-rw-r--r-- | lib/rubygems/dependency_resolver/vendor_set.rb | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/lib/rubygems/dependency_resolver/vendor_set.rb b/lib/rubygems/dependency_resolver/vendor_set.rb index 716c2a8e26..87eb6fd818 100644 --- a/lib/rubygems/dependency_resolver/vendor_set.rb +++ b/lib/rubygems/dependency_resolver/vendor_set.rb @@ -13,17 +13,18 @@ # The directory vendor/rake must contain an unpacked rake gem along with a # rake.gemspec (watching the given name). -class Gem::DependencyResolver::VendorSet +class Gem::DependencyResolver::VendorSet < Gem::DependencyResolver::Set - def initialize - @specs = {} + def initialize # :nodoc: + @directories = {} + @specs = {} end ## # Adds a specification to the set with the given +name+ which has been # unpacked into the given +directory+. - def add_vendor_gem name, directory + def add_vendor_gem name, directory # :nodoc: gemspec = File.join directory, "#{name}.gemspec" spec = Gem::Specification.load gemspec @@ -33,7 +34,8 @@ class Gem::DependencyResolver::VendorSet key = "#{spec.name}-#{spec.version}-#{spec.platform}" - @specs[key] = spec + @specs[key] = spec + @directories[spec] = directory end ## @@ -44,7 +46,8 @@ class Gem::DependencyResolver::VendorSet @specs.values.select do |spec| req.matches_spec? spec end.map do |spec| - Gem::DependencyResolver::VendorSpecification.new self, spec, nil + source = Gem::Source::Vendor.new @directories[spec] + Gem::DependencyResolver::VendorSpecification.new self, spec, source end end @@ -53,17 +56,11 @@ class Gem::DependencyResolver::VendorSet # +source+ is defined when the specification was added to index it is not # used. - def load_spec name, version, platform, source + def load_spec name, version, platform, source # :nodoc: key = "#{name}-#{version}-#{platform}" @specs.fetch key end - ## - # No prefetch is needed as the index is loaded at creation time. - - def prefetch gems - end - end |