summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/bundler/cli.rb14
-rw-r--r--spec/bundler/other/major_deprecation_spec.rb1
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index f7613287d0..3d5194d61f 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -254,6 +254,8 @@ module Bundler
remembered_flag_deprecation(option)
end
+ remembered_negative_flag_deprecation("no-deployment")
+
require_relative "cli/install"
Bundler.settings.temporary(:no_install => false) do
Install.new(options.dup).run
@@ -812,10 +814,22 @@ module Bundler
nil
end
+ def remembered_negative_flag_deprecation(name)
+ positive_name = name.gsub(/\Ano-/, "")
+ option = current_command.options[positive_name]
+ flag_name = "--no-" + option.switch_name.gsub(/\A--/, "")
+
+ flag_deprecation(positive_name, flag_name, option)
+ end
+
def remembered_flag_deprecation(name)
option = current_command.options[name]
flag_name = option.switch_name
+ flag_deprecation(name, flag_name, option)
+ end
+
+ def flag_deprecation(name, flag_name, option)
name_index = ARGV.find {|arg| flag_name == arg.split("=")[0] }
return unless name_index
diff --git a/spec/bundler/other/major_deprecation_spec.rb b/spec/bundler/other/major_deprecation_spec.rb
index 102588e97a..c8023dc8f5 100644
--- a/spec/bundler/other/major_deprecation_spec.rb
+++ b/spec/bundler/other/major_deprecation_spec.rb
@@ -318,6 +318,7 @@ RSpec.describe "major deprecations" do
"deployment" => ["deployment", true],
"frozen" => ["frozen", true],
"no-cache" => ["no_cache", true],
+ "no-deployment" => ["deployment", false],
"no-prune" => ["no_prune", true],
"path" => ["path", "vendor/bundle"],
"shebang" => ["shebang", "ruby27"],