initial tests

Changes

@@ -1,91 +1,3 @@
-feedgnuplot (1.45)
-
-  * zsh completion: --hardcopy, --image  suggest filenames
-  * --image now produces a nicer legend: just the filename
-  * --curvestyle now overrides --curvestyleall
-    - This is a bug fix
-  * The version is now treated as a string not as a number
-    - So "1.40" is distinct from "1.4"
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 29 Oct 2017 13:56:28 -0700
-
-feedgnuplot (1.44)
-
-  * --image draws its output beneath everything else
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 20 Jun 2017 16:44:30 -0700
-
-feedgnuplot (1.43)
-
-  * Added --image
-
- -- Dima Kogan <dima@secretsauce.net>  Mon, 19 Jun 2017 13:12:38 -0700
-
-feedgnuplot (1.42)
-
-  * Data can now come from STDIN or files on the cmdline.
-    This fixes a regression. Self-plotting data files work again
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Mar 2017 15:38:47 -0700
-
-feedgnuplot (1.41)
-
-  * Histograms: --xlen can coexist with --xmin/--xmax
-  * Histograms: work as expected with --xlen and --monotonic
-  * Histograms: better sanity checking of options
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Feb 2017 23:42:28 -0800
-
-feedgnuplot (1.40)
-
-  * If the options couldn't be parsed I don't dump the whole manpage
-  * --style and --rangesize can now take a comma-separated list of IDs
-  * 'any' is from List::MoreUtils, not List::Util
-  * the sleep-forever delay at end is now > 1000 days
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 25 Nov 2016 14:45:06 -0800
-
-feedgnuplot (1.39)
-
-  * by default, histograms are plotted in expected ways
-
- -- Dima Kogan <dima@secretsauce.net>  Sat, 15 Oct 2016 20:45:15 -0700
-
-feedgnuplot (1.38)
-
-  * hardcopy defaults:
-    - no enhanced text mode
-    - larger font size
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 27 Jul 2016 22:15:11 -0700
-
-feedgnuplot (1.37)
-
-  * At the end of a streaming plot, include the last chunk of data
-  * Added --equation to the completions
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 01 Jan 2016 08:09:43 -0800
-
-feedgnuplot (1.36)
-
-  * Added --equation to plot symbolic equations
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 13 Nov 2015 11:08:26 -0800
-
-feedgnuplot (1.35)
-
-  * replaced a 'say' with 'print'. Should work better with ancient perls
-  * an "exit" command now has effect even with triggered-only replotting
-
-  * More sophisticated handling of termination conditions:
-    - Without --exit, we always end up with an interactive plot when the
-    input data is exhausted or when the user sends a ^C to the pipeline
-    - When streaming, the first ^C does not kill feedgnuplot
-  
-  * Removed threading
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 01 Nov 2015 12:50:33 -0800
-
 feedgnuplot (1.34)
 
   * Fix for "Use of implicit split to @_ is deprecated". Thanks to Corey

Makefile.PL

