From dd15ec048b6e89c73cfdeaf38294e999d8c45531 Mon Sep 17 00:00:00 2001
From: Oleg Sukhodolsky <os97673@gmail.com>
Date: Fri, 8 Mar 2013 09:49:35 +0400
Subject: [PATCH] Reverting #324.  Fixes #386.  Closes #388

---
 History.md                        |  3 +--
 lib/cucumber/rake/task.rb         |  3 +--
 spec/cucumber/rake/forked_spec.rb | 15 +--------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/History.md b/History.md
index e1f4eb031d..5fa77a0012 100644
--- a/History.md
+++ b/History.md
@@ -1,8 +1,7 @@
 ## [Git master](https://github.com/cucumber/cucumber/compare/v1.2.2...master)
 
-### New Features
-
 ### Bugfixes
+* Fix problem with rake task for jruby and ruby installed from packages on Ubuntu ([#386](https://github.com/cucumber/cucumber/issues/386), [#388](https://github.com/cucumber/cucumber/issues/388) y-higuchi)
 * Fix embedding images in json ([#315](https://github.com/cucumber/cucumber/issues/315) Oleg Sukhodolsky)
 
 ## [1.2.2](https://github.com/cucumber/cucumber/compare/v1.2.1...v1.2.2)
diff --git a/lib/cucumber/rake/task.rb b/lib/cucumber/rake/task.rb
index c2f35650ea..6a7e1e010b 100644
--- a/lib/cucumber/rake/task.rb
+++ b/lib/cucumber/rake/task.rb
@@ -92,8 +92,7 @@ def gem_available_new_rubygems?(gemname)
 
         def cmd
           if use_bundler
-            bundle_cmd = Gem.default_exec_format % 'bundle'
-            [ Cucumber::RUBY_BINARY, '-S', bundle_cmd, 'exec', 'cucumber', @cucumber_opts,
+            [ Cucumber::RUBY_BINARY, '-S', 'bundle', 'exec', 'cucumber', @cucumber_opts,
             @feature_files ].flatten
           else
             [ Cucumber::RUBY_BINARY, '-I', load_path(@libs), quoted_binary(@cucumber_bin),
diff --git a/spec/cucumber/rake/forked_spec.rb b/spec/cucumber/rake/forked_spec.rb
index 5307a198e7..9db1cf8cd6 100644
--- a/spec/cucumber/rake/forked_spec.rb
+++ b/spec/cucumber/rake/forked_spec.rb
@@ -24,22 +24,9 @@ module Rake
         end
 
         it "uses bundle exec to find cucumber and libraries" do
-          bundle_cmd = Gem.default_exec_format % 'bundle'
-
-          subject.cmd.should == [Cucumber::RUBY_BINARY,
-                                 '-S',
-                                 bundle_cmd,
-                                 'exec',
-                                 'cucumber',
-                                 '--cuke-option'] + feature_files
-        end
-
-        it "obeys program suffix for bundler" do
-          Gem::ConfigMap.stub(:[]).with(:ruby_install_name).and_return('XrubyY')
-
           subject.cmd.should == [Cucumber::RUBY_BINARY,
                                  '-S',
-                                 'XbundleY',
+                                 'bundle',
                                  'exec',
                                  'cucumber',
                                  '--cuke-option'] + feature_files