Make the equivalent change to `bundle update`

3 files changed, 38 insertions, 3 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 5679b65553..53241b15f6 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -256,7 +256,7 @@ module Bundler
       "Only output warnings and errors."
     method_option "source", :type => :array, :banner =>
       "Update a specific source (and all gems associated with it)"
-    method_option "force", :type => :boolean, :banner =>
+    method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
       "Force downloading every gem."
     method_option "ruby", :type => :boolean, :banner =>
       "Update ruby specified in Gemfile.lock"
@@ -275,6 +275,7 @@ module Bundler
     method_option "all", :type => :boolean, :banner =>
       "Update everything."
     def update(*gems)
+      SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
       require "bundler/cli/update"
       Update.new(options, gems).run
     end
diff --git a/man/bundle-update.ronn b/man/bundle-update.ronn
index 2ad678f424..397fecadcb 100644
--- a/man/bundle-update.ronn
+++ b/man/bundle-update.ronn
@@ -12,8 +12,8 @@ bundle-update(1) -- Update your gems to the latest available versions
                         [--full-index]
                         [--jobs=JOBS]
                         [--quiet]
-                        [--force]
                         [--patch|--minor|--major]
+                        [--redownload]
                         [--strict]
                         [--conservative]
 
@@ -64,7 +64,7 @@ gem.
 * `--quiet`:
   Only output warnings and errors.
 
-* `--force`:
+* `--redownload`:
   Force downloading every gem.
 
 * `--patch`:
diff --git a/spec/update/redownload_spec.rb b/spec/update/redownload_spec.rb
new file mode 100644
index 0000000000..02da654069
--- /dev/null
+++ b/spec/update/redownload_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.describe "bundle update" do
+  before :each do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+  end
+
+  describe "with --force" do
+    it "shows a deprecation when single flag passed" do
+      bundle! "update rack --force"
+      expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
+    end
+
+    it "shows a deprecation when multiple flags passed" do
+      bundle! "update rack --no-color --force"
+      expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
+    end
+  end
+
+  describe "with --redownload" do
+    it "does not show a deprecation when single flag passed" do
+      bundle! "update rack --redownload"
+      expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
+    end
+
+    it "does not show a deprecation when single multiple flags passed" do
+      bundle! "update rack --no-color --redownload"
+      expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`"
+    end
+  end
+end