bundler 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94dcf8415141822172726fafaafc71de5639e1b7
-  data.tar.gz: 2c99b2539d93bd15af0a51c6167bf1825d5f7fd5
+  metadata.gz: bd9cd2a859f1af1500763f43966145161f3ae948
+  data.tar.gz: 7c6e684d16889f20d8f23f957a22c90e0ee33c21
 SHA512:
-  metadata.gz: 767a8471e930fd16d98b2bad05bf8719cf86996a9ed592a619c12d8ef1728450cfc52f0c7897acf7cfe3557e2720d26ad091da21a5d0af6f0107d4836f54ae2a
-  data.tar.gz: 368ac2c806d1e2e90c998fb5e9df1c0b41ace6db7f8a40aed9a9f4c665cb2f3254a88b0a45a67bd10b13d57a045d71dd7e5cc7f9eb663cde0791450271423c68
+  metadata.gz: e35cce86ced240aaba9dea510d7960e5809020fa950cf72cf10c238f21199d262487cb8a1929db266ea722c356a2894417ca1ce007e972489dc4bd7684cd96df
+  data.tar.gz: 5504d5b6d31351943f466cdc743202e68135de21309135a8f8ab6d074cba0aa125677e5c172525c571a13f5ac7484b70266ca12e0fdfdc45c9819b86fea1567d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.8.5 (2015-03-11)
+
+Bugfixes:
+
+  - remove MIT license from gemspec when removing license file (@indirect)
+  - respect 'no' immediately as well as saving it in `gem` config (@kirs)
+
 ## 1.8.4 (2015-03-05)
 
 Bugfixes:

data/lib/bundler/cli/gem.rb

@@ -26,7 +26,7 @@ module Bundler
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
 
-      opts = {
+      config = {
         :name             => name,
         :underscored_name => underscored_name,
         :namespaced_path  => namespaced_path,
@@ -67,6 +67,7 @@ module Bundler
           "for free as long as they admit you created it. You can read more about the MIT license " \
           "at choosealicense.com/licenses/mit."
         )
+        config[:mit] = true
         templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
       end
 
@@ -99,7 +100,7 @@ module Bundler
       end
 
       templates.each do |src, dst|
-        thor.template("newgem/#{src}", target.join(dst), opts)
+        thor.template("newgem/#{src}", target.join(dst), config)
       end
 
       Bundler.ui.info "Initializing git repo in #{target}"
@@ -118,17 +119,15 @@ module Bundler
     end
 
     def ask_and_set(key, header, message)
-      result = options[key]
-      if !Bundler.settings.all.include?("gem.#{key}")
-        if result.nil?
-          Bundler.ui.confirm header
-          result = Bundler.ui.ask("#{message} y/(n):") == "y"
-        end
+      choice = options[key] || Bundler.settings["gem.#{key}"]
 
-        Bundler.settings.set_global("gem.#{key}", result)
+      if choice.nil?
+        Bundler.ui.confirm header
+        choice = (Bundler.ui.ask("#{message} y/(n):") =~ /y|yes/)
+        Bundler.settings.set_global("gem.#{key}", choice)
       end
 
-      result || Bundler.settings["gem.#{key}"]
+      choice
     end
 
     def validate_ext_name
@@ -143,6 +142,7 @@ module Bundler
 
     def ask_and_set_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?"
         result = Bundler.ui.ask "Type 'rspec' or 'minitest' to generate those test files now and " \
@@ -150,7 +150,7 @@ module Bundler
         if result =~ /rspec|minitest/
           test_framework = result
         else
-          test_framework = "false"
+          test_framework = false
         end
       end
 
@@ -158,7 +158,6 @@ module Bundler
         Bundler.settings.set_global("gem.test", test_framework)
       end
 
-      return if test_framework == "false"
       test_framework
     end
 

data/lib/bundler/settings.rb

@@ -10,10 +10,15 @@ module Bundler
       @global_config = load_config(global_config_file)
     end
 
-    def [](key)
-      the_key = key_for(key)
-      value = (@local_config[the_key] || ENV[the_key] || @global_config[the_key])
-      is_bool(key) ? to_bool(value) : value
+    def [](name)
+      key = key_for(name)
+      value = (@local_config[key] || ENV[key] || @global_config[key])
+
+      if !value.nil? && is_bool(name)
+        to_bool(value)
+      else
+        value
+      end
     end
 
     def []=(key, value)

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -9,14 +9,12 @@ Gem::Specification.new do |spec|
   spec.authors       = [<%=config[:author].inspect%>]
   spec.email         = [<%=config[:email].inspect%>]
 
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-
   spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
   spec.description   = %q{TODO: Write a longer description or delete this line.}
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+<%- if config[:mit] -%>
   spec.license       = "MIT"
+<%- end -%>
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -26,6 +24,10 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/<%=config[:underscored_name]%>/extconf.rb"]
 <%- end -%>
 
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
+  end
+
   spec.add_development_dependency "bundler", "~> <%= Bundler::VERSION.split(".")[0..1].join(".") %>"
   spec.add_development_dependency "rake", "~> 10.0"
 <%- if config[:ext] -%>

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.8.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.8.5" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache