[DSL] Warn on invalid options instead of raisingseg-warn-on-unknown-ops

1 files changed, 14 insertions, 13 deletions

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index b064c80d4c..7585a8c6a2 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -382,20 +382,21 @@ module Bundler
       opts["optional"] ||= false
     end
 
-    def validate_keys(command, opts, valid_keys)
+    def validate_keys(command, opts, valid_keys, raise_on_invalid_keys = false)
       invalid_keys = opts.keys - valid_keys
-      if invalid_keys.any?
-        message = String.new
-        message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
-        message << if invalid_keys.size > 1
-                     "as options for #{command}, but they are invalid."
-                   else
-                     "as an option for #{command}, but it is invalid."
-                   end
-
-        message << " Valid options are: #{valid_keys.join(", ")}"
-        raise InvalidOption, message
-      end
+      return true if invalid_keys.empty?
+      message = String.new
+      message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
+      message << if invalid_keys.size > 1
+                   "as options for #{command}, but they are invalid."
+                 else
+                   "as an option for #{command}, but it is invalid."
+                 end
+
+      message << " Valid options are: #{valid_keys.join(", ")}"
+      raise InvalidOption, message if raise_on_invalid_keys
+      Bundler.ui.warn(message)
+      false
     end
 
     def normalize_source(source)