1 files changed, 11 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
index d43a8df03f..18ac5a1c5c 100644
--- a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
+++ b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
@@ -1,7 +1,8 @@
 class PluginGenerator < Rails::Generator::NamedBase
   attr_reader :plugin_path
 
-  def initialize(*args)
+  def initialize(runtime_args, runtime_options = {})
+    @with_generator = runtime_args.delete("--with-generator")
     super
     @plugin_path = "vendor/plugins/#{file_name}"
   end
@@ -18,6 +19,15 @@ class PluginGenerator < Rails::Generator::NamedBase
       m.template 'plugin.rb',     "#{plugin_path}/lib/#{file_name}.rb"
       m.template 'tasks.rake',    "#{plugin_path}/tasks/#{file_name}_tasks.rake"
       m.template 'unit_test.rb',  "#{plugin_path}/test/#{file_name}_test.rb"
+      
+      if @with_generator
+        m.directory "#{plugin_path}/generators"
+        m.directory "#{plugin_path}/generators/#{file_name}"
+        m.directory "#{plugin_path}/generators/#{file_name}/templates"
+
+        m.template 'generator.rb', "#{plugin_path}/generators/#{file_name}/#{file_name}_generator.rb"
+        m.template 'USAGE',        "#{plugin_path}/generators/#{file_name}/USAGE"
+      end
     end
   end
 end