r61451 - in /trunk/nama: Changes META.yml Makefile.PL debian/changelog debian/control lib/Audio/Nama.pm lib/Audio/Nama/Assign.pm

Mon Aug 9 06:53:42 UTC 2010

Author: bolangi-guest
Date: Mon Aug  9 06:53:31 2010
New Revision: 61451

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61451
Log:
merge upstream version 1.064
debian/control: new dependency: libfile-homedir-perl
debian/control: recommends: libaudio-ecasound-perl

Modified:
    trunk/nama/Changes
    trunk/nama/META.yml
    trunk/nama/Makefile.PL
    trunk/nama/debian/changelog
    trunk/nama/debian/control
    trunk/nama/lib/Audio/Nama.pm
    trunk/nama/lib/Audio/Nama/Assign.pm

Modified: trunk/nama/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/Changes?rev=61451&op=diff
==============================================================================

--- trunk/nama/Changes (original)
+++ trunk/nama/Changes Mon Aug  9 06:53:31 2010
@@ -1,4 +1,7 @@
 Changes to Audio::Nama
+
+1.064  August 6, 2010
+      - fix Bug rt.cpan.org #60024: Audio::Nama::Assign::expand_tilde()
 
 1.063  August 2, 2010
 

Modified: trunk/nama/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/META.yml?rev=61451&op=diff
==============================================================================
--- trunk/nama/META.yml (original)
+++ trunk/nama/META.yml Mon Aug  9 06:53:31 2010
@@ -19,6 +19,7 @@
   Event: 0
   File::Copy::Link: 0
   File::Find::Rule: 0
+  File::HomeDir: 0
   File::Temp: 0
   Graph: 0
   IO::All: 0
@@ -34,4 +35,4 @@
   perl: 5.10.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 1.063
+version: 1.064

Modified: trunk/nama/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/Makefile.PL?rev=61451&op=diff
==============================================================================
--- trunk/nama/Makefile.PL (original)
+++ trunk/nama/Makefile.PL Mon Aug  9 06:53:31 2010
@@ -16,6 +16,7 @@
 		Event => 0,
 		File::Find::Rule => 0,
 		File::Copy::Link => 0,
+		File::HomeDir => 0,
 		File::Temp => 0,
 		Graph => 0,
 		IO::All => 0,

Modified: trunk/nama/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/debian/changelog?rev=61451&op=diff
==============================================================================
--- trunk/nama/debian/changelog (original)
+++ trunk/nama/debian/changelog Mon Aug  9 06:53:31 2010
@@ -1,3 +1,9 @@
+nama (1.064-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Joel Roth <joelz at pobox.com>  Sun, 08 Aug 2010 20:47:48 -1000
+
 nama (1.063-1) unstable; urgency=low
 
   * Team Upload.

Modified: trunk/nama/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/debian/control?rev=61451&op=diff
==============================================================================
--- trunk/nama/debian/control (original)
+++ trunk/nama/debian/control Mon Aug  9 06:53:31 2010
@@ -7,7 +7,7 @@
   libfile-find-rule-perl, libanyevent-perl, libevent-perl,
   libfile-copy-link-perl, libyaml-tiny-perl, libparse-recdescent-perl,
   libterm-readline-gnu-perl, libdata-section-perl, libtest-pod-perl,
-  libtest-pod-coverage-perl
+  libtest-pod-coverage-perl, libfile-homedir-perl,
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/nama
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/nama
@@ -21,7 +21,8 @@
   libgraph-perl, libtext-format-perl, libmodern-perl-perl,
   libfile-find-rule-perl, libanyevent-perl, libevent-perl,
   libfile-copy-link-perl, libyaml-tiny-perl, libparse-recdescent-perl,
-  libterm-readline-gnu-perl, libdata-section-perl
+  libterm-readline-gnu-perl, libdata-section-perl, libfile-homedir-perl,
+Recommends: libaudio-ecasound-perl
 Suggests: perl-tk
 Description: Ecasound-based multitrack recorder/mixer
  Nama is a text-based application for multitrack                                   

Modified: trunk/nama/lib/Audio/Nama.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/lib/Audio/Nama.pm?rev=61451&op=diff
==============================================================================
--- trunk/nama/lib/Audio/Nama.pm (original)
+++ trunk/nama/lib/Audio/Nama.pm Mon Aug  9 06:53:31 2010
@@ -26,7 +26,7 @@
 package Audio::Nama;
 require 5.10.0;
 use vars qw($VERSION);
-$VERSION = 1.063;
+$VERSION = 1.064;
 use Modern::Perl;
 #use Carp::Always;
 no warnings qw(uninitialized syntax);
@@ -4548,6 +4548,9 @@
 sub command_process {
 	my $input = shift;
 	my $input_was = $input;
+
+	# parse repeatedly until all input is consumed
+	
 	while ($input =~ /\S/) { 
 		$debug and say "input: $input";
 		$parser->meta(\$input) or print("bad command: $input_was\n"), last;
@@ -8193,7 +8196,8 @@
 	1;
 }
 bunch_spec: text 
-meta: text semicolon(?) { $Audio::Nama::parser->do_part($item{text}) }
+meta: nosemi(s /\s*;\s*/) semicolon(?) 
+nosemi: text { $Audio::Nama::parser->do_part($item{text}) }
 text: /[^;]+/ 
 semicolon: ';'
 do_part: track_spec command

Modified: trunk/nama/lib/Audio/Nama/Assign.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/nama/lib/Audio/Nama/Assign.pm?rev=61451&op=diff
==============================================================================
--- trunk/nama/lib/Audio/Nama/Assign.pm (original)
+++ trunk/nama/lib/Audio/Nama/Assign.pm Mon Aug  9 06:53:31 2010
@@ -7,6 +7,7 @@
 use Carp;
 use YAML::Tiny;
 use IO::All;
+use File::HomeDir;
 use Storable;
 #use Devel::Cycle;
 
@@ -351,13 +352,16 @@
 sub expand_tilde { 
 	my $path = shift; 
 
+ 	my $home = File::HomeDir->my_home;
+
+
 	# ~bob -> /home/bob
 	$path =~ s(
 		^ 		# beginning of line
 		~ 		# tilde
 		(\w+) 	# username
 	)
-	(/home/$1)x;
+	(File::HomeDir->users_home($1))ex;
 
 	# ~/something -> /home/bob/something
 	$path =~ s( 
@@ -365,7 +369,7 @@
 		~		# tilde
 		/		# slash
 	)
-	($ENV{HOME}/)x;
+	($home/)x;
 	$path
 }
 sub read_file {


