r54999 - in /trunk/libgetopt-declare-perl: Changes MANIFEST META.yml Makefile.PL README debian/changelog demo_cmdline demo_csv demo_interp demo_shell demos/ lib/Getopt/Declare.pm t/ test.pl

nhandler-guest at users.alioth.debian.org nhandler-guest at users.alioth.debian.org
Mon Mar 29 02:31:55 UTC 2010


Author: nhandler-guest
Date: Mon Mar 29 02:31:49 2010
New Revision: 54999

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54999
Log:
New upstream release

Added:
    trunk/libgetopt-declare-perl/META.yml
      - copied unchanged from r54997, branches/upstream/libgetopt-declare-perl/current/META.yml
    trunk/libgetopt-declare-perl/demos/
      - copied from r54997, branches/upstream/libgetopt-declare-perl/current/demos/
    trunk/libgetopt-declare-perl/t/
      - copied from r54997, branches/upstream/libgetopt-declare-perl/current/t/
Removed:
    trunk/libgetopt-declare-perl/demo_cmdline
    trunk/libgetopt-declare-perl/demo_csv
    trunk/libgetopt-declare-perl/demo_interp
    trunk/libgetopt-declare-perl/demo_shell
    trunk/libgetopt-declare-perl/test.pl
Modified:
    trunk/libgetopt-declare-perl/Changes
    trunk/libgetopt-declare-perl/MANIFEST
    trunk/libgetopt-declare-perl/Makefile.PL
    trunk/libgetopt-declare-perl/README
    trunk/libgetopt-declare-perl/debian/changelog
    trunk/libgetopt-declare-perl/lib/Getopt/Declare.pm

Modified: trunk/libgetopt-declare-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-declare-perl/Changes?rev=54999&op=diff
==============================================================================
--- trunk/libgetopt-declare-perl/Changes (original)
+++ trunk/libgetopt-declare-perl/Changes Mon Mar 29 02:31:49 2010
@@ -115,7 +115,6 @@
 	- Added AUTOLOAD to delegate embedded sub calls back to main 
 
 
-
 1.11	Tue Feb  3 20:44:26 2004
 
 	- Fixed bug in multi-argument parameters
@@ -134,3 +133,11 @@
 
 	- Added emphasis in the documentation on the need for tabs in the
 	  specification
+
+
+1.13	Sun Mar 28 16:35:18 2010
+
+	- Fixed the support for IO::Pager
+
+  - Improved unit testing with Test::More
+

Modified: trunk/libgetopt-declare-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-declare-perl/MANIFEST?rev=54999&op=diff
==============================================================================
--- trunk/libgetopt-declare-perl/MANIFEST (original)
+++ trunk/libgetopt-declare-perl/MANIFEST Mon Mar 29 02:31:49 2010
@@ -1,9 +1,11 @@
 Changes
+demos/demo_cmdline
+demos/demo_csv
+demos/demo_interp
+demos/demo_shell
+lib/Getopt/Declare.pm
+Makefile.PL
 MANIFEST
-Makefile.PL
-demo_csv
-demo_interp
-demo_shell
-demo_cmdline
-lib/Getopt/Declare.pm
-test.pl
+README
+t/test.t
+META.yml                                 Module meta-data (added by MakeMaker)

Modified: trunk/libgetopt-declare-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-declare-perl/Makefile.PL?rev=54999&op=diff
==============================================================================
--- trunk/libgetopt-declare-perl/Makefile.PL (original)
+++ trunk/libgetopt-declare-perl/Makefile.PL Mon Mar 29 02:31:49 2010
@@ -2,7 +2,6 @@
 use ExtUtils::MakeMaker;
 WriteMakefile(
 		NAME	=> q[Getopt::Declare],
-		VERSION => q[1.12],
-                PREREQ_PM => { 'Text::Balanced'=> 0 },
-
-	     );
+		VERSION => q[1.13],
+    PREREQ_PM => { 'Text::Balanced'=> 0 },
+);

Modified: trunk/libgetopt-declare-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-declare-perl/README?rev=54999&op=diff
==============================================================================
--- trunk/libgetopt-declare-perl/README (original)
+++ trunk/libgetopt-declare-perl/README Mon Mar 29 02:31:49 2010
@@ -1,5 +1,5 @@
 ==============================================================================
-                  Release of version 1.12 of Getopt::Declare
+                  Release of version 1.13 of Getopt::Declare
 ==============================================================================
 
 
@@ -86,11 +86,11 @@
 
 ==============================================================================
 
-CHANGES IN VERSION 1.12
+CHANGES IN VERSION 1.13
 
 
-	- Bug fixes for parsing decimal numbers and lists of files
-
+	- Bug fix for the use of IO::Pager
+  - Unit testing uses Test::More now
 
 ==============================================================================
 

