Make Rake::DSL methods available within Railtie rake_tasks block

Fixes incompatibility introduced by Rake 0.9.0
rails · May 23, 2011 · 83f257f · 83f257f · sferik · May 26, 2011
1 parent a37ae63
commit 83f257f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
@@ -211,10 +211,12 @@ def default_middleware_stack
     end
 
     def initialize_tasks
-      require "rails/tasks"
+      self.class.rake_tasks do
-      task :environment do
+        require "rails/tasks"
-        $rails_rake_task = true
+        task :environment do
-        require_environment!
+          $rails_rake_task = true
+          require_environment!
+        end
       end
     end
 

diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
@@ -181,6 +181,7 @@ def load_console
     end
 
     def load_tasks
+      extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each(&:call)
     end