From 530b8ff5ae811e0dd5e1343b478f42eed6fffdbd Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@Carlhudas-iMac.local>
Date: Tue, 24 Nov 2009 13:03:24 -0800
Subject: Have script/* and Rakefile use the application object

---
 railties/lib/rails/application.rb                   | 18 +++++++++++++-----
 railties/lib/rails/commands/console.rb              | 10 +++++++---
 railties/lib/rails/commands/dbconsole.rb            | 10 +++++++---
 railties/lib/rails/commands/server.rb               | 19 ++++++++++++++++---
 .../lib/rails/generators/rails/app/app_generator.rb |  8 ++++++--
 .../rails/generators/rails/app/templates/Rakefile   |  2 +-
 .../rails/generators/rails/app/templates/config.ru  |  2 +-
 .../rails/app/templates/config/application.rb       |  2 +-
 .../rails/app/templates/config/environment.rb       |  2 +-
 .../generators/rails/app/templates/script/console   |  3 ---
 .../rails/app/templates/script/console.tt           |  3 +++
 .../generators/rails/app/templates/script/dbconsole |  3 ---
 .../rails/app/templates/script/dbconsole.tt         |  3 +++
 .../generators/rails/app/templates/script/server    |  3 ---
 .../generators/rails/app/templates/script/server.tt |  3 +++
 railties/lib/rails/rack/log_tailer.rb               |  4 +---
 railties/lib/rails/tasks/misc.rake                  |  4 ----
 railties/test/application/load_test.rb              | 21 ++++-----------------
 18 files changed, 67 insertions(+), 53 deletions(-)
 delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/console
 create mode 100755 railties/lib/rails/generators/rails/app/templates/script/console.tt
 delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/dbconsole
 create mode 100755 railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
 delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/server
 create mode 100755 railties/lib/rails/generators/rails/app/templates/script/server.tt

(limited to 'railties')

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
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 8807307271..37eb6d40ea 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -6,8 +6,12 @@ module Rails
   class Console
     ENVIRONMENTS = %w(production development test)
 
-    def self.start
-      new.start
+    def self.start(app)
+      new(app).start
+    end
+
+    def initialize(app)
+      @app = app
     end
 
     def start
@@ -25,7 +29,7 @@ module Rails
         ENV['RAILS_ENV'] = ENVIRONMENTS.find { |e| e.index(env) } || env
       end
 
-      require "#{Rails.root}/config/environment"
+      @app.initialize!
       require "rails/console_app"
       require "rails/console_sandbox" if options[:sandbox]
       require "rails/console_with_helpers"
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 064373f8f9..77c3404343 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -4,8 +4,12 @@ require 'optparse'
 
 module Rails
   class DBConsole
-    def self.start
-      new.start
+    def self.start(app)
+      new(app).start
+    end
+
+    def initialize(app)
+      @app = app
     end
 
     def start
@@ -31,7 +35,7 @@ module Rails
       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("#{@app.root}/config/database.yml")).result)[env]
         abort "No database is configured for the environment '#{env}'"
       end
 
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index ff2282a534..57b7c6a49c 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -37,6 +37,15 @@ module Rails
       Options.new
     end
 
+    def self.start(app)
+      new(app).start
+    end
+
+    def initialize(app)
+      super() # Call Rack::Server#initialize without passing any options to use.
+      @app = app
+    end
+
     def start
       puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
       puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}"
@@ -54,20 +63,24 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::LogTailer] unless options[:daemonize]
+      middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
       Hash.new(middlewares)
     end
 
+    def log_path
+      "#{File.expand_path(@app.root)}/log/#{options[:environment]}.log"
+    end
+
     def default_options
       {
         :Port        => 3000,
         :Host        => "0.0.0.0",
         :environment => (ENV['RAILS_ENV'] || "development").dup,
-        :rack_file   => "#{Rails.root}/config.ru",
+        :rack_file   => "#{@app.root}/config.ru",
         :daemonize   => false,
         :debugger    => false,
-        :pid         => "#{Rails.root}/tmp/pids/server.pid",
+        :pid         => "#{@app.root}/tmp/pids/server.pid",
         :AccessLog   => []
       }
     end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2bcea4bc8f..7e21a6d1d9 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -48,9 +48,9 @@ module Rails::Generators
     end
 
     def create_root_files
-      copy_file "Rakefile"
       copy_file "README"
-      copy_file "config.ru"
+      template "Rakefile"
+      template "config.ru"
       template "Gemfile"
     end
 
@@ -181,6 +181,10 @@ module Rails::Generators
         @app_name ||= File.basename(destination_root)
       end
 
+      def app_const
+        @app_const ||= app_name.classify
+      end
+
       def app_secret
         ActiveSupport::SecureRandom.hex(64)
       end
diff --git a/railties/lib/rails/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile
index 6b6d07e8cc..c19ad0e945 100755
--- a/railties/lib/rails/generators/rails/app/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/app/templates/Rakefile
@@ -7,4 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'rails/tasks'
+<%= app_const %>.load_tasks
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru
index 509a0da5b7..f3bf3d6117 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -2,4 +2,4 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 
 # Dispatch the request
-run Rails.application
+run <%= app_const%>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 8008c6ba07..2c17de2a23 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -1,6 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-Rails::Initializer.run do |config|
+class <%= app_const %> < Rails::Application
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory are automatically loaded.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
index 0bb191f205..1684986a59 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-Rails.initialize!
+<%= app_const %>.initialize!
diff --git a/railties/lib/rails/generators/rails/app/templates/script/console b/railties/lib/rails/generators/rails/app/templates/script/console
deleted file mode 100755
index 6043f3792b..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/script/console
+++ /dev/null
@@ -1,3 +0,0 @@
-require File.expand_path('../../config/application',  __FILE__)
-require 'rails/commands/console'
-Rails::Console.start
diff --git a/railties/lib/rails/generators/rails/app/templates/script/console.tt b/railties/lib/rails/generators/rails/app/templates/script/console.tt
new file mode 100755
index 0000000000..4262439e52
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/script/console.tt
@@ -0,0 +1,3 @@
+require File.expand_path('../../config/application',  __FILE__)
+require 'rails/commands/console'
+Rails::Console.start(<%= app_const %>)
diff --git a/railties/lib/rails/generators/rails/app/templates/script/dbconsole b/railties/lib/rails/generators/rails/app/templates/script/dbconsole
deleted file mode 100755
index 904df54ff2..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/script/dbconsole
+++ /dev/null
@@ -1,3 +0,0 @@
-require File.expand_path('../../config/application',  __FILE__)
-require 'rails/commands/dbconsole'
-Rails::DBConsole.start
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
new file mode 100755
index 0000000000..9dfa24c378
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
@@ -0,0 +1,3 @@
+require File.expand_path('../../config/application',  __FILE__)
+require 'rails/commands/dbconsole'
+Rails::DBConsole.start(<%= app_const %>)
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/app/templates/script/server b/railties/lib/rails/generators/rails/app/templates/script/server
deleted file mode 100755
index 709ca002df..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/script/server
+++ /dev/null
@@ -1,3 +0,0 @@
-require File.expand_path('../../config/application',  __FILE__)
-require 'rails/commands/server'
-Rails::Server.start
diff --git a/railties/lib/rails/generators/rails/app/templates/script/server.tt b/railties/lib/rails/generators/rails/app/templates/script/server.tt
new file mode 100755
index 0000000000..d98f677475
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/script/server.tt
@@ -0,0 +1,3 @@
+require File.expand_path('../../config/application',  __FILE__)
+require 'rails/commands/server'
+Rails::Server.start(<%= app_const %>)
diff --git a/railties/lib/rails/rack/log_tailer.rb b/railties/lib/rails/rack/log_tailer.rb
index a237cee6bc..077311be3c 100644
--- a/railties/lib/rails/rack/log_tailer.rb
+++ b/railties/lib/rails/rack/log_tailer.rb
@@ -1,12 +1,10 @@
 module Rails
   module Rack
     class LogTailer
-      EnvironmentLog = "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log"
-
       def initialize(app, log = nil)
         @app = app
 
-        path = Pathname.new(log || EnvironmentLog).cleanpath
+        path = Pathname.new(log || "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
         @cursor = ::File.size(path)
         @last_checked = Time.now.to_f
 
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 7f244ebaed..9433b3556a 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -1,8 +1,4 @@
 task :default => :test
-task :environment do
-  $rails_rake_task = true
-  require(File.join(Rails.root, 'config', 'environment'))
-end
 
 task :rails_env do
   unless defined? RAILS_ENV
diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb
index 3da51c4355..dc5d03b323 100644
--- a/railties/test/application/load_test.rb
+++ b/railties/test/application/load_test.rb
@@ -7,21 +7,8 @@ module ApplicationTests
     include ActiveSupport::Testing::Isolation
 
     def rackup
-      config = "#{app_path}/config.ru"
-      # Copied from ActionDispatch::Utils.parse_config
-      # ActionDispatch is not necessarily available at this point.
-      require 'rack'
-      if config =~ /\.ru$/
-        cfgfile = ::File.read(config)
-        if cfgfile[/^#\\(.*)/]
-          opts.parse! $1.split(/\s+/)
-        end
-        inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app",
-                         nil, config
-      else
-        require config
-        inner_app = Object.const_get(::File.basename(config, '.rb').capitalize)
-      end
+      require "rack"
+      Rack::Builder.parse_file("#{app_path}/config.ru")
     end
 
     def setup
@@ -40,14 +27,14 @@ module ApplicationTests
 
     test "Rails.application is available after config.ru has been racked up" do
       rackup
-      assert Rails.application < Rails::Application
+      assert Rails.application.is_a?(Rails::Application)
     end
 
     # Passenger still uses AC::Dispatcher, so we need to
     # keep it working for now
     test "deprecated ActionController::Dispatcher still works" do
       rackup
-      assert ActionController::Dispatcher.new < Rails::Application
+      assert ActionController::Dispatcher.new.is_a?(Rails::Application)
     end
 
     test "the config object is available on the application object" do
-- 
cgit v1.2.3