aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/request_set.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-25 19:14:49 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-25 19:14:49 +0000
commit04817ae6d3e1d898d6fbf09ad146850d26d2b404 (patch)
tree7e5482d13830cacf363d21a087b490588a960095 /lib/rubygems/request_set.rb
parentc107372597586e1ad0fea03c00a14bdd7205b5d8 (diff)
downloadruby-04817ae6d3e1d898d6fbf09ad146850d26d2b404.tar.gz
* lib/rubygems: Update to RubyGems master 612f85a. Notable changes:
Fixed installation and activation of git: and path: gems via Gem.use_gemdeps Improved documentation coverage * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set.rb')
-rw-r--r--lib/rubygems/request_set.rb27
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
index d91a39cb22..d6337e32d8 100644
--- a/lib/rubygems/request_set.rb
+++ b/lib/rubygems/request_set.rb
@@ -166,29 +166,22 @@ class Gem::RequestSet
installed = []
- sorted_requests.each do |req|
- if existing.find { |s| s.full_name == req.spec.full_name }
- yield req, nil if block_given?
- next
- end
+ options[:install_dir] = dir
+ options[:only_install_dir] = true
- path = req.download(dir)
+ sorted_requests.each do |request|
+ spec = request.spec
- unless path then # already installed
- yield req, nil if block_given?
+ if existing.find { |s| s.full_name == spec.full_name } then
+ yield request, nil if block_given?
next
end
- options[:install_dir] = dir
- options[:only_install_dir] = true
-
- inst = Gem::Installer.new path, options
-
- yield req, inst if block_given?
-
- inst.install
+ spec.install options do |installer|
+ yield request, installer if block_given?
+ end
- installed << req
+ installed << request
end
installed