bin_path checks gem name as well as the availability of named bin.

2 files changed, 38 insertions, 2 deletions

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 3bbbf1d293..c901445c16 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -300,8 +300,8 @@ module Bundler
         spec = nil
 
         if exec_name
-          spec = specs.find { |s| s.executables.include?(exec_name) }
-          spec or raise Gem::Exception, "can't find executable #{exec_name}"
+          spec = specs.find { |s| s.name == name && s.executables.include?(exec_name) }
+          spec or raise Gem::Exception, "can't find executable #{exec_name} in #{name}"
         else
           spec = specs.find  { |s| s.name == name }
           exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
diff --git a/spec/commands/binstubs_spec.rb b/spec/commands/binstubs_spec.rb
index 3d3ed0fc58..d38c6fb6f1 100644
--- a/spec/commands/binstubs_spec.rb
+++ b/spec/commands/binstubs_spec.rb
@@ -191,3 +191,39 @@ describe "bundle binstubs <gem>" do
     end
   end
 end
+
+describe "running binstubs" do
+  it "gets correct version from binstub" do
+    build_git "gem_with_executable1" do |s|
+      s.executables = "gwe"
+    end
+    install_gemfile <<-G
+      gem "gem_with_executable1", :git => "#{lib_path('gem_with_executable1-1.0')}"
+      gem "bundler"
+    G
+
+    bundle "binstubs gem_with_executable1"
+
+    expect(bundled_app("bin/gwe")).to exist
+    expect(sys_exec("RUBYLIB='#{lib}' #{bundled_app("bin/gwe")}")).to eq("1.0")
+  end
+
+  it "loads correct version from binstub when two gems have a bin with the same name" do
+    build_git "gem_with_executable1" do |s|
+      s.executables = "gwe"
+    end
+    build_git "gem_with_executable2", "2.0" do |s|
+      s.executables = "gwe"
+    end
+    install_gemfile <<-G
+      gem "gem_with_executable1", :git => "#{lib_path('gem_with_executable1-1.0')}"
+      gem "gem_with_executable2", :git => "#{lib_path('gem_with_executable2-2.0')}"
+      gem "bundler"
+    G
+
+    bundle "binstubs gem_with_executable2"
+
+    expect(bundled_app("bin/gwe")).to exist
+    expect(sys_exec("RUBYLIB='#{lib}' #{bundled_app("bin/gwe")}")).to eq("2.0")
+  end
+end