push logic for dealing with string 'false' down to Settings class

2 files changed, 5 insertions, 9 deletions

diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 5a180a029d..cef64f27a8 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -162,14 +162,8 @@ module Bundler
       exit 1
     end
 
-    def sanitized_test_framework
-      test_framework = options[:test] || Bundler.settings["gem.test"]
-      
-      test_framework == "false" ? false : test_framework
-    end
-
     def ask_and_set_test_framework
-      test_framework = sanitized_test_framework
+      test_framework = options[:test] || Bundler.settings["gem.test"]
 
       if test_framework.nil?
         Bundler.ui.confirm "Do you want to generate tests with your gem?"
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index c675089a5a..4ce1ecc996 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -17,9 +17,11 @@ module Bundler
       value = (@local_config[key] || ENV[key] || @global_config[key] || DEFAULT_CONFIG[name])
 
       case
-      when !value.nil? && is_bool(name)
+      when value.nil?
+        nil
+      when is_bool(name) || value == "false" 
         to_bool(value)
-      when !value.nil? && is_num(name)
+      when is_num(name)
         value.to_i
       else
         value