test

I use strftime() and strptime() to deal with xlen in the timefmt case, and those
functions only work with integers

Changes

@@ -0,0 +1,107 @@
+feedgnuplot (1.26)
+
+  * Minor POD fixes
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 01:17:57 -0700
+
+feedgnuplot (1.25)
+
+  * 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)
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 00:09:36 -0700
+
+feedgnuplot (1.24)
+
+  * Fixed regression in --monotonic. This works again now
+  * moved POD back into the main source file. This fixes the broken usage
+    messages
+  * added --version
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 08 Feb 2013 01:53:47 -0800
+
+feedgnuplot (1.23)
+
+  * --extracmds no longer accepts comma-separated lists
+    This was needed because a command can have a comma
+  * --curvestyle no longer adds on top of --curvestyleall
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 29 Sep 2012 16:29:38 -0700
+
+feedgnuplot (1.22)
+
+  * removed --size option
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 03 Sep 2012 08:33:26 -0700
+
+feedgnuplot (1.21)
+
+  * removed the POD from the script to its own file
+  * fixed regression to allow no given extracmds, histogram or y2
+    options
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 02 Sep 2012 23:52:21 -0700
+
+feedgnuplot (1.20)
+
+  * no longer hardcoding 'x11' as the default terminal
+  * added histogram support
+  * generic terminals can now be requested
+  * --extracmds, --histogram, --y2 can now take comma-separated lists
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Aug 2012 01:35:50 -0700
+
+feedgnuplot (1.19)
+
+  * added --geometry option to specify plot dimensions
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 11 Feb 2012 21:04:42 -0800
+
+feedgnuplot (1.18)
+
+  * data-ids can now include characters such as -. Any non-whitespace
+    works
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
+
+feedgnuplot (1.17)
+
+  [ Dima Kogan ]
+  * POD: removed -Winteractive, since this was apparently a mawk-ism
+  * added zsh and bash completions
+
+  [ Hermann Schwarting ]
+  * add build dependency libtest-script-run-perl
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Nov 2011 19:17:22 -0800
+
+feedgnuplot (1.16)
+
+  * Some POD fixes
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 11 Nov 2011 00:10:18 -0800
+
+feedgnuplot (1.15)
+
+  * Renamed main script from feedGnuplot to feedgnuplot
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 16 Oct 2011 11:58:15 -0700
+
+feedgnuplot (1.14)
+
+  * added 'clear' command, documented commands
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 22 May 2011 15:25:28 -0700
+
+feedgnuplot (1.13)
+
+  * Better streaming plot control
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 26 Apr 2011 14:24:09 -0700

INSTALL

@@ -1,8 +1,14 @@
 If running on a Debian-based OS (this includes Ubuntu), it is highly recommended
-to install this program as a package by doing
+to install this program as a package. In debian/unstable feedgnuplot is in the
+official repos, so all you need to do is
 
+   sudo apt-get install feedgnuplot
+
+Otherwise a package can be built with
+
+   ln -fs package_definitions/debian debian
    dpkg-buildpackage -us -uc -b
-   sudo dpkg -i feedgnuplot*.deb
+   sudo dpkg -i ../feedgnuplot*.deb
 
 This builds a debian package and installs it.
 

LICENSE

@@ -0,0 +1,8 @@
+This library is distributed under the terms of the GNU GPL:
+
+http://www.gnu.org/licenses/gpl.html
+
+
+or the Artistic license:
+
+http://dev.perl.org/licenses/artistic.html

MANIFEST

@@ -1,5 +1,7 @@
 Makefile.PL
 MANIFEST
 bin/feedgnuplot
-t/00-load.t
 t/manifest.t
+t/plots.t
+Changes
+LICENSE

Makefile.PL

@@ -4,17 +4,33 @@ use ExtUtils::MakeMaker;
 
 sub parseversion
 {
-# grab the version number from the debian changelog file. I look for lines line
+# grab the version number from the changelog. I look for lines line
 #
-# libpackage-perl (0.02) unstable; urgency=low
+# libpackage-perl (0.02)
 #
 # I parse out the 0.02 part
-  open DCH, 'debian/changelog' or die "Couldn't open debian/changelog";
+  open DCH, '<', 'Changes' or die "Couldn't open 'Changes'";
   my ($version) = <DCH> =~ /^\S+ \s* \( ([0-9\.]+) \)/x
-    or die "Couldn't parse version from debian/changelog";
+    or die "Couldn't parse version from 'Changes'";
   close DCH;
 
-  return $version;
+  # The version is also stored in the script itself. Here I extract that version
+  # number and make sure the two match
+  open PL, '<', 'bin/feedgnuplot' or die "Couldn't open 'bin/feedgnuplot'";
+
+  while(<PL>)
+  {
+    if( /VERSION = ([0-9\.]+)/ )
+    {
+      if ( $1 != $version )
+      {
+        die "Version mismatch. Changes says version is '$version', but 'bin/feedgnuplot' says it is '$1'";
+      }
+
+      return $version;
+    }
+  }
+  die "Couldn't parse version from 'bin/feedgnuplot'";
 }
 
 sub MY::libscan
