Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2025-02-17 06:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #792 from chef/dr/utf8cli

Browse source 
use utf-8 characters for default cli formatter
This commit is contained in:
Christoph Hartmann 2016-06-15 19:35:54 +02:00 • committed by GitHub
commit 7e7abf61a9
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/inspec/rspec_json_formatter.rb
View file

@ -151,14 +151,14 @@ class InspecRspecCli < InspecRspecJson # rubocop:disable Metrics/ClassLength
}.freeze
INDICATORS = {
'critical' => '[CRIT] ',
'major' => '[FAIL] ',
'minor' => '[WARN] ',
'failed' => '[FAIL] ',
'skipped' => '[SKIP] ',
'passed' => '[PASS] ',
'unknown' => '[ ?? ] ',
'empty' => ' ',
'critical' => ' ✖ ',
'major' => ' ✖ ',
'minor' => ' ✖ ',
'failed' => ' ✖ ',
'skipped' => ' ○ ',
'passed' => ' ✔ ',
'unknown' => ' ? ',
'empty' => ' ',
}.freeze
TEST_INDICATORS = {
@ -172,7 +172,7 @@ class InspecRspecCli < InspecRspecJson # rubocop:disable Metrics/ClassLength
@indicators = INDICATORS
@test_indicators = TEST_INDICATORS
@format = '%color%indicator%id %summary'
@format = '%color%indicator%id%summary'
@current_control = nil
@missing_controls = []
super(*args)
@ -268,8 +268,9 @@ class InspecRspecCli < InspecRspecJson # rubocop:disable Metrics/ClassLength
fails, skips, summary_indicator = current_control_infos
summary = current_control_summary(fails, skips)
control_id = @current_control[:id]
control_id = nil if control_id.start_with? '(generated from '
control_id = @current_control[:id].to_s
control_id += ': '
control_id = '' if control_id.start_with? '(generated from '
f = format_line(
color: @colors[summary_indicator] || '',

17
test/functional/inspec_exec_test.rb
View file

@ -11,10 +11,11 @@ describe 'inspec exec' do
out = inspec('exec ' + example_profile)
out.stderr.must_equal ''
out.exit_status.must_equal 0
out.stdout.must_include "\n\e[32m[PASS] ssh-1 Allow only SSH Protocol 2\e[0m\n"
out.stdout.must_include "\n\e[32m[PASS] tmp-1.0 Create /tmp directory\e[0m\n"
out.stdout.must_include "\n\e[37m[SKIP] gordon-1.0 Verify the version number of Gordon (1 skipped)\e[0m\n"
out.stdout.must_include "\nSummary: 4 successful 0 failures 1 skipped\n"
stdout = out.stdout.force_encoding(Encoding::UTF_8)
stdout.must_include "\n\e[32m ✔ ssh-1: Allow only SSH Protocol 2\e[0m\n"
stdout.must_include "\n\e[32m ✔ tmp-1.0: Create /tmp directory\e[0m\n"
stdout.must_include "\n\e[37m ○ gordon-1.0: Verify the version number of Gordon (1 skipped)\e[0m\n"
stdout.must_include "\nSummary: 4 successful 0 failures 1 skipped\n"
end
it 'executes a minimum metadata-only profile' do
@ -47,10 +48,10 @@ Summary: 0 successful 0 failures 0 skipped
out = inspec('exec ' + File.join(profile_path, 'spec_only'))
out.stderr.must_equal ''
out.exit_status.must_equal 1
out.stdout.must_equal "
\e[32m[PASS] working should eq \"working\"\e[0m
\e[37m[SKIP] skippy This will be skipped intentionally.\e[0m
\e[31m[FAIL] failing should eq \"as intended\"
out.stdout.force_encoding(Encoding::UTF_8).must_equal "
\e[32m ✔ working should eq \"working\"\e[0m
\e[37m ○ skippy This will be skipped intentionally.\e[0m
\e[31m ✖ failing should eq \"as intended\"
expected: \"as intended\"
got: \"failing\"