X-Git-Url: http://git.shiar.net/barcat.git/blobdiff_plain/b8ecf0c19b1c9f899933a067a6958edf859927f8..48a2e93f039145d144094a5cd0fdae12ae3cb5fa:/barcat diff --git a/barcat b/barcat index aa18957..ae9fff1 100755 --- a/barcat +++ b/barcat @@ -79,16 +79,27 @@ GetOptions(\%opt, 'usage|h' => sub { local $/; my $pod = readline *DATA; - $pod =~ s/^=over\K/ 22/m; # indent options list + $pod =~ s/^=over\K/ 25/m; # indent options list $pod =~ s/^=item \N*\n\n\N*\n\K(?:(?:^=over.*?^=back\n)?(?!=)\N*\n)*/\n/msg; + $pod =~ s/[.,](?=\n)//g; # trailing punctuation + $pod =~ s/^=item \K(?=--)/____/gm; # align long options + # abbreviate indicators + $pod =~ s/\Q>.../s>/g; + $pod =~ s/<(?:number|count|seconds)>/N/g; + $pod =~ s//\Uchar$1/g; + $pod =~ s/\Q | /|/g; + $pod =~ s/(?/\U$1/g; # uppercase require Pod::Usage; - my $parser = Pod::Usage->new; + my $parser = Pod::Usage->new(USAGE_OPTIONS => { + -indent => 2, -width => 78, + }); $parser->select('SYNOPSIS', 'OPTIONS'); $parser->output_string(\my $contents); $parser->parse_string_document($pod); $contents =~ s/\n(?=\n\h)//msg; # strip space between items + $contents =~ s/^ \K____/ /gm; # nbsp substitute print $contents; exit; }, @@ -111,7 +122,8 @@ $opt{'value-length'} = 1 if $opt{unmodified}; $opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT'; $opt{markers} //= '=avg >31.73v <68.27v +50v |0'; $opt{palette} //= $opt{color} && [31, 90, 32]; -$opt{input} = @ARGV && $ARGV[0] =~ m/\A[-0-9]/ ? \@ARGV : undef; +$opt{input} = @ARGV && $ARGV[0] =~ m/\A[-0-9]/ ? \@ARGV : undef + and undef $opt{interval}; my (@lines, @values, @order); @@ -132,7 +144,9 @@ if (defined $opt{interval}) { } or warn $@, "Expect slowdown with large datasets!\n"; } -my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x; +my $valmatch = qr< + $opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |) +>x; while (defined ($_ = $opt{input} ? shift @{ $opt{input} } : readline)) { s/\r?\n\z//; s/^\h*// unless $opt{unmodified}; @@ -173,14 +187,18 @@ state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0; @lines > $nr or return unless $opt{hidemin}; @order = sort { $b <=> $a } @order unless tied @order; -my $maxval = $opt{maxval} // ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0; +my $maxval = $opt{maxval} // ( + $opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : + $order[0] +) // 0; my $minval = $opt{minval} // min $order[-1] // (), 0; +my $range = $maxval - $minval; my $lenval = $opt{'value-length'} // max map { length } @order; my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 : max map { length $values[$_] && length $lines[$_] } 0 .. min $#lines, $opt{hidemax} || (); # left padding -my $size = ($maxval - $minval) && - ($opt{width} - $lenval - $len) / ($maxval - $minval); # bar multiplication +my $size = $range && + ($opt{width} - $lenval - $len) / $range; # bar multiplication my @barmark; if ($opt{markers} and $size > 0) { @@ -210,7 +228,7 @@ if ($opt{markers} and $size > 0) { ($lastmax - $minval) * $size + .5, '-' x (($values[$nr - 1] - $minval) * $size); print color(92); - say '+' x (($maxval - $lastmax - $minval) * $size + .5); + say '+' x (($range - $lastmax) * $size + .5); print color(0); $lastmax = $maxval; } @@ -231,7 +249,7 @@ sub sival { say( color(31), sprintf('%*s', $lenval, $minval), color(90), '-', color(36), '+', - color(32), sprintf('%*s', $size * ($maxval - $minval) - 3, $maxval), + color(32), sprintf('%*s', $size * $range - 3, $maxval), color(90), '-', color(36), '+', color(0), ) if $opt{header}; @@ -239,7 +257,7 @@ say( while ($nr <= $#lines) { $nr >= $opt{hidemax} and last if defined $opt{hidemax}; my $val = $values[$nr]; - my $rel = length $val && ($val - $minval) / ($maxval - $minval); + my $rel = length $val && $range && ($val - $minval) / $range; my $color = !length $val || !$opt{palette} ? undef : $val == $order[0] ? $opt{palette}->[-1] : # max $val == $order[-1] ? $opt{palette}->[0] : # min @@ -263,7 +281,8 @@ while ($nr <= $#lines) { } my $line = $lines[$nr] =~ s/\n/$val/r; printf '%-*s', $len + length($val), $line; - print $barmark[$_] // $opt{'graph-format'} for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5; + print $barmark[$_] // $opt{'graph-format'} + for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5; say ''; } continue { @@ -336,7 +355,7 @@ Force colored output of values and bar markers. Defaults on if output is a tty, disabled otherwise such as when piped or redirected. -=item -f, --field=(|) +=item -f, --field=( | ) Compare values after a given number of whitespace separators, or matching a regular expression. @@ -359,7 +378,7 @@ turning long numbers like I<12356789> into I<12.4M>. Also changes an exponent I<1.602176634e-19> to I<160.2z>. Short integers are aligned but kept without decimal point. -=item -t, --interval[=(|-)] +=item -t, --interval[=( | -)] Output partial progress every given number of seconds or input lines. An update can also be forced by sending a I alarm signal. @@ -432,7 +451,7 @@ In case of additional colors, the last is used for values equal to the maximum, the first for minima. If unspecified, these are green and red respectively (I<31 90 32>). -=item --spark[=] +=item --spark[=] Replace lines by I, single characters corresponding to input values. @@ -497,7 +516,7 @@ Monitor network latency from prefixed results: Commonly used after counting, for example users on the current server: - users | sed 's/ /\n/g' | sort | uniq -c | barcat + users | tr ' ' '\n' | sort | uniq -c | barcat Letter frequencies in text files: @@ -552,7 +571,11 @@ Or the top 3 most frequent authors with statistics over all: git shortlog -sn | barcat -L3 -s -Activity of the last days (substitute date C<-v-{}d> on BSD): +Sparkline graphics of simple input given as inline parameters: + + barcat --spark= 3 1 4 1 5 0 9 2 4 + +Activity graph of the last days (substitute date C<-v-{}d> on BSD): ( git log --pretty=%ci --since=30day | cut -b-10 seq 0 30 | xargs -i date +%F -d-{}day ) |