@@ -23,37 +39,31 @@ sub MY::libscan
 
     my ($self, $file) = @_;
 
-    # Don't install the README.pod or any non-feedgnuplot .pl file
-    return undef if $file !~ /feedgnuplot.pl/ && $file =~ /\.pl$|^README.pod/;
+    # Don't install any symlinks (i.e. README.pod)
+    return undef if -l $file;
 
     return $self->SUPER::libscan ($file);
 }
 
+# I want my manpage to go into the man section '1', NOT '1p'. Here I add a
+# snippet to the end of the generated Makefile to force this
+sub MY::postamble
+{
+  return "MAN1EXT := 1\n";
+}
+
+
 WriteMakefile
   (
    NAME                       => 'feedgnuplot',
    AUTHOR                     => q{Dima Kogan <dima@secretsauce.net>},
    VERSION                    => parseversion(),
-   ABSTRACT_FROM              => 'bin/feedgnuplot',
    ($ExtUtils::MakeMaker::VERSION >= 6.3002
     ? ('LICENSE'              => 'perl')
     : ()),
    PL_FILES                   => {},
    EXE_FILES                  => [ 'bin/feedgnuplot' ],
-   PREREQ_PM                  => { 'Test::Script::Run' => 0},
+   BUILD_REQUIRES             => { 'String::ShellQuote' => 0},
    dist                       => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
    clean                      => { FILES => 'feedgnuplot-*' },
   );
-
-# reroute the main POD into a separate README.pod if requested. This is here
-# purely to generate a README.pod for the github front page
-if(exists $ARGV[0] && $ARGV[0] eq 'README.pod')
-{
-  open SCRIPT, 'bin/feedgnuplot' or die "Couldn't open main script";
-  open README, '>README.pod'     or die "Couldn't open README.pod";
-  while (<SCRIPT>)
-  {
-    if (/^=/../^=cut/)
-    { print README; }
-  }
-}

completions/bash/feedgnuplot

@@ -1,39 +1,46 @@
-complete -W                                     \
-'                                               \
-    --domain                                    \
-    --dataid                                    \
-    --3d                                        \
-    --colormap                                  \
-    --stream                                    \
-    --lines                                     \
-    --points                                    \
-    --circles                                   \
-    --xlabel                                    \
-    --ylabel                                    \
-    --y2label                                   \
-    --zlabel                                    \
-    --zlabel                                    \
-    --title                                     \
-    --autolegend                                \
-    --xlen                                      \
-    --xmin                                      \
-    --xmax                                      \
-    --ymin                                      \
-    --ymax                                      \
-    --y2min                                     \
-    --y2max                                     \
-    --zmin                                      \
-    --zmax                                      \
-    --y2                                        \
-    --curvestyleall                             \
-    --extracmds                                 \
-    --size                                      \
-    --square                                    \
-    --square_xy                                 \
-    --hardcopy                                  \
-    --maxcurves                                 \
-    --monotonic                                 \
-    --extraValuesPerPoint                       \
-    --dump                                      \
-    --curvestyle                                \
-    --legend' feedgnuplot
+complete -W               \
+'                         \
+    --3d                  \
+    --autolegend          \
+    --binwidth            \
+    --circles             \
+    --colormap            \
+    --curvestyle          \
+    --curvestyleall       \
+    --dataid              \
+    --domain              \
+    --dump                \
+    --exit                \
+    --extraValuesPerPoint \
+    --extracmds           \
+    --geometry            \
+    --hardcopy            \
+    --help                \
+    --histogram           \
+    --histstyle           \
+    --legend              \
+    --lines               \
+    --maxcurves           \
+    --monotonic           \
+    --points              \
+    --square              \
+    --square_xy           \
+    --stream              \
+    --terminal            \
+    --timefmt             \
+    --title               \
+    --version             \
+    --xlabel              \
+    --xlen                \
+    --xmax                \
+    --xmin                \
+    --y2                  \
+    --y2label             \
+    --y2max               \
+    --y2min               \
+    --ylabel              \
+    --ymax                \
+    --ymin                \
+    --zlabel              \
+    --zmax                \
+    --zmin' feedgnuplot

