Save Cocaine::CommandLine.path that already set

thoughtbot · Sep 23, 2011 · 3a35ba9 · 3a35ba9
1 parent 825e1f1
commit 3a35ba9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/paperclip.rb b/lib/paperclip.rb
@@ -97,7 +97,8 @@ def run(cmd, *params)
       if options[:image_magick_path]
         Paperclip.log("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
-      Cocaine::CommandLine.path = options[:command_path] || options[:image_magick_path]
+      command_path = options[:command_path] || options[:image_magick_path]
+      Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path, command_path ].flatten : command_path )
       Cocaine::CommandLine.new(cmd, *params).run
     end
 

diff --git a/test/paperclip_test.rb b/test/paperclip_test.rb
@@ -6,6 +6,11 @@ class PaperclipTest < Test::Unit::TestCase
       Cocaine::CommandLine.expects(:new).with("convert", "stuff").returns(stub(:run))
       Paperclip.run("convert", "stuff")
     end
+    should "save Cocaine::CommandLine.path that set before" do
+      Cocaine::CommandLine.path = "/opt/my_app/bin"
+      Paperclip.run("convert", "stuff")
+      assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
+    end
   end
 
   context "Paperclip.each_instance_with_attachment" do