Merge branch 'master' of github.com:rails/rails

1 files changed, 13 insertions, 4 deletions

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index be6cdec3fa..c64042cf7d 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -27,12 +27,17 @@ module Rails
 
     def self.rake_tasks(&blk)
       @rake_tasks ||= []
-      @rake_tasks << blk
+      @rake_tasks << blk if blk
+      @rake_tasks
     end
 
-    def self.load_tasks
-      return unless @rake_tasks
-      @rake_tasks.each { |blk| blk.call }
+    def rake_tasks
+      self.class.rake_tasks
+    end
+
+    def 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.
@@ -80,6 +85,10 @@ module Rails
         Dir["#{path}/{lib}", "#{path}/app/{models,controllers,helpers}"]
       end
 
+      def load_tasks
+        Dir["#{path}/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+      end
+
       initializer :add_to_load_path, :after => :set_autoload_paths do |app|
         load_paths.each do |path|
           $LOAD_PATH << path