From 3072bf75557346f1e70c47baef0fba205bc39c51 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 19 Oct 2009 18:10:14 -0700 Subject: Check for bundler environment or 2.x-style vendor/rails + rubygems --- .../generators/rails/app/templates/config/boot.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 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 index 44c884623e..2c527b4a4a 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,17 +1,15 @@ -# Package management -# Choose one - +# Use Bundler (preferred) environment = File.expand_path('../../vendor/gems/environment', __FILE__) -vendor_rails = File.expand_path('../../vendor/rails', __FILE__) - if File.exist?(environment) - # Use Bundler (preferred) require environment -elsif File.exist?(vendor_rails) - # Use 2.x style vendor/rails directory - Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) } + +# Use 2.x style vendor/rails and RubyGems else - # Load Rails from traditional RubyGems + vendor_rails = File.expand_path('../../vendor/rails', __FILE__) + if File.exist?(vendor_rails) + Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) } + end + require 'rubygems' end -- cgit v1.2.3