diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-18 01:02:58 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-18 01:02:58 +0000 |
| commit | 228ad3d799dc04550647a2d1855d5a89c0f629cc (patch) | |
| tree | 7a5f105106abb34fa67f0188bff1deca977bd64c /lib/rubygems/request_set.rb | |
| parent | 2d493a85cf63f8fcb3681d18c3bb78d5bcf0b060 (diff) | |
* 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
Diffstat (limited to 'lib/rubygems/request_set.rb')
| -rw-r--r-- | lib/rubygems/request_set.rb | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index 24bd6d1109..aa3f27c9c1 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -33,6 +33,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 attr_reader :sets # :nodoc: @@ -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 |