Skip to content

Fix colorized log alignment. #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 20, 2016
Merged

Fix colorized log alignment. #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f97649d
Fix colorized log alignment.
May 20, 2016
bc06721
Fix colorized log alignment.
May 20, 2016
638b7f4
Merge branch 'colorized-output-alignment' of github.com:xavierholt/ss…
May 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ appear at the top.
* Add your entries below here, remember to credit yourself however you want
to be credited!
* Known hosts lookup optimization is now enabled by default. @byroot
* Fixed colorized output alignment in Logger::Pretty. @xavierholt
[PR #349](https://github.com/capistrano/sshkit/pull/349)

## 1.10.0 (2016-04-22)

Expand Down
6 changes: 3 additions & 3 deletions lib/sshkit/formatters/pretty.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def log_command_data(command, stream_type, stream_data)

def log_command_exit(command)
runtime = sprintf('%5.3f seconds', command.runtime)
successful_or_failed = command.failure? ? colorize('failed', :red, :bold) : colorize('successful', :green, :bold)
successful_or_failed = command.failure? ? colorize('failed', :red, :bold) : colorize('successful', :green, :bold)
message = "Finished in #{runtime} with exit status #{command.exit_status} (#{successful_or_failed})."
write_message(command.verbosity, message, command.uuid)
end
Expand All @@ -43,8 +43,8 @@ def log_command_exit(command)

def format_message(verbosity, message, uuid=nil)
message = "[#{colorize(uuid, :green)}] #{message}" unless uuid.nil?
level = colorize(Pretty::LEVEL_NAMES[verbosity], Pretty::LEVEL_COLORS[verbosity])
'%6s %s' % [level, message]
level = colorize(LEVEL_NAMES[verbosity].rjust(6), LEVEL_COLORS[verbosity])
"#{level} #{message}"
end

private
Expand Down
22 changes: 11 additions & 11 deletions test/unit/formatters/test_pretty.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ def pretty
end

{
log: "\e[0;34;49mINFO\e[0m Test\n",
fatal: "\e[0;31;49mFATAL\e[0m Test\n",
error: "\e[0;31;49mERROR\e[0m Test\n",
warn: "\e[0;33;49mWARN\e[0m Test\n",
info: "\e[0;34;49mINFO\e[0m Test\n",
debug: "\e[0;30;49mDEBUG\e[0m Test\n"
log: "\e[0;34;49m INFO\e[0m Test\n",
fatal: "\e[0;31;49m FATAL\e[0m Test\n",
error: "\e[0;31;49m ERROR\e[0m Test\n",
warn: "\e[0;33;49m WARN\e[0m Test\n",
info: "\e[0;34;49m INFO\e[0m Test\n",
debug: "\e[0;30;49m DEBUG\e[0m Test\n"
}.each do |level, expected_output|
define_method("test_#{level}_output_with_color") do
output.stubs(:tty?).returns(true)
Expand All @@ -37,11 +37,11 @@ def test_command_lifecycle_logging_with_color
simulate_command_lifecycle(pretty)

expected_log_lines = [
"\e[0;34;49mINFO\e[0m [\e[0;32;49maaaaaa\e[0m] Running \e[1;33;49m/usr/bin/env a_cmd some args\e[0m as \e[0;34;49muser\e[0m@\e[0;34;49mlocalhost\e[0m",
"\e[0;30;49mDEBUG\e[0m [\e[0;32;49maaaaaa\e[0m] Command: \e[0;34;49m/usr/bin/env a_cmd some args\e[0m",
"\e[0;30;49mDEBUG\e[0m [\e[0;32;49maaaaaa\e[0m] \e[0;32;49m\tstdout message\e[0m",
"\e[0;30;49mDEBUG\e[0m [\e[0;32;49maaaaaa\e[0m] \e[0;31;49m\tstderr message\e[0m",
"\e[0;34;49mINFO\e[0m [\e[0;32;49maaaaaa\e[0m] Finished in 1.000 seconds with exit status 0 (\e[1;32;49msuccessful\e[0m)."
"\e[0;34;49m INFO\e[0m [\e[0;32;49maaaaaa\e[0m] Running \e[1;33;49m/usr/bin/env a_cmd some args\e[0m as \e[0;34;49muser\e[0m@\e[0;34;49mlocalhost\e[0m",
"\e[0;30;49m DEBUG\e[0m [\e[0;32;49maaaaaa\e[0m] Command: \e[0;34;49m/usr/bin/env a_cmd some args\e[0m",
"\e[0;30;49m DEBUG\e[0m [\e[0;32;49maaaaaa\e[0m] \e[0;32;49m\tstdout message\e[0m",
"\e[0;30;49m DEBUG\e[0m [\e[0;32;49maaaaaa\e[0m] \e[0;31;49m\tstderr message\e[0m",
"\e[0;34;49m INFO\e[0m [\e[0;32;49maaaaaa\e[0m] Finished in 1.000 seconds with exit status 0 (\e[1;32;49msuccessful\e[0m)."
]
assert_equal expected_log_lines, output.split("\n")
end
Expand Down