diff options
| author | Michal Papis <mpapis@gmail.com> | 2012-05-15 08:55:58 +0200 |
|---|---|---|
| committer | Michal Papis <mpapis@gmail.com> | 2012-05-15 08:57:05 +0200 |
| commit | aed906af97cfa86801951a6a97251084fac6dc57 (patch) | |
| tree | b33164436933f4c6203f4c2127eb2fbb062846ae /railties/lib/rails/generators/app_base.rb | |
| parent | 3bc73df409974c2f6821203bc1abd1ee9678ccac (diff) | |
| download | rails-aed906af97cfa86801951a6a97251084fac6dc57.tar.gz rails-aed906af97cfa86801951a6a97251084fac6dc57.tar.bz2 rails-aed906af97cfa86801951a6a97251084fac6dc57.zip | |
prevent using already loaded Gemfile for 'bundle install', fix #6314
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 8 |
1 files changed, 8 insertions, 0 deletions
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 |