summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKir Shatrov <shatrov@me.com>2015-03-09 10:02:53 +0200
committerAndre Arko <andre@arko.net>2015-03-11 00:23:13 -0700
commitedb4b50e74dcd5dec877027218cfc5970a60bcc7 (patch)
tree4dec0ab30a3231dcb715873fc1c006661c63f8ed
parenta9b1825a3e1c1076dc158381fec8a96e5d9afad8 (diff)
downloadbundler-edb4b50e74dcd5dec877027218cfc5970a60bcc7.tar.gz
Fixed ’no’ option in gem generator
Fix #3436
-rw-r--r--lib/bundler/cli/gem.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 4694a01328..308846f2d3 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -118,17 +118,21 @@ module Bundler
end
def ask_and_set(key, header, message)
- result = options[key]
+ choice = options[key]
if !Bundler.settings.all.include?("gem.#{key}")
- if result.nil?
+ if choice.nil?
Bundler.ui.confirm header
- result = Bundler.ui.ask("#{message} y/(n):") == "y"
+ choice = Bundler.ui.ask("#{message} y/(n):") == "y"
end
- Bundler.settings.set_global("gem.#{key}", result)
+ Bundler.settings.set_global("gem.#{key}", choice)
end
- result || Bundler.settings["gem.#{key}"]
+ if choice.nil?
+ Bundler.settings["gem.#{key}"]
+ else
+ choice
+ end
end
def validate_ext_name