X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/e178db6520bafa9ba6c2a89804310982940e7b13..4644846ee87e7e9eaa30ec40d679d0e02afd8d14:/graph

diff --git a/graph b/graph
index 20ce299..ab51d08 100755
--- a/graph
+++ b/graph
@@ -1,42 +1,98 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
-use List::Util qw( max sum );
+use utf8;
+use List::Util qw( min max sum );
 use open qw( :std :utf8 );
 
-our $VERSION = '1.00';
+our $VERSION = '1.02';
 
-use Getopt::Long '2.33';
-sub podexit { require Pod::Usage; Pod::Usage::pod2usage(-exitval => 0, @_) }
+use Getopt::Long '2.33', qw( :config gnu_getopt );
+sub podexit {
+	require Pod::Usage;
+	Pod::Usage::pod2usage(-exitval => 0, -perldocopt => '-oman', @_);
+}
 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) {
+	chomp;
+	push @values, s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x && $1;
+	if (defined $opt{trim}) {
+		my $trimpos = abs $opt{trim};
+		if ($trimpos <= 1) {
+			$_ = substr $_, 0, 1;
+		}
+		elsif (length > $trimpos) {
+			substr($_, $trimpos - 1) = '…';
+		}
+	}
+	push @lines, $_;
+}
+@lines or exit;
+
+$SIG{INT} = 'DEFAULT';
+
+sub show_lines {
+
+state $nr = 0;
 
-my @lines = readline or exit;
-chomp for @lines;
-my @values = map { s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x and $1 } @lines;
 my @order  = sort { $b <=> $a } grep { length } @values;
 my $maxval = $order[0];
 my $minval = min $order[-1], 0;
-
 my $lenval = max map { length } @order;
-my $len    = 1 + max map { length } @lines;  # left padding
+my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
+	1 + max map { length } @lines;  # left padding
 my $size   = ($maxval - $minval) &&
 	($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
-sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size }
 my @barmark;
-$barmark[ (sum(@order) / @order - $minval) * $size ] = '=';  # average
-$barmark[ orderpos($#order / 2) ] = '+';  # mean
-$barmark[ -$minval * $size ] = '|' if $minval < 0;  # zero
-defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark;
+if ($opt{markers} // 1 and $size > 0) {
+	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 :
@@ -48,9 +104,13 @@ for my $nr (0 .. $#lines) {
 		print "\e[0m" if $color;
 	}
 	printf '%-*s', $len, $lines[$nr];
-	print $barmark[$_] // '-' for 1 .. (($val || 0) - $minval) * $size;
+	print $barmark[$_] // '-' for 1 .. $size && (($val || 0) - $minval) * $size;
 	say '';
+	$nr++;
+}
+
 }
+show_lines();
 
 __END__
 
@@ -70,9 +130,58 @@ 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.
+
+=item -f, --follow[=<seconds>]
+
+Interval to output partial progress.
+
+=item -l, --length=[-]<size>
 
-Disable colored output of values and bar markers.
+Trim line contents (between number and bars)
+to a maximum number of characters.
+The exceeding part is replaced by an abbreviation sign,
+unless C<--length=0>.
+
+Prepend a dash (i.e. make negative) to enforce padding
+regardless of encountered contents.
+
+=item -m, --markers=
+
+Statistical positions to indicate on bars.
+Cannot be customized yet,
+only disabled by providing an empty argument.
+
+Any value enables all marker characters:
+
+=over 2
+
+=item B<=>
+
+Average:
+the sum of all values divided by the number of counted lines.
+
+=item B<+>
+
+Mean, median:
+the middle value or average between middle values.
+
+=item B<<>
+
+Standard deviation left of the mean.
+Only 16% of all values are lower.
+
+=item B<< > >>
+
+Standard deviation right of the mean.
+The part between B<< <--> >> encompass all I<normal> results,
+or 68% of all entries.
+
+=back
 
 =item -w, --width=<columns>
 
@@ -118,6 +227,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 <perl@shiar.org>