Add the ability to have plugins load rake tasks.

2 files changed, 15 insertions, 0 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index cd579a1c0d..4c1f36f537 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -72,7 +72,12 @@ module Rails
 
     def load_tasks
       require "rails/tasks"
+      # Load all extension rake tasks
+      plugins.each(&:load_tasks)
+      # Load all plugin tasks
       Dir["#{root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+      # Load all application tasks
+      # TODO: extract out the path to the rake tasks
       Dir["#{root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
       task :environment do
         $rails_rake_task = true
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index aa325c6f76..be6cdec3fa 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -25,6 +25,16 @@ module Rails
       Configuration.default
     end
 
+    def self.rake_tasks(&blk)
+      @rake_tasks ||= []
+      @rake_tasks << blk
+    end
+
+    def self.load_tasks
+      return unless @rake_tasks
+      @rake_tasks.each { |blk| blk.call }
+    end
+
     # Creates an initializer which includes all given modules to the given class.
     #
     #   module Rails