Merge RubyGems-3.3.20 and Bundler-2.3.20

This commit is contained in:
Hiroshi SHIBATA 2022-08-22 11:50:00 +09:00 committed by nagachika
parent 44c926f3a9
commit 522b75f1b6
135 changed files with 1131 additions and 613 deletions

View file

@ -96,7 +96,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
def defaults_str # :nodoc:
"--version '#{Gem::Requirement.default}' --no-force " +
"--user-install"
"--user-install"
end
def description # :nodoc:
@ -114,8 +114,8 @@ that is a dependency of an existing gem. You can use the
end
def check_version # :nodoc:
if options[:version] != Gem::Requirement.default and
get_all_gem_names.size > 1
if options[:version] != Gem::Requirement.default &&
get_all_gem_names.size > 1
alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
" version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
terminate_interaction 1
@ -125,7 +125,7 @@ that is a dependency of an existing gem. You can use the
def execute
check_version
if options[:all] and not options[:args].empty?
if options[:all] && !options[:args].empty?
uninstall_specific
elsif options[:all]
uninstall_all