diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-18 00:41:36 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-18 00:41:36 +0000 |
commit | 05ca2faba2e0851f2b8c659974b1742458e2cf8e (patch) | |
tree | ec5846bc6f75d4e83a9a9fe89ec3782ba195d6cd /lib/rubygems/request_set.rb | |
parent | 4fa08bbaf8f2c029f6df7f7ab85293cd31874b15 (diff) | |
download | ruby-05ca2faba2e0851f2b8c659974b1742458e2cf8e.tar.gz |
* lib/rubygems: Update to RubyGems master cee6788. Changes:
Fix test failure on vc10-x64 Server on rubyci.org due to attempting
to File.chmod where it is not supported.
Continuing work on improved gem dependencies file (Gemfile) support.
* test: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set.rb')
-rw-r--r-- | lib/rubygems/request_set.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index 0d52423f8f..eb45516cfb 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -37,6 +37,11 @@ class Gem::RequestSet attr_accessor :soft_missing ## + # The set of vendor gems imported via load_gemdeps. + + attr_reader :vendor_set # :nodoc: + + ## # Creates a RequestSet for a list of Gem::Dependency objects, +deps+. You # can then #resolve and #install the resolved list of dependencies. # @@ -54,6 +59,7 @@ class Gem::RequestSet @soft_missing = false @sorted = nil @specs = nil + @vendor_set = nil yield self if block_given? end @@ -69,7 +75,7 @@ class Gem::RequestSet # Add +deps+ Gem::Dependency objects to the set. def import deps - @dependencies += deps + @dependencies.concat deps end def install options, &block @@ -143,6 +149,8 @@ class Gem::RequestSet # Load a dependency management file. def load_gemdeps path + @vendor_set = Gem::DependencyResolver::VendorSet.new + gf = Gem::RequestSet::GemDependencyAPI.new self, path gf.load end |