bundler 1.12.4 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5433fc9cc8573aa85b617097a9c959a633b4fc
-  data.tar.gz: 53fe7741d85bcc26b81211e9b51ab6056e907f3e
+  metadata.gz: 6879f22286c10e34a40f3287efd41ac222878fb2
+  data.tar.gz: a6fac6da4a88d86e8e4d7a34b39a350b0a961cff
 SHA512:
-  metadata.gz: e738d624fbd192e6d6fd01ac413675e5e15e3f514618530bf36451798ee4798e73f6dd5f5b1b5b7acf151cc5326ec4c0f828424914d209d36d351b31d356cd8f
-  data.tar.gz: 11996eed9e6045a19e039044e151bdb010b013c697d8abbdef9d6d3cd5157e2c70de3087c130617f5bdee95f53243459e3ea83053c401055a706542b61d0e789
+  metadata.gz: ffb3c32b1c28b5e68f8fb169a1b2ff2d92aad3cc37686903c1342900941253e0f6ad8a165677905f8dffc4d7261ca05c6cd61b7c7343cac6956b908b309395fc
+  data.tar.gz: 9e6e9598a0487349a7e33de0b30ac79eaa8596ad94b94b51c4d05241d8e7effede9037e5f7954ceac79b17aa64f5be7dcbed358a90040ca77719dd7a7fea3efd

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.12.5 (2016-05-25)
+
+Bugfixes:
+  - only take over `--help` on `bundle exec` when the first two arguments are `exec` and `--help` (#4596, @segiddins)
+  - don't require `require: true` dependencies that are excluded via `env` or `install_if` (@BrianHawley)
+  - reduce the number of threads used simultaneously by bundler (#4367, @will-in-wi)
+
 ## 1.12.4 (2016-05-16)
 
 Bugfixes:

data/lib/bundler/cli.rb

@@ -438,35 +438,20 @@ module Bundler
     def self.reformatted_help_args(args)
       bundler_commands = all_commands.keys
       help_flags = %w(--help -h)
-      exec_commands = %w(exec e)
-      help_used = args.select {|a| help_flags.include? a }
-      exec_used = args.select {|a| exec_commands.include? a }
-      command = args.select {|a| bundler_commands.include? a }
-      if exec_used.any? && help_used.any?
-        regex = /
-            ( # Matches `exec --help` or `exec --help foo`
-              (#{exec_commands.join("|")})
-              \s
-              (#{help_flags.join("|")})
-              (.+)*
-            )|
-            ( # Matches `--help exec` or `--help exec foo`
-              (#{help_flags.join("|")})
-              \s
-              (#{exec_commands.join("|")})
-              (.+)*
-            )
-          /x
-        arg_str = args.join(" ")
-        if arg_str =~ regex
+      exec_commands = %w(e ex exe exec)
+      help_used = args.index {|a| help_flags.include? a }
+      exec_used = args.index {|a| exec_commands.include? a }
+      command = args.find {|a| bundler_commands.include? a }
+      if exec_used && help_used
+        if exec_used + help_used == 1
           %w(help exec)
         else
           args
         end
-      elsif command.empty?
+      elsif command.nil?
         abort("Could not find command \"#{args.join(" ")}\".")
       else
-        ["help", command.first]
+        ["help", command || args].flatten.compact
       end
     end
 

data/lib/bundler/fetcher/compact_index.rb

@@ -89,7 +89,7 @@ module Bundler
               worker_name = "Compact Index (#{display_uri.host})"
               worker = Bundler::Worker.new(25, worker_name, func)
               inputs.each {|input| worker.enq(input) }
-              inputs.map { worker.deq }
+              inputs.map { worker.deq }.tap { worker.stop }
             end
           end
         end

data/lib/bundler/friendly_errors.rb

@@ -69,7 +69,7 @@ module Bundler
         Error details
 
             #{e.class}: #{e.message}
-              #{e.backtrace.join("\n              ")}
+              #{e.backtrace && e.backtrace.join("\n              ")}
 
         #{Bundler::Env.new.report(:print_gemfile => false, :print_gemspecs => false).gsub(/\n/, "\n      ").strip}
         --- TEMPLATE END ----------------------------------------------------------------

data/lib/bundler/runtime.rb

@@ -68,9 +68,9 @@ module Bundler
       groups = [:default] if groups.empty?
 
       @definition.dependencies.each do |dep|
-        # Skip the dependency if it is not in any of the requested
-        # groups
-        next unless (dep.groups & groups).any? && dep.current_platform?
+        # Skip the dependency if it is not in any of the requested groups, or
+        # not for the current platform, or doesn't match the gem constraints.
+        next unless (dep.groups & groups).any? && dep.should_include?
 
         required_file = nil
 

data/lib/bundler/version.rb

@@ -7,5 +7,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.12.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.12.5" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.5
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies