Fix redmine:plugins:assets rake task fails (#36287, #32938).

Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@21300 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/plugin_loader.rb b/lib/redmine/plugin_loader.rb
index 7b05a8a3d72b7ed1f1bb6ed6e810d97086ea27c1..1d2f2db48dd11f03008e2da4fce2cca3b48af345 100644 (file)
--- a/lib/redmine/plugin_loader.rb
+++ b/lib/redmine/plugin_loader.rb
@@ -136,8 +136,12 @@ module Redmine
       @plugin_directories
     end
 
-    def self.mirror_assets
-      directories.each(&:mirror_assets)
+    def self.mirror_assets(name=nil)
+      if name.present?
+        directories.find{|d| d.to_s == File.join(directory, name)}.mirror_assets
+      else
+        directories.each(&:mirror_assets)
+      end
     end
   end
 end

diff --git a/lib/tasks/redmine.rake b/lib/tasks/redmine.rake
index 2bebaf18cbd69307f12675fb030729fb4785c093..c7c257bfc35c43a977d773cbd7e2d6b1d2797a02 100644 (file)
--- a/lib/tasks/redmine.rake
+++ b/lib/tasks/redmine.rake
@@ -150,7 +150,7 @@ DESC
       name = ENV['NAME']
 
       begin
-        Redmine::Plugin.mirror_assets(name)
+        Redmine::PluginLoader.mirror_assets(name)
       rescue Redmine::PluginNotFound
         abort "Plugin #{name} was not found."
       end

diff --git a/test/unit/lib/redmine/plugin_loader_test.rb b/test/unit/lib/redmine/plugin_loader_test.rb
index 43d100521aeb54e5dbe3311b150ddadf8dd81576..2b103420eec0f4c3a8aeb4be05f5d33ff0ff8124 100644 (file)
--- a/test/unit/lib/redmine/plugin_loader_test.rb
+++ b/test/unit/lib/redmine/plugin_loader_test.rb
@@ -41,6 +41,20 @@ class Redmine::PluginLoaderTest < ActiveSupport::TestCase
     assert File.exist?("#{@klass.public_directory}/foo_plugin/stylesheets/foo.css")
   end
 
+  def test_mirror_assets
+    Redmine::PluginLoader.mirror_assets
+
+    assert File.exist?("#{@klass.public_directory}/foo_plugin")
+    assert File.exist?("#{@klass.public_directory}/foo_plugin/stylesheets/foo.css")
+  end
+
+  def test_mirror_assets_with_plugin_name
+    Redmine::PluginLoader.mirror_assets('foo_plugin')
+
+    assert File.exist?("#{@klass.public_directory}/foo_plugin")
+    assert File.exist?("#{@klass.public_directory}/foo_plugin/stylesheets/foo.css")
+  end
+
   def clear_public
     FileUtils.rm_rf 'tmp/public'
   end