@@ -20,9 +20,9 @@ sub parseversion
 
   while(<PL>)
   {
-    if( /VERSION = '([0-9\.]+)'/ )
+    if( /VERSION = ([0-9\.]+)/ )
     {
-      if ( $1 ne $version )
+      if ( $1 != $version )
       {
         die "Version mismatch. Changes says version is '$version', but 'bin/feedgnuplot' says it is '$1'";
       }
@@ -64,7 +64,6 @@ WriteMakefile
    PL_FILES                   => {},
    EXE_FILES                  => [ 'bin/feedgnuplot' ],
    BUILD_REQUIRES             => { 'String::ShellQuote' => 0,
-                                   'List::MoreUtils'    => 0,
                                    'IPC::Run'           => 0},
    dist                       => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
    clean                      => { FILES => 'feedgnuplot-*' },

completions/bash/feedgnuplot

@@ -20,8 +20,6 @@ complete -W               \
     --extracmds           \
     --set                 \
     --unset               \
-    --equation            \
-    --image               \
     --geometry            \
     --hardcopy            \
     --help                \

completions/zsh/_feedgnuplot

@@ -32,11 +32,9 @@ _arguments -S
     '*--extracmds[Additional gnuplot commands]:command'                           \
     '*--set[Additional 'set' gnuplot commands]:set-option'                        \
     '*--unset[Additional 'unset' gnuplot commands]:unset-option'                  \
-    '*--equation[Raw symbolic equation]:equation'                                 \
-    '--image[Image file to render beneath the data]:image:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
     '--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]:new image filename:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \
+    '--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]'                  \
     '(--rangesizeall)--extraValuesPerPoint[How many extra values are given for each data range]:N'\

debian/changelog

@@ -1,82 +1,3 @@
-feedgnuplot (1.45-1) unstable; urgency=medium
-
-  * zsh completion: --hardcopy, --image  suggest filenames
-  * --image now produces a nicer legend: just the filename
-  * --curvestyle now overrides --curvestyleall
-    - This is a bug fix
-  * The version is now treated as a string not as a number
-    - So "1.40" is distinct from "1.4"
-
- -- Dima Kogan <dkogan@debian.org>  Sun, 29 Oct 2017 14:06:26 -0700
-
-feedgnuplot (1.44-1) unstable; urgency=medium
-
-  * --image always goes on the FRONT of the equation list
-
- -- Dima Kogan <dkogan@debian.org>  Tue, 20 Jun 2017 16:45:42 -0700
-
-feedgnuplot (1.43-1) unstable; urgency=medium
-
-  * added --image as a convenience wrapper for --equation
-
- -- Dima Kogan <dkogan@debian.org>  Mon, 19 Jun 2017 13:16:18 -0700
-
-feedgnuplot (1.42-1) unstable; urgency=medium
-
-  * Upstream update:
-    - Fixed regression: data can now come from STDIN or files on the
-      cmdline
-    - reworded manpage of --exit
-
- -- Dima Kogan <dkogan@debian.org>  Tue, 25 Apr 2017 11:02:18 -0700
-
-feedgnuplot (1.41-1) unstable; urgency=medium
-
-  * Upstream update:
-    - Histograms: --xlen can coexist with --xmin/--xmax
-    - Histograms: work as expected with --xlen and --monotonic
-    - Histograms: better sanity checking of options
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 24 Feb 2017 23:53:27 -0800
-
-feedgnuplot (1.40-1) unstable; urgency=medium
-
-  * Upstream update:
-    - If the options couldn't be parsed I don't dump the whole manpage
-    - --style and --rangesize can now take a comma-separated list of IDs
-    - 'any' is from List::MoreUtils, not List::Util
-    - the sleep-forever delay at end is now > 1000 days
-
- -- Dima Kogan <dkogan@debian.org>  Fri, 25 Nov 2016 14:49:36 -0800
-
-feedgnuplot (1.39-1) unstable; urgency=medium
-
-  * Upstream update:
-    - by default, histograms are plotted in expected ways
-    - No enhanced text mode in hardcopies, slightly larger font size
-
- -- Dima Kogan <dkogan@debian.org>  Sat, 15 Oct 2016 20:45:15 -0700
-
-feedgnuplot (1.37-1) unstable; urgency=medium
-
-  * Upstream update: At the end of a streaming plot, include the last
-    chunk of data
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 01 Jan 2016 08:14:23 -0800
-
-feedgnuplot (1.36-1) unstable; urgency=medium
-
-  * Upstream update: added --equation to plot symbolic equations
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 13 Nov 2015 11:14:30 -0800
-
-feedgnuplot (1.35-1) unstable; urgency=medium
-
-  * Upstream update: fancier handling of termination conditions, no more
-    threading code
-
- -- Dima Kogan <dima@secretsauce.net>  Mon, 02 Nov 2015 13:55:32 -0800
-
 feedgnuplot (1.34-2) unstable; urgency=medium
 
   * Depends now works with the 'gnuplot5' packages

debian/control

@@ -12,7 +12,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnu
 Package: feedgnuplot
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends},
-         liblist-moreutils-perl,
          gnuplot-qt | gnuplot-x11 | gnuplot-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | gnuplot
 Description: Pipe-oriented frontend to Gnuplot
  Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data

feedgnuplot.spec

@@ -1,58 +0,0 @@
-# Sample spec file for rpm-based systems. Debian-based systems already have this
-# packaged, so we do not ship those here
-
-Name:           feedgnuplot
-Version:        1.38
-Release:        1%{?dist}
-Summary:        Pipe-oriented frontend to Gnuplot
-BuildArch:      noarch
-
-License:        Artistic or GPL-1+
-URL:            https://www.github.com/dkogan/feedgnuplot/
-Source0:        https://www.github.com/dkogan/feedgnuplot/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-
-BuildRequires:  /usr/bin/pod2html
-BuildRequires:  perl-String-ShellQuote
-BuildRequires:  perl-ExtUtils-MakeMaker
-BuildRequires:  perl
-BuildRequires:  gawk
-BuildRequires:  gnuplot
-BuildRequires:  perl-IPC-Run
-
-Requires:       gnuplot
-
-%description
-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.
-
-%prep
-%setup -q
-
-%build
-perl Makefile.PL INSTALLDIRS=vendor
-make
-pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
-
-%install
-make install DESTDIR=%{buildroot} PREFIX=/usr
-
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
-cp Changes LICENSE feedgnuplot.html %{buildroot}%{_defaultdocdir}/%{name}
-
-mkdir -p %{buildroot}%{_datadir}/zsh/site-functions
-cp completions/zsh/* %{buildroot}%{_datadir}/zsh/site-functions
-
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-cp completions/bash/* %{buildroot}%{_datadir}/bash-completion/completions
-
-rm -rf %{buildroot}/usr/lib64
-
-
-%files
-%{_bindir}/*
-%{_datadir}/zsh/*
-%{_datadir}/bash-completion/*
-%doc %{_defaultdocdir}/%{name}/*
-%doc %{_mandir}