bundler 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b30d7f68ab57d609b0945f483f536cafac8d4757
-  data.tar.gz: 7a7c04740ead7985a85d89061738f7a654c95c06
+  metadata.gz: f54e9406657c9cbddf32e89288ac35910b1529a2
+  data.tar.gz: cc760f3dd023d2a9159b62d930abf0a2cda52333
 SHA512:
-  metadata.gz: 8a04ea9994afc79eaa115ca259758e15fba0da19228f4210646c2451e0c3b11b0e39278fda7aa56f1c1202993b248a3b16227ceff5ab7d72ecaf4c31be2ccd73
-  data.tar.gz: f26a87583ff7b6cf97bb260874117d47cb9636a3051a59d1cb88e4551cae9bdb7ebc745f2e5aa07ec57a1ea96a698d82b2a9b4853947ca392f55b9cc4773162a
+  metadata.gz: b66eee7c1e92eb57df7fad62c4811a08cffaf25650ecf3f53d479b793bae0ebfd2e10017042d784cbf8df0beb6cfe8f023c08737b8d310fe0f172149ab54244c
+  data.tar.gz: 7b7cf53500de4c9359e1a136a3b0703412bd98cd0e88bb599855ad45f6231e388bd95d2e35a73fe2001869c15114f896e476f620e94e42e25d5523c2dbd11d6b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.12.2 (2016-05-04)
+
+Bugfixes:
+  - fix modifying a frozen string when the resolver conflicts on dependencies with requirements (#4520, @grzuy)
+  - fix `bundle exec foo --help` not showing the invoked command's help (#4480, @b-ggs)
+
 ## 1.12.1 (2016-04-30)
 
 Bugfixes:

data/lib/bundler/cli.rb

@@ -437,13 +437,37 @@ module Bundler
     # into the corresponding `bundle help #{command}` call
     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 command.empty?
+      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
+          %w(help exec)
+        else
+          args
+        end
+      elsif command.empty?
         abort("Could not find command \"#{args.join(" ")}\".")
       else
-        command = command.first
+        ["help", command.first]
       end
-      ["help", command]
     end
 
   private

data/lib/bundler/definition.rb

@@ -428,7 +428,7 @@ module Bundler
     end
 
     def pretty_dep(dep, source = false)
-      msg = "#{dep.name}"
+      msg = String.new(dep.name)
       msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
       msg << " from the `#{dep.source}` source" if source && dep.source
       msg

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-04 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.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies