Skip to content

Commit 7df9798

Browse files
hsbtdentarg
authored andcommitted
[ruby/rubygems] Improve banner message for the default command.
Co-authored-by: Benoit Daloze <eregontp@gmail.com> ruby/rubygems@463488b439 Co-authored-by: Patrik Ragnarsson <patrik@starkast.net>
1 parent e2d1765 commit 7df9798

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/bundler/cli.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ def self.default_command(meth = nil)
133133

134134
unless Bundler.settings[:default_cli_command]
135135
Bundler.ui.info <<-MSG
136-
In the feature version of Bundler, running `bundle` without argument will no longer run `bundle install`.
136+
In a future version of Bundler, running `bundle` without argument will no longer run `bundle install`.
137137
Instead, the `cli_help` command will be displayed. Please use `bundle install` explicitly for scripts like CI/CD.
138-
If you wish to use feature behavior now with `bundle config set default_cli_command cli_help --global`
139-
or you can continue to use the old behavior with `bundle config set default_cli_command install_or_cli_help --global`.
138+
You can use the future behavior now with `bundle config set default_cli_command cli_help --global`,
139+
or you can continue to use the current behavior with `bundle config set default_cli_command install_or_cli_help --global`.
140140
This message will be removed after a default_cli_command value is set.
141141
MSG
142142
end

spec/bundler/bundler/cli_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def out_with_macos_man_workaround
9090
it "tries to installs by default but print help on missing Gemfile" do
9191
bundle "", raise_on_error: false
9292
expect(err).to include("Could not locate Gemfile")
93-
expect(out).to include("In the feature version of Bundler")
93+
expect(out).to include("In a future version of Bundler")
9494

9595
expect(out).to include("Bundler version #{Bundler::VERSION}").
9696
and include("\n\nBundler commands:\n\n").
@@ -102,7 +102,7 @@ def out_with_macos_man_workaround
102102
it "runs bundle install when default_cli_command set to install" do
103103
bundle "config set default_cli_command install_or_cli_help"
104104
bundle "", raise_on_error: false
105-
expect(out).to_not include("In the feature version of Bundler")
105+
expect(out).to_not include("In a future version of Bundler")
106106
expect(err).to include("Could not locate Gemfile")
107107
end
108108
end

0 commit comments

Comments
 (0)