From 30f401114e753ed6676201a20088470b940ee35a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 21 Mar 2005 02:08:58 +0000 Subject: Expanded the requires again and included the load paths git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/environments/environment.rb | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'railties/environments/environment.rb') diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 0f047c3323..8345965ae3 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -11,7 +11,21 @@ ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"]) # Followed by the standard includes. ADDITIONAL_LOAD_PATHS.concat %w( - app app/models app/controllers app/helpers app/apis config components lib vendor + app + app/models + app/controllers + app/helpers + app/apis + config + components + lib + vendor + vendor/rails/railties/lib + vendor/rails/actionpack/lib + vendor/rails/activesupport/lib + vendor/rails/activerecord/lib + vendor/rails/actionmailer/lib + vendor/rails/actionwebservice/lib ).map { |dir| "#{RAILS_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) } # Prepend to $LOAD_PATH @@ -31,7 +45,12 @@ if rails_files.all? { |f| File.file?(f) } rails_files.each { |f| require f } else require 'rubygems' - %w( activesupport activerecord actionpack actionmailer actionwebservice rails ).each { |gem| require_gem(gem) } + require_gem 'activesupport' + require_gem 'activerecord' + require_gem 'actionpack' + require_gem 'actionmailer' + require_gem 'actionwebservice' + require_gem 'rails' end # Environment-specific configuration. -- cgit v1.2.3