diff options
| author | André Arko <mail@arko.net> | 2015-07-27 12:26:13 -0700 |
|---|---|---|
| committer | André Arko <mail@arko.net> | 2015-07-27 12:26:13 -0700 |
| commit | 0433b83757cf8e5e424221f8752bf59b1ac5d693 (patch) | |
| tree | 0b7d31f3a53c7785c617520820548cd0393c7999 | |
| parent | 854fd9b248f415d025ccb09b627a291b011b7b2a (diff) | |
| parent | bc94ea065151cdef557e63a8c457ce313f688c5b (diff) | |
| download | bundler-0433b83757cf8e5e424221f8752bf59b1ac5d693.tar.gz | |
Merge pull request #3881 from roseweixel/sanitize-config-test
fix bug that causes "run `rake false`" to appear in README.md
| -rw-r--r-- | lib/bundler/settings.rb | 6 | ||||
| -rw-r--r-- | lib/bundler/templates/newgem/newgem.gemspec.tt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index c675089a5a..0ebde20c71 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 diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt index e630801026..89f669120b 100644 --- a/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| <%- if config[:ext] -%> spec.add_development_dependency "rake-compiler" <%- end -%> -<%- if config[:test] && config[:test] != "false" -%> +<%- if config[:test] -%> spec.add_development_dependency "<%=config[:test]%>" <%- end -%> end |