diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-03-01 13:46:49 +0100 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-03-06 22:17:00 +0900 |
| commit | 156079a85d29a137521e6b911a39c25f35a960d2 (patch) | |
| tree | 285775d52f3f042a025d45937c850cd404864fc3 /lib/bundler/cli.rb | |
| parent | 7cc0c53169759996f75eacd7cceb2ea8d47c57d7 (diff) | |
[rubygems/rubygems] Make `--strict` flag of `update` and `outdated` commands consistent
Previously they had slightly different behavior when combined with
conservative updating flags.
The correct behavior is the `--update-strict` option, so `--script` now
does that, The `--update-strict` option is left there for now but I will
deprecate it later.
https://github.com/rubygems/rubygems/commit/ab42046229
Diffstat (limited to 'lib/bundler/cli.rb')
| -rw-r--r-- | lib/bundler/cli.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 16651dfad9..922ba469a4 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -391,7 +391,7 @@ module Bundler are up to date, Bundler will exit with a status of 0. Otherwise, it will exit 1. For more information on patch level options (--major, --minor, --patch, - --update-strict) see documentation on the same options on the update command. + --strict) see documentation on the same options on the update command. D method_option "group", :type => :string, :banner => "List gems from a specific group" method_option "groups", :type => :boolean, :banner => "List gems organized by groups" @@ -399,10 +399,9 @@ module Bundler "Do not attempt to fetch gems remotely and use the gem cache instead" method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems" method_option "source", :type => :array, :banner => "Check against a specific source" - strict_is_update = Bundler.feature_flag.forget_cli_options? - method_option "filter-strict", :type => :boolean, :aliases => strict_is_update ? [] : %w[--strict], :banner => + method_option "filter-strict", :type => :boolean, :banner => "Only list newer versions allowed by your Gemfile requirements" - method_option "update-strict", :type => :boolean, :aliases => strict_is_update ? %w[--strict] : [], :banner => + method_option "strict", :type => :boolean, :aliases => "--update-strict", :banner => "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major" method_option "minor", :type => :boolean, :banner => "Prefer updating only to next minor version" method_option "major", :type => :boolean, :banner => "Prefer updating to next major version (default)" |