Skip to content

Commit 0e919ea

Browse files
Refactor bundle info
1 parent fad186d commit 0e919ea

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

bundler/lib/bundler/cli/common.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ def self.select_spec(name, regex_match = nil)
5757
specs << spec if regexp && spec.name =~ regexp
5858
end
5959

60+
default_spec = default_gem_spec(name)
61+
specs << default_spec if default_spec
62+
6063
case specs.count
6164
when 0
6265
dep_in_other_group = Bundler.definition.current_dependencies.find {|dep|dep.name == name }
@@ -75,6 +78,12 @@ def self.select_spec(name, regex_match = nil)
7578
raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
7679
end
7780

81+
def self.default_gem_spec(name)
82+
return unless Gem::Specification.respond_to?(:find_all_by_name)
83+
gem_spec = Gem::Specification.find_all_by_name(name).last
84+
gem_spec if gem_spec&.default_gem?
85+
end
86+
7887
def self.ask_for_spec_from(specs)
7988
specs.each_with_index do |spec, index|
8089
Bundler.ui.info "#{index.succ} : #{spec.name}", true

bundler/lib/bundler/cli/info.rb

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,8 @@ def run
2525

2626
private
2727

28-
def spec_for_gem(gem_name)
29-
spec = Bundler.definition.specs.find {|s| s.name == gem_name }
30-
spec || default_gem_spec(gem_name) || Bundler::CLI::Common.select_spec(gem_name, :regex_match)
31-
end
32-
33-
def default_gem_spec(gem_name)
34-
return unless Gem::Specification.respond_to?(:find_all_by_name)
35-
gem_spec = Gem::Specification.find_all_by_name(gem_name).last
36-
gem_spec if gem_spec&.default_gem?
28+
def spec_for_gem(name)
29+
Bundler::CLI::Common.select_spec(name, :regex_match)
3730
end
3831

3932
def print_gem_version(spec)

0 commit comments

Comments
 (0)