summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Arko <mail@arko.net>2015-04-19 17:18:03 -0700
committerAndré Arko <mail@arko.net>2015-04-19 17:18:03 -0700
commit182372b565f6d3a9fb4a8f8cc9e6cff81f1ee793 (patch)
treede492402bc30646d83a27bda7ecfd7a7f11b3b0f
parentc7fce7422f467407f7544062661cbbb726b9ef38 (diff)
parent8247e5516af2120758a1bc4b1a09b39aaddb6a6b (diff)
downloadbundler-182372b565f6d3a9fb4a8f8cc9e6cff81f1ee793.tar.gz
Merge pull request #3579 from pducks32/fix-boolean-settings
Fix `bundle gem` boolean settings
-rw-r--r--lib/bundler/cli/gem.rb2
-rw-r--r--lib/bundler/ui/shell.rb8
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index f102dd50f9..3bb8b69ec4 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -139,7 +139,7 @@ module Bundler
if choice.nil?
Bundler.ui.confirm header
- choice = (Bundler.ui.ask("#{message} y/(n):") =~ /y|yes/)
+ choice = Bundler.ui.yes? "#{message} y/(n):"
Bundler.settings.set_global("gem.#{key}", choice)
end
diff --git a/lib/bundler/ui/shell.rb b/lib/bundler/ui/shell.rb
index 6299c5e9d2..81849c3a55 100644
--- a/lib/bundler/ui/shell.rb
+++ b/lib/bundler/ui/shell.rb
@@ -46,6 +46,14 @@ module Bundler
@shell.ask(msg)
end
+ def yes?(msg)
+ @shell.yes?(msg)
+ end
+
+ def no?
+ @shell.no?(msg)
+ end
+
def level=(level)
raise ArgumentError unless LEVELS.include?(level.to_s)
@level = level