Renamed the .rb files in the plugin_generator to end in .erb. The .rb was

causing rdoc to try to document them and fail.

* Updated the generator's manifest to use the new files
* Renamed template README to README.rdoc

  #2011

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1949 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/generators/redmine_plugin/redmine_plugin_generator.rb b/lib/generators/redmine_plugin/redmine_plugin_generator.rb
index 666386abdf9c2ef46f095fc96340096e8f3d1614..bd161a5d763d18866fbbbb46233e3101289ecf9f 100644 (file)
--- a/lib/generators/redmine_plugin/redmine_plugin_generator.rb
+++ b/lib/generators/redmine_plugin/redmine_plugin_generator.rb
@@ -22,10 +22,10 @@ class RedminePluginGenerator < Rails::Generator::NamedBase
       m.directory "#{plugin_path}/lang"
       m.directory "#{plugin_path}/test"
       
-      m.template 'README',    "#{plugin_path}/README"
-      m.template 'init.rb',   "#{plugin_path}/init.rb"
+      m.template 'README.rdoc',    "#{plugin_path}/README.rdoc"
+      m.template 'init.rb.erb',   "#{plugin_path}/init.rb"
       m.template 'en.yml',    "#{plugin_path}/lang/en.yml"
-      m.template 'test_helper.rb',    "#{plugin_path}/test/test_helper.rb"
+      m.template 'test_helper.rb.erb',    "#{plugin_path}/test/test_helper.rb"
     end
   end
 end

diff --git a/lib/generators/redmine_plugin/templates/README b/lib/generators/redmine_plugin/templates/README
deleted file mode 100644 (file)
index 7a31a89..0000000
--- a/lib/generators/redmine_plugin/templates/README
+++ /dev/null
@@ -1,3 +0,0 @@
-= <%= file_name %>
-
-Description goes here

diff --git a/lib/generators/redmine_plugin/templates/README.rdoc b/lib/generators/redmine_plugin/templates/README.rdoc
new file mode 100644 (file)
index 0000000..7a31a89
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/README.rdoc
@@ -0,0 +1,3 @@
+= <%= file_name %>
+
+Description goes here

diff --git a/lib/generators/redmine_plugin/templates/init.rb b/lib/generators/redmine_plugin/templates/init.rb
deleted file mode 100644 (file)
index 1ffcd7b..0000000
--- a/lib/generators/redmine_plugin/templates/init.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'redmine'
-
-Redmine::Plugin.register :<%= plugin_name %> do
-  name '<%= plugin_pretty_name %> plugin'
-  author 'Author name'
-  description 'This is a plugin for Redmine'
-  version '0.0.1'
-end

diff --git a/lib/generators/redmine_plugin/templates/init.rb.erb b/lib/generators/redmine_plugin/templates/init.rb.erb
new file mode 100644 (file)
index 0000000..1ffcd7b
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/init.rb.erb
@@ -0,0 +1,8 @@
+require 'redmine'
+
+Redmine::Plugin.register :<%= plugin_name %> do
+  name '<%= plugin_pretty_name %> plugin'
+  author 'Author name'
+  description 'This is a plugin for Redmine'
+  version '0.0.1'
+end

diff --git a/lib/generators/redmine_plugin/templates/test_helper.rb b/lib/generators/redmine_plugin/templates/test_helper.rb
deleted file mode 100644 (file)
index bd1ed0c..0000000
--- a/lib/generators/redmine_plugin/templates/test_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Load the normal Rails helper
-require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper')
-
-# Ensure that we are using the temporary fixture path
-Engines::Testing.set_fixture_path

diff --git a/lib/generators/redmine_plugin/templates/test_helper.rb.erb b/lib/generators/redmine_plugin/templates/test_helper.rb.erb
new file mode 100644 (file)
index 0000000..bd1ed0c
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/test_helper.rb.erb
@@ -0,0 +1,5 @@
+# Load the normal Rails helper
+require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper')
+
+# Ensure that we are using the temporary fixture path
+Engines::Testing.set_fixture_path