X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/e31503d6e3fc1c0961d26db24e7474afa005e0ba..b7992da312c627399c0363b59b3c00df380aee1d:/barcat

diff --git a/barcat b/barcat
index 723c7da..a443942 100755
--- a/barcat
+++ b/barcat
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl -CA
 use 5.018;
 use warnings;
 use utf8;
@@ -6,7 +6,7 @@ use List::Util qw( min max sum );
 use open qw( :std :utf8 );
 use experimental qw( lexical_subs );
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
 use Getopt::Long '2.33', qw( :config gnu_getopt );
 sub podexit {
@@ -47,10 +47,28 @@ GetOptions(\%opt,
 		);
 	},
 	'markers|m=s',
+	'spark:s' => sub {
+		$opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█'];
+	},
 	'stat|s!',
 	'unmodified|u!',
 	'width|w=i',
-	'usage|h' => sub { podexit() },
+	'usage|h' => sub {
+		local $/;
+		my $pod = readline *DATA;
+		$pod =~ s/^=over\K/ 22/m;  # indent options list
+		$pod =~ s/^=item \N*\n\n\N*\n\K(?:(?:^=over.*?^=back\n)?(?!=)\N*\n)*/\n/msg;
+
+		require Pod::Usage;
+		my $parser = Pod::Usage->new;
+		$parser->select('SYNOPSIS', 'OPTIONS');
+		$parser->output_string(\my $contents);
+		$parser->parse_string_document($pod);
+
+		$contents =~ s/\n(?=\n\h)//msg;  # strip space between items
+		print $contents;
+		exit;
+	},
 	'help'    => sub { podexit(-verbose => 2) },
 ) or exit 64;  # EX_USAGE
 
@@ -60,6 +78,7 @@ $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
 $opt{units}   = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
 $opt{anchor} //= qr/\A/;
 $opt{'value-length'} = 6 if $opt{units};
+$opt{'value-length'} = 1 if $opt{unmodified};
 
 my (@lines, @values, @order);
 
@@ -77,7 +96,10 @@ if (defined $opt{interval}) {
 	} or warn $@, "Expect slowdown with large datasets!\n";
 }
 
-$SIG{INT} = 'IGNORE';  # continue after assumed eof
+$SIG{INT} = sub {
+	$SIG{INT} = 'DEFAULT';  # reset for subsequent attempts
+	'IGNORE' # continue after assumed eof
+};
 
 my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
 while (readline) {
@@ -87,6 +109,7 @@ while (readline) {
 	push @order, $1 if length $1;
 	if (defined $opt{trim} and defined $1) {
 		my $trimpos = abs $opt{trim};
+		$trimpos -= length $1 if $opt{unmodified};
 		if ($trimpos <= 1) {
 			$_ = substr $_, 0, 1;
 		}
@@ -161,6 +184,12 @@ sub sival {
 while ($nr <= $#lines) {
 	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
+
+	if ($opt{spark}) {
+		print $opt{spark}->[ ($val - $minval) / $maxval * $#{$opt{spark}} ];
+		next;
+	}
+
 	if (length $val) {
 		my $color = !$opt{color} ? undef :
 			$val == $order[0] ? 32 : # max
@@ -173,9 +202,11 @@ while ($nr <= $#lines) {
 	printf '%-*s', $len + length($val), $line;
 	print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5;
 	say '';
-
+}
+continue {
 	$nr++;
 }
+say '' if $opt{spark};
 
 }
 show_lines();
@@ -301,7 +332,7 @@ Total statistics after all data.
 
 =item -u, --unmodified
 
-Do not strip leading whitespace.
+Do not reformat values, keeping leading whitespace.
 Keep original value alignment, which may be significant in some programs.
 
 =item --value-length=<size>
@@ -352,6 +383,11 @@ Any kind of database query with counts, preserving returned alignment:
     echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' |
     psql -t | barcat -u
 
+Earthquakes worldwide magnitude 1+ in the last 24 hours:
+
+    https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/1.0_day.csv |
+    column -tns, | graph -f4 -u -l80%
+
 External datasets, like movies per year:
 
     curl https://github.com/prust/wikipedia-movie-data/raw/master/movies.json |
@@ -386,6 +422,12 @@ 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):
+
+    ( git log --pretty=%ci --since=30day | cut -b-10
+      seq 0 30 | xargs -i date +%F -d-{}day ) |
+    sort | uniq -c | awk '$1--' | graph --spark
+
 =head1 AUTHOR
 
 Mischa POSLAWSKY <perl@shiar.org>