changelog bump

$options{y2} and $options{extracmds} now default to [], so I never need to check
for defined $options{y2}.

This patch also changes some

 foreach()
 {
   dosomething();
 }

blocks into

 dosomething() foreach();

Changes

@@ -1,4 +1,50 @@
-feedgnuplot (1.24) unstable; urgency=low
+feedgnuplot (1.30) unstable; urgency=low
+
+  * Added --with, --set, --unset, --style, --styleall
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Jan 2014 15:38:07 -0800
+
+feedgnuplot (1.29) unstable; urgency=low
+
+  * added CPAN meta-data to require IPC::Run at build time
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 21:12:40 -0800
+
+feedgnuplot (1.28)
+
+  * Minor POD update
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 02:01:05 -0800
+
+feedgnuplot (1.27)
+
+  * Disabled tests that can fail on some arches (can be re-enabled with
+    environment variable)
+  * Removed sample debianization; this program is now in Debian proper
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 03 Dec 2013 23:37:40 -0800
+
+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

INSTALL

@@ -1,17 +1,9 @@
 If running on a Debian-based OS (this includes Ubuntu), it is highly recommended
-to install this program as a package. In debian/unstable feedgnuplot is in the
-official repos, so all you need to do is
+to install this program as a package. In Debian and Ubuntu, 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
-
-This builds a debian package and installs it.
-
 Without a package, an installation can be done with
 
          perl Makefile.PL prefix=/usr/local

MANIFEST

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

Makefile.PL

@@ -63,7 +63,8 @@ WriteMakefile
     : ()),
    PL_FILES                   => {},
    EXE_FILES                  => [ 'bin/feedgnuplot' ],
-   PREREQ_PM                  => { 'Test::Script::Run' => 0},
+   BUILD_REQUIRES             => { 'String::ShellQuote' => 0,
+                                   'IPC::Run'           => 0},
    dist                       => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
    clean                      => { FILES => 'feedgnuplot-*' },
   );

completions/bash/feedgnuplot

@@ -1,43 +1,51 @@
-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                                 \
-    --square                                    \
-    --square_xy                                 \
-    --hardcopy                                  \
-    --maxcurves                                 \
-    --monotonic                                 \
-    --extraValuesPerPoint                       \
-    --dump                                      \
-    --geometry                                  \
-    --curvestyle                                \
-    --histogram                                 \
-    --binwidth                                  \
-    --histstyle                                 \
-    --terminal                                  \
-    --legend' feedgnuplot
+complete -W               \
+'                         \
+    --3d                  \
+    --autolegend          \
+    --binwidth            \
+    --circles             \
+    --colormap            \
+    --curvestyle          \
+    --curvestyleall       \
+    --style               \
+    --styleall            \
+    --with                \
+    --dataid              \
+    --domain              \
+    --dump                \
+    --exit                \
+    --extraValuesPerPoint \
+    --extracmds           \
+    --set                 \
+    --unset               \
+    --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,44 +1,53 @@
 #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 --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:'                      \
-    '--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]:'                                        \
-    '--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]'                           \
-    '--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:'
+_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:'                                         \
+    '(--with)--curvestyleall[Additional styles for ALL curves]:style'             \
+    '(--with)--styleall[Additional styles for ALL curves]:style'                  \
+    '(--curvestyleall)--with[Additional styles for ALL curves]:style'             \
+    '*--extracmds[Additional gnuplot commands]:command'                           \
+    '*--set[Additional 'set' gnuplot commands]:set-option'                        \
+    '*--unset[Additional 'unset' gnuplot commands]:unset-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]: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:'              \
+    '*--style[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/changelog

@@ -0,0 +1,58 @@
+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

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

debian/control

@@ -0,0 +1,19 @@
+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/feedgnuplot.doc-base

@@ -0,0 +1,9 @@
+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

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

debian/gbp.conf

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

debian/rules

@@ -0,0 +1,12 @@
+#!/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

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

debian/watch

@@ -0,0 +1,4 @@
+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

package_definitions/debian/changelog

@@ -1,111 +0,0 @@
-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 <dima@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
-
-feedgnuplot (1.17) unstable; urgency=low
-
-  [ Dima Kogan ]
-  * POD: removed -Winteractive, since this was apparently a mawk-ism
-  * added zsh and bash completions to the package
-
-  [ 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) unstable; urgency=low
-
-  * deb version parser now works for any package name
-  * Some POD fixes
-  * now building a native package
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 11 Nov 2011 00:10:18 -0800
-
-feedgnuplot (1.15-2) unstable; urgency=low
-
-  * added source format for the debianization
-  * added configuration to let git-buildpackage build this package
-  * standards bump to make lintian happier
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 23 Oct 2011 13:38:15 -0700
-
-feedgnuplot (1.15-1) unstable; urgency=low
-
-  * Renamed main script from feedGnuplot to feedgnuplot
-  * Slightly improved packaging, added instructions, etc
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 16 Oct 2011 11:58:15 -0700
-
-feedgnuplot (1.14-1) unstable; urgency=low
-
-  * New upstream release (added 'clear' command, documented commands)
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 22 May 2011 15:25:28 -0700
-
-feedgnuplot (1.13-1) unstable; urgency=low
-
-  * New upstream release (Better streaming plot control)
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 26 Apr 2011 14:24:09 -0700
-
-feedgnuplot (1.12-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 19 Apr 2011 11:02:23 -0700
-
-feedgnuplot (1.11-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 09 Apr 2011 14:10:21 -0700
-
-feedgnuplot (1.10-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 09 Apr 2011 14:08:06 -0700
-
-feedgnuplot (1.09-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 03 Apr 2011 17:23:38 -0700
-
-feedgnuplot (1.08-1) unstable; urgency=low
-
-  * Initial debianized release.
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 6 Feb 2011 15:58:22 -0800

package_definitions/debian/compat

@@ -1 +0,0 @@
-7

package_definitions/debian/control

@@ -1,20 +0,0 @@
-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/gbp.conf

@@ -1,5 +0,0 @@
-[DEFAULT]
-upstream-tree = branch
-upstream-branch = master
-debian-branch = master
-debian-tag = debian-%(version)s

package_definitions/debian/rules

@@ -1,4 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@

package_definitions/debian/source/format

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

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');
-