diff options
author | Carlhuda <carlhuda@Carlhudas-iMac.local> | 2009-11-24 13:03:24 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@Carlhudas-iMac.local> | 2009-11-24 14:36:30 -0800 |
commit | 530b8ff5ae811e0dd5e1343b478f42eed6fffdbd (patch) | |
tree | bbff1bbfbf0c889a78ce6badf93aab0d1f6b2ed1 /railties/lib/rails/application.rb | |
parent | a2cb90c0c246e772e9735ff59f5517e3dee313ff (diff) | |
download | rails-530b8ff5ae811e0dd5e1343b478f42eed6fffdbd.tar.gz rails-530b8ff5ae811e0dd5e1343b478f42eed6fffdbd.tar.bz2 rails-530b8ff5ae811e0dd5e1343b478f42eed6fffdbd.zip |
Have script/* and Rakefile use the application object
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r-- | railties/lib/rails/application.rb | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 7c2d8eab67..e49ea8973b 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -3,11 +3,6 @@ module Rails include Initializable class << self - def inherited(klass) - Rails.application ||= klass unless klass.name =~ /Rails/ - super - end - # Stub out App initialize def initialize! new @@ -32,12 +27,21 @@ module Rails config.root end + def load_tasks + require "rails/tasks" + task :environment do + $rails_rake_task = true + initialize! + end + end + def call(env) new.call(env) end end def initialize + Rails.application ||= self run_initializers(self) end @@ -45,6 +49,10 @@ module Rails self.class.config end + def root + config.root + end + alias configuration config def middleware |