diff options
| author | Hiroshi SHIBATA <[email protected]> | 2022-08-09 11:16:07 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2022-08-09 12:05:19 +0900 |
| commit | 44264b4fee1e208e759710c39271186ff9856b40 (patch) | |
| tree | 939a9810293c86553e7b600bce9fb426776f6000 /lib/rubygems/commands/install_command.rb | |
| parent | f8936b3341376948112e31f9e9b0cb3ad6e91e7c (diff) | |
Merge rubygems/bundler HEAD.
Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6224
Diffstat (limited to 'lib/rubygems/commands/install_command.rb')
| -rw-r--r-- | lib/rubygems/commands/install_command.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index 690f90c2e4..724b4fe51d 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -46,8 +46,8 @@ class Gem::Commands::InstallCommand < Gem::Command def defaults_str # :nodoc: "--both --version '#{Gem::Requirement.default}' --no-force\n" + - "--install-dir #{Gem.dir} --lock\n" + - install_update_defaults_str + "--install-dir #{Gem.dir} --lock\n" + + install_update_defaults_str end def description # :nodoc: @@ -134,15 +134,15 @@ You can use `i` command instead of `install`. end def check_install_dir # :nodoc: - if options[:install_dir] and options[:user_install] + if options[:install_dir] && options[:user_install] alert_error "Use --install-dir or --user-install but not both" terminate_interaction 1 end 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 install 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`" terminate_interaction 1 @@ -191,8 +191,8 @@ You can use `i` command instead of `install`. end def install_gem(name, version) # :nodoc: - return if options[:conservative] and - not Gem::Dependency.new(name, version).matching_specs.empty? + return if options[:conservative] && + !Gem::Dependency.new(name, version).matching_specs.empty? req = Gem::Requirement.create(version) |