From b47d565b26c616597b1835878366ea0d9e81634d Mon Sep 17 00:00:00 2001 From: Sebastian Schuster Date: Wed, 26 Feb 2014 16:08:56 +0100 Subject: [PATCH] Fixed non-functional plugin generation taking this gem from github Also small readme fixes Conflicts: lib/open_project/plugins/engine.rb openproject-plugins.gemspec --- doc/CHANGELOG.md | 2 ++ .../open_project/plugin/templates/%full_name%.gemspec.tt | 2 +- lib/generators/open_project/plugin/templates/README.md.tt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 477d36be1e..8dc0463c44 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -15,6 +15,8 @@ See doc/COPYRIGHT.md for more details. # Changelog +* Fixed non-functional plugin generation when this gem is taken from github directly + ## 1.0.6 * Allows plugin register to receive a block so plugins don't have to register with this plugin AND Redmine::Plugin diff --git a/lib/generators/open_project/plugin/templates/%full_name%.gemspec.tt b/lib/generators/open_project/plugin/templates/%full_name%.gemspec.tt index 98a51e7ff5..20b71f38fc 100644 --- a/lib/generators/open_project/plugin/templates/%full_name%.gemspec.tt +++ b/lib/generators/open_project/plugin/templates/%full_name%.gemspec.tt @@ -16,5 +16,5 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + %w(CHANGELOG.md README.md) s.add_dependency "rails", "~> 3.2.14" - s.add_dependency "openproject-plugins", "~> <%= OpenProject::Plugins::VERSION %>" + s.add_dependency "openproject-plugins", "~> <%= Bundler.environment.specs["openproject-plugins"].first.version.to_s %>" end diff --git a/lib/generators/open_project/plugin/templates/README.md.tt b/lib/generators/open_project/plugin/templates/README.md.tt index e46a317bcf..01ee9e7371 100644 --- a/lib/generators/open_project/plugin/templates/README.md.tt +++ b/lib/generators/open_project/plugin/templates/README.md.tt @@ -4,4 +4,4 @@ FIXME Add description and check issue tracker link below ## Issue Tracker -https://www.openproject.org/projects/<%= plugin_name.gsub('_','-') %>/issues +https://www.openproject.org/projects/<%= plugin_name.gsub('_','-') %>/work_packages