completions/zsh/_feedgnuplot

@@ -1,40 +1,48 @@
 #compdef feedgnuplot
 
-_arguments -S                                                                           \
-    '()--domain[first element of each line is the domain variable]'                     \
-    '--dataid[each data point is preceded by the corresponding ID]'                     \
-    '(--monotonic --xlen)--3d'                                                          \
-    '--colormap[show a colormapped xy plot]'                                            \
-    '--stream[Plot the data in realtime]::period in s:'                                 \
-    '--lines'                                                                           \
-    '--points'                                                                          \
-    '--circles'                                                                         \
-    '--xlabel:X-axis label:'                                                            \
-    '--ylabel:Y-axis label:'                                                            \
-    '--y2label:Y2-axis label:'                                                          \
-    '--zlabel:Z-axis label:'                                                            \
-    '--zlabel:Z-axis label:'                                                            \
-    '--title:Plot title:'                                                               \
-    '--autolegend[Label each plot with its data ID]'                                    \
-    '(--3d)--xlen[the size of the x-window to plot]::window size:'                      \
-    '--xmin:min X:'                                                                     \
-    '--xmax:max X:'                                                                     \
-    '--ymin:min Y:'                                                                     \
-    '--ymax:max Y:'                                                                     \
-    '--y2min:min Y2:'                                                                   \
-    '--y2max:max Y2:'                                                                   \
-    '--zmin:min Z:'                                                                     \
-    '--zmax:max Z:'                                                                     \
-    '*--y2:plot to place on the Y2 axis:'                                               \
-    '--curvestyleall[Additional styles for ALL curves]:'                                \
-    '*--extracmds[Additional gnuplot commands]:'                                        \
-    '--size[Gnuplot size option]:'                                                      \
-    '--square[Plot data with square aspect ratio]'                                      \
-    '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'          \
-    '--hardcopy[Plot to a file]:'                                                       \
-    '--maxcurves[The maximum allowed number of curves]:'                                \
-    '(--3d)--monotonic[Resets plot if an X in the past is seen]'                        \
-    '--extraValuesPerPoint[How many extra values are given for each data point]:'       \
-    '--dump[Instead of printing to gnuplot, print to STDOUT]'                           \
-    '*--curvestyle[Additional styles for a curve]:curve id: :style:'                    \
-    '*--legend[Legend for a curve]:curve id: :legend:'
+_arguments -S                                                                     \
+    '()--domain[first element of each line is the domain variable]'               \
+    '--dataid[each data point is preceded by the corresponding ID]'               \
+    '(--monotonic --xlen --histogram)--3d'                                        \
+    '--colormap[show a colormapped xy plot]'                                      \
+    '--stream[Plot the data in realtime]::period in s:'                           \
+    '--lines'                                                                     \
+    '--points'                                                                    \
+    '--circles'                                                                   \
+    '--xlabel:X-axis label:'                                                      \
+    '--ylabel:Y-axis label:'                                                      \
+    '--y2label:Y2-axis label:'                                                    \
+    '--zlabel:Z-axis label:'                                                      \
+    '--zlabel:Z-axis label:'                                                      \
+    '--title:Plot title:'                                                         \
+    '--autolegend[Label each plot with its data ID]'                              \
+    '(--3d)--xlen[the size of the x-window to plot]::window size:'                \
+    '(--xlen)--xmin:min X:'                                                       \
+    '(--xlen)--xmax:max X:'                                                       \
+    '--ymin:min Y:'                                                               \
+    '--ymax:max Y:'                                                               \
+    '--y2min:min Y2:'                                                             \
+    '--y2max:max Y2:'                                                             \
+    '--zmin:min Z:'                                                               \
+    '--zmax:max Z:'                                                               \
+    '*--y2:plot to place on the Y2 axis:'                                         \
+    '--curvestyleall[Additional styles for ALL curves]:style'                     \
+    '*--extracmds[Additional gnuplot commands]:command'                           \
+    '--square[Plot data with square aspect ratio]'                                \
+    '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'    \
+    '--hardcopy[Plot to a file]:filename'                                         \
+    '--maxcurves[The maximum allowed number of curves]:number of curves'          \
+    '(--3d)--monotonic[Resets plot if an X in the past is seen]'                  \
+    '--extraValuesPerPoint[How many extra values are given for each data point]:N'\
+    '--dump[Instead of printing to gnuplot, print to STDOUT]'                     \
+    '--geometry[The X11 geometry string]:geometry string:'                        \
+    '*--curvestyle[Additional styles for a curve]:curve id: :style:'              \
+    '(--3d)*--histogram:plot to treat as a histogram:'                            \
+    '--binwidth:Histogram bin width:'                                             \
+    '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'        \
+    '--terminal:Terminal options to set with "set terminal":'                     \
+    '*--legend[Legend for a curve]:curve id: :legend:'                            \
+    '--exit[Exit gnuplot after making the plot]'                                  \
+    '--version'                                                                   \
+    '--help'                                                                      \
+    '--timefmt[Format for time/date data]:time format'

