@@ -1,15 +1,18 @@ # Package management # Choose one -# Use Bundler (preferred) environment = File.expand_path('../../vendor/gems/environment', __FILE__) -require environment if File.exist?(environment) - -# Use 2.x style vendor/rails directory vendor_rails = File.expand_path('../../vendor/rails', __FILE__) -Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) } if File.exist?(vendor_rails) -# Load Rails from traditional RubyGems -require 'rubygems' +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) } +else + # Load Rails from traditional RubyGems + require 'rubygems' +end require 'rails' railties/lib/rails/generators/rails/app/templates/config/boot.rb 77bb129fdb3b1da8365931a6313b5e7ef4c91de0 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/1ac5cf478825391071d34ec3d7f294fe28c0fceb 1ac5cf478825391071d34ec3d7f294fe28c0fceb 2009-10-19T10:06:54-07:00 2009-10-19T10:06:54-07:00 Make sure boot.rb requires rubygems only when needed 3f96636a58f7d3211617039fe9794e0538c49e3c Pratik Naik pratiknaik@gmail.com