summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-07-19 13:51:13 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-07-19 15:54:40 -0500
commitcb88c7189bd6af5223a276a5f5862ee3254eb684 (patch)
tree4fd7ec73fb83b5b7e6f1c49ea49f63d037b405d4 /lib
parent9760e0898734340d1d44f7a5a6b84341b0c512ae (diff)
downloadbundler-cb88c7189bd6af5223a276a5f5862ee3254eb684.tar.gz
[CLI] Deprecate install --force in favor of --redownload
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/cli.rb3
-rw-r--r--lib/bundler/cli/install.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 2284466bbb..92696276e3 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -170,7 +170,8 @@ module Bundler
"Do not attempt to fetch gems remotely and use the gem cache instead"
deprecated_option "no-cache", :type => :boolean, :banner =>
"Don't update the existing gem cache."
- method_option "force", :type => :boolean, :banner =>
+ method_option "redownload", :type => :boolean, :aliases =>
+ [Bundler.feature_flag.forget_cli_options? ? nil : "--force"].compact, :banner =>
"Force downloading every gem."
method_option "no-prune", :type => :boolean, :banner =>
"Don't remove stale gems from the cache."
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index bd91db1b89..cc41cce7a6 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -194,6 +194,8 @@ module Bundler
disable_shared_gems = Bundler.settings[:path] ? true : nil
Bundler.settings.set_command_option :disable_shared_gems, disable_shared_gems unless Bundler.settings[:disable_shared_gems] == disable_shared_gems
+
+ options[:force] = options[:redownload]
end
def warn_ambiguous_gems