debian/control

@@ -1,17 +0,0 @@
-Source: feedgnuplot
-Section: perl
-Priority: optional
-Build-Depends: debhelper (>= 7), libtest-script-run-perl
-Build-Depends-Indep: perl
-Maintainer: Dima Kogan <dima@secretsauce.net>
-Standards-Version: 3.9.2
-Homepage: https://github.com/dkogan/feedgnuplot
-
-Package: feedgnuplot
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, gnuplot
-Description: A pipe-oriented frontend to Gnuplot
- This is a flexible, command-line-oriented frontend to Gnuplot. It 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/watch

@@ -1,2 +0,0 @@
-version=3
-http://search.cpan.org/dist/feedGnuplot/   .*/feedgnuplot-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$

package_definitions/debian/changelog

@@ -1,9 +1,38 @@
+feedgnuplot (1.22) unstable; urgency=low
+
+  * removed --size option
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 03 Sep 2012 08:33:26 -0700
+
+feedgnuplot (1.21) unstable; urgency=low
+
+  * removed the POD from the script to its own file
+  * fixed regression to allow no given extracmds, histogram or y2
+    options
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 02 Sep 2012 23:52:21 -0700
+
+feedgnuplot (1.20) unstable; urgency=low
+
+  * no longer hardcoding 'x11' as the default terminal
+  * added histogram support
+  * generic terminals can now be requested
+  * --extracmds, --histogram, --y2 can now take comma-separated lists
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Aug 2012 01:35:50 -0700
+
+feedgnuplot (1.19) unstable; urgency=low
+
+  * added --geometry option to specify plot dimensions
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 11 Feb 2012 21:04:42 -0800
+
 feedgnuplot (1.18) unstable; urgency=low
 
   * data-ids can now include characters such as -. Any non-whitespace
     works
 
- -- Dima Kogan <dkogan@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
 
 feedgnuplot (1.17) unstable; urgency=low
 
@@ -14,7 +43,7 @@ feedgnuplot (1.17) unstable; urgency=low
   [ Hermann Schwarting ]
   * add build dependency libtest-script-run-perl
 
- -- Dima Kogan <dkogan@secretsauce.net>  Sun, 20 Nov 2011 19:17:22 -0800
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Nov 2011 19:17:22 -0800
 
 feedgnuplot (1.16) unstable; urgency=low
 

package_definitions/debian/control

@@ -0,0 +1,20 @@
+Source: feedgnuplot
+Section: science
+Priority: extra
+Build-Depends: debhelper (>= 7), libtest-script-run-perl, perl
+Maintainer: Dima Kogan <dima@secretsauce.net>
+Uploaders: Dima Kogan <dima@secretsauce.net>
+Standards-Version: 3.9.3
+Homepage: https://github.com/dkogan/feedgnuplot
+Vcs-Git: git://github.com/dkogan/feedgnuplot.git
+Vcs-Browser: https://github.com/dkogan/feedgnuplot
+DM-Upload-Allowed: yes
+
+Package: feedgnuplot
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}, 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.

package_definitions/debian/copyright

@@ -1,13 +1,9 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Dima Kogan, <dima at secretsauce.net>
-Source: http://search.cpan.org/dist/feedGnuplot/
-Name: feedgnuplot
+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: Dima Kogan, <dima at secretsauce.net>
-License: 
-
-Files: debian/*
 Copyright: 2011, Dima Kogan <dima@secretsauce.net>
 License: Artistic or GPL-1+
 

t/00-load.t

@@ -1,16 +0,0 @@
-#!/usr/bin/perl
-
-# require a threaded perl for my tests. This block lifted verbatim from the cpantesters wiki
-BEGIN {
-  use Config;
-  if (! $Config{'useithreads'}) {
-    print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
-    exit(0);
-  }
-}
-
-use Test::More tests => 1;
-use Test::Script::Run;
-
-run_ok( 'feedgnuplot', ['--help'], 'feedgnuplot can run');
-