kotovalexarian-likes-github/capistrano
1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00
Code Releases Activity

Revert "Verbose command execution log should be optional. Set :verbose_command_log to true when you need it. Refs #178."

Browse source 
This reverts commit e9ba06f354.
This commit is contained in:
Lee Hambley 2012-04-13 10:52:02 +02:00
parent 830b353c1b
commit ef5f83f63b
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/capistrano/command.rb
View file

@ -219,7 +219,7 @@ module Capistrano
command_line = [environment, shell, cmd].compact.join(" ") command_line = [environment, shell, cmd].compact.join(" ")
ch[:command] = command_line ch[:command] = command_line
logger.trace command_line, ch[:server] if logger && options[:verbose_command_log] logger.trace command_line, ch[:server] if logger
ch.exec(command_line) ch.exec(command_line)
ch.send_data(options[:data]) if options[:data] ch.send_data(options[:data]) if options[:data]

6
lib/capistrano/configuration/actions/invocation.rb
View file

@ -175,11 +175,7 @@ module Capistrano
execute_on_servers(options) do |servers| execute_on_servers(options) do |servers|
targets = servers.map { |s| sessions[s] } targets = servers.map { |s| sessions[s] }
Command.process(tree, targets, options.merge( Command.process(tree, targets, options.merge(:logger => logger))
:logger => logger,
:verbose_command_log => fetch(:verbose_command_log, false)
)
)
end end
end end

2
test/configuration_test.rb
View file

@ -16,7 +16,7 @@ class ConfigurationTest < Test::Unit::TestCase
process_args = Proc.new do |tree, session, opts| process_args = Proc.new do |tree, session, opts|
tree.fallback.command == "echo 'hello world'" && tree.fallback.command == "echo 'hello world'" &&
session == [:session] && session == [:session] &&
opts == { :logger => @config.logger, :verbose_command_log => false } opts == { :logger => @config.logger }
end end
Capistrano::Command.expects(:process).with(&process_args) Capistrano::Command.expects(:process).with(&process_args)