bundler 1.10.5 → 1.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2462b2530c9588977f9eca5df458b9f9cd50f5cf
-  data.tar.gz: 3e4c22647357a52bdcea5edcdc4b66af60ab1c1d
+  metadata.gz: 7b5b82f62ba26e1ac9da898f780001baab80d27e
+  data.tar.gz: 72988f3a780eea7870f3c1306ffa455aa33cffce
 SHA512:
-  metadata.gz: 0a871b02641e097cb07274f6944e9391950c14e4ac859ac7fe739f75786e37364f851b9b4fab058659bf504918438ff1343207d12f5a7f6bbdb32107404dcce8
-  data.tar.gz: a1ea05745751c4f07e5a33bf17ac507a2c4c706c23d3304791ed2618afc1456b85571d2370c67fa4fa2f93c76a35c1ceffaae6154528682435cbd5db4181099a
+  metadata.gz: d70d3b9ac2f6f76bd2a301e03c6b515e1468030c85daf2dc678ab0475582ba6fc289238f3e9d80656c75ff783426c10850b317c4c5922dda6e98f768945ee064
+  data.tar.gz: a8c44a1a6b8d8eb4497d39ad64fd9bf2693e280b5eb9ba410d6112ae8f635acaa7901ef75355961edabbcee040e302f206ff4bfe2d6402bc512241c02d5962b9

data/.travis.yml

@@ -45,7 +45,6 @@ env:
   - RGV=v2.4.8
 
 matrix:
-  fast_finish: true
   include:
     # Ruby 2.2, Rubygems 2.4.5 and up (RG 2.4 is included by the matrix above)
     # Ruby 2.1, Rubygems 2.2.2 and up

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.10.6 (2015-07-22)
+
+Workarounds:
+
+  - only warn on invalid gemspecs (@indirect)
+
+Bugfixes:
+
+  - fix installing dependencies in the correct order (#3799, @pducks32)
+  - fix sorting of mixed DependencyLists (#3762, @tony-spataro-rs)
+  - fix `install_if` conditionals when using the block form (@danieltdt)
+
 ## 1.10.5 (2015-06-24)
 
 Workarounds:

data/lib/bundler.rb

@@ -371,8 +371,9 @@ module Bundler
         spec
       end
     rescue Gem::InvalidSpecificationException => e
-      raise InvalidOption, "The gemspec at #{file} is not valid. " \
+      Bundler.ui.warn "The gemspec at #{file} is not valid. " \
         "The validation error was '#{e.message}'"
+      nil
     end
 
     def clear_gemspec_cache

data/lib/bundler/cli.rb

@@ -345,13 +345,13 @@ module Bundler
     end
 
     desc "gem GEM [OPTIONS]", "Creates a skeleton for creating a rubygem"
-    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library. Set a default with `bundle config gem.mit true`."
+    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library."
     method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
     method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
       :lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? },
       :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
     method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
-    method_option :mit, :type => :boolean, :desc => "Generate an MIT license file"
+    method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`."
     method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "rspec",
       :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
     def gem(name)

data/lib/bundler/dsl.rb

@@ -186,7 +186,7 @@ module Bundler
       @install_conditionals.concat args
       blk.call
     ensure
-      args.each { @groups.pop }
+      args.each { @install_conditionals.pop }
     end
 
     def platforms(*platforms)

data/lib/bundler/installer/parallel_installer.rb

@@ -35,10 +35,9 @@ class ParallelInstaller
 
     # Checks installed dependencies against spec's dependencies to make
     # sure needed dependencies have been installed.
-    def dependencies_installed?(remaining_specs)
-      installed_specs = remaining_specs.reject(&:installed?).map(&:name)
-      already_installed = lambda {|dep| installed_specs.include? dep.name }
-      dependencies.all? {|d| already_installed[d] }
+    def dependencies_installed?(all_specs)
+      installed_specs = all_specs.select(&:installed?).map(&:name)
+      dependencies.all? {|d| installed_specs.include? d.name }
     end
 
     # Represents only the non-development dependencies and the ones that

data/lib/bundler/remote_specification.rb

@@ -52,8 +52,6 @@ module Bundler
       @_remote_specification = spec
     end
 
-  private
-
     # Create a delegate used for sorting. This strategy is copied from
     # RubyGems 2.23 and ensures that Bundler's specifications can be
     # compared and sorted with RubyGems' own specifications.
@@ -67,6 +65,8 @@ module Bundler
       [@name, @version, @platform == Gem::Platform::RUBY ? -1 : 1]
     end
 
+  private
+
     def _remote_specification
       @_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
     end

data/lib/bundler/source/git/git_proxy.rb

@@ -83,7 +83,7 @@ module Bundler
             FileUtils.mkdir_p(destination.dirname)
             FileUtils.rm_rf(destination)
             git_retry %|clone --no-checkout --quiet "#{path}" "#{destination}"|
-            File.chmod((0777 & ~File.umask), destination)
+            File.chmod(((File.stat(destination).mode | 0777) & ~File.umask), destination)
           end
 
           SharedHelpers.chdir(destination) do

data/lib/bundler/templates/newgem/README.md.tt

@@ -26,7 +26,7 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

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.10.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.6" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 1.10.6
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -316,8 +316,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
+has_rdoc: