diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2021-07-23 23:06:29 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-08-31 19:06:14 +0900 |
| commit | d298ef40f252165f76bfd8c677e1aa907e4c0007 (patch) | |
| tree | 471006720e1bc5ffb740f08419f4393de870a5ca /lib | |
| parent | 8116b7fef7ccef49eda3d1258121bbf343daf12a (diff) | |
| download | ruby-d298ef40f252165f76bfd8c677e1aa907e4c0007.tar.gz | |
[rubygems/rubygems] Small refactor by DRYing up some logic
https://github.com/rubygems/rubygems/commit/c7e3c092e1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 81cd94eb5f..06f73dd1bd 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -190,7 +190,7 @@ module Bundler # # @return [Bundler::SpecSet] def specs - @specs ||= add_bundler_to(resolve.materialize(requested_dependencies)) + @specs ||= materialize(requested_dependencies) rescue GemNotFound => e # Handle yanked gem gem_name, gem_version = extract_gem_info(e) locked_gem = @locked_specs[gem_name].last @@ -246,7 +246,7 @@ module Bundler def specs_for(groups) groups = requested_groups if groups.empty? deps = dependencies_for(groups) - add_bundler_to(resolve.materialize(expand_dependencies(deps))) + materialize(expand_dependencies(deps)) end def dependencies_for(groups) @@ -496,7 +496,9 @@ module Bundler private - def add_bundler_to(specs) + def materialize(dependencies) + specs = resolve.materialize(dependencies) + unless specs["bundler"].any? bundler = sources.metadata_source.specs.search(Gem::Dependency.new("bundler", VERSION)).last specs["bundler"] = bundler |