1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Replace domain parameter in Gem::Command#show_lookup_failure with a parameter to suppress suggestions

Browse Source 
https://github.com/rubygems/rubygems/commit/760b7d834f
This commit is contained in:
bronzdoc 2019-07-25 23:54:06 -06:00 committed by Hiroshi SHIBATA
parent b8984370da
commit 89ad5df979
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rubygems/command.rb
View File

@ -155,9 +155,8 @@ class Gem::Command
## ##
# Display to the user that a gem couldn't be found and reasons why # Display to the user that a gem couldn't be found and reasons why
#-- #--
# TODO: replace +domain+ with a parameter to suppress suggestions
def show_lookup_failure(gem_name, version, errors, domain, required_by = nil) def show_lookup_failure(gem_name, version, errors, suppress_suggestions = false, required_by = nil)
gem = "'#{gem_name}' (#{version})" gem = "'#{gem_name}' (#{version})"
msg = String.new "Could not find a valid gem #{gem}" msg = String.new "Could not find a valid gem #{gem}"
@ -174,7 +173,7 @@ class Gem::Command
alert_error msg alert_error msg
unless domain == :local # HACK unless suppress_suggestions
suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name gem_name suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name gem_name
unless suggestions.empty? unless suggestions.empty?

5
lib/rubygems/commands/install_command.rb
View File

@ -218,6 +218,7 @@ You can use `i` command instead of `install`.
gem_version ||= options[:version] gem_version ||= options[:version]
domain = options[:domain] domain = options[:domain]
domain = :local unless options[:suggest_alternate] domain = :local unless options[:suggest_alternate]
supress_suggestions = (domain == :local)
begin begin
install_gem gem_name, gem_version install_gem gem_name, gem_version
@ -225,11 +226,11 @@ You can use `i` command instead of `install`.
alert_error "Error installing #{gem_name}:\n\t#{e.message}" alert_error "Error installing #{gem_name}:\n\t#{e.message}"
exit_code |= 1 exit_code |= 1
rescue Gem::GemNotFoundException => e rescue Gem::GemNotFoundException => e
show_lookup_failure e.name, e.version, e.errors, domain show_lookup_failure e.name, e.version, e.errors, supress_suggestions
exit_code |= 2 exit_code |= 2
rescue Gem::UnsatisfiableDependencyError => e rescue Gem::UnsatisfiableDependencyError => e
show_lookup_failure e.name, e.version, e.errors, domain, show_lookup_failure e.name, e.version, e.errors, supress_suggestions,
"'#{gem_name}' (#{gem_version})" "'#{gem_name}' (#{gem_version})"
exit_code |= 2 exit_code |= 2

2
test/rubygems/test_gem_command.rb
View File

@ -328,7 +328,7 @@ ERROR: Could not find a valid gem 'other' (>= 0) in any repository
end end
use_ui @ui do use_ui @ui do
@cmd.show_lookup_failure misspelled, Gem::Requirement.default, [], :remote @cmd.show_lookup_failure misspelled, Gem::Requirement.default, []
end end
expected = <<-EXPECTED expected = <<-EXPECTED