X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/cbf018815e12a627e8331a85088671e2c7eca0c5..2635f0b521e899b3f1b81dcd72ebfb33cf1b930b:/graph diff --git a/graph b/graph index cb8a406..cdcb80c 100755 --- a/graph +++ b/graph @@ -5,20 +5,33 @@ use utf8; use List::Util qw( min max sum ); use open qw( :std :utf8 ); -our $VERSION = '1.01'; +our $VERSION = '1.02'; use Getopt::Long '2.33', qw( :config gnu_getopt ); sub podexit { require Pod::Usage; Pod::Usage::pod2usage(-exitval => 0, @_) } GetOptions(\my %opt, 'color|c!', + 'follow|f:i', 'trim|length|l=i', 'markers|m=s', 'width|w=i', 'usage|h' => sub { podexit() }, 'help' => sub { podexit(-verbose => 2) }, ) or exit 64; # EX_USAGE + $opt{width} ||= $ENV{COLUMNS} || 80; -$opt{color} //= 1; +$opt{color} //= -t *STDOUT; # enable on tty + +if (defined $opt{follow}) { + $opt{follow} ||= 1; + $SIG{ALRM} = sub { + show_lines(); + alarm $opt{follow}; + }; + alarm $opt{follow}; +} + +$SIG{INT} = 'IGNORE'; # continue after assumed eof my (@lines, @values); while (readline) { @@ -37,6 +50,12 @@ while (readline) { } @lines or exit; +$SIG{INT} = 'DEFAULT'; + +sub show_lines { + +state $nr = 0; + my @order = sort { $b <=> $a } grep { length } @values; my $maxval = $order[0]; my $minval = min $order[-1], 0; @@ -48,16 +67,29 @@ my $size = ($maxval - $minval) && my @barmark; if ($opt{markers} // 1 and $size > 0) { - sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size } + my sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size } $barmark[ (sum(@order) / @order - $minval) * $size ] = '='; # average $barmark[ orderpos($#order * .31731) ] = '>'; $barmark[ orderpos($#order * .68269) ] = '<'; $barmark[ orderpos($#order / 2) ] = '+'; # mean $barmark[ -$minval * $size ] = '|' if $minval < 0; # zero defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark; + + state $lastmax = $maxval; + if ($maxval > $lastmax) { + print ' ' x ($lenval + $len); + printf "\e[90m" if $opt{color}; + printf '%-*s', + ($lastmax - $minval) * $size + .5, + '-' x (($values[$nr - 1] - $minval) * $size); + print "\e[92m" if $opt{color}; + say '+' x (($maxval - $lastmax - $minval) * $size + .5); + print "\e[0m" if $opt{color}; + $lastmax = $maxval; + } } -for my $nr (0 .. $#lines) { +while ($nr <= $#lines) { my $val = $values[$nr]; if (length $val) { my $color = !$opt{color} ? 0 : @@ -71,7 +103,11 @@ for my $nr (0 .. $#lines) { printf '%-*s', $len, $lines[$nr]; print $barmark[$_] // '-' for 1 .. $size && (($val || 0) - $minval) * $size; say ''; + $nr++; +} + } +show_lines(); __END__ @@ -91,9 +127,15 @@ Each line starting with a number is given a bar to visualise relative sizes. =over -=item --no-color +=item -c, --[no-]color + +Force colored output of values and bar markers. +Defaults on if output is a tty, +disabled otherwise such as when piped or redirected. -Disable colored output of values and bar markers. +=item -f, --follow[=] + +Interval to output partial progress. =item -l, --length=[-] @@ -182,6 +224,11 @@ Or the most frequent authors: git shortlog -sn | graph | head -3 +Latency history: + + ping google.com | + perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -f + =head1 AUTHOR Mischa POSLAWSKY