Merge rubygems/bundler HEAD.

Pick from dfbb5a3811
This commit is contained in:
Hiroshi SHIBATA 2022-08-09 11:16:07 +09:00
parent f8936b3341
commit 44264b4fee
Notes: git 2022-08-09 12:05:48 +09:00
80 changed files with 312 additions and 286 deletions

View file

@ -82,7 +82,7 @@ Do you want to add this source?
def check_rubygems_https(source_uri) # :nodoc:
uri = URI source_uri
if uri.scheme and uri.scheme.downcase == "http" and
if uri.scheme && uri.scheme.downcase == "http" &&
uri.host.downcase == "rubygems.org"
question = <<-QUESTION.chomp
https://rubygems.org is recommended for security over #{uri}
@ -215,9 +215,9 @@ To remove a source use the --remove argument:
def remove_cache_file(desc, path) # :nodoc:
FileUtils.rm_rf path
if not File.exist?(path)
if !File.exist?(path)
say "*** Removed #{desc} source cache ***"
elsif not File.writable?(path)
elsif !File.writable?(path)
say "*** Unable to remove #{desc} source cache (write protected) ***"
else
say "*** Unable to remove #{desc} source cache ***"