From f8e7904dc0d6e54b9afe12acf127ae20952d8a76 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Tue, 29 May 2012 23:31:27 +0900
Subject: Add support runner hook.

---
 railties/lib/rails/application.rb        | 11 +++++++++++
 railties/lib/rails/commands/runner.rb    |  1 +
 railties/lib/rails/engine.rb             |  5 +++++
 railties/lib/rails/railtie.rb            | 10 ++++++++++
 railties/test/application/runner_test.rb | 10 ++++++++++
 railties/test/railties/railtie_test.rb   | 16 ++++++++++++++++
 6 files changed, 53 insertions(+)

(limited to 'railties')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 660e864d2a..32797ee657 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -158,6 +158,14 @@ module Rails
       self
     end
 
+    # Load the application runner and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.runner</tt> for more info.
+    def load_runner(app=self)
+      initialize_runner
+      super
+      self
+    end
+
     # Stores some of the Rails initial environment parameters which
     # will be used by middlewares and engines to configure themselves.
     def env_config
@@ -304,6 +312,9 @@ module Rails
       require "rails/console/helpers"
     end
 
+    def initialize_runner #:nodoc:
+    end
+
     def build_original_fullpath(env)
       path_info    = env["PATH_INFO"]
       query_string = env["QUERY_STRING"]
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 77f1b15fb4..a672258aa6 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -41,6 +41,7 @@ ENV["RAILS_ENV"] = options[:environment]
 
 require APP_PATH
 Rails.application.require_environment!
+ Rails.application.load_runner
 
 if code_or_file.nil?
   $stderr.puts "Run '#{$0} -h' for help."
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 4c7199a2e2..806b553b81 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -437,6 +437,11 @@ module Rails
       super
     end
 
+    def load_runner(app=self)
+      railties.all { |r| r.load_runner(app) }
+      super
+    end
+
     def eager_load!
       railties.all(&:eager_load!)
 
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 2102f8a03c..c3cc65ab31 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -145,6 +145,12 @@ module Rails
         @load_console
       end
 
+      def runner(&blk)
+        @load_runner ||= []
+        @load_runner << blk if blk
+        @load_runner
+      end
+
       def generators(&blk)
         @generators ||= []
         @generators << blk if blk
@@ -179,6 +185,10 @@ module Rails
       self.class.console.each { |block| block.call(app) }
     end
 
+    def load_runner(app=self)
+      self.class.runner.each { |block| block.call(app) }
+    end
+
     def load_tasks(app=self)
       extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each { |block| self.instance_exec(app, &block) }
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index e1d283a7fd..81ed5873a5 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -57,5 +57,15 @@ module ApplicationTests
 
       assert_match "script/program_name.rb", Dir.chdir(app_path) { `bundle exec rails runner "script/program_name.rb"` }
     end
+
+    def test_with_hook
+      add_to_config <<-RUBY
+        runner do |app|
+          app.config.ran = true
+        end
+      RUBY
+
+      assert_match "true", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.application.config.ran"` }
+    end
   end
 end
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index cd495320b5..c80b0f63af 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -163,6 +163,22 @@ module RailtiesTest
       assert $ran_block
     end
 
+    test "runner block is executed when MyApp.load_runner is called" do
+      $ran_block = false
+
+      class MyTie < Rails::Railtie
+        runner do
+          $ran_block = true
+        end
+      end
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      AppTemplate::Application.load_runner
+      assert $ran_block
+    end
+
     test "railtie can add initializers" do
       $ran_block = false
 
-- 
cgit v1.2.3