Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #742 from apolzon/respect_swallow_stderr_option_wh…

…en_running_commands

Paperclip#run now respects swallow_stderr setting. Fix for #741
  • Loading branch information...
commit 6fca437d53610860d706a8add4db9048f912c18d 2 parents 56012bf + 58671eb
@sikachu sikachu authored
Showing with 14 additions and 0 deletions.
  1. +1 −0  lib/paperclip.rb
  2. +13 −0 test/paperclip_test.rb
View
1  lib/paperclip.rb
@@ -99,6 +99,7 @@ def run(cmd, arguments = "", local_options = {})
command_path = options[:command_path] || options[:image_magick_path]
Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path, command_path ].flatten : command_path )
local_options = local_options.merge(:logger => logger) if logging? && (options[:log_command] || local_options[:log_command])
+ local_options = local_options.merge(:swallow_stderr => options[:swallow_stderr]) if !local_options[:swallow_stderr] && !options[:swallow_stderr].nil?
Cocaine::CommandLine.new(cmd, arguments, local_options).run
end
View
13 test/paperclip_test.rb
@@ -4,6 +4,7 @@ class PaperclipTest < Test::Unit::TestCase
context "Calling Paperclip.run" do
setup do
Paperclip.options[:log_command] = false
+ Paperclip.options[:swallow_stderr] = nil
Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
@original_command_line_path = Cocaine::CommandLine.path
end
@@ -22,6 +23,18 @@ class PaperclipTest < Test::Unit::TestCase
Paperclip.run("convert", "stuff")
assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
end
+
+ should "respect Paperclip.options[:swallow_stderr]" do
+ Paperclip.options[:swallow_stderr] = false
+ Cocaine::CommandLine.unstub(:new)
+ Cocaine::CommandLine.expects(:new).with("convert", "stuff", {:swallow_stderr => false}).returns(stub(:run))
+ Paperclip.run("convert", "stuff")
+
+ Paperclip.options[:swallow_stderr] = true
+ Cocaine::CommandLine.unstub(:new)
+ Cocaine::CommandLine.expects(:new).with("convert", "stuff", {:swallow_stderr => true}).returns(stub(:run))
+ Paperclip.run("convert", "stuff")
+ end
end
context "Calling Paperclip.run with a logger" do
Please sign in to comment.
Something went wrong with that request. Please try again.