From a89c78a63841bc24e5c0388fefa1b0fa6bfdd146 Mon Sep 17 00:00:00 2001
From: Nathaniel Bibler <git@nathanielbibler.com>
Date: Wed, 27 May 2009 09:41:15 -0400
Subject: [PATCH] Added frozen gem path(s) to rakefile loading scheme, with tests.

---
 railties/lib/tasks/rails.rb                        |    1 +
 railties/test/task_test.rb                         |   17 +++++++++++++++++
 .../vendor/gems/dummy-gem-k-1.0.0/tasks/tasks.rake |    7 +++++++
 3 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 railties/test/task_test.rb
 create mode 100644 railties/test/vendor/gems/dummy-gem-k-1.0.0/tasks/tasks.rake

diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb
index 8c2b7f9..01da1c9 100644
--- a/railties/lib/tasks/rails.rb
+++ b/railties/lib/tasks/rails.rb
@@ -4,5 +4,6 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
+Dir["#{RAILS_ROOT}/vendor/gems/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
diff --git a/railties/test/task_test.rb b/railties/test/task_test.rb
new file mode 100644
index 0000000..4e5ade5
--- /dev/null
+++ b/railties/test/task_test.rb
@@ -0,0 +1,17 @@
+require 'plugin_test_helper'
+
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'
+
+
+class TaskTest < Test::Unit::TestCase
+  
+  def test_should_include_frozen_gem_tasks
+    assert Rake::Task.task_defined?('dummy_gem_k:test')
+  end
+  
+end
diff --git a/railties/test/vendor/gems/dummy-gem-k-1.0.0/tasks/tasks.rake b/railties/test/vendor/gems/dummy-gem-k-1.0.0/tasks/tasks.rake
new file mode 100644
index 0000000..46fcc24
--- /dev/null
+++ b/railties/test/vendor/gems/dummy-gem-k-1.0.0/tasks/tasks.rake
@@ -0,0 +1,7 @@
+namespace :dummy_gem_k do
+  
+  task :test do
+    "passed"
+  end
+  
+end
-- 
1.6.0.4