test strptime stuff

Hopefully this is sufficient. We'll see

https://github.com/dkogan/feedgnuplot/pull/16
https://github.com/CPAN-API/metacpan-web/issues/1148
https://github.com/CPAN-API/metacpan-web/issues/1170
https://github.com/CPAN-API/metacpan-web/issues/994

Changes

@@ -1,3 +1,19 @@
+feedgnuplot (1.34)
+
+  * Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey
+    Putkunz
+
+  * Declaring feedgnuplot as a package to let MetaCPAN index this
+    distribution
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 14 May 2014 00:45:24 -0700
+
+feedgnuplot (1.33)
+
+  * fixed incorrect plotting of --timefmt --rangesize plots
+
+ -- Dima Kogan <dima@secretsauce.net>  Thu, 06 Feb 2014 23:17:21 -0800
+
 feedgnuplot (1.32)
 
   * Added --rangesize and --rangesizeall. Different curves can now plot

bin/feedgnuplot

@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+
+package feedgnuplot; # for the metacpan indexer
+
 use strict;
 use warnings;
 use Getopt::Long;
@@ -11,9 +14,9 @@ use threads;
 use threads::shared;
 use Thread::Queue;
 use Pod::Usage;
-use Time::Piece;
+use DateTime::Format::Strptime;
 
-my $VERSION = 1.32;
+my $VERSION = 1.34;
 
 my %options;
 interpretCommandline();
@@ -28,6 +31,9 @@ interpretCommandline();
 # datastring
 
 
+
+my $strptime;
+
 my @curves = ();
 
 # list mapping curve names to their indices in the @curves list
@@ -72,6 +78,7 @@ if($options{stream})
   }
 
   $streamingFinished = 1;
+  $dataQueue->enqueue(undef);
 
   $plotThr->join() if defined $plotThr;
   $addThr->join();
@@ -202,6 +209,23 @@ sub interpretCommandline
     exit -1;
   }
 
+
+  # I now set up the rangesize to always be
+  #  $options{rangesize_hash}{$id} // $options{rangesize_default}
+  if ( $options{rangesizeall} )
+  {
+      $options{rangesize_default} = $options{rangesizeall};
+  }
+  else
+  {
+      $options{rangesize_default} = 1;
+
+      $options{rangesize_default} += $options{extraValuesPerPoint} if ($options{extraValuesPerPoint});
+      $options{rangesize_default}++                                if ($options{colormap});
+      $options{rangesize_default}++                                if ($options{circles} );
+  }
+
+
   # parse stream option. Allowed only numbers >= 0 or 'trigger'. After this code
   # $options{stream} is
   #  -1 for triggered replotting
@@ -354,19 +378,23 @@ sub interpretCommandline
     $options{timefmt} =~ s/^\s*//;
     $options{timefmt} =~ s/\s*$//;
 
-    my $Nfields = scalar split( ' ', $options{timefmt});
+    my $Nfields = () = split /\s+/, $options{timefmt}, -1;
     $options{timefmt_Ncols} = $Nfields;
 
     # make sure --xlen is an integer. With a timefmt xlen goes through strptime
     # and strftime, and those are integer-only
     if( defined $options{xlen} )
     {
+        # warning do I need to make sure this is an integer anymore?
       if( $options{xlen} - int($options{xlen}) )
       {
-        say STDERR "When streaming --xlen MUST be an integer. Rounding up to the nearest second";
+        print STDERR "When streaming --xlen MUST be an integer. Rounding up to the nearest second\n";
         $options{xlen} = 1 + int($options{xlen});
       }
     }
+
+
+#    $strptime = DateTime::Format::Strptime->new( pattern => $options{timefmt} );
   }
 }
 
@@ -393,8 +421,6 @@ sub plotUpdateThread
     # indicate that the timer was the replot source
     $dataQueue->enqueue('replot timertick');
   }
-
-  $dataQueue->enqueue(undef);
 }
 
 sub sendRangeCommand
