From 2110a524a4913815d036786aa01319fd67db0ee2 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Fri, 16 Oct 2009 12:49:39 -0700
Subject: Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the
 application's object root)

---
 railties/lib/rails/commands/about.rb     | 1 -
 railties/lib/rails/commands/console.rb   | 2 +-
 railties/lib/rails/commands/dbconsole.rb | 2 +-
 railties/lib/rails/commands/destroy.rb   | 1 -
 railties/lib/rails/commands/server.rb    | 4 ++--
 5 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'railties/lib/rails/commands')

diff --git a/railties/lib/rails/commands/about.rb b/railties/lib/rails/commands/about.rb
index 9a05c47390..54c12a266f 100644
--- a/railties/lib/rails/commands/about.rb
+++ b/railties/lib/rails/commands/about.rb
@@ -1,4 +1,3 @@
-require "#{RAILS_ROOT}/config/application"
 Rails.application.new
 require 'rails/info'
 puts Rails::Info
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 31448bdf1a..b977b7162f 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -12,7 +12,7 @@ OptionParser.new do |opt|
 end
 
 libs =  " -r irb/completion"
-libs << %( -r "#{RAILS_ROOT}/config/environment")
+libs << %( -r "#{Rails.root}/config/environment")
 libs << " -r rails/console_app"
 libs << " -r rails/console_sandbox" if options[:sandbox]
 libs << " -r rails/console_with_helpers"
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index e6f11a45db..4e699acf6b 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -25,7 +25,7 @@ OptionParser.new do |opt|
 end
 
 env = ARGV.first || ENV['RAILS_ENV'] || 'development'
-unless config = YAML::load(ERB.new(IO.read(RAILS_ROOT + "/config/database.yml")).result)[env]
+unless config = YAML::load(ERB.new(IO.read(Rails.root + "/config/database.yml")).result)[env]
   abort "No database is configured for the environment '#{env}'"
 end
 
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 860c03e01e..1270fdd033 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -1,5 +1,4 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'generators'))
-require "#{RAILS_ROOT}/config/application"
 
 if ARGV.size == 0
   Rails::Generators.help
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index c138cbc9bf..d29fa620fb 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -7,7 +7,7 @@ options = {
   :Port        => 3000,
   :Host        => "0.0.0.0",
   :environment => (ENV['RAILS_ENV'] || "development").dup,
-  :config      => RAILS_ROOT + "/config.ru",
+  :config      => Rails.root + "/config.ru",
   :detach      => false,
   :debugger    => false
 }
@@ -46,7 +46,7 @@ puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}
 
 if options[:detach]
   Process.daemon
-  pid = "#{RAILS_ROOT}/tmp/pids/server.pid"
+  pid = "#{Rails.root}/tmp/pids/server.pid"
   File.open(pid, 'w'){ |f| f.write(Process.pid) }
   at_exit { File.delete(pid) if File.exist?(pid) }
 end
-- 
cgit v1.2.3