aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-24 09:42:28 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-24 09:42:28 +0100
commit5b26fa48755c461619f7d48f4cd28faa9db442f8 (patch)
treeca7bee63fc5f0d06bf3a067f548695802e9a8d8f
parent2fde9d774b322fc708990675671231c64c691a33 (diff)
downloadrails-5b26fa48755c461619f7d48f4cd28faa9db442f8.tar.gz
rails-5b26fa48755c461619f7d48f4cd28faa9db442f8.tar.bz2
rails-5b26fa48755c461619f7d48f4cd28faa9db442f8.zip
Make plugin generator compatible with new schema.
-rw-r--r--railties/lib/generators/rails/plugin/plugin_generator.rb2
-rw-r--r--railties/lib/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt (renamed from railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt)0
-rw-r--r--railties/test/generators/plugin_generator_test.rb2
3 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/generators/rails/plugin/plugin_generator.rb
index b68b8691db..8f01dcd589 100644
--- a/railties/lib/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/generators/rails/plugin/plugin_generator.rb
@@ -17,7 +17,7 @@ module Rails
def create_tasks_files
return unless options[:tasks]
- directory 'tasks', plugin_dir('tasks')
+ directory 'lib/tasks', plugin_dir('lib/tasks')
end
hook_for :generator do |generator|
diff --git a/railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt b/railties/lib/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
index 72920a9d3a..72920a9d3a 100644
--- a/railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt
+++ b/railties/lib/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 0a79e2cfb8..065dbe1423 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -48,7 +48,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
def test_creates_tasks_if_required
run_generator ["plugin_fu", "--tasks"]
- assert_file "vendor/plugins/plugin_fu/tasks/plugin_fu_tasks.rake"
+ assert_file "vendor/plugins/plugin_fu/lib/tasks/plugin_fu_tasks.rake"
end
def test_creates_generator_if_required