Skip to content

Commit

Permalink
[rubygems/rubygems] Small refactor by DRYing up some logic
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez authored and hsbt committed Aug 31, 2021
1 parent 8116b7f commit d298ef4
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/bundler/definition.rb
Expand Up @@ -190,7 +190,7 @@ def resolve_remotely!
#
# @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
Expand Down Expand Up @@ -246,7 +246,7 @@ def current_dependencies
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)
Expand Down Expand Up @@ -496,7 +496,9 @@ def unlocking?

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
Expand Down

0 comments on commit d298ef4

Please sign in to comment.