From 3cf7d52a637f48a097ab4ccce600fe4e10efea30 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Wed, 26 Oct 2016 14:09:05 +0200 Subject: [PATCH] Use a more common terminal type. --- golden-files/help | 44 +++++++++---------- golden-files/results/bcpp-hello_cpp | 16 +++---- golden-files/results/contents-hi3_py | 4 +- golden-files/results/metadata-hi3_py | 26 +++++------ golden-files/results/perltidy-perl_pl | 4 +- golden-files/results/python_coverage-hi3_py | 6 +-- golden-files/results/python_coverage-hi_py | 6 +-- golden-files/results/python_gut-hi3_py | 4 +- golden-files/results/python_gut-hi_py | 4 +- .../results/uncrustify-closure-util_java | 4 +- golden-files/results/uncrustify-hello_c | 14 +++--- golden-files/results/uncrustify-hello_cpp | 16 +++---- golden-files/results/uncrustify-hello_h | 12 ++--- termstr_test.py | 4 +- tools_test.py | 2 +- vigil_test.py | 2 +- 16 files changed, 84 insertions(+), 84 deletions(-) diff --git a/golden-files/help b/golden-files/help index b25de6c..f30f505 100644 --- a/golden-files/help +++ b/golden-files/help @@ -1,4 +1,4 @@ -┌────────────────────────────────────────────── Help ──────────────────────────────────────────────┐ +(B┌────────────────────────────────────────────── Help ──────────────────────────────────────────────┐ │Vigil Code Monitor │ │ │ │Vigil shows a list of status reports for a given codebase, and keeps them │ @@ -14,30 +14,30 @@ │directory. │ │ │ │Keys: │ -│ h - Show the help screen. (toggle) │ -│ q - Quit. │ -│ d, c, j, k, f, v or arrow keys or mouse click - Move the cursor. │ -│ D, C, J, K, F, V or page up, page down, home, end or the mouse wheel - │ +│ (Bh(B - Show the help screen. (toggle) │ +│ (Bq(B - Quit. │ +│ (Bd(B, (Bc(B, (Bj(B, (Bk(B, (Bf(B, (Bv(B or arrow keys or mouse click - Move the cursor. │ +│ (BD(B, (BC(B, (BJ(B, (BK(B, (BF(B, (BV(B or page up, page down, home, end or the mouse wheel - │ │ Scroll the result pane. │ -│ t - Turn the result pane to portrait or landscape orientation. (toggle) │ -│ l - Show the activity log. (toggle) │ -│ e - Edit the current file with an editor defined by -e, $EDITOR or $VISUAL. │ -│ n - Move to the next issue. │ -│ N - Move to the next issue of the current tool. │ -│ p - Pause workers. (toggle) │ -│ o - Order files by type, or by directory location. (toggle) │ -│ r - Refresh the currently selected report. │ +│ (Bt(B - Turn the result pane to portrait or landscape orientation. (toggle) │ +│ (Bl(B - Show the activity log. (toggle) │ +│ (Be(B - Edit the current file with an editor defined by -e, $EDITOR or $VISUAL. │ +│ (Bn(B - Move to the next issue. │ +│ (BN(B - Move to the next issue of the current tool. │ +│ (Bp(B - Pause workers. (toggle) │ +│ (Bo(B - Order files by type, or by directory location. (toggle) │ +│ (Br(B - Refresh the currently selected report. │ │ │ │Statuses: │ -│   Normal │ -│   Ok │ -│   Problem │ -│   Not applicable │ -│   Running │ -│   Paused │ -│   Timed out │ +│ (B (B Normal │ +│ (B (B Ok │ +│ (B (B Problem │ +│ (B (B Not applicable │ +│ (B (B Running │ +│ (B (B Paused │ +│ (B (B Timed out │ │ . Pending │ -│ E Error │ +│ (BE(B Error │ │ │ │ │ │ │ @@ -57,4 +57,4 @@ │ │ │ │ │ │ -└──────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file +└──────────────────────────────────────────────────────────────────────────────────────────────────┘(B \ No newline at end of file diff --git a/golden-files/results/bcpp-hello_cpp b/golden-files/results/bcpp-hello_cpp index 71b0705..d2f88ba 100644 --- a/golden-files/results/bcpp-hello_cpp +++ b/golden-files/results/bcpp-hello_cpp @@ -1,8 +1,8 @@ -#include   -  -using namespace std;  -  -int main()  -{  - cout << "Hello World" << endl; -}  \ No newline at end of file +(B#include(B (B(B (B +(B (B +(Busing(B (Bnamespace(B std;(B (B +(B (B +(Bint(B (Bmain(B()(B (B +(B{(B (B +(B cout << (B"Hello World"(B << endl;(B +(B}(B (B \ No newline at end of file diff --git a/golden-files/results/contents-hi3_py b/golden-files/results/contents-hi3_py index aa556be..386249f 100644 --- a/golden-files/results/contents-hi3_py +++ b/golden-files/results/contents-hi3_py @@ -1,2 +1,2 @@ -def hi():  - print("hi") \ No newline at end of file +(Bdef(B (Bhi(B():(B (B +(B (Bprint(B((B"hi"(B)(B \ No newline at end of file diff --git a/golden-files/results/metadata-hi3_py b/golden-files/results/metadata-hi3_py index 97d8952..1322b5a 100644 --- a/golden-files/results/metadata-hi3_py +++ b/golden-files/results/metadata-hi3_py @@ -1,18 +1,18 @@ -size: 12.0 B (12 bytes) -permissions: ?rwxr-xr-x (755) +(Bsize:(B 12.0 B(B (12 bytes)(B +(Bpermissions:(B ?rwxr-xr-x(B (755)(B -modified time: Sun Jan 31 23:14:05 2016 (1454282045 secs) -creation time: Sun Jan 31 23:14:05 2016 (1454282045 secs) -access time: Sun Jan 31 23:14:07 2016 (1454282047 secs) +(Bmodified time:(B Sun Jan 31 23:14:05 2016(B (1454282045 secs)(B +(Bcreation time:(B Sun Jan 31 23:14:05 2016(B (1454282045 secs)(B +(Baccess time:(B Sun Jan 31 23:14:07 2016(B (1454282047 secs)(B -owner: foo (1111 uid) -group: foo (1111 gid) +(Bowner:(B foo(B (1111 uid)(B +(Bgroup:(B foo(B (1111 gid)(B -hardlinks: 2 -symlink: no +(Bhardlinks:(B 2 +(Bsymlink:(B no -md5: 28ca2e417cb64ea4e555efe3203642de -sha1: 8b8c0214f3f0a0d79032d1b44550064964a33a26 +(Bmd5:(B 28ca2e417cb64ea4e555efe3203642de +(Bsha1:(B 8b8c0214f3f0a0d79032d1b44550064964a33a26 -mime type: text/plain; charset=us-ascii -file type: ASCII text  \ No newline at end of file +(Bmime type:(B text/plain; charset=us-ascii +(Bfile type:(B ASCII text (B \ No newline at end of file diff --git a/golden-files/results/perltidy-perl_pl b/golden-files/results/perltidy-perl_pl index 2c84409..4d7e9c3 100644 --- a/golden-files/results/perltidy-perl_pl +++ b/golden-files/results/perltidy-perl_pl @@ -1,2 +1,2 @@ -#!/usr/bin/perl  -print "Hello, world!\n"; \ No newline at end of file +(B#!/usr/bin/perl(B (B +(Bprint(B (B"Hello, world!\n"(B;(B \ No newline at end of file diff --git a/golden-files/results/python_coverage-hi3_py b/golden-files/results/python_coverage-hi3_py index 9474653..652e03a 100644 --- a/golden-files/results/python_coverage-hi3_py +++ b/golden-files/results/python_coverage-hi3_py @@ -1,4 +1,4 @@ - +(B -> def hi(): -> print("hi") \ No newline at end of file +(B> def hi():(B +(B> print("hi")(B \ No newline at end of file diff --git a/golden-files/results/python_coverage-hi_py b/golden-files/results/python_coverage-hi_py index a58d963..91201fb 100644 --- a/golden-files/results/python_coverage-hi_py +++ b/golden-files/results/python_coverage-hi_py @@ -1,4 +1,4 @@ - +(B -> def hi(): -> print "hi" \ No newline at end of file +(B> def hi():(B +(B> print "hi"(B \ No newline at end of file diff --git a/golden-files/results/python_gut-hi3_py b/golden-files/results/python_gut-hi3_py index cfec95b..8e22e9f 100644 --- a/golden-files/results/python_gut-hi3_py +++ b/golden-files/results/python_gut-hi3_py @@ -1,2 +1,2 @@ -def hi(): - \ No newline at end of file +(Bdef(B (Bhi(B(): +(B \ No newline at end of file diff --git a/golden-files/results/python_gut-hi_py b/golden-files/results/python_gut-hi_py index cfec95b..8e22e9f 100644 --- a/golden-files/results/python_gut-hi_py +++ b/golden-files/results/python_gut-hi_py @@ -1,2 +1,2 @@ -def hi(): - \ No newline at end of file +(Bdef(B (Bhi(B(): +(B \ No newline at end of file diff --git a/golden-files/results/uncrustify-closure-util_java b/golden-files/results/uncrustify-closure-util_java index e307dcb..f98a431 100644 --- a/golden-files/results/uncrustify-closure-util_java +++ b/golden-files/results/uncrustify-closure-util_java @@ -1,2 +1,2 @@ - - \ No newline at end of file +(B +(B \ No newline at end of file diff --git a/golden-files/results/uncrustify-hello_c b/golden-files/results/uncrustify-hello_c index 9f7d0a2..6f0ceae 100644 --- a/golden-files/results/uncrustify-hello_c +++ b/golden-files/results/uncrustify-hello_c @@ -1,7 +1,7 @@ -#include   -  -int main()  -{  - printf("Hello World\n"); - return 0;  -}  \ No newline at end of file +(B#include(B (B(B (B +(B (B +(Bint(B (Bmain(B()(B (B +(B{(B (B +(B printf((B"Hello World\n"(B);(B +(B (Breturn(B (B0(B;(B (B +(B}(B (B \ No newline at end of file diff --git a/golden-files/results/uncrustify-hello_cpp b/golden-files/results/uncrustify-hello_cpp index 71b0705..d2f88ba 100644 --- a/golden-files/results/uncrustify-hello_cpp +++ b/golden-files/results/uncrustify-hello_cpp @@ -1,8 +1,8 @@ -#include   -  -using namespace std;  -  -int main()  -{  - cout << "Hello World" << endl; -}  \ No newline at end of file +(B#include(B (B(B (B +(B (B +(Busing(B (Bnamespace(B std;(B (B +(B (B +(Bint(B (Bmain(B()(B (B +(B{(B (B +(B cout << (B"Hello World"(B << endl;(B +(B}(B (B \ No newline at end of file diff --git a/golden-files/results/uncrustify-hello_h b/golden-files/results/uncrustify-hello_h index 8231d65..a073754 100644 --- a/golden-files/results/uncrustify-hello_h +++ b/golden-files/results/uncrustify-hello_h @@ -1,6 +1,6 @@ -#ifndef HELLO_H -#define HELLO_H -  -void hello();  -  -#endif  \ No newline at end of file +(B#ifndef HELLO_H(B +(B#define HELLO_H(B +(B (B +(Bvoid(B (Bhello(B();(B (B +(B (B +(B#endif(B (B \ No newline at end of file diff --git a/termstr_test.py b/termstr_test.py index ef3b4f5..8cc03b0 100755 --- a/termstr_test.py +++ b/termstr_test.py @@ -7,7 +7,7 @@ import os import pickle import unittest -os.environ["TERM"] = "st-256color" +os.environ["TERM"] = "xterm-256color" from termstr import TermStr, CharStyle import termstr @@ -55,7 +55,7 @@ class CharStyleTests(unittest.TestCase): def test_code_for_term(self): self.assertEqual(self.style.code_for_term(), - "\x1b[0m\x1b[38;2;255;255;255m\x1b[48;2;0;0;0m") + "\x1b(B\x1b[m\x1b[38;2;255;255;255m\x1b[48;2;0;0;0m") class TermStrTests(unittest.TestCase): diff --git a/tools_test.py b/tools_test.py index 80a5827..3b25dd4 100755 --- a/tools_test.py +++ b/tools_test.py @@ -9,7 +9,7 @@ import subprocess import unittest import unittest.mock -os.environ["TERM"] = "st-256color" +os.environ["TERM"] = "xterm-256color" import fill3 import golden diff --git a/vigil_test.py b/vigil_test.py index b0d6485..cd70756 100755 --- a/vigil_test.py +++ b/vigil_test.py @@ -13,7 +13,7 @@ import unittest import psutil -os.environ["TERM"] = "st-256color" +os.environ["TERM"] = "xterm-256color" import fill3 import golden