Modified: trunk/libgetopt-declare-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-declare-perl/debian/changelog?rev=54999&op=diff
==============================================================================
--- trunk/libgetopt-declare-perl/debian/changelog (original)
+++ trunk/libgetopt-declare-perl/debian/changelog Mon Mar 29 02:31:49 2010
@@ -1,3 +1,9 @@
+libgetopt-declare-perl (1.13-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Nathan Handler <nhandler at ubuntu.com>  Sun, 28 Mar 2010 21:28:26 -0500
+
 libgetopt-declare-perl (1.12-1) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libgetopt-declare-perl/lib/Getopt/Declare.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgetopt-declare-perl/lib/Getopt/Declare.pm?rev=54999&op=diff
==============================================================================
--- trunk/libgetopt-declare-perl/lib/Getopt/Declare.pm (original)
+++ trunk/libgetopt-declare-perl/lib/Getopt/Declare.pm Mon Mar 29 02:31:49 2010
@@ -5,7 +5,7 @@
 use UNIVERSAL qw(isa);
 use Carp;
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 sub import {
 	my ($class, $defn) = @_;
@@ -1005,16 +1005,37 @@
 
 sub version
 {
+	my ($self, $exit_status) = @_;
 	# my $filedate = localtime(time - 86400 * -M $0);
 	my $filedate = localtime((stat $0)[9]);
 	if ($::VERSION) { print "\n\t$0: version $::VERSION  ($filedate)\n\n" }
-	else		{ print "\n\t$0: version dated $filedate\n\n" }
-	exit $_[1] if defined $_[1];
+	else { print "\n\t$0: version dated $filedate\n\n" }
+	exit $exit_status if defined $exit_status;
+  return 1;
 }
 
 sub usage
 {
-	my $self = $_[0];
+	my ($self, $exit_status) = @_;
+	if (eval { require IO::Pager })
+	{
+		new IO::Pager; # use a pager for all print() statements
+	}
+	print $self->usage_string;
+	if (eval { require IO::Pager })
+	{
+		close; # done using the pager
+	}
+	if (defined $exit_status)
+	{
+		exit $exit_status;
+	}
+	return 1;
+}
+
+sub usage_string
+{
+	my $self = shift;
 	local $_ = $self->{_internal}{usage};
 	
 	my $lastflag = undef;
@@ -1074,7 +1095,6 @@
 
 			next;
 		};
-
 
 	# OTHERWISE, DECORATION
 		if (s/((?:(?!\[\s*pvtype:).)*)(\n|(?=\[\s*pvtype:))//)
@@ -1105,24 +1125,17 @@
 	my $helpcmd = Getopt::Declare::Arg::besthelp;
 	my $versioncmd = Getopt::Declare::Arg::bestversion;
 
-	my $PAGER = \*STDOUT;
-
-	if (eval { require IO::Pager })
-	{
-		$PAGER = new IO::Pager ( resume => 1 );
-	}
-
-	unless ($self->{_internal}{source})
-	{
-		print $PAGER  "\nUsage: $0 [options] $required\n";
-		print $PAGER  "       $0 $helpcmd\n" if $helpcmd;
-		print $PAGER  "       $0 $versioncmd\n" if $versioncmd;
-		print $PAGER  "\n" unless $decfirst && $usage =~ /\A[ \t]*\n/;
-	}
-	print $PAGER  "Options:\n" unless $decfirst;
-	print $PAGER  $usage;
-
-	exit $_[1] if defined $_[1];
+  my $msg = '';
+  unless ($self->{_internal}{source})
+	{
+		$msg .= "\nUsage: $0 [options] $required\n";
+		$msg .= "       $0 $helpcmd\n" if $helpcmd;
+		$msg .= "       $0 $versioncmd\n" if $versioncmd;
+		$msg .= "\n" unless $decfirst && $usage =~ /\A[ \t]*\n/;
+	}
+	$msg .= "Options:\n" unless $decfirst;
+  $msg .= $usage;
+  return $msg;
 }
 
 sub unused {
@@ -1328,8 +1341,7 @@
 
 =head1 VERSION
 
-This document describes version 1.12 of Getopt::Declare,
-released Sept 2, 2009
+This document describes version 1.13 of Getopt::Declare, released Mar 28, 2010
 
 =head1 SYNOPSIS
 
@@ -2708,6 +2720,7 @@
 Note that the operators C<&&>, C<||>, and C<!> retain their normal
 Perl precedences.
 
+=back
 
 =head2 Parsing from other sources
 




More information about the Pkg-perl-cvs-commits mailing list