r57393 - in /trunk/libscriptalicious-perl: ./ debian/ debian/source/ lib/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon May 3 14:37:26 UTC 2010
Author: jawnsy-guest
Date: Mon May 3 14:37:10 2010
New Revision: 57393
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57393
Log:
* New upstream release
* Use new short debhelper rules format
* Use new 3.0 (quilt) source format
* Generate changelog from Changes.pod
* Standards-Version 3.8.4 (drop perl version dep)
* Add myself to Uploaders and Copyright
* Drop M::B from B-D as EUMM is used instead
* Rewrite control description
Added:
trunk/libscriptalicious-perl/SIGNATURE
- copied unchanged from r57390, branches/upstream/libscriptalicious-perl/current/SIGNATURE
trunk/libscriptalicious-perl/debian/clean
trunk/libscriptalicious-perl/debian/source/
trunk/libscriptalicious-perl/debian/source/format
Removed:
trunk/libscriptalicious-perl/MANIFEST.SKIP
Modified:
trunk/libscriptalicious-perl/Changes.pod
trunk/libscriptalicious-perl/MANIFEST
trunk/libscriptalicious-perl/META.yml
trunk/libscriptalicious-perl/Makefile.PL
trunk/libscriptalicious-perl/debian/changelog
trunk/libscriptalicious-perl/debian/control
trunk/libscriptalicious-perl/debian/copyright
trunk/libscriptalicious-perl/debian/rules
trunk/libscriptalicious-perl/lib/Scriptalicious.pm
trunk/libscriptalicious-perl/lib/Scriptalicious.pod
Modified: trunk/libscriptalicious-perl/Changes.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/Changes.pod?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/Changes.pod (original)
+++ trunk/libscriptalicious-perl/Changes.pod Mon May 3 14:37:10 2010
@@ -1,5 +1,41 @@
=head1 WHATS NEW IN SCRIPTALICIOUS
+
+=head2 VERSION 1.16
+
+=over
+
+=item Clear PERL5OPT before invoking $^X in tests
+
+To hopefully resolve some false failures
+
+=item Fix code for case when Time::HiRes is not available
+
+I never got a report about this, but it clearly didn't work! Guess
+no-one's using a Perl before 5.7.3 or without that module any more.
+
+=item put the magic AUTOLOAD back
+
+Scriptalicious will do most of its core stuff without compiling most
+of itself, and there is an AUTOLOAD hook which puts them into place.
+I decided to re-enable it.
+
+=item remove (soft) dependency on Pod::Constants
+
+Scriptalicious scripts are less delicious without a working --help,
+and many systems did not bother with this soft dependency, so it is
+of benefit to just implement what that code did instead.
+
+=item new $CONFIG variable
+
+Used for telling where config was read from (or specifying where it is
+to be read from)
+
+=item deal with negative values in sci_unit and time_unit
+
+These functions didn't deal with negative input; fix that.
+
+=back
=head2 VERSION 1.15
@@ -9,10 +45,6 @@
Gah, sorry about this. Note that it is a retrospective license, so
you don't need to 'upgrade' to this version to copy the software.
-
-=item Clear PERL5OPT before invoking $^X in tests
-
-To hopefully resolve some false failures
=back
Modified: trunk/libscriptalicious-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/MANIFEST?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/MANIFEST (original)
+++ trunk/libscriptalicious-perl/MANIFEST Mon May 3 14:37:10 2010
@@ -3,8 +3,8 @@
lib/Scriptalicious.pod
Makefile.PL
MANIFEST This list of files
-MANIFEST.SKIP
README
+SIGNATURE
t/01-mmmdelicious.t
t/02-script.t
t/03-yaml.t
Modified: trunk/libscriptalicious-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/META.yml?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/META.yml (original)
+++ trunk/libscriptalicious-perl/META.yml Mon May 3 14:37:10 2010
@@ -1,15 +1,21 @@
--- #YAML:1.0
-name: Scriptalicious
-version: 1.15
-abstract: Make scripts more delicious to SysAdmins
-license: ~
-author:
+name: Scriptalicious
+version: 1.16
+abstract: Make scripts more delicious to SysAdmins
+author:
- Sam Vilain <samv at cpan.org>
-generated_by: ExtUtils::MakeMaker version 6.42
-distribution_type: module
-requires:
- Term::ReadKey: 0
- Test::More: 0
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+requires:
+ Term::ReadKey: 0
+ Test::More: 0
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.48
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/libscriptalicious-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/Makefile.PL?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/Makefile.PL (original)
+++ trunk/libscriptalicious-perl/Makefile.PL Mon May 3 14:37:10 2010
@@ -3,7 +3,7 @@
use ExtUtils::MakeMaker;
# See perldoc Module::Build for details of how this works
-my @recommends = qw(Text::Wrap Time::HiRes YAML Pod::Constants);
+my @recommends = qw(Text::Wrap Time::HiRes YAML);
for my $module ( @recommends ) {
eval "use $module";
Modified: trunk/libscriptalicious-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/debian/changelog?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/debian/changelog (original)
+++ trunk/libscriptalicious-perl/debian/changelog Mon May 3 14:37:10 2010
@@ -1,4 +1,4 @@
-libscriptalicious-perl (1.15-2) UNRELEASED; urgency=low
+libscriptalicious-perl (1.16-1) UNRELEASED; urgency=low
[ gregor herrmann ]
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
@@ -9,7 +9,17 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregoa at debian.org> Sun, 16 Nov 2008 20:46:47 +0100
+ [ Jonathan Yu ]
+ * New upstream release
+ * Use new short debhelper rules format
+ * Use new 3.0 (quilt) source format
+ * Generate changelog from Changes.pod
+ * Standards-Version 3.8.4 (drop perl version dep)
+ * Add myself to Uploaders and Copyright
+ * Drop M::B from B-D as EUMM is used instead
+ * Rewrite control description
+
+ -- Jonathan Yu <jawnsy at cpan.org> Mon, 03 May 2010 11:12:24 -0400
libscriptalicious-perl (1.15-1) unstable; urgency=low
Added: trunk/libscriptalicious-perl/debian/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/debian/clean?rev=57393&op=file
==============================================================================
--- trunk/libscriptalicious-perl/debian/clean (added)
+++ trunk/libscriptalicious-perl/debian/clean Mon May 3 14:37:10 2010
@@ -1,0 +1,1 @@
+Changes.generated
Modified: trunk/libscriptalicious-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/debian/control?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/debian/control (original)
+++ trunk/libscriptalicious-perl/debian/control Mon May 3 14:37:10 2010
@@ -1,11 +1,12 @@
Source: libscriptalicious-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7), libmodule-build-perl
-Build-Depends-Indep: perl (>= 5.8.0-7), libyaml-perl, libpod-constants-perl
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: perl, libyaml-perl, libpod-constants-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
-Standards-Version: 3.8.0
+Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
+ Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Scriptalicious/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libscriptalicious-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libscriptalicious-perl/
@@ -14,6 +15,8 @@
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}
Suggests: libterm-readkey-perl, libyaml-perl
-Description: Make scripts more delicious to SysAdmins
- This module helps you write scripts that conform to best common practices,
- quickly.
+Description: module to
+ Scriptalicious is a Perl module that enables developers to write scripts that
+ conform to common best practices, quickly and easily. It provides some useful
+ features such as providing a help message via the -h option and shortcuts for
+ aborting the program with various error conditions.
Modified: trunk/libscriptalicious-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/debian/copyright?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/debian/copyright (original)
+++ trunk/libscriptalicious-perl/debian/copyright Mon May 3 14:37:10 2010
@@ -1,23 +1,30 @@
-It was created by Florian Ragwitz <florian.ragwitz at s2004.tu-chemnitz.de> on
-Sun, 04 Sep 2005 16:32:40 +0200
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Sam Vilain <samv at cpan.org>
+Source: http://search.cpan.org/dist/Scriptalicious/
+Name: Scriptalicious
-It was downloaded from: http://search.cpan.org/~samv/Scriptalicious/
+Files: *
+Copyright: 2005-2008, Sam Vilain <samv at cpan.org>
+License: Artistic or GPL-1+
-The upstream author is: Sam Vilain <samv at cpan.org>
+Files: debian/*
+Copyright: 2010, Jonathan Yu <jawnsy at cpan.org>
+ 2008, Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
+ 2005, Florian Ragwitz <rafl at debianforum.de>
+License: Artistic or GPL-1+
-Copyright 2005-2008, Sam Vilain. All rights reserved.
+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'
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
-
-Perl is distributed under licenses:
-
- a) the GNU General Public License as published by the Free Software
- Foundation; either version 1, or (at your option) any later
- version, or
-
- b) the "Artistic License" which comes with Perl.
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in /usr/share/common-licenses/GPL' and
- the Artistic Licence 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 the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Modified: trunk/libscriptalicious-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/debian/rules?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/debian/rules (original)
+++ trunk/libscriptalicious-perl/debian/rules Mon May 3 14:37:10 2010
@@ -1,25 +1,8 @@
#!/usr/bin/make -f
-export DH_ALWAYS_EXCLUDE=Changes.3pm.gz
+%:
+ dh $@
-build: build-stamp
-build-stamp:
- dh build
- pod2text Changes.pod > CHANGES
- touch build-stamp
-
-clean:
- dh clean
-
-install: build install-stamp
-install-stamp:
- dh install
- touch install-stamp
-
-binary-arch: install
-
-
-binary-indep: install
- dh binary-indep
-
-binary: binary-arch binary-indep
+override_dh_installchangelogs:
+ pod2text Changes.pod >Changes.generated
+ dh_installchangelogs Changes.generated
Added: trunk/libscriptalicious-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/debian/source/format?rev=57393&op=file
==============================================================================
--- trunk/libscriptalicious-perl/debian/source/format (added)
+++ trunk/libscriptalicious-perl/debian/source/format Mon May 3 14:37:10 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libscriptalicious-perl/lib/Scriptalicious.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/lib/Scriptalicious.pm?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/lib/Scriptalicious.pm (original)
+++ trunk/libscriptalicious-perl/lib/Scriptalicious.pm Mon May 3 14:37:10 2010
@@ -14,7 +14,7 @@
use warnings;
use Carp qw(croak);
-our $VERSION = "1.15";
+our $VERSION = "1.16";
use Getopt::Long;
use base qw(Exporter);
@@ -24,6 +24,7 @@
our @EXPORT = qw(say mutter whisper abort moan barf run run_err
capture capture_err getopt $VERBOSE $PROGNAME
+ $CONFIG
start_timer show_delta show_elapsed getconf
getconf_f sci_unit prompt_for prompt_passwd
prompt_yn prompt_Yn prompt_yN prompt_string
@@ -66,6 +67,7 @@
# automatically guess the program name if called for
(our $PROGNAME = $0) =~ s{.*/}{} unless $PROGNAME;
+our $CONFIG;
BEGIN {
Getopt::Long::config("bundling", "pass_through");
@@ -196,7 +198,7 @@
eval "use Time::HiRes qw(gettimeofday tv_interval)";
*gettimeofday = sub { return time() }
unless defined &gettimeofday;
- *tv_interval = sub { return ${$_[0]} - ${$_[1]} }
+ *tv_interval = sub { return ${$_[0]}[0] - ${$_[1]}[0] }
unless defined &tv_interval;
}
@@ -266,80 +268,90 @@
die "capture2 not implemented yet"
}
-#our $DATA = join "", <DATA>; close DATA;
-#our ($AUTOLOAD, $l);sub AUTOLOAD{croak"No such function $AUTOLOAD"if
-#$l;(undef,my($f,$n))=ll();$n+=1;eval"package ".__PACKAGE__.";\n"
-#."# line $n \"$f\"\n$DATA"; $@&&die"Error in autoload: $@";
-#$l=1;goto &{$AUTOLOAD};}sub ll{sub{caller()}->();} "P E A C E";
-#__DATA__
+our $DATA = join "", <DATA>; close DATA;
+our ($AUTOLOAD, $l);sub AUTOLOAD{croak"No such function $AUTOLOAD"if
+$l;(undef,my($f,$n))=ll();$n+=1;eval"package ".__PACKAGE__.";\n"
+."# line $n \"$f\"\n$DATA"; $@&&die"Error in autoload: $@";
+$l=1;goto &{$AUTOLOAD};}sub ll{sub{caller()}->();} "P E A C E";
+__DATA__
our ($NAME, $SHORT_DESC, $SYNOPSIS, $DESCRIPTION, @options);
#---------------------------------------------------------------------
-# calls Pod::Constants to get the synopsis, etc, from the calling
-# script.
+# get the synopsis, etc, from the calling script.
#---------------------------------------------------------------------
sub _get_pod_usage {
- return if $SYNOPSIS;
- (undef, my ($fn, $line)) = sub{caller()}->();
- eval "# line $line \"$fn\"\npackage main;\n".q{
- our $level;
- use Pod::Constants;
- Pod::Constants::import_from_file($0, -trim => 1,
- 'NAME' => sub {
- my @m;
- ( @m = m/(\S+) - (.*)/ ) &&
- do { $Scriptalicious::PROGNAME = $m[0];
- $Scriptalicious::SHORT_DESC = $m[1]; }
- },
- 'SYNOPSIS' => \$Scriptalicious::SYNOPSIS,
- 'DESCRIPTION' => \$Scriptalicious::DESCRIPTION,
- 'COMMAND LINE OPTIONS' => sub {
- &Pod::Constants::add_hook
- ('*item' => sub {
- return unless $level == 1;
- my ($switches, $description) =
- m/^(.*?)\n\n(.*)/s;
- $switches =~ s{[BCI]<([^>]*)>}{$1}g;
- my (@switches, $longest);
- $longest = "";
- for my $switch
- ($switches =~ m/\G
- ((?:-\w|--\w+))
- (?:,\s*)?
- /gx) {
- push @switches, $switch;
- if ( length $switch > length $longest) {
- $longest = $switch;
- }
- }
- $longest =~ s/^-*//;
- push @options,
- $longest, {
- options => \@switches,
- description => $description,
- };
- });
- &Pod::Constants::add_hook
- ("*over" => sub { $level++ });
- &Pod::Constants::add_hook
- ("*back" => sub {
- --$level or do {
- &Pod::Constants::delete_hook($_)
- foreach qw(*over *back *item);
- };
- });
- }
- );
- };
-
- if ( $@ ) {
- $SYNOPSIS = "(error: Pod::Constants failed to load)";
- } else {
+ return if $SYNOPSIS;
+ our $level;
+ open SCR_POD, $0 or warn "failed to open $0 for reading; $!";
+ my $targ;
+ my $in_options;
+ my $name_desc;
+ local($_);
+ while (<SCR_POD>) {
+ if ( !m{^=} and $targ ) {
+ $$targ .= $_;
+ }
+ if ( m{^=encoding (\w+)} ) {
+ binmode SCR_POD, ":$1";
+ }
+ elsif ( m{^=head\w\s+SYNOPSIS\s*$} ) {
+ $targ = \$Scriptalicious::SYNOPSIS;
+ }
+ elsif ( m{^=head\w\s+DESCRIPTION\s*$} ) {
+ $targ = \$Scriptalicious::DESCRIPTION;
+ }
+ elsif ( m{^=head\w\s+NAME\s*$} ) {
+ $targ = \$name_desc;
+ }
+ elsif ( m{^=head\w\s+COMMAND[\- ]LINE OPTIONS\s*$} ) {
+ undef($targ);
+ $in_options = 1;
+ }
+ elsif ( $in_options ) {
+ if ( m{^=over} ) {
+ $level++
+ }
+ elsif ( m{^=item\s+(.*)} ) {
+ next unless $level == 1;
+ my $switches = $1;
+ $switches =~ s{[BCI]<([^>]*)>}{$1}g;
+ my (@switches, $longest);
+ $longest = "";
+ for my $switch
+ ($switches =~ m/\G
+ ((?:-\w|--\w+))
+ (?:,\s*)?
+ /gx) {
+ push @switches, $switch;
+ if ( length $switch > length $longest) {
+ $longest = $switch;
+ }
+ }
+ $longest =~ s/^-*//;
+ my $opt_hash = {
+ options => \@switches,
+ description => "",
+ };
+ $targ = \$opt_hash->{description};
+ push @options, $longest, $opt_hash;
+ }
+ elsif ( m{^=back} ) {
+ if ( --$level == 0 ) {
+ undef($in_options);
+ }
+ }
+ }
+ }
+ if ( $name_desc ) {
+ $name_desc =~ m{^(\S+)(?:\s+-\s+(.*))?$};
+ $PROGNAME ||= $1;
+ $SHORT_DESC ||= $2;
+ }
+
foreach ( $SYNOPSIS, $SHORT_DESC, $DESCRIPTION ) {
- $_ ||= "(no text found, no POD given?)";
- }
- }
+ $_ ||= "(not found in POD)";
+ }
}
sub short_usage {
@@ -480,6 +492,10 @@
[ "ms", 0.001 ], [ "us", 1e-6 ], ["ns", 1e-9]);
sub time_unit {
my $scalar = shift;
+ my $neg = $scalar < 0;
+ if ($neg) {
+ $scalar = -$scalar;
+ }
my $d = (shift) || 4;
if ($scalar == 0) {
return "0s";
@@ -517,7 +533,7 @@
$rem = $new_rem;
}
}
- $rv;
+ ($neg?"-":"").$rv;
}
my %prefixes=(18=>"E",15=>"P",12=>"T",9=>"G",6=>"M",3=>"k",0=>"",
@@ -525,6 +541,10 @@
sub sci_unit {
my $scalar = shift;
+ my $neg = $scalar < 0 ? "-" : "";
+ if ($neg) {
+ $scalar = -$scalar;
+ }
my $unit = (shift) || "";
my $d = (shift) || 4;
my $e = 0;
@@ -536,10 +556,10 @@
if (exists $prefixes{$e}) {
$d -= ceil(log($scalar)/log(10));
$d = 0 if $d < 0;
- my $a = sprintf("%.${d}f", $scalar);
+ my $a = sprintf("%s%.${d}f", $neg, $scalar);
return $a.$prefixes{$e}.$unit;
} else {
- return sprintf("%${d}e", $scalar).$unit;
+ return sprintf("%s%${d}e", $neg, $scalar).$unit;
}
}
@@ -552,12 +572,13 @@
moan "failed to include YAML; not able to load config";
return @_;
}
- for my $loc ( "$ENV{HOME}/.${PROGNAME}rc",
+ for my $loc ( $CONFIG,
+ "$ENV{HOME}/.${PROGNAME}rc",
"/etc/perl/$PROGNAME.conf",
"/etc/$PROGNAME.conf",
"POD"
) {
-
+ next if not defined $loc;
eval {
$conf_obj = getconf_f($loc, @_);
};
@@ -568,6 +589,7 @@
barf "error processing config file $loc; $@";
}
} else {
+ $CONFIG = $loc;
last;
}
}
Modified: trunk/libscriptalicious-perl/lib/Scriptalicious.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libscriptalicious-perl/lib/Scriptalicious.pod?rev=57393&op=diff
==============================================================================
--- trunk/libscriptalicious-perl/lib/Scriptalicious.pod (original)
+++ trunk/libscriptalicious-perl/lib/Scriptalicious.pod Mon May 3 14:37:10 2010
@@ -129,6 +129,12 @@
It is recommended that you only ever read this variable, and pass it
in via the import. This is not automatically extracted from the POD
for performance reasons.
+
+=item C<$CONFIG>
+
+Name of the configuration file. Set before a call to C<getconf>, or
+read afterwards to see if a config file was used. New in
+Scriptalicious 1.16
=item B<getopt(@getopt_args)>
@@ -492,6 +498,10 @@
L<Getopt::EUCLID> is Damian Conway's take on this.
+Finally, if you don't mind the dependencies of Moose (or Mouse), then
+L<MooseX::Getopt> and L<MooseX::SimpleConfig> are much more elegant
+approaches to getopt handling and configuration than this module.
+
If you have solved this problem in a new and interesting way, or even
rehashed it in an old, boring and inelegant way and want your module
to be listed here, please contact the
More information about the Pkg-perl-cvs-commits
mailing list