mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
4fa08bbaf8
commit
05ca2faba2
11 changed files with 128 additions and 21 deletions
|
|
@ -36,6 +36,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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue