changelog bump

This caused issues with commands that had commas in them

Changes

@@ -1,3 +1,11 @@
+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

bin/feedgnuplot

@@ -95,8 +95,9 @@ sub interpretCommandline
 
   # Previously I was using 'legend=s%' and 'curvestyle=s%' for curve addressing. This had cleaner
   # syntax, but disregarded the order of the given options. This resulted in arbitrarily ordered
-  # curves.
+  # curves. I thus make parse these into lists, and then also make hashes, for later use
-  # needed for these to be parsed into a ref to a list
+
+  # needed for these to be parsed into an array-ref
   $options{legend}     = [];
   $options{curvestyle} = [];
   $options{histogram}  = [];
@@ -118,12 +119,27 @@ sub interpretCommandline
   $options->{curvestyleall} = '' unless defined $options->{curvestyleall};
 
   # expand options that are given as comma-separated lists
-  for my $listkey (qw(extracmds histogram y2))
+  for my $listkey (qw(histogram y2))
   {
     @{$options{$listkey}} = map split('\s*,\s*', $_), @{$options{$listkey}}
       if defined $options{$listkey};
   }
 
+  # --legend and --curvestyle options are conceptually hashes, but are parsed as
+  # arrays in order to preserve the ordering. I parse both of these into hashes
+  # because those are useful to have later. After this I can access individual
+  # legends with $options{legend_hash}{curveid}
+  for my $listkey (qw(legend curvestyle))
+  {
+    $options{"${listkey}_hash"} = {};
+
+    my $n = scalar @{$options{$listkey}}/2;
+    foreach my $idx (0..$n-1)
+    {
+      $options{"${listkey}_hash"}{$options{$listkey}[$idx*2]} = $options{$listkey}[$idx*2 + 1];
+    }
+  }
+
   # parse stream option. Allowed only numbers >= 0 or 'trigger'
   if(defined $options->{stream})
   {
@@ -376,7 +392,10 @@ sub mainThread
 # For the specified values, set the legend entries to 'title "blah blah"'
     if(@{$options{legend}})
     {
-      # @{$options{legend}} is a list where consecutive pairs are (curveID, legend)
+      # @{$options{legend}} is a list where consecutive pairs are (curveID,
+      # legend). I use $options{legend} here instead of $options{legend_hash}
+      # because I create a new curve when I see a new one, and the hash is
+      # unordered, thus messing up the ordering
       my $n = scalar @{$options{legend}}/2;
       foreach my $idx (0..$n-1)
       {
@@ -388,7 +407,10 @@ sub mainThread
 # add the extra curve options
     if(@{$options{curvestyle}})
     {
-      # @{$options{curvestyle}} is a list where consecutive pairs are (curveID, style)
+      # @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
+      # style). I use $options{curvestyle} here instead of
+      # $options{curvestyle_hash} because I create a new curve when I see a new
+      # one, and the hash is unordered, thus messing up the ordering
       my $n = scalar @{$options{curvestyle}}/2;
       foreach my $idx (0..$n-1)
       {
@@ -598,10 +620,14 @@ sub updateCurveOptions
   { $title = $id; }
 
   my $titleoption = defined $title ? "title \"$title\"" : "notitle";
-  my $extraoption = defined $options{curvestyleall} ? $options{curvestyleall} : '';
+
+  my $curvestyleall = '';
+  $curvestyleall = $options{curvestyleall}
+    if defined $options{curvestyleall} && !defined $options{curvestyle_hash}{$id};
+
   my $histoptions = $curveoptions->{histoptions} || '';
 
-  $curveoptions->{options} = "$histoptions $titleoption $curveoptions->{extraoptions} $extraoption";
+  $curveoptions->{options} = "$histoptions $titleoption $curveoptions->{extraoptions} $curvestyleall";
 }
 
 sub getCurve

bin/feedgnuplot.pod

@@ -46,7 +46,8 @@ passed in with C<--extracmds>. For example, to turn off the grid, pass in
 C<--extracmds 'unset grid'>. As many of these options as needed can be passed
 in. To add arbitrary curve styles, use C<--curvestyle curveID extrastyle>. Pass
 these more than once to affect more than one curve. To apply an extra style to
-I<all> the curves, pass in C<--curvestyleall extrastyle>.
+I<all> the curves that lack an explicit C<--curvestyle>, pass in
+C<--curvestyleall extrastyle>.
 
 =head2 Data formats
 
@@ -319,15 +320,16 @@ As an example, if line 3 of the input is "0 9 1 20"
                        'cumulative', but rescaled to end up at 1.0.
 
   --curvestyle curveID style
-                       Additional styles per curve. With --dataid, curveID is the
+                       Additional styles per curve. With --dataid, curveID is
-                       ID. Otherwise, it's the index of the curve, starting at 0. Use
+                       the ID. Otherwise, it's the index of the curve, starting
-                       this option multiple times for multiple curves
+                       at 0. Use this option multiple times for multiple curves.
+                       --curvestylall does NOT apply to curves that have a
+                       --curvestyle
 
-  --curvestyleall xxx  Additional styles for ALL curves.
+  --curvestyleall xxx  Additional styles for all curves that have no --curvestyle
 
   --extracmds xxx      Additional commands. These could contain extra global styles
-                       for instance. Can be passed multiple times, or passed a comma-
+                       for instance. Can be passed multiple times.
-                       separated list
 
   --square             Plot data with aspect ratio 1. For 3D plots, this controls the
                        aspect ratio for all 3 axes

debian/changelog

@@ -1,118 +0,0 @@
-feedgnuplot (1.22-1) experimental; urgency=low
-
-  * debianization split from the upstream source
-  * package now uploaded to Debian (Closes: #686413)
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 11 Sep 2012 11:32:30 -0700
-
-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

debian/compat

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

debian/control

@@ -1,20 +0,0 @@
-Source: feedgnuplot
-Section: science
-Priority: extra
-Build-Depends: debhelper (>= 7.0.50~), libtest-script-run-perl, perl
-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Dima Kogan <dima@secretsauce.net>
-Standards-Version: 3.9.3
-Homepage: https://github.com/dkogan/feedgnuplot
-Vcs-Git: git://git.debian.org/git/debian-science/packages/feedgnuplot.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/feedgnuplot.git
-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.

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.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,7 +0,0 @@
-[DEFAULT]
-debian-branch = debian
-upstream-tree = tag
-debian-tag = debian/%(version)s
-pristine-tar = False
-sign-tags = True
-sign-changelog = True

debian/rules

@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	dh_auto_build
-	pod2html --title=feedgnuplot bin/feedgnuplot.pod > 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,2 +0,0 @@
-version = 3
-https://github.com/dkogan/feedgnuplot/tags .*/tarball/v(\d[\d\.]+)

package_definitions/debian/changelog

@@ -1,10 +1,3 @@
-feedgnuplot (1.23) unstable; urgency=low
-
-  * debian packaging cleanup
-  * package now uploaded to Debian (Closes: #686413)
-
- -- Dima Kogan <dima@secretsauce.net>  Mon, 10 Sep 2012 20:47:40 -0700
-
 feedgnuplot (1.22) unstable; urgency=low
 
   * removed --size option