diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
| commit | 8da8d4b043c37b53a69803c71ff36b478d4776d0 (patch) | |
| tree | 7c8cec15645e74f19c88e4eb5b210b96174c7d03 /lib/rubygems/request_set.rb | |
| parent | c5cb386eba6d9a2d9a8e6ffa8c30137d0c4660c1 (diff) | |
Merge RubyGems 3.0.0.beta1.
* It drop to support < Ruby 2.2
* Cleanup deprecated methods and classes.
* Mark obsoleted methods to deprecate.
* and other enhancements.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set.rb')
| -rw-r--r-- | lib/rubygems/request_set.rb | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index e54a7b8818..89f47616ec 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -191,22 +191,7 @@ class Gem::RequestSet return requests if options[:gemdeps] - specs = requests.map do |request| - case request - when Gem::Resolver::ActivationRequest then - request.spec.spec - else - request - end - end - - require 'rubygems/dependency_installer' - inst = Gem::DependencyInstaller.new options - inst.installed_gems.replace specs - - Gem.done_installing_hooks.each do |hook| - hook.call inst, specs - end unless Gem.done_installing_hooks.empty? + install_hooks requests, options requests end @@ -283,12 +268,36 @@ class Gem::RequestSet installed << request end + install_hooks installed, options + installed ensure ENV['GEM_HOME'] = gem_home end ## + # Call hooks on installed gems + + def install_hooks requests, options + specs = requests.map do |request| + case request + when Gem::Resolver::ActivationRequest then + request.spec.spec + else + request + end + end + + require "rubygems/dependency_installer" + inst = Gem::DependencyInstaller.new options + inst.installed_gems.replace specs + + Gem.done_installing_hooks.each do |hook| + hook.call inst, specs + end unless Gem.done_installing_hooks.empty? + end + + ## # Load a dependency management file. def load_gemdeps path, without_groups = [], installing = false |