aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-05-16 03:35:12 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-08-31 20:51:37 +0200
commit7fc4b4681b83b86d5871f0726460ea808bd76f1b (patch)
tree0befa485738d188bbbb9bacefad6ca50e273d11f /railties/lib/rails/generators/app_base.rb
parent414158805fe9ffed253c7afc665b573c0ba3c6be (diff)
downloadrails-7fc4b4681b83b86d5871f0726460ea808bd76f1b.tar.gz
rails-7fc4b4681b83b86d5871f0726460ea808bd76f1b.tar.bz2
rails-7fc4b4681b83b86d5871f0726460ea808bd76f1b.zip
Use Bundler.with_clean_env instead of custom code
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 84de254f2f..742129e258 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -251,12 +251,9 @@ module Rails
# 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
+ Bundler.with_clean_env do
+ print `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
+ end
end
def run_bundle