Redmine 4.1.1

lib/generators/redmine_plugin/USAGE

@@ -2,7 +2,7 @@ Description:
     The plugin generator creates stubs for a new Redmine plugin.
 
 Example:
-    ./script/rails generate redmine_plugin meetings
+    bundle exec rails generate redmine_plugin meetings
       create  plugins/meetings/app
       create  plugins/meetings/app/controllers
       create  plugins/meetings/app/helpers

lib/generators/redmine_plugin/redmine_plugin_generator.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-2019  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 class RedminePluginGenerator < Rails::Generators::NamedBase
   source_root File.expand_path("../templates", __FILE__)
 
@@ -27,6 +46,7 @@ class RedminePluginGenerator < Rails::Generators::NamedBase
     empty_directory "#{plugin_path}/test/unit"
     empty_directory "#{plugin_path}/test/functional"
     empty_directory "#{plugin_path}/test/integration"
+    empty_directory "#{plugin_path}/test/system"
 
     template 'README.rdoc',    "#{plugin_path}/README.rdoc"
     template 'init.rb.erb',   "#{plugin_path}/init.rb"

lib/generators/redmine_plugin_controller/USAGE

@@ -2,4 +2,4 @@ Description:
     Generates a plugin controller.
 
 Example:
-    ./script/rails generate redmine_plugin_controller meetings pools index show vote
+    bundle exec rails generate redmine_plugin_controller meetings pools index show vote

lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-2019  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 class RedminePluginControllerGenerator < Rails::Generators::NamedBase
   source_root File.expand_path("../templates", __FILE__)
   argument :controller, :type => :string
@@ -14,12 +33,12 @@ class RedminePluginControllerGenerator < Rails::Generators::NamedBase
   end
 
   def copy_templates
-    template 'controller.rb.erb', "#{plugin_path}/app/controllers/#{controller}_controller.rb"
-    template 'helper.rb.erb', "#{plugin_path}/app/helpers/#{controller}_helper.rb"
-    template 'functional_test.rb.erb', "#{plugin_path}/test/functional/#{controller}_controller_test.rb"
+    template 'controller.rb.erb', "#{plugin_path}/app/controllers/#{controller.underscore}_controller.rb"
+    template 'helper.rb.erb', "#{plugin_path}/app/helpers/#{controller.underscore}_helper.rb"
+    template 'functional_test.rb.erb', "#{plugin_path}/test/functional/#{controller.underscore}_controller_test.rb"
     # View template for each action.
     actions.each do |action|
-      path = "#{plugin_path}/app/views/#{controller}/#{action}.html.erb"
+      path = "#{plugin_path}/app/views/#{controller.underscore}/#{action}.html.erb"
       @action_name = action
       template 'view.html.erb', path
     end

lib/generators/redmine_plugin_migration/USAGE

@@ -0,0 +1,5 @@
+Description:
+    Generates a plugin migration.
+
+Examples:
+    bin/rails generate redmine_plugin_migration my_plugin add_new_column_to_table

lib/generators/redmine_plugin_migration/redmine_plugin_migration_generator.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-2019  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class RedminePluginMigrationGenerator < Rails::Generators::NamedBase
+  include Rails::Generators::Migration
+
+  source_root File.expand_path("../templates", __FILE__)
+  argument :migration, :type => :string
+
+  class << self
+    def next_migration_number(dirname)
+      next_migration_number = current_migration_number(dirname) + 1
+      ActiveRecord::Migration.next_migration_number(next_migration_number)
+    end
+  end
+
+  def create_migration_file
+    plugin_name = file_name.underscore
+    plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
+    migration_template "migration.rb",
+                       "#{plugin_path}/db/migrate/#{@migration}.rb"
+  end
+end

lib/generators/redmine_plugin_migration/templates/migration.rb.tt

@@ -0,0 +1,4 @@
+class <%= @migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+  end
+end

lib/generators/redmine_plugin_model/USAGE

@@ -2,4 +2,4 @@ Description:
     Generates a plugin model.
 
 Examples:
-    ./script/rails generate redmine_plugin_model meetings pool
+    bundle exec rails generate redmine_plugin_model meetings pool

lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb

@@ -1,9 +1,28 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-2019  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 class RedminePluginModelGenerator < Rails::Generators::NamedBase
-  
+
   source_root File.expand_path("../templates", __FILE__)
   argument :model, :type => :string
   argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
-  class_option :migration,  :type => :boolean
+  class_option :migration,  :type => :boolean, :default => true
   class_option :timestamps, :type => :boolean
   class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
   class_option :indexes,    :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns"
@@ -24,11 +43,14 @@ class RedminePluginModelGenerator < Rails::Generators::NamedBase
   def copy_templates
     template 'model.rb.erb', "#{plugin_path}/app/models/#{model.underscore}.rb"
     template 'unit_test.rb.erb', "#{plugin_path}/test/unit/#{model.underscore}_test.rb"
-    
-    migration_filename = "%03i_#{@migration_filename}.rb" % (migration_number + 1)
+
+    return unless options[:migration]
+    migration_filename = "%.14d_#{@migration_filename}.rb" % migration_number
     template "migration.rb", "#{plugin_path}/db/migrate/#{migration_filename}"
   end
 
+  private
+
   def attributes_with_index
     attributes.select { |a| a.has_index? || (a.reference? && options[:indexes]) }
   end
@@ -37,5 +59,11 @@ class RedminePluginModelGenerator < Rails::Generators::NamedBase
     current = Dir.glob("#{plugin_path}/db/migrate/*.rb").map do |file|
       File.basename(file).split("_").first.to_i
     end.max.to_i
+
+    [current + 1, Time.now.utc.strftime("%Y%m%d%H%M%S").to_i].max
+  end
+
+  def parent_class_name
+    options[:parent] || "ActiveRecord::Base"
   end
 end

lib/generators/redmine_plugin_model/templates/migration.rb

@@ -1,4 +1,4 @@
-class <%= @migration_class_name %> < ActiveRecord::Migration
+class <%= @migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
     create_table :<%= @table_name %> do |t|
 <% attributes.each  do |attribute| -%>

lib/generators/redmine_plugin_model/templates/model.rb.erb

@@ -1,2 +1,2 @@
-class <%= @model_class %> < ActiveRecord::Base
+class <%= @model_class %> < <%= parent_class_name.classify %>
 end