From 5335ce0e060c7a2a0b01c57f8f8a64254f2658e1 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 21 Nov 2018 10:20:47 +0000 Subject: Merge master branch from rubygems/rubygems upstream. * Enable Style/MethodDefParentheses in Rubocop https://github.com/rubygems/rubygems/pull/2478 * Enable Style/MultilineIfThen in Rubocop https://github.com/rubygems/rubygems/pull/2479 * Fix required_ruby_version with prereleases and improve error message https://github.com/rubygems/rubygems/pull/2344 * Fix bundler rubygems binstub not properly looking for bundler https://github.com/rubygems/rubygems/pull/2426 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/install_update_options.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/rubygems/install_update_options.rb') diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb index 824682f9ad..f05491a31c 100644 --- a/lib/rubygems/install_update_options.rb +++ b/lib/rubygems/install_update_options.rb @@ -50,7 +50,7 @@ module Gem::InstallUpdateOptions add_option(:"Install/Update", '--vendor', 'Install gem into the vendor directory.', 'Only for use by gem repackagers.') do |value, options| - unless Gem.vendor_dir then + unless Gem.vendor_dir raise OptionParser::InvalidOption.new 'your platform is not supported' end @@ -140,7 +140,7 @@ module Gem::InstallUpdateOptions File.exist? file end unless v - unless v then + unless v message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ', '})" raise OptionParser::InvalidArgument, @@ -178,7 +178,6 @@ module Gem::InstallUpdateOptions 'Suggest alternates when gems are not found') do |v,o| options[:suggest_alternate] = v end - end ## @@ -189,4 +188,3 @@ module Gem::InstallUpdateOptions end end - -- cgit v1.2.3