shell out to run bundler on app generation, see rationale in the comment

1 files changed, 12 insertions, 6 deletions

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 7972c72c1e..f07e090c25 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -188,13 +188,19 @@ module Rails
       end
 
       def bundle_command(command)
-        require 'bundler'
-        require 'bundler/cli'
-
         say_status :run, "bundle #{command}"
-        Bundler::CLI.new.send(command)
-      rescue
-        say_status :failure, "bundler raised an exception, are you offline?", :red
+
+        # We are going to shell out rather than invoking Bundle::CLI.new(command)
+        # because `rails new` loads the Thor gem and on the other hand bundler uses
+        # its own vendored Thor, which could be a different version. Running both
+        # things in the same process is a recipe for a night with paracetamol.
+        #
+        # We use backticks and #print here instead of vanilla #system because it
+        # is easier to silence stdout in the existing test suite this way. The
+        # end-user gets the bundler commands called anyway, so no big deal.
+        #
+        # Thanks to James Tucker for the Gem tricks involved in this call.
+        print `"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
       end
 
       def run_bundle