From de68cf7e0624e7d8e7e94034858a061ca0f6f68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 3 Jul 2009 12:19:22 +0200 Subject: Plugin generators now reflect new generators sutrcture. --- railties/lib/generators/rails/plugin/plugin_generator.rb | 2 +- .../templates/generators/%file_name%/%file_name%_generator.rb.tt | 2 -- .../rails/plugin/templates/generators/%file_name%/USAGE.tt | 8 -------- .../templates/generators/%file_name%/templates/.empty_directory | 0 .../plugin/templates/lib/generators/%file_name%_generator.rb.tt | 5 +++++ .../lib/generators/rails/plugin/templates/lib/generators/USAGE.tt | 8 ++++++++ .../plugin/templates/lib/generators/templates/.empty_directory | 0 railties/test/generators/plugin_generator_test.rb | 7 +++---- 8 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt delete mode 100644 railties/lib/generators/rails/plugin/templates/generators/%file_name%/USAGE.tt delete mode 100644 railties/lib/generators/rails/plugin/templates/generators/%file_name%/templates/.empty_directory create mode 100644 railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt create mode 100644 railties/lib/generators/rails/plugin/templates/lib/generators/USAGE.tt create mode 100644 railties/lib/generators/rails/plugin/templates/lib/generators/templates/.empty_directory (limited to 'railties') diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/generators/rails/plugin/plugin_generator.rb index 9eaf902021..903f720e12 100644 --- a/railties/lib/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/generators/rails/plugin/plugin_generator.rb @@ -26,7 +26,7 @@ module Rails def create_generator_files return unless options[:generator] - directory 'generators', plugin_dir('generators') + directory 'lib/generators', plugin_dir('lib/generators') end protected diff --git a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt b/railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt deleted file mode 100644 index 90aa557eeb..0000000000 --- a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt +++ /dev/null @@ -1,2 +0,0 @@ -class <%= class_name %>Generator < Rails::Generators::NamedBase -end diff --git a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/USAGE.tt b/railties/lib/generators/rails/plugin/templates/generators/%file_name%/USAGE.tt deleted file mode 100644 index ea9f4f12cc..0000000000 --- a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/USAGE.tt +++ /dev/null @@ -1,8 +0,0 @@ -Description: - Explain the generator - -Example: - ./script/generate <%= file_name %> Thing - - This will create: - what/will/it/create diff --git a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/templates/.empty_directory b/railties/lib/generators/rails/plugin/templates/generators/%file_name%/templates/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt b/railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt new file mode 100644 index 0000000000..675f00043f --- /dev/null +++ b/railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt @@ -0,0 +1,5 @@ +class <%= class_name %>Generator < Rails::Generators::NamedBase + def self.source_root + @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates')) + end +end diff --git a/railties/lib/generators/rails/plugin/templates/lib/generators/USAGE.tt b/railties/lib/generators/rails/plugin/templates/lib/generators/USAGE.tt new file mode 100644 index 0000000000..ea9f4f12cc --- /dev/null +++ b/railties/lib/generators/rails/plugin/templates/lib/generators/USAGE.tt @@ -0,0 +1,8 @@ +Description: + Explain the generator + +Example: + ./script/generate <%= file_name %> Thing + + This will create: + what/will/it/create diff --git a/railties/lib/generators/rails/plugin/templates/lib/generators/templates/.empty_directory b/railties/lib/generators/rails/plugin/templates/lib/generators/templates/.empty_directory new file mode 100644 index 0000000000..e69de29bb2 diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index b9f09d5163..2b41f85a2d 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -37,10 +37,9 @@ class PluginGeneratorTest < GeneratorsTestCase def test_creates_generator_if_required run_generator ["plugin_fu", "--generator"] - assert_file "vendor/plugins/plugin_fu/generators/plugin_fu/templates" - - flag = /class PluginFuGenerator < Rails::Generators::NamedBase/ - assert_file "vendor/plugins/plugin_fu/generators/plugin_fu/plugin_fu_generator.rb", flag + assert_file "vendor/plugins/plugin_fu/lib/generators/templates" + assert_file "vendor/plugins/plugin_fu/lib/generators/plugin_fu_generator.rb", + /class PluginFuGenerator < Rails::Generators::NamedBase/ end def test_plugin_generator_on_revoke -- cgit v1.2.3