diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-05-17 10:19:04 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-05-17 11:33:40 -0700 |
| commit | 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7 (patch) | |
| tree | 43f51fb2b09a3e3ecec6865068786791186edfaa /railties/lib/rails | |
| parent | 319903bde56bae0f7c83a049bb44377522699bd8 (diff) | |
| download | rails-0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.tar.gz rails-0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.tar.bz2 rails-0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.zip | |
Revert changes related to `bundle install` fixes in `rails new`
Reverted changes:
f3482a9 Fix tests in railties
5904295 improve #6318
aed906a prevent using already loaded Gemfile for 'bundle install'
In order to fix this, we need a fix in bundler related to GEM_PATH,
which will allow to run tests properly. I will get this changes back
when it happens.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 10ad475d55..2c1742c6be 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -246,17 +246,8 @@ 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_command = Gem.bin_path('bundler', 'bundle') - - bundle_bin_path, bundle_gemfile, rubyopt = ENV['BUNDLE_BIN_PATH'], ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] - ENV['BUNDLE_BIN_PATH'], ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] = "", "", "" - - print `"#{Gem.ruby}" "#{_bundle_command}" #{command}` - - ENV['BUNDLE_BIN_PATH'], ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] = bundle_bin_path, bundle_gemfile, rubyopt + print `"#{Gem.ruby}" "#{Gem.bin_path('bundler', 'bundle')}" #{command}` end def run_bundle |