@@ -421,32 +447,23 @@ sub makeDomainNumeric
 {
   my ($domain0) = @_;
 
-  if ( $options{timefmt} )
-  {
-    my $timepiece = Time::Piece->strptime( $domain0, $options{timefmt} )
-      or die "Couldn't parse time format. String '$domain0' doesn't fit format '$options{timefmt}'";
 
-    return $timepiece->epoch();
+
+  if( $options{timefmt})
+  {
+#      my $t = $strptime->parse_datetime($domain0);
+#      print STDERR "$domain0 $t\n";
   }
 
+
+
+
+#  return $strptime->parse_datetime($domain0) if $options{timefmt};
   return $domain0;
 }
 
 sub mainThread
 {
-    my $valuesPerPoint;
-    if( $options{rangesizeall} )
-    {
-        $valuesPerPoint = $options{rangesizeall};
-    }
-    else
-    {
-        $valuesPerPoint = 1;
-        if($options{extraValuesPerPoint}) { $valuesPerPoint += $options{extraValuesPerPoint}; }
-        if($options{colormap})            { $valuesPerPoint++; }
-        if($options{circles} )            { $valuesPerPoint++; }
-    }
-
     local *PIPE;
     my $dopersist = '';
 
@@ -686,6 +703,17 @@ sub mainThread
               @domain = splice(@fields, 0, 2);
           }
 
+
+
+
+          # domain0_numeric is only used for xlen and monotonic, I think. And
+          # this is the only thing that requires strptime. Shouldn't bother with
+          # strptime otherwise
+
+
+
+
+
           if( $options{monotonic} )
           {
             if( defined $latestX && $domain0_numeric < $latestX )
@@ -720,8 +748,6 @@ sub mainThread
 
         while(@fields)
         {
-            my $rangesize = $valuesPerPoint;
-
             if($options{dataid})
             {
                 $id = shift @fields;
@@ -731,10 +757,10 @@ sub mainThread
                 $id++;
             }
 
-            if( $options{rangesize_hash}{$id} )
+            # I'd like to use //, but I guess some people are still on perl 5.8
-            {
+            my $rangesize = exists $options{rangesize_hash}{$id} ?
-                $rangesize = $options{rangesize_hash}{$id};
+              $options{rangesize_hash}{$id} :
-            }
+              $options{rangesize_default};
 
             last if @fields < $rangesize;
 
@@ -747,14 +773,8 @@ sub mainThread
       }
     }
 
-    # if we were streaming, we're now done!
-    if( $options{stream} )
-    {
-      return;
-    }
-
     # finished reading in all. Plot what we have
-    plotStoredData();
+    plotStoredData() unless $options{stream};
 
     if ( defined $options{hardcopy})
     {
@@ -763,7 +783,7 @@ sub mainThread
       # sleep until the plot file exists, and it is closed. Sometimes the output
       # is still being written at this point. If the output filename starts with
       # '|', gnuplot pipes the output to that process, instead of writing to a
-      # file. In that case I don't make sure the file exists, since there IS not
+      # file. In that case I don't make sure the file exists, since there IS no
       # file
       if( $options{hardcopy} !~ /^\|/ )
       {
@@ -865,7 +885,19 @@ sub updateCurveOptions
   my $usingoptions = '';
   if( $options{timefmt} )
   {
-    $usingoptions = "using 1:" . ($options{timefmt_Ncols}+1);
+      # with --timefmt I need an explicit 'using' specification. I specify the
+      # columns as 1:2:3..... I need the right number of columns (this is given
+      # as 1 + rangesize). I also need to start the range at the first column
+      # past the timefmt
+
+      # I'd like to use //, but I guess some people are still on perl 5.8
+      my $rangesize = exists $options{rangesize_hash}{$id} ?
+        $options{rangesize_hash}{$id} :
+        $options{rangesize_default};
+
+      my @rest = map {$_ + $options{timefmt_Ncols}} (1..$rangesize);
+
+      $usingoptions = "using 1:" . join(':', @rest);
   }
 
   $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $curvestyleall";
@@ -986,7 +1018,7 @@ sub replot
       {
         # if we're using a timefmt, I need to convert my xmin range from
         # seconds-since-the-epoch BACK to the timefmt. Sheesh
-        ($xmin, $xmax) = map {Time::Piece->strptime( $_, '%s' )->strftime( $options{timefmt} ) } ($xmin, $xmax);
+        ($xmin, $xmax) = map {$strptime->parse_datetime($_)} ($xmin, $xmax);
       }
       sendRangeCommand( "xrange", $xmin, $xmax );
     }

debian/changelog

@@ -1,65 +0,0 @@
-feedgnuplot (1.32-1) unstable; urgency=low
-
-  * Added --rangesize and --rangesizeall. Different curves can now plot
-    different-size tuples
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 05 Feb 2014 14:00:44 -0800
-
-feedgnuplot (1.30-1) unstable; urgency=low
-
-  * made the VCS links canonical
-  * added --set, --unset, --with, --style, --styleall
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Jan 2014 15:50:03 -0800
-
-feedgnuplot (1.28-1) unstable; urgency=low
-
-  * Upstream update:
-    - Removed example debianization
-    - Removed unreliable unit tests from automated testing (Closes: #731080)
-  * gnuplot dependency now favors graphical gnuplot packages
-  * Removed Anton Gladky from the Uploaders
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 02:05:08 -0800
-
-feedgnuplot (1.26-1) unstable; urgency=low
-
-  [ Dima Kogan ]
-  * Minor POD update
-  * Added test suite
-  * Added initial support for --timefmt. Currently time/date data is
-    supported only at the x-axis domain
-  * Added --exit option for force feedgnuplot to return even if gnuplot
-    may not yet be done rendering (patch by Eric Schulte)
-  * Reformatted the documentation
-  * y2-axis curves no longer have a thicker line by default
-  * --hardcopy now handles piped output (gnuplot 'set output |process'
-    syntax)
-
-  [ Anton Gladky ]
-  * Add libipc-run-perl to Build-Depends to execute tests
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 01:19:51 -0700
-
-feedgnuplot (1.24-2) unstable; urgency=low
-
-  * Now building the html documentation from the correct POD source
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 28 Apr 2013 17:42:52 -0700
-
-feedgnuplot (1.24-1) unstable; urgency=low
-
-  * Fixed regression in --monotonic. This works again now
-  * moved POD back into the main source file. This fixes the broken usage
-    messages
-  * added --version
-  * fixed watchfile to work with newer github pages
-  * priority now optional
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 08 Feb 2013 02:01:32 -0800
-
-feedgnuplot (1.23-2) unstable; urgency=low
-
-  * Initial Debian release (Closes: #686413)
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 30 Oct 2012 11:14:01 -0700

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,19 +0,0 @@
-Source: feedgnuplot
-Section: science
-Priority: optional
-Build-Depends: debhelper (>= 9), libstring-shellquote-perl, perl, gawk, gnuplot, libipc-run-perl
-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Dima Kogan <dima@secretsauce.net>
-Standards-Version: 3.9.4
-Homepage: https://github.com/dkogan/feedgnuplot
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/feedgnuplot.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
-
-Package: feedgnuplot
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, gnuplot-qt | gnuplot-x11 | gnuplot
-Description: Pipe-oriented frontend to Gnuplot
- Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
- coming in on STDIN or given in a filename passed on the commandline. Various
- data representations are supported, as is hardcopy output and streaming display
- of live data.

debian/copyright

@@ -1,24 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://github.com/dkogan/feedgnuplot
-Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
-Upstream-Name: feedgnuplot
-
-Files: *
-Copyright: 2011, Dima Kogan <dima@secretsauce.net>
-License: Artistic or GPL-1+
-
-License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- .
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'.
-
-License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- .
- On Debian GNU/Linux systems, the complete text of version 1 of the
- General Public License can be found in `/usr/share/common-licenses/GPL-1'.

debian/feedgnuplot.doc-base

@@ -1,9 +0,0 @@
-Document: feedgnuplot
-Title: Feedgnuplot Manual
-Author: Dima Kogan
-Abstract: Formatted manpage for feedgnuplot
-Section: Science/Data Analysis
-
-Format: HTML
-Index: /usr/share/doc/feedgnuplot/feedgnuplot.html
-Files: /usr/share/doc/feedgnuplot/feedgnuplot.html

debian/feedgnuplot.docs

@@ -1 +0,0 @@
-feedgnuplot.html

debian/feedgnuplot.install

@@ -1,2 +0,0 @@
-completions/bash/feedgnuplot /etc/bash_completion.d/
-completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions

debian/gbp.conf

@@ -1,4 +0,0 @@
-[DEFAULT]
-debian-branch = debian
-upstream-tag = v%(version)s
-pristine-tar = True

debian/rules

@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	dh_auto_build
-	pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
-
-override_dh_auto_clean:
-	rm -rf feedgnuplot.html pod2htm*
-	dh_auto_clean

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/watch

@@ -1,4 +0,0 @@
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
-https://github.com/dkogan/feedgnuplot/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-# Bart Martens <bartm@debian.org>  Sat, 22 Dec 2012 12:54:18 +0000

t/plots.t

@@ -39,7 +39,7 @@ BEGIN {
   }
 }
 
-use Test::More tests => 56;
+use Test::More tests => 58;
 use File::Temp 'tempfile';
 use IPC::Run 'run';
 use String::ShellQuote;
@@ -801,6 +801,53 @@ tryplot( testname => '--timefmt plot with --monotonic',
 
 EOF
 
+tryplot( testname => '--timefmt with custom rangesize',
+         cmd      => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1,$1/10}'},
+         options  => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
+                      qw(--with errorbars --rangesizeall 2)],
+         refplot  => <<'EOF' );
+
+
+  5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
+      +          +           +          +          +          +           +          +          *
+      |                                                                                         *
+    5 ++                                                                                       +A
+      |                                                                                         *
+      |                                                                                         *
+      |                                                                                         *
+  4.5 ++                                                                                       **
+      |                                                                  ***                    |
+      |                                                                   *                     |
+    4 ++                                                                  A                    ++
+      |                                                                   *                     |
+      |                                                                   *                     |
+      |                                                                  ***                    |
+  3.5 ++                                                                                       ++
+      |                                           ***                                           |
+      |                                            *                                            |
+    3 ++                                           A                                           ++
+      |                                            *                                            |
+      |                                            *                                            |
+      |                                           ***                                           |
+  2.5 ++                                                                                       ++
+      |                                                                                         |
+      |                     ***                                                                 |
+    2 ++                     A                                                                 ++
+      |                      *                                                                  |
+      |                     ***                                                                 |
+      |                                                                                         |
+  1.5 ++                                                                                       ++
+      |                                                                                         |
+      |                                                                                         |
+    1 A*                                                                                       ++
+      **                                                                                        |
+      |                                                                                         |
+      +          +           +          +          +          +           +          +          +
+  0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
+    05:08      05:08       05:09      05:09      05:10      05:10       05:11      05:11      05:12
+
+EOF
+
 tryplot( testname => 'Error bars (using extraValuesPerPoint)',
          cmd      => q{seq 5 | gawk '{print $1,$1,$1/10}'},
          options  => [qw(--domain),