Use require 'bundler/setup' instead of directly calling Bundler.setup…

… in config/boot.rb
rails · Dec 17, 2010 · e22885f · e22885f
1 parent 07567ae
commit e22885f
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-begin
+
-  ENV['BUNDLE_GEMFILE'] ||= gemfile
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)