@@ -1,3 +1,8 @@ +*unreleased* + +* Changed capture() helper to not raise an exception on error, but to warn instead [Jeff Forcier] + + *2.4.0* June 13, 2008 * Added :normalize_asset_timestamps option to deployment, defaulting to true, which allows asset timestamping to be disabled [John Trupiano] CHANGELOG @@ -34,7 +34,7 @@ module Capistrano invoke_command(command, options.merge(:once => true)) do |ch, stream, data| case stream when :out then output << data - when :err then raise CaptureError, "error processing #{command.inspect}: #{data.inspect}" + when :err then warn "[err :: #{ch[:server]}] #{data}" end end output lib/capistrano/configuration/actions/inspect.rb @@ -37,9 +37,12 @@ class ConfigurationActionsInspectTest < Test::Unit::TestCase @config.capture("hostname", :foo => "bar") end - def test_capture_with_stderr_result_should_raise_capture_error - @config.expects(:invoke_command).yields(mock("channel"), :err, "boom") - assert_raises(Capistrano::CaptureError) { @config.capture("hostname") } + def test_capture_with_stderr_should_emit_stderr_via_warn + ch = mock("channel") + ch.expects(:[]).with(:server).returns(server("capistrano")) + @config.expects(:invoke_command).yields(ch, :err, "boom") + @config.expects(:warn).with("[err :: capistrano] boom") + @config.capture("hostname") end def test_capture_with_stdout_should_aggregate_and_return_stdout @@ -59,4 +62,4 @@ class ConfigurationActionsInspectTest < Test::Unit::TestCase @config.channel = channel @config.script = output end -end \ No newline at end of file +end test/configuration/actions/inspect_test.rb 074d75a00621b276e2bf0a8276c77da0b3cc976f Jeff Forcier jeff@bitprophet.org http://github.com/jamis/capistrano/commit/a6223b3939f0ef91c928f94502c806a68a011e74 a6223b3939f0ef91c928f94502c806a68a011e74 2008-06-23T06:44:29-07:00 2008-06-14T21:52:57-07:00 Update capture() to warn about stderr instead of raising CaptureError. 23effbf0143075d09f9874979a8e29254ff22324 Jamis Buck jamis@37signals.com