mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 13:04:13 +02:00
* lib/rubygems: Update to RubyGems master d8f12e2. This increases the
speed of `gem install --ignore-dependencies` which helps bundler tests. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2d493a85cf
commit
228ad3d799
7 changed files with 123 additions and 20 deletions
|
@ -31,6 +31,11 @@ class Gem::Resolver
|
|||
|
||||
attr_accessor :development
|
||||
|
||||
##
|
||||
# When true, no dependencies are looked up for requested gems.
|
||||
|
||||
attr_accessor :ignore_dependencies
|
||||
|
||||
##
|
||||
# List of dependencies that could not be found in the configured sources.
|
||||
|
||||
|
@ -91,11 +96,12 @@ class Gem::Resolver
|
|||
@set = set || Gem::Resolver::IndexSet.new
|
||||
@needed = needed
|
||||
|
||||
@conflicts = []
|
||||
@development = false
|
||||
@missing = []
|
||||
@soft_missing = false
|
||||
@stats = Gem::Resolver::Stats.new
|
||||
@conflicts = []
|
||||
@development = false
|
||||
@ignore_dependencies = false
|
||||
@missing = []
|
||||
@soft_missing = false
|
||||
@stats = Gem::Resolver::Stats.new
|
||||
end
|
||||
|
||||
def explain stage, *data # :nodoc:
|
||||
|
@ -132,6 +138,8 @@ class Gem::Resolver
|
|||
end
|
||||
|
||||
def requests s, act, reqs=nil # :nodoc:
|
||||
return reqs if @ignore_dependencies
|
||||
|
||||
s.dependencies.reverse_each do |d|
|
||||
next if d.type == :development and not @development
|
||||
reqs.add Gem::Resolver::DependencyRequest.new(d, act)
|
||||
|
@ -151,7 +159,7 @@ class Gem::Resolver
|
|||
def resolve
|
||||
@conflicts = []
|
||||
|
||||
needed = RequirementList.new
|
||||
needed = Gem::Resolver::RequirementList.new
|
||||
|
||||
@needed.reverse_each do |n|
|
||||
request = Gem::Resolver::DependencyRequest.new n, nil
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue