From aed906af97cfa86801951a6a97251084fac6dc57 Mon Sep 17 00:00:00 2001 From: Michal Papis Date: Tue, 15 May 2012 08:55:58 +0200 Subject: prevent using already loaded Gemfile for 'bundle install', fix #6314 --- railties/lib/rails/generators/app_base.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'railties/lib/rails/generators/app_base.rb') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 2c1742c6be..d661c62148 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -246,8 +246,16 @@ module Rails # 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. # + # We unset temporary bundler variables to load proper bundler and Gemfile. + # # Thanks to James Tucker for the Gem tricks involved in this call. + + bundle_gemfile, rubyopt = ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] + ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] = "", "" + print `"#{Gem.ruby}" "#{Gem.bin_path('bundler', 'bundle')}" #{command}` + + ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] = bundle_gemfile, rubyopt end def run_bundle -- cgit v1.2.3