Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
Merge #7475
Browse files Browse the repository at this point in the history
7475: Delay deprecation of `bundle config` and `bundle update` without args r=hsbt a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem I was thinking about the upcoming release of bundler 2.1.0, and I'm not convinced about these two deprecations.

I'm not necessarily against them, but these command are very common IMO, and we'll be making them harder to run. Again, maybe for good reasons, but still. That will be combined with the fact that:

* In this same release, we'll be enabling all of the other deprecations.
* Ruby 2.7 will include bundler 2.1 and ruby 2.7 will also come with a lot of warnings about keyword arguments. 

### What was your diagnosis of the problem?

My diagnosis was that I think it's better to postpone these two deprecations for now. Get the other deprecations going and get user feedback about them, and then worry about these two later.

### What is your fix for the problem, implemented in this PR?

My fix is to delay both deprecations.

### Why did you choose this fix out of the possible options?

I chose this fix because I don't want to be too annoying to users at this moment.


Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
  • Loading branch information
bundlerbot and deivid-rodriguez committed Dec 13, 2019
2 parents 6394536 + 89f12a9 commit 69a88cf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion lib/bundler/cli/config.rb
Expand Up @@ -25,7 +25,7 @@ def base(name = nil, *value)
["config", "get", ARGV[1]]
end

SharedHelpers.major_deprecation 2,
SharedHelpers.major_deprecation 3,
"Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead."

Base.new(options, name, value, self).run
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/cli/update.rb
Expand Up @@ -22,7 +22,7 @@ def run
if Bundler.feature_flag.update_requires_all_flag?
raise InvalidOption, "To update everything, pass the `--all` flag."
end
SharedHelpers.major_deprecation 2, "Pass --all to `bundle update` to update everything"
SharedHelpers.major_deprecation 3, "Pass --all to `bundle update` to update everything"
elsif !full_update && options[:all]
raise InvalidOption, "Cannot specify --all along with specific options."
end
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/feature_flag.rb
Expand Up @@ -46,7 +46,7 @@ def self.settings_method(name, key, &default)
settings_flag(:specific_platform) { bundler_3_mode? }
settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
settings_flag(:unlock_source_unlocks_spec) { !bundler_3_mode? }
settings_flag(:update_requires_all_flag) { bundler_3_mode? }
settings_flag(:update_requires_all_flag) { bundler_4_mode? }
settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? }

settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
Expand Down
18 changes: 9 additions & 9 deletions spec/other/major_deprecation_spec.rb
Expand Up @@ -127,7 +127,7 @@
bundle! "config"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config list` instead.")
end

Expand All @@ -139,7 +139,7 @@
bundle! "config waka"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config get waka` instead.")
end

Expand All @@ -151,7 +151,7 @@
bundle! "config waka wakapun"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set waka wakapun` instead.")
end

Expand All @@ -163,7 +163,7 @@
bundle! "config --local waka wakapun"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set --local waka wakapun` instead.")
end

Expand All @@ -175,7 +175,7 @@
bundle! "config --global waka wakapun"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config set --global waka wakapun` instead.")
end

Expand All @@ -187,7 +187,7 @@
bundle! "config --delete waka"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset waka` instead.")
end

Expand All @@ -199,7 +199,7 @@
bundle! "config --delete --local waka"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset --local waka` instead.")
end

Expand All @@ -211,7 +211,7 @@
bundle! "config --delete --global waka"
end

it "warns", :bundler => "2" do
it "warns", :bundler => "3" do
expect(deprecations).to include("Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle config unset --global waka` instead.")
end

Expand All @@ -227,7 +227,7 @@
G
end

it "warns when no options are given", :bundler => "2" do
it "warns when no options are given", :bundler => "3" do
bundle! "update"
expect(deprecations).to include("Pass --all to `bundle update` to update everything")
end
Expand Down

0 comments on commit 69a88cf

Please sign in to comment.