* 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:
drbrain 2013-12-18 01:02:58 +00:00
parent 2d493a85cf
commit 228ad3d799
7 changed files with 123 additions and 20 deletions

View file

@ -426,7 +426,8 @@ class Gem::DependencyInstaller
if @ignore_dependencies then
installer_set.ignore_dependencies = true
request_set.soft_missing = true
request_set.ignore_dependencies = true
request_set.soft_missing = true
end
composed_set = Gem::Resolver.compose_sets as, installer_set

View file

@ -32,6 +32,12 @@ class Gem::RequestSet
attr_reader :git_set # :nodoc:
##
# When true, dependency resolution is not performed, only the requested gems
# are installed.
attr_accessor :ignore_dependencies
##
# Sets used for resolution
@ -59,17 +65,18 @@ class Gem::RequestSet
def initialize *deps
@dependencies = deps
@always_install = []
@dependency_names = {}
@development = false
@git_set = nil
@install_dir = Gem.dir
@requests = []
@sets = []
@soft_missing = false
@sorted = nil
@specs = nil
@vendor_set = nil
@always_install = []
@dependency_names = {}
@development = false
@git_set = nil
@ignore_dependencies = false
@install_dir = Gem.dir
@requests = []
@sets = []
@soft_missing = false
@sorted = nil
@specs = nil
@vendor_set = nil
yield self if block_given?
end
@ -230,8 +237,9 @@ class Gem::RequestSet
set = Gem::Resolver.compose_sets(*@sets)
resolver = Gem::Resolver.new @dependencies, set
resolver.development = @development
resolver.soft_missing = @soft_missing
resolver.development = @development
resolver.ignore_dependencies = @ignore_dependencies
resolver.soft_missing = @soft_missing
@resolver = resolver

View file

@ -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