X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/6b073cda9ed996cec5895eb2d9f0b0fd88e50312..a052b8d20f25e69c82104135c9925c17dcaa3eb3:/graph

diff --git a/graph b/graph
index 0d9db2e..e76ec64 100755
--- a/graph
+++ b/graph
@@ -5,31 +5,63 @@ 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', qw( :config gnu_getopt );
-sub podexit { require Pod::Usage; Pod::Usage::pod2usage(-exitval => 0, @_) }
+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',
+	'unmodified|u!',
 	'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};
+}
 
-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;
-if (defined $opt{trim}) {
-	my $trimpos = abs $opt{trim};
-	$trimpos <= 1 ? ($_ = substr($_, 0, 1)) :
-	(length > $trimpos and substr($_, $trimpos - 1) = '…') for @lines;
+$SIG{INT} = 'IGNORE';  # continue after assumed eof
+
+my (@lines, @values);
+while (readline) {
+	s/\r?\n\z//;
+	s/^\h*// unless $opt{unmodified};
+	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 @order  = sort { $b <=> $a } grep { length } @values;
 my $maxval = $order[0];
 my $minval = min $order[-1], 0;
 my $lenval = max map { length } @order;
@@ -40,14 +72,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 :
@@ -59,10 +106,14 @@ 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__
 
 =head1 NAME
@@ -81,9 +132,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.
+
+=item -f, --follow[=<seconds>]
 
-Disable colored output of values and bar markers.
+Interval to output partial progress.
 
 =item -l, --length=[-]<size>
 
@@ -112,11 +169,27 @@ the sum of all values divided by the number of counted lines.
 
 =item B<+>
 
-Median:
+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 -u, --unmodified
+
+Do not strip leading whitespace.
+Keep original value alignment, which may be significant in some programs.
+
 =item -w, --width=<columns>
 
 Override the maximum number of columns to use.
@@ -151,7 +224,7 @@ Number of HTTP requests per day:
 Any kind of database query with leading counts:
 
     echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' |
-    psql -t | graph
+    psql -t | graph -u
 
 Git statistics, such commit count by year:
 
@@ -161,6 +234,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>