X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/f63df915b63775f1593664cb6cc47ead45108bdb..13fb03e4b877662289ca3395ce81f7a8462b127a:/t/examples.t

diff --git a/t/examples.t b/t/examples.t
index 29f7c50..c9b285e 100755
--- a/t/examples.t
+++ b/t/examples.t
@@ -2,7 +2,6 @@
 use 5.014;
 use warnings;
 use re '/ms';
-use IPC::Run 'run';
 
 use Test::More;
 { # silence fail diagnostics because of single caller
@@ -10,9 +9,14 @@ use Test::More;
 	sub Test::Builder::_ok_debug {}
 }
 
+eval q(use IPC::Run 'run');
+plan skip_all => "IPC::Run required to test commands" if $@;
+
 my %CMDARGS = (
-	ping => '-c 1',
+	ping => '-c 1 ',
 	'cat \Khttpd/' => '/var/log/apache2/',
+	' \K\*(?=\h*\|)' => 'sample/media/*.*',
+	find => 'sample/media -name \*.\* ',
 );
 
 my $filename = 'barcat';
@@ -31,9 +35,10 @@ SKIP: {
 	my $ref = "$filename line $.";
 
 	# store curl downloads
-	s{\bcurl (\S*)(?<param>[^|]*)}{
-		my $url = $1;
-		my @params = split ' ', $+{param};
+	$cmd =~ s{\bcurl (\S*)([^|]*)}{
+		my ($url, $params) = ($1, $2);
+		my $cache = 'sample/data/';
+		-w $cache or skip($url, 2);
 		my $ext = (
 			$cmd =~ /\bxml/     ? 'xml'  :
 			$cmd =~ / jq /      ? 'json' :
@@ -42,13 +47,15 @@ SKIP: {
 		);
 		my ($domain, $path) = $url =~ m{//([^/]+) .*/ ([^/]*) \z}x;
 		$path =~ s/\.$ext\z//;
-		my $cache = join '.', $path =~ tr/./_/r, $domain, $ext;
-		$cache = "sample/data/$cache";
+		$cache .= join '.', $path =~ tr/./_/r, $domain, $ext;
+		my $cached = -e $cache;
 		SKIP: {
-			-e $cache and skip($url, 1);
-			ok(defined runres(['curl', '-sS', $url, '-o', $cache, @params]), $url)
-				or diag("download at $ref: $@");
+			# download to file
+			skip($url, 1) if $cached;
+			$cached = defined runres("curl -sSf $url$params -o $cache");
+			ok($cached, $url) or diag("download at $ref: $@");
 		}
+		$cached or skip($url, 1);
 		"cat $cache"
 	}e;
 
@@ -65,8 +72,8 @@ SKIP: {
 
 	# prepare shell command to execute
 	while (my ($subcmd, $args) = each %CMDARGS) {
-		$subcmd .= " \\K", $args .= ' ' unless $subcmd =~ m/\\K/;
-		$cmd =~ s/\b$subcmd/$args/;
+		$subcmd .= " \\K" unless $subcmd =~ m/\\K/;
+		$cmd =~ s/$subcmd/$args/;
 	}
 
 	for my $param ($cmd =~ m{^[(\h]* (\w\S*)}gx) {