mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[rubygems/rubygems] Small refactor by DRYing up some logic
https://github.com/rubygems/rubygems/commit/c7e3c092e1
This commit is contained in:
parent
8116b7fef7
commit
d298ef40f2
Notes:
git
2021-08-31 19:07:28 +09:00
1 changed files with 5 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue