Add Rakefile to plugin generator. Let test_plugins rake task look deeper into plugins' test dirs. Make plugin test cases flunk by default.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2790 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 16 insertions, 10 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 2db7f98f8d..d43a8df03f 100644
--- a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
+++ b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
@@ -1,17 +1,23 @@
 class PluginGenerator < Rails::Generator::NamedBase
+  attr_reader :plugin_path
+
+  def initialize(*args)
+    super
+    @plugin_path = "vendor/plugins/#{file_name}"
+  end
+
   def manifest
     record do |m|
-      m.directory File.join('vendor', 'plugins', file_name)
-      m.directory File.join('vendor', 'plugins', file_name, 'lib')
-      m.directory File.join('vendor', 'plugins', file_name, 'test')
-      m.directory File.join('vendor', 'plugins', file_name, 'tasks')
-
-      m.template 'plugin.rb',    File.join('vendor', 'plugins', file_name, 'lib',  "#{file_name}.rb")
-      m.template 'unit_test.rb', File.join('vendor', 'plugins', file_name, 'test', "#{file_name}_test.rb")
+      m.directory "#{plugin_path}/lib"
+      m.directory "#{plugin_path}/tasks"
+      m.directory "#{plugin_path}/test"
 
-      m.template 'init.rb',    File.join('vendor', 'plugins', file_name, 'init.rb')
-      m.template 'tasks.rake', File.join('vendor', 'plugins', file_name, 'tasks', "#{file_name}_tasks.rake")
-      m.template 'README',     File.join('vendor', 'plugins', file_name, 'README')
+      m.template 'README',        "#{plugin_path}/README"
+      m.template 'Rakefile',      "#{plugin_path}/Rakefile"
+      m.template 'init.rb',       "#{plugin_path}/init.rb"
+      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"
     end
   end
 end