diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | colorize.1 | 12 | ||||
| -rw-r--r-- | colorize.c | 232 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | doc/colorize.html | 14 | ||||
| -rwxr-xr-x | t/conf/fail.t | 19 | ||||
| -rwxr-xr-x | t/conf/param.t | 5 | ||||
| -rwxr-xr-x | t/conf/parse/fail.t | 4 | ||||
| -rwxr-xr-x | t/conf/parse/success.t | 6 | ||||
| -rwxr-xr-x | t/conf/use.t | 9 | ||||
| -rwxr-xr-x | t/fail.t | 58 | ||||
| -rwxr-xr-x | test.pl | 41 |
14 files changed, 325 insertions, 94 deletions
@@ -2,3 +2,5 @@ /colorize /debug.txt /version.h + +*~ @@ -1,4 +1,4 @@ -.TH COLORIZE 1 "2019-09-01" "colorize v0.65" "User Commands" +.TH COLORIZE 1 "2024-07-28" "colorize v0.66" "User Commands" .SH NAME colorize \- colorize text on terminal with ANSI escape sequences .SH SYNOPSIS @@ -49,6 +49,12 @@ text color to be excluded when selecting a random foreground color .BR \-\-omit\-color\-empty omit printing color escape sequences for empty lines .TP +.BR \-\-rainbow\-fg +enable foreground color rainbow mode +.TP +.BR \-\-rainbow\-bg +enable background color rainbow mode +.TP .BR \-h ", " \-\-help show help screen and exit .TP @@ -76,6 +82,8 @@ attr = bold,underscore color = magenta # favorite one exclude-random = black omit-color-empty = yes +rainbow-fg = no +rainbow-bg = no .fi .RE .RE @@ -88,6 +96,8 @@ attr (values same as command-line option) color (value same as command-line colors) exclude-random (value same as command-line option) omit-color-empty (yes/no) +rainbow-fg (yes/no) +rainbow-bg (yes/no) .fi .RE .RE @@ -2,7 +2,7 @@ * colorize - Read text from standard input stream or file and print * it colorized through use of ANSI escape sequences * - * Copyright (c) 2011-2019 Steven Schubiger + * Copyright (c) 2011-2022 Steven Schubiger * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -74,6 +74,7 @@ #define LF 0x01 #define CR 0x02 +#define PARTIAL 0x04 #define COUNT_OF(obj, type) (sizeof (obj) / sizeof (type)) @@ -132,7 +133,7 @@ #define PROGRAM_NAME "colorize" -#define VERSION "0.65" +#define VERSION "0.66" typedef enum { false, true } bool; @@ -141,6 +142,8 @@ struct conf { char *color; char *exclude_random; char *omit_color_empty; + char *rainbow_fg; + char *rainbow_bg; }; enum { DESC_OPTION, DESC_CONF }; @@ -153,31 +156,34 @@ struct color_name { struct color { const char *name; const char *code; + unsigned int index; }; +static unsigned int rainbow_index; + static const struct color fg_colors[] = { - { "none", NULL }, - { "black", "30m" }, - { "red", "31m" }, - { "green", "32m" }, - { "yellow", "33m" }, - { "blue", "34m" }, - { "magenta", "35m" }, - { "cyan", "36m" }, - { "white", "37m" }, - { "default", "39m" }, + { "none", NULL, 0 }, + { "black", "30m", 1 }, + { "red", "31m", 2 }, + { "green", "32m", 3 }, + { "yellow", "33m", 4 }, + { "blue", "34m", 5 }, + { "magenta", "35m", 6 }, + { "cyan", "36m", 7 }, + { "white", "37m", 8 }, + { "default", "39m", 9 }, }; static const struct color bg_colors[] = { - { "none", NULL }, - { "black", "40m" }, - { "red", "41m" }, - { "green", "42m" }, - { "yellow", "43m" }, - { "blue", "44m" }, - { "magenta", "45m" }, - { "cyan", "46m" }, - { "white", "47m" }, - { "default", "49m" }, + { "none", NULL, 0 }, + { "black", "40m", 1 }, + { "red", "41m", 2 }, + { "green", "42m", 3 }, + { "yellow", "43m", 4 }, + { "blue", "44m", 5 }, + { "magenta", "45m", 6 }, + { "cyan", "46m", 7 }, + { "white", "47m", 8 }, + { "default", "49m", 9 }, }; struct bytes_size { @@ -195,7 +201,9 @@ enum { FMT_FILE, FMT_TYPE, FMT_CONF, - FMT_CONF_FILE + FMT_CONF_FILE, + FMT_CONF_INIT, + FMT_RAINBOW }; static const char *formats[] = { "%s", /* generic */ @@ -207,7 +215,9 @@ static const char *formats[] = { "%s: %s", /* file */ "%s: %s: %s", /* type */ "%s: option '%s' %s", /* conf */ - "config file %s: %s" /* conf file */ + "config file %s: %s", /* conf file */ + "%s %s", /* conf init */ + "%s color '%s' %s %s" /* rainbow */ }; enum { GENERIC, FOREGROUND = 0, BACKGROUND }; @@ -225,7 +235,9 @@ static unsigned int opts_set; enum opt_set { OPT_ATTR_SET = 0x01, OPT_EXCLUDE_RANDOM_SET = 0x02, - OPT_OMIT_COLOR_EMPTY_SET = 0x04 + OPT_OMIT_COLOR_EMPTY_SET = 0x04, + OPT_RAINBOW_FG_SET = 0x08, + OPT_RAINBOW_BG_SET = 0x10 }; static struct { char *attr; @@ -239,6 +251,8 @@ enum { OPT_CONFIG, OPT_EXCLUDE_RANDOM, OPT_OMIT_COLOR_EMPTY, + OPT_RAINBOW_FG, + OPT_RAINBOW_BG, OPT_HELP, OPT_VERSION }; @@ -250,6 +264,8 @@ static const struct option long_opts[] = { { "config", required_argument, &opt_type, OPT_CONFIG }, { "exclude-random", required_argument, &opt_type, OPT_EXCLUDE_RANDOM }, { "omit-color-empty", no_argument, &opt_type, OPT_OMIT_COLOR_EMPTY }, + { "rainbow-fg", no_argument, &opt_type, OPT_RAINBOW_FG }, + { "rainbow-bg", no_argument, &opt_type, OPT_RAINBOW_BG }, { "help", no_argument, &opt_type, OPT_HELP }, { "version", no_argument, &opt_type, OPT_VERSION }, { NULL, 0, NULL, 0 }, @@ -286,9 +302,16 @@ static FILE *log; static unsigned int stacked_vars; static struct var_list *vars_list; +static struct { + bool fg; + bool bg; +} rainbow_from_conf = { false, false }; + static bool clean; static bool clean_all; static bool omit_color_empty; +static bool rainbow_fg; +static bool rainbow_bg; static char attr[MAX_ATTRIBUTE_CHARS + 1]; static char *exclude; @@ -305,7 +328,8 @@ static void write_attr (const struct attr *, unsigned int *, const bool); static void process_opt_exclude_random (const char *, const bool); static void parse_conf (const char *, struct conf *); static void assign_conf (const char *, struct conf *, const char *, char *); -static void init_conf_vars (const struct conf *); +static void init_conf_vars (const char *, const struct conf *); +static void init_conf_boolean (const char *, bool *, const char *, bool *); static void init_opts_vars (void); static void print_hint (void); static void print_help (void); @@ -325,6 +349,8 @@ static void save_char (char, char **, size_t *, size_t *); static void find_color_entries (struct color_name **, const struct color **); static void find_color_entry (const struct color_name *, unsigned int, const struct color **); static void print_line (const char *, const struct color **, const char * const, unsigned int, bool); +static unsigned int get_rainbow_index (const struct color **, unsigned int, unsigned int, unsigned int); +static bool skipable_rainbow_index (const struct color **, unsigned int, unsigned int); static void print_clean (const char *); static bool is_esc (const char *); static const char *get_end_of_esc (const char *); @@ -359,8 +385,6 @@ static void vfprintf_fail (const char *, ...); static void stack (struct var_list **, unsigned int *, unsigned int, void *, enum var_type); static void release (struct var_list *, unsigned int, void **); -extern int optind; - int main (int argc, char **argv) { @@ -374,7 +398,7 @@ main (int argc, char **argv) const char *file = NULL; char *conf_file = NULL; - struct conf config = { NULL, NULL, NULL, NULL }; + struct conf config = { NULL, NULL, NULL, NULL, NULL, NULL }; program_name = argv[0]; atexit (cleanup); @@ -421,12 +445,13 @@ main (int argc, char **argv) if (access (conf_file, F_OK) != -1) parse_conf (conf_file, &config); #endif + init_conf_vars (conf_file, &config); + + init_opts_vars (); + #if !defined(CONF_FILE_TEST) && !defined(TEST) RELEASE (conf_file); #endif - init_conf_vars (&config); - - init_opts_vars (); arg_cnt = argc - optind; @@ -445,6 +470,8 @@ main (int argc, char **argv) { "attr", OPT_ATTR_SET }, { "exclude-random", OPT_EXCLUDE_RANDOM_SET }, { "omit-color-empty", OPT_OMIT_COLOR_EMPTY_SET }, + { "rainbow-fg", OPT_RAINBOW_FG_SET }, + { "rainbow-bg", OPT_RAINBOW_BG_SET }, }; for (i = 0; i < COUNT_OF (options, struct option_set); i++) if (opts_set & options[i].set) @@ -453,6 +480,12 @@ main (int argc, char **argv) } else { + if (rainbow_fg && rainbow_bg) + vfprintf_fail ("%s and %s are mutually exclusive", + !rainbow_from_conf.fg ? "--rainbow-fg switch" : "rainbow-fg conf option", + !rainbow_from_conf.bg ? "--rainbow-bg switch" : "rainbow-bg conf option" + ); + if (arg_cnt == 0 || arg_cnt > 2) { vfprintf_diag ("%u arguments provided, expected 1-2 arguments or --clean[-all]", arg_cnt); @@ -513,8 +546,6 @@ print_tstamp (FILE *log) print_version (); \ exit (EXIT_SUCCESS); -extern char *optarg; - static void process_opts (int argc, char **argv, char **conf_file) { @@ -547,6 +578,12 @@ process_opts (int argc, char **argv, char **conf_file) case OPT_OMIT_COLOR_EMPTY: opts_set |= OPT_OMIT_COLOR_EMPTY_SET; break; + case OPT_RAINBOW_FG: + opts_set |= OPT_RAINBOW_FG_SET; + break; + case OPT_RAINBOW_BG: + opts_set |= OPT_RAINBOW_BG_SET; + break; case OPT_HELP: PRINT_HELP_EXIT (); case OPT_VERSION: @@ -698,6 +735,10 @@ init_opts_vars (void) process_opt_exclude_random (opts_arg.exclude_random, true); if (opts_set & OPT_OMIT_COLOR_EMPTY_SET) omit_color_empty = true; + if (opts_set & OPT_RAINBOW_FG_SET) + rainbow_fg = true; + if (opts_set & OPT_RAINBOW_BG_SET) + rainbow_bg = true; RELEASE (opts_arg.attr); RELEASE (opts_arg.exclude_random); @@ -804,29 +845,51 @@ assign_conf (const char *conf_file, struct conf *config, const char *cfg, char * ASSIGN_CONF (config->exclude_random, val); else if (streq (cfg, "omit-color-empty")) ASSIGN_CONF (config->omit_color_empty, val); + else if (streq (cfg, "rainbow-fg")) + ASSIGN_CONF (config->rainbow_fg, val); + else if (streq (cfg, "rainbow-bg")) + ASSIGN_CONF (config->rainbow_bg, val); else vfprintf_fail (formats[FMT_CONF], conf_file, cfg, "not recognized"); } static void -init_conf_vars (const struct conf *config) +init_conf_vars (const char *conf_file, const struct conf *config) { if (config->attr) process_opt_attr (config->attr, false); if (config->exclude_random) process_opt_exclude_random (config->exclude_random, false); if (config->omit_color_empty) + init_conf_boolean (config->omit_color_empty, &omit_color_empty, "omit-color-empty", NULL); + + if (config->rainbow_fg || config->rainbow_bg) { - if (streq (config->omit_color_empty, "yes")) - omit_color_empty = true; - else if (streq (config->omit_color_empty, "no")) - omit_color_empty = false; - else - vfprintf_fail (formats[FMT_GENERIC], "omit-color-empty conf option is not valid"); + if (config->rainbow_fg && config->rainbow_bg) + vfprintf_fail (formats[FMT_CONF_FILE], conf_file, "rainbow-fg and rainbow-bg option are mutually exclusive"); + + if (config->rainbow_fg) + init_conf_boolean (config->rainbow_fg, &rainbow_fg, "rainbow-fg", &rainbow_from_conf.fg); + else if (config->rainbow_bg) + init_conf_boolean (config->rainbow_bg, &rainbow_bg, "rainbow-bg", &rainbow_from_conf.bg); } } static void +init_conf_boolean (const char *conf_var, bool *boolean_var, const char *name, bool *seen_opt) +{ + if (streq (conf_var, "yes")) + *boolean_var = true; + else if (streq (conf_var, "no")) + *boolean_var = false; + else + vfprintf_fail (formats[FMT_CONF_INIT], name, "conf option is not valid"); + + if (seen_opt) + *seen_opt = true; +} + +static void print_hint (void) { fprintf (stderr, "Type `%s --help' for help screen.\n", program_name); @@ -1002,6 +1065,8 @@ free_conf (struct conf *config) RELEASE (config->color); RELEASE (config->exclude_random); RELEASE (config->omit_color_empty); + RELEASE (config->rainbow_fg); + RELEASE (config->rainbow_bg); } static void @@ -1075,6 +1140,30 @@ process_args (unsigned int arg_cnt, char **arg_strings, char *attr, const struct } } + /* --rainbow-bg */ + if (rainbow_bg && !color_names[BACKGROUND]) + vfprintf_fail ("background color required with %s", !rainbow_from_conf.bg ? "--rainbow-bg switch" : "rainbow-bg conf option"); + + /* --rainbow{-fg,-bg} */ + if (rainbow_fg || rainbow_bg) + { + unsigned int i; + const unsigned int color_set[2] = { FOREGROUND, BACKGROUND }; + for (i = 0; i < 2; i++) + { + const unsigned int color = color_set[i]; + if (color_names[color] && ( + streq (color_names[color]->name, "none") + || streq (color_names[color]->name, "default")) + ) { + vfprintf_fail (formats[FMT_RAINBOW], tables[color].desc, color_names[color]->orig, "cannot be used with", + rainbow_fg ? !rainbow_from_conf.fg ? "--rainbow-fg switch" : "rainbow-fg conf option" + : !rainbow_from_conf.bg ? "--rainbow-bg switch" : "rainbow-bg conf option" + ); + } + } + } + find_color_entries (color_names, colors); assert (colors[FOREGROUND] != NULL); free_color_names (color_names); @@ -1288,13 +1377,15 @@ read_print_stream (const char *attr, const struct color **colors, const char *fi if (feof (stream)) { if (*line != '\0') - print_line (attr, colors, line, 0, true); + print_line (attr, colors, line, PARTIAL, true); } else if (*line != '\0') { char *p; if ((clean || clean_all) && (p = strrchr (line, '\033'))) merge_print_line (line, p, stream); + else if (rainbow_fg || rainbow_bg) + print_line (attr, colors, line, PARTIAL, true); else print_line (attr, colors, line, 0, true); } @@ -1511,6 +1602,36 @@ print_line (const char *attr, const struct color **colors, const char *const lin /* skip for --omit-color-empty? */ else if (emit_colors) { + /* --rainbow{-fg,-bg} */ + if (rainbow_fg || rainbow_bg) + { + const unsigned int color_sets[2][2] = { { FOREGROUND, BACKGROUND }, { BACKGROUND, FOREGROUND } }; + unsigned int color_iter, color_cmp, set; + unsigned int index, max_index; + + if (rainbow_fg) + set = 0; + else if (rainbow_bg) + set = 1; + + color_iter = color_sets[set][0]; + color_cmp = color_sets[set][1]; + + max_index = tables[color_iter].count - 2; /* omit color default */ + + if (rainbow_index == 0) + rainbow_index = colors[color_iter]->index; /* init */ + else if (rainbow_index > max_index) + rainbow_index = 1; /* black */ + + index = get_rainbow_index (colors, color_cmp, rainbow_index, max_index); + + colors[color_iter] = (struct color *)&tables[color_iter].entries[index]; + + if (!(flags & PARTIAL)) + rainbow_index = index + 1; + } + /* Foreground color code is guaranteed to be set when background color code is present. */ if (colors[BACKGROUND] && colors[BACKGROUND]->code) printf ("\033[%s", colors[BACKGROUND]->code); @@ -1525,6 +1646,33 @@ print_line (const char *attr, const struct color **colors, const char *const lin putchar ('\n'); } +static unsigned int +get_rainbow_index (const struct color **colors, unsigned int color_cmp, unsigned int index, unsigned int max) +{ + if (skipable_rainbow_index (colors, color_cmp, index)) + { + if (index + 1 > max) + { + if (skipable_rainbow_index (colors, color_cmp, 1)) + return 2; + else + return 1; + } + else + return index + 1; + } + else + return index; +} + +static bool +skipable_rainbow_index (const struct color **colors, unsigned int color_cmp, unsigned int index) +{ + if (color_cmp == BACKGROUND && !colors[color_cmp]) + return false; + return (index == colors[color_cmp]->index); +} + static void print_clean (const char *line) { diff --git a/debian/changelog b/debian/changelog index 37ca47b..150c98e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -colorize (0.65-2) UNRELEASED; urgency=medium +colorize (0.66-1) unstable; urgency=low + * New upstream release. + * Declare compliance with Debian Policy 4.7.0. + (No changes needed.) + * debian/copyright: amend years. + * debian/control: use v13 mode of debhelper-compat package. * debian/control: update Homepage link. - -- Steven Schubiger <stsc@refcnt.org> Tue, 23 Jun 2020 14:09:26 +0200 + -- Steven Schubiger <stsc@refcnt.org> Sun, 09 Jun 2024 21:20:11 +0200 colorize (0.65-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 00bfb3d..6c5f5f4 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: colorize Section: utils Priority: optional Maintainer: Steven Schubiger <stsc@refcnt.org> -Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.5.0 +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.7.0 Rules-Requires-Root: no Homepage: http://cgit.refcnt.org/colorize.git/about/ Vcs-Git: git://refcnt.org/colorize.git diff --git a/debian/copyright b/debian/copyright index e38c26b..79e7f97 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: colorize Source: http://cgit.refcnt.org/colorize.git/ Files: * -Copyright: 2011-2020 Steven Schubiger <stsc@refcnt.org> +Copyright: 2011-2024 Steven Schubiger <stsc@refcnt.org> License: GPL-3.0+ Files: debian/* -Copyright: 2016-2020 Steven Schubiger <stsc@refcnt.org> +Copyright: 2016-2024 Steven Schubiger <stsc@refcnt.org> License: GPL-3.0+ License: GPL-3.0+ diff --git a/doc/colorize.html b/doc/colorize.html index 381ddb0..69e1854 100644 --- a/doc/colorize.html +++ b/doc/colorize.html @@ -34,6 +34,8 @@ Usage: ./colorize (foreground) OR (foreground)/(background) OR --clean[-all] [-| -c, --config=PATH --exclude-random=COLOR --omit-color-empty + --rainbow-fg + --rainbow-bg -h, --help -V, --version </pre> @@ -102,8 +104,18 @@ permitted by applicable law. <span style="color:lime;">The programs included with the Debian GNU/Linux system are free software;</span> </pre> <pre> +<span style="color:yellow;font-weight:bold;">[sts@apollo ~/colorize]$</span> ./colorize --rainbow-fg White/black /etc/motd +<span style="background-color:black;"></span><span style="font-weight:bold;color:gray;background-color:black;"></span> +<span style="background-color:black;"></span><span style="font-weight:bold;color:red;background-color:black;">The programs included with the Debian GNU/Linux system are free software;</span> +<span style="background-color:black;"></span><span style="font-weight:bold;color:green;background-color:black;">the exact distribution terms for each program are described in the</span> +<span style="background-color:black;"></span><span style="font-weight:bold;color:olive;background-color:black;">individual files in /usr/share/doc/*/copyright.</span> +<span style="background-color:black;"></span><span style="font-weight:bold;color:blue;background-color:black;"></span> +<span style="background-color:black;"></span><span style="font-weight:bold;color:purple;background-color:black;">Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent</span> +<span style="background-color:black;"></span><span style="font-weight:bold;color:teal;background-color:black;">permitted by applicable law.</span> +</pre> +<pre> <span style="color:yellow;font-weight:bold;">[sts@apollo ~/colorize]$</span> ./colorize --version -colorize v0.64-17-ga3c5c67 (compiled at Sep 10 2019, 21:32:03) +colorize v0.66-4-gdb8be3e (compiled at Aug 2 2024, 16:07:13) Compiler flags: "-ansi -pedantic " Linker flags: "" Preprocessor flags: "" diff --git a/t/conf/fail.t b/t/conf/fail.t index d3b8852..0a16f8e 100755 --- a/t/conf/fail.t +++ b/t/conf/fail.t @@ -12,7 +12,7 @@ use IPC::Open3 qw(open3); use Symbol qw(gensym); use Test::More; -my $tests = 7; +my $tests = 10; my $run_program_fail = sub { @@ -39,13 +39,16 @@ SKIP: { my $infile = $write_to_tmpfile->(''); my @set = ( - [ 'attr=:', 'attr conf option must be provided a string' ], - [ 'attr=bold:underscore', 'attr conf option must have strings separated by ,' ], - [ 'attr=b0ld', 'attr conf option attribute \'b0ld\' is not valid' ], - [ 'attr=b0ld,underscore', 'attr conf option attribute \'b0ld\' is not valid' ], # handle comma - [ 'attr=bold,bold', 'attr conf option has attribute \'bold\' twice or more' ], - [ 'exclude-random=random', 'exclude-random conf option must be provided a plain color' ], - [ 'omit-color-empty=unsure', 'omit-color-empty conf option is not valid' ], + [ 'attr=:', 'attr conf option must be provided a string' ], + [ 'attr=bold:underscore', 'attr conf option must have strings separated by ,' ], + [ 'attr=b0ld', 'attr conf option attribute \'b0ld\' is not valid' ], + [ 'attr=b0ld,underscore', 'attr conf option attribute \'b0ld\' is not valid' ], # handle comma + [ 'attr=bold,bold', 'attr conf option has attribute \'bold\' twice or more' ], + [ 'exclude-random=random', 'exclude-random conf option must be provided a plain color' ], + [ 'omit-color-empty=unsure', 'omit-color-empty conf option is not valid' ], + [ 'rainbow-fg=unsure', 'rainbow-fg conf option is not valid' ], + [ 'rainbow-bg=unsure', 'rainbow-bg conf option is not valid' ], + [ "rainbow-fg=yes\nrainbow-bg=no", 'mutually exclusive' ], ); foreach my $set (@set) { open(my $fh, '>', $conf_file) or die "Cannot open `$conf_file' for writing: $!\n"; diff --git a/t/conf/param.t b/t/conf/param.t index 520df2b..f8f535f 100755 --- a/t/conf/param.t +++ b/t/conf/param.t @@ -14,14 +14,15 @@ my $conf = <<'EOT'; attr=bold color=blue omit-color-empty=yes +rainbow-fg=yes EOT my $expected = <<"EOT"; \e[1;34mfoo\e[0m -\e[1;34mbar\e[0m +\e[1;35mbar\e[0m -\e[1;34mbaz\e[0m +\e[1;36mbaz\e[0m EOT plan tests => $tests; diff --git a/t/conf/parse/fail.t b/t/conf/parse/fail.t index d2988e4..f3aef48 100755 --- a/t/conf/parse/fail.t +++ b/t/conf/parse/fail.t @@ -12,7 +12,7 @@ use IPC::Open3 qw(open3); use Symbol qw(gensym); use Test::More; -my $tests = 9; +my $tests = 11; my $run_program_fail = sub { @@ -46,6 +46,8 @@ SKIP: { [ 'color1=magenta', 'option \'color1\' not recognized' ], [ 'exclude-random1=black', 'option \'exclude-random1\' not recognized' ], [ 'omit-color-empty1=yes', 'option \'omit-color-empty1\' not recognized' ], + [ 'rainbow-fg1=no', 'option \'rainbow-fg1\' not recognized' ], + [ 'rainbow-bg1=no', 'option \'rainbow-bg1\' not recognized' ], [ 'attr', 'option \'attr\' not followed by =' ], [ 'attr#', 'option \'attr\' not followed by =' ], [ 'attr bold', 'option \'attr\' not followed by =' ], diff --git a/t/conf/parse/success.t b/t/conf/parse/success.t index fe2d46d..9dd4937 100755 --- a/t/conf/parse/success.t +++ b/t/conf/parse/success.t @@ -12,7 +12,7 @@ use IPC::Open3 qw(open3); use Symbol qw(gensym); use Test::More; -my $tests = 21; +my $tests = 25; my $conf = <<'EOT'; # comment @@ -30,12 +30,16 @@ color=green color=green exclude-random=black omit-color-empty=yes +rainbow-fg=no +rainbow-bg=no attr=bold # comment attr=bold # comment attr= color= exclude-random= omit-color-empty= +rainbow-fg= +rainbow-bg= EOT my $run_program_succeed = sub diff --git a/t/conf/use.t b/t/conf/use.t index 0a695df..8c0586e 100755 --- a/t/conf/use.t +++ b/t/conf/use.t @@ -12,8 +12,9 @@ my $tests = 21; my $conf = <<'EOT'; attr=underscore -color=yellow # tested also in color.t +color=yellow/black # tested also in color.t omit-color-empty=yes +rainbow-bg=yes EOT plan tests => $tests; @@ -36,11 +37,11 @@ EOT close($fh); is(qx($program $infile1), <<"EOT", 'use config'); -\e[4;33mfoo\e[0m +\e[40m\e[4;33mfoo\e[0m -\e[4;33mbar\e[0m +\e[41m\e[4;33mbar\e[0m -\e[4;33mbaz\e[0m +\e[42m\e[4;33mbaz\e[0m EOT my $infile2 = $write_to_tmpfile->('foo'); @@ -12,7 +12,7 @@ use IPC::Open3 qw(open3); use Symbol qw(gensym); use Test::More; -my $tests = 25; +my $tests = 31; my $run_program_fail = sub { @@ -40,31 +40,37 @@ SKIP: { my $dir = tempdir(CLEANUP => true); my @set = ( - [ '--attr=:', 'must be provided a string' ], - [ '--attr=bold:underscore', 'must have strings separated by ,' ], - [ '--attr=b0ld', 'attribute \'b0ld\' is not valid' ], - [ '--attr=b0ld,underscore', 'attribute \'b0ld\' is not valid' ], # handle comma - [ '--attr=bold,bold', 'has attribute \'bold\' twice or more' ], - [ '--exclude-random=random', 'must be provided a plain color' ], - [ '--clean --clean-all', 'mutually exclusive' ], - [ '--clean file1 file2', 'more than one file' ], - [ '--clean-all file1 file2', 'more than one file' ], - [ '- file', 'hyphen cannot be used as color string' ], - [ '-', 'hyphen must be preceded by color string' ], - [ "$file file", 'cannot be used as color string' ], - [ "$file", 'must be preceded by color string' ], - [ "$dir", 'is not a valid file type' ], - [ '/black', 'foreground color missing' ], - [ 'white/', 'background color missing' ], - [ 'white/black/yellow', 'one color pair allowed only' ], - [ 'y3llow', 'cannot be made of non-alphabetic characters' ], - [ 'yEllow', 'cannot be in mixed lower/upper case' ], - [ 'None', 'cannot be bold' ], - [ 'white/Black', 'cannot be bold' ], - [ 'random/none', 'cannot be combined with' ], - [ 'random/default', 'cannot be combined with' ], - [ 'none/random', 'cannot be combined with' ], - [ 'default/random', 'cannot be combined with' ], + [ '--attr=:', 'must be provided a string' ], + [ '--attr=bold:underscore', 'must have strings separated by ,' ], + [ '--attr=b0ld', 'attribute \'b0ld\' is not valid' ], + [ '--attr=b0ld,underscore', 'attribute \'b0ld\' is not valid' ], # handle comma + [ '--attr=bold,bold', 'has attribute \'bold\' twice or more' ], + [ '--exclude-random=random', 'must be provided a plain color' ], + [ '--clean --clean-all', 'mutually exclusive' ], + [ '--clean file1 file2', 'more than one file' ], + [ '--clean-all file1 file2', 'more than one file' ], + [ '- file', 'hyphen cannot be used as color string' ], + [ '-', 'hyphen must be preceded by color string' ], + [ "$file file", 'cannot be used as color string' ], + [ "$file", 'must be preceded by color string' ], + [ "$dir", 'is not a valid file type' ], + [ '/black', 'foreground color missing' ], + [ 'white/', 'background color missing' ], + [ 'white/black/yellow', 'one color pair allowed only' ], + [ 'y3llow', 'cannot be made of non-alphabetic characters' ], + [ 'yEllow', 'cannot be in mixed lower/upper case' ], + [ 'None', 'cannot be bold' ], + [ 'white/Black', 'cannot be bold' ], + [ 'random/none', 'cannot be combined with' ], + [ 'random/default', 'cannot be combined with' ], + [ 'none/random', 'cannot be combined with' ], + [ 'default/random', 'cannot be combined with' ], + [ '--rainbow-fg --rainbow-bg', 'mutually exclusive' ], + [ 'green --rainbow-bg', 'background color required with' ], + [ 'white/none --rainbow-fg', 'cannot be used with --rainbow-fg' ], + [ 'white/default --rainbow-bg', 'cannot be used with --rainbow-bg' ], + [ 'none/white --rainbow-fg', 'cannot be used with --rainbow-fg' ], + [ 'default/white --rainbow-bg', 'cannot be used with --rainbow-bg' ], ); foreach my $set (@set) { ok($run_program_fail->($program, $set->[0], $set->[1]), $set->[1]); @@ -13,7 +13,7 @@ use Getopt::Long qw(:config no_auto_abbrev no_ignore_case); use Test::Harness qw(runtests); use Test::More; -my $tests = 32; +my $tests = 38; my $valgrind_cmd = ''; { @@ -101,7 +101,7 @@ SKIP: { { my $ok = true; - foreach my $option (qw(--attr=bold --exclude-random=black --omit-color-empty)) { + foreach my $option (qw(--attr=bold --exclude-random=black --omit-color-empty --rainbow-fg --rainbow-bg)) { $ok &= qx($valgrind_cmd$program $option $switch $infile1 2>&1 >/dev/null) =~ /switch has no meaning with/; } ok($ok, "$type strict options"); @@ -135,6 +135,23 @@ SKIP: { is_deeply([split /\n/, qx(cat $infile2 | $valgrind_cmd$program none/none)], [split /\n/, $repeated], "read ${\length $repeated} bytes (BUF_SIZE=$BUF_SIZE{normal})"); + SKIP: { + my $program_buf = tmpnam(); + skip 'compiling failed (short buffer)', 2 unless system("$compiler -DTEST -DBUF_SIZE=$BUF_SIZE{short} -o $program_buf $source") == 0; + + my $short_text = 'foo bar baz' x 2; + + is(qx(printf %s "$short_text" | $valgrind_cmd$program_buf blue --rainbow-fg), + "\e[34mfoo bar ba\e[0m\e[34mzfoo bar b\e[0m\e[34maz\e[0m", + "partial line (BUF_SIZE=$BUF_SIZE{short}, rainbow-fg)"); + + is(qx(printf %s "$short_text" | $valgrind_cmd$program_buf blue/black --rainbow-bg), + "\e[40m\e[34mfoo bar ba\e[0m\e[40m\e[34mzfoo bar b\e[0m\e[40m\e[34maz\e[0m", + "partial line (BUF_SIZE=$BUF_SIZE{short}, rainbow-bg)"); + + unlink $program_buf; + } + { my $colored_text = qx(printf '%s\n' "foo bar baz" | $valgrind_cmd$program red); my $sequences = 0; @@ -160,6 +177,26 @@ SKIP: { 'switch omit-color-empty'); } + { + my $infile = $write_to_tmpfile->("foo\nbar\nbaz"); + + is_deeply([split /\n/, qx($valgrind_cmd$program black/black --rainbow-fg $infile)], + [split /\n/, "\e[40m\e[31mfoo\e[0m\n\e[40m\e[32mbar\e[0m\n\e[40m\e[33mbaz\e[0m"], + 'switch rainbow-fg (init)'); + + is_deeply([split /\n/, qx($valgrind_cmd$program white --rainbow-fg $infile)], + [split /\n/, "\e[37mfoo\e[0m\n\e[30mbar\e[0m\n\e[31mbaz\e[0m"], + 'switch rainbow-fg (reset)'); + + is_deeply([split /\n/, qx($valgrind_cmd$program black/black --rainbow-bg $infile)], + [split /\n/, "\e[41m\e[30mfoo\e[0m\n\e[42m\e[30mbar\e[0m\n\e[43m\e[30mbaz\e[0m"], + 'switch rainbow-bg (init)'); + + is_deeply([split /\n/, qx($valgrind_cmd$program green/white --rainbow-bg $infile)], + [split /\n/, "\e[47m\e[32mfoo\e[0m\n\e[40m\e[32mbar\e[0m\n\e[41m\e[32mbaz\e[0m"], + 'switch rainbow-bg (reset)'); + } + SKIP: { skip 'valgrind not found', 1 unless system('which valgrind >/dev/null 2>&1') == 0; like(qx(valgrind $program none/none $infile1 2>&1 >/dev/null), qr/no leaks are possible/, 'valgrind memleaks'); |