r47850 - in /branches/upstream/libmoosex-getopt-perl/current: ./ inc/Module/Install/ lib/MooseX/ lib/MooseX/Getopt/ lib/MooseX/Getopt/Meta/ lib/MooseX/Getopt/Meta/Attribute/ lib/MooseX/Getopt/Meta/Attribute/Trait/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Nov 27 14:49:42 UTC 2009
Author: jawnsy-guest
Date: Fri Nov 27 14:48:05 2009
New Revision: 47850
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47850
Log:
[svn-upgrade] Integrating new upstream version, libmoosex-getopt-perl (0.25)
Added:
branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AutoManifest.pm
branches/upstream/libmoosex-getopt-perl/current/t/104_override_usage.t
Modified:
branches/upstream/libmoosex-getopt-perl/current/ChangeLog
branches/upstream/libmoosex-getopt-perl/current/MANIFEST
branches/upstream/libmoosex-getopt-perl/current/META.yml
branches/upstream/libmoosex-getopt-perl/current/Makefile.PL
branches/upstream/libmoosex-getopt-perl/current/README
branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AuthorRequires.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Basic.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/GLD.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm
branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/OptionTypeMap.pm
Modified: branches/upstream/libmoosex-getopt-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/ChangeLog?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/ChangeLog (original)
+++ branches/upstream/libmoosex-getopt-perl/current/ChangeLog Fri Nov 27 14:48:05 2009
@@ -1,4 +1,12 @@
Revision history for Perl extension MooseX-Getopt
+
+0.25 Thu. Nov 26 2009
+ * MooseX::Getopt
+ - Split out the warnings and the exception from Getopt so that they can be
+ overridden.
+ - Split out calling ->die on Getopt::Long::Descriptive::Usage so that
+ it can be overridden.
+ - Properly split roles as promised in 0.22.
0.24 Fri. Oct 23 2009
* MooseX::Getopt
Modified: branches/upstream/libmoosex-getopt-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/MANIFEST?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/MANIFEST (original)
+++ branches/upstream/libmoosex-getopt-perl/current/MANIFEST Fri Nov 27 14:48:05 2009
@@ -2,6 +2,7 @@
inc/Module/Install.pm
inc/Module/Install/AuthorRequires.pm
inc/Module/Install/AuthorTests.pm
+inc/Module/Install/AutoManifest.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/Fetch.pm
@@ -38,5 +39,6 @@
t/101_argv_bug.t
t/102_basic_basic.t
t/103_uc_bug.t
+t/104_override_usage.t
t/author/pod.t
t/author/pod_coverage.t
Modified: branches/upstream/libmoosex-getopt-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/META.yml?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/META.yml (original)
+++ branches/upstream/libmoosex-getopt-perl/current/META.yml Fri Nov 27 14:48:05 2009
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.91'
+generated_by: 'Module::Install version 0.910'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,4 +27,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: git://git.moose.perl.org/MooseX-Getopt.git
-version: 0.24
+version: 0.25
Modified: branches/upstream/libmoosex-getopt-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/Makefile.PL?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/Makefile.PL (original)
+++ branches/upstream/libmoosex-getopt-perl/current/Makefile.PL Fri Nov 27 14:48:05 2009
@@ -1,6 +1,6 @@
use strict;
use warnings;
-use inc::Module::Install 0.75;
+use inc::Module::Install 0.91;
if ($Module::Install::AUTHOR) {
require Module::Install::AuthorRequires;
Modified: branches/upstream/libmoosex-getopt-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/README?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/README (original)
+++ branches/upstream/libmoosex-getopt-perl/current/README Fri Nov 27 14:48:05 2009
@@ -1,4 +1,4 @@
-MooseX::Getopt version 0.21
+MooseX::Getopt version 0.25
===========================
See the individual module documentation for more information
@@ -21,7 +21,7 @@
COPYRIGHT AND LICENCE
-Copyright (C) 2007-2008 Infinity Interactive, Inc.
+Copyright (C) 2007-2009 Infinity Interactive, Inc.
http://www.iinteractive.com
Modified: branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AuthorRequires.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AuthorRequires.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AuthorRequires.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AuthorRequires.pm Fri Nov 27 14:48:05 2009
@@ -4,14 +4,13 @@
package Module::Install::AuthorRequires;
+use base 'Module::Install::Base';
+
# cargo cult
BEGIN {
- our $VERSION = '0.01';
+ our $VERSION = '0.02';
our $ISCORE = 1;
-# our @ISA = qw{Module::Install::Base};
}
-
-use base qw/Module::Install::Base/;
sub author_requires {
my $self = shift;
@@ -36,4 +35,4 @@
__END__
-#line 93
+#line 92
Added: branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AutoManifest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AutoManifest.pm?rev=47850&op=file
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AutoManifest.pm (added)
+++ branches/upstream/libmoosex-getopt-perl/current/inc/Module/Install/AutoManifest.pm Fri Nov 27 14:48:05 2009
@@ -1,0 +1,45 @@
+#line 1
+use strict;
+use warnings;
+
+package Module::Install::AutoManifest;
+
+use Module::Install::Base;
+
+BEGIN {
+ our $VERSION = '0.003';
+ our $ISCORE = 1;
+ our @ISA = qw(Module::Install::Base);
+}
+
+sub auto_manifest {
+ my ($self) = @_;
+
+ return unless $Module::Install::AUTHOR;
+
+ die "auto_manifest requested, but no MANIFEST.SKIP exists\n"
+ unless -e "MANIFEST.SKIP";
+
+ if (-e "MANIFEST") {
+ unlink('MANIFEST') or die "Can't remove MANIFEST: $!";
+ }
+
+ $self->postamble(<<"END");
+create_distdir: manifest_clean manifest
+
+distclean :: manifest_clean
+
+manifest_clean:
+\t\$(RM_F) MANIFEST
+END
+
+}
+
+1;
+__END__
+
+#line 48
+
+#line 131
+
+1; # End of Module::Install::AutoManifest
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt.pm Fri Nov 27 14:48:05 2009
@@ -1,246 +1,12 @@
-
package MooseX::Getopt;
use Moose::Role;
-use MooseX::Getopt::OptionTypeMap;
-use MooseX::Getopt::Meta::Attribute;
-use MooseX::Getopt::Meta::Attribute::NoGetopt;
-
-use Carp ();
-
-use Getopt::Long (); # GLD uses it anyway, doesn't hurt
use constant HAVE_GLD => not not eval { require Getopt::Long::Descriptive };
-our $VERSION = '0.24';
+our $VERSION = '0.25';
our $AUTHORITY = 'cpan:STEVAN';
-has ARGV => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
-has extra_argv => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
-
-sub new_with_options {
- my ($class, @params) = @_;
-
- my $config_from_file;
- if($class->meta->does_role('MooseX::ConfigFromFile')) {
- local @ARGV = @ARGV;
-
- my $configfile;
- my $opt_parser = Getopt::Long::Parser->new( config => [ qw( pass_through ) ] );
- $opt_parser->getoptions( "configfile=s" => \$configfile );
-
- if(!defined $configfile) {
- my $cfmeta = $class->meta->find_attribute_by_name('configfile');
- $configfile = $cfmeta->default if $cfmeta->has_default;
- if (ref $configfile eq 'CODE') {
- # not sure theres a lot you can do with the class and may break some assumptions
- # warn?
- $configfile = &$configfile($class);
- }
- if (defined $configfile) {
- $config_from_file = eval {
- $class->get_config_from_file($configfile);
- };
- if ($@) {
- die $@ unless $@ =~ /Specified configfile '\Q$configfile\E' does not exist/;
- }
- }
- }
- else {
- $config_from_file = $class->get_config_from_file($configfile);
- }
- }
-
- my $constructor_params = ( @params == 1 ? $params[0] : {@params} );
-
- Carp::croak("Single parameters to new_with_options() must be a HASH ref")
- unless ref($constructor_params) eq 'HASH';
-
- my %processed = $class->_parse_argv(
- options => [
- $class->_attrs_to_options( $config_from_file )
- ],
- params => $constructor_params,
- );
-
- my $params = $config_from_file ? { %$config_from_file, %{$processed{params}} } : $processed{params};
-
- # did the user request usage information?
- if ( $processed{usage} && ($params->{'?'} or $params->{help} or $params->{usage}) )
- {
- $processed{usage}->die();
- }
-
- $class->new(
- ARGV => $processed{argv_copy},
- extra_argv => $processed{argv},
- %$constructor_params, # explicit params to ->new
- %$params, # params from CLI
- );
-}
-
-sub _parse_argv {
- my ( $class, %params ) = @_;
-
- local @ARGV = @{ $params{params}{argv} || \@ARGV };
-
- my ( $opt_spec, $name_to_init_arg ) = ( HAVE_GLD ? $class->_gld_spec(%params) : $class->_traditional_spec(%params) );
-
- # Get a clean copy of the original @ARGV
- my $argv_copy = [ @ARGV ];
-
- my @err;
-
- my ( $parsed_options, $usage ) = eval {
- local $SIG{__WARN__} = sub { push @err, @_ };
-
- if ( HAVE_GLD ) {
- return Getopt::Long::Descriptive::describe_options($class->_usage_format(%params), @$opt_spec);
- } else {
- my %options;
- Getopt::Long::GetOptions(\%options, @$opt_spec);
- return ( \%options, undef );
- }
- };
-
- die join "", grep { defined } @err, $@ if @err or $@;
-
- # Get a copy of the Getopt::Long-mangled @ARGV
- my $argv_mangled = [ @ARGV ];
-
- my %constructor_args = (
- map {
- $name_to_init_arg->{$_} => $parsed_options->{$_}
- } keys %$parsed_options,
- );
-
- return (
- params => \%constructor_args,
- argv_copy => $argv_copy,
- argv => $argv_mangled,
- ( defined($usage) ? ( usage => $usage ) : () ),
- );
-}
-
-sub _usage_format {
- return "usage: %c %o";
-}
-
-sub _traditional_spec {
- my ( $class, %params ) = @_;
-
- my ( @options, %name_to_init_arg, %options );
-
- foreach my $opt ( @{ $params{options} } ) {
- push @options, $opt->{opt_string};
-
- my $identifier = lc($opt->{name});
- $identifier =~ s/\W/_/g; # Getopt::Long does this to all option names
-
- $name_to_init_arg{$identifier} = $opt->{init_arg};
- }
-
- return ( \@options, \%name_to_init_arg );
-}
-
-sub _gld_spec {
- my ( $class, %params ) = @_;
-
- my ( @options, %name_to_init_arg );
-
- my $constructor_params = $params{params};
-
- foreach my $opt ( @{ $params{options} } ) {
- push @options, [
- $opt->{opt_string},
- $opt->{doc} || ' ', # FIXME new GLD shouldn't need this hack
- {
- ( ( $opt->{required} && !exists($constructor_params->{$opt->{init_arg}}) ) ? (required => $opt->{required}) : () ),
- # NOTE:
- # remove this 'feature' because it didn't work
- # all the time, and so is better to not bother
- # since Moose will handle the defaults just
- # fine anyway.
- # - SL
- #( exists $opt->{default} ? (default => $opt->{default}) : () ),
- },
- ];
-
- my $identifier = lc($opt->{name});
- $identifier =~ s/\W/_/g; # Getopt::Long does this to all option names
-
- $name_to_init_arg{$identifier} = $opt->{init_arg};
- }
-
- return ( \@options, \%name_to_init_arg );
-}
-
-sub _compute_getopt_attrs {
- my $class = shift;
- grep {
- $_->does("MooseX::Getopt::Meta::Attribute::Trait")
- or
- $_->name !~ /^_/
- } grep {
- !$_->does('MooseX::Getopt::Meta::Attribute::Trait::NoGetopt')
- } $class->meta->get_all_attributes
-}
-
-sub _get_cmd_flags_for_attr {
- my ( $class, $attr ) = @_;
-
- my $flag = $attr->name;
-
- my @aliases;
-
- if ($attr->does('MooseX::Getopt::Meta::Attribute::Trait')) {
- $flag = $attr->cmd_flag if $attr->has_cmd_flag;
- @aliases = @{ $attr->cmd_aliases } if $attr->has_cmd_aliases;
- }
-
- return ( $flag, @aliases );
-}
-
-sub _attrs_to_options {
- my $class = shift;
- my $config_from_file = shift || {};
-
- my @options;
-
- foreach my $attr ($class->_compute_getopt_attrs) {
- my ( $flag, @aliases ) = $class->_get_cmd_flags_for_attr($attr);
-
- my $opt_string = join(q{|}, $flag, @aliases);
-
- if ($attr->name eq 'configfile') {
- $opt_string .= '=s';
- }
- elsif ($attr->has_type_constraint) {
- my $type = $attr->type_constraint;
- if (MooseX::Getopt::OptionTypeMap->has_option_type($type)) {
- $opt_string .= MooseX::Getopt::OptionTypeMap->get_option_type($type)
- }
- }
-
- push @options, {
- name => $flag,
- init_arg => $attr->init_arg,
- opt_string => $opt_string,
- required => $attr->is_required && !$attr->has_default && !$attr->has_builder && !exists $config_from_file->{$attr->name},
- # NOTE:
- # this "feature" was breaking because
- # Getopt::Long::Descriptive would return
- # the default value as if it was a command
- # line flag, which would then override the
- # one passed into a constructor.
- # See 100_gld_default_bug.t for an example
- # - SL
- #( ( $attr->has_default && ( $attr->is_default_a_coderef xor $attr->is_lazy ) ) ? ( default => $attr->default({}) ) : () ),
- ( $attr->has_documentation ? ( doc => $attr->documentation ) : () ),
- }
- }
-
- return @options;
-}
+with HAVE_GLD ? 'MooseX::Getopt::GLD' : 'MooseX::Getopt::Basic';
no Moose::Role; 1;
@@ -490,6 +256,8 @@
Drew Taylor, E<lt>drew at drewtaylor.comE<gt>
+Tomas Doran, (t0m) C<< <bobtfish at bobtfish.net> >>
+
=head1 COPYRIGHT AND LICENSE
Copyright 2007-2008 by Infinity Interactive, Inc.
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Basic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Basic.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Basic.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Basic.pm Fri Nov 27 14:48:05 2009
@@ -1,3 +1,4 @@
+
package MooseX::Getopt::Basic;
use Moose::Role;
@@ -6,27 +7,10 @@
use MooseX::Getopt::Meta::Attribute::NoGetopt;
use Carp ();
-use Getopt::Long (); # GLD uses it anyway, doesn't hurt
-
-our $VERSION = '0.20';
-our $AUTHORITY = 'cpan:STEVAN';
+use Getopt::Long ();
has ARGV => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
has extra_argv => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
-
-# _getopt_spec() and _getoptions() are overrided by MooseX::Getopt::GLD.
-
-sub _getopt_spec {
- my ($class, %params) = @_;
- return $class->_traditional_spec(%params)
-}
-
-sub _get_options {
- my ($class, undef, $opt_spec) = @_;
- my %options;
- Getopt::Long::GetOptions(\%options, @$opt_spec);
- return ( \%options, undef );
-}
sub new_with_options {
my ($class, @params) = @_;
@@ -42,20 +26,27 @@
if(!defined $configfile) {
my $cfmeta = $class->meta->find_attribute_by_name('configfile');
$configfile = $cfmeta->default if $cfmeta->has_default;
- }
-
- if (defined $configfile) {
- $config_from_file = eval {
- $class->get_config_from_file($configfile);
- };
- if ($@) {
- die $@ unless $@ =~ /Specified configfile '\Q$configfile\E' does not exist/;
+ if (ref $configfile eq 'CODE') {
+ # not sure theres a lot you can do with the class and may break some assumptions
+ # warn?
+ $configfile = &$configfile($class);
}
+ if (defined $configfile) {
+ $config_from_file = eval {
+ $class->get_config_from_file($configfile);
+ };
+ if ($@) {
+ die $@ unless $@ =~ /Specified configfile '\Q$configfile\E' does not exist/;
+ }
+ }
+ }
+ else {
+ $config_from_file = $class->get_config_from_file($configfile);
}
}
my $constructor_params = ( @params == 1 ? $params[0] : {@params} );
-
+
Carp::croak("Single parameters to new_with_options() must be a HASH ref")
unless ref($constructor_params) eq 'HASH';
@@ -71,7 +62,7 @@
# did the user request usage information?
if ( $processed{usage} && ($params->{'?'} or $params->{help} or $params->{usage}) )
{
- $processed{usage}->die();
+ $class->_getopt_full_usage($processed{usage});
}
$class->new(
@@ -82,6 +73,8 @@
);
}
+sub _getopt_spec { shift->_traditional_spec(@_); }
+
sub _parse_argv {
my ( $class, %params ) = @_;
@@ -92,15 +85,15 @@
# Get a clean copy of the original @ARGV
my $argv_copy = [ @ARGV ];
- my @err;
-
+ my @warnings;
my ( $parsed_options, $usage ) = eval {
- local $SIG{__WARN__} = sub { push @err, @_ };
-
- return $class->_get_options(\%params, $opt_spec);
+ local $SIG{__WARN__} = sub { push @warnings, @_ };
+
+ return $class->_getopt_get_options(\%params, $opt_spec);
};
- die join "", grep { defined } @err, $@ if @err or $@;
+ $class->_getopt_spec_warnings(@warnings) if @warnings;
+ $class->_getopt_spec_exception(\@warnings, $@) if $@;
# Get a copy of the Getopt::Long-mangled @ARGV
my $argv_mangled = [ @ARGV ];
@@ -119,6 +112,25 @@
);
}
+sub _getopt_get_options {
+ my ($class, $params, $opt_spec) = @_;
+ my %options;
+ Getopt::Long::GetOptions(\%options, @$opt_spec);
+ return ( \%options, undef );
+}
+
+sub _getopt_spec_warnings { }
+
+sub _getopt_spec_exception {
+ my ($self, $warnings, $exception) = @_;
+ die @$warnings, $exception;
+}
+
+sub _getopt_full_usage {
+ my ($self, $usage) = @_;
+ $usage->die;
+}
+
sub _usage_format {
return "usage: %c %o";
}
@@ -131,7 +143,7 @@
foreach my $opt ( @{ $params{options} } ) {
push @options, $opt->{opt_string};
- my $identifier = $opt->{name};
+ my $identifier = lc($opt->{name});
$identifier =~ s/\W/_/g; # Getopt::Long does this to all option names
$name_to_init_arg{$identifier} = $opt->{init_arg};
@@ -210,14 +222,13 @@
no Moose::Role; 1;
-1;
+__END__
=pod
=head1 NAME
-MooseX::Getopt::Basic - role to implement the basic functionality of
-L<MooseX::Getopt> without GLD.
+MooseX::Getopt::Basic - role to implement the Getopt::Long functionality
=head1 SYNOPSIS
@@ -250,39 +261,9 @@
=head1 METHODS
-=over 4
-
-=item B<new_with_options>
-
-See L<MooseX::Getopt> .
-
-=item B<meta>
-
-This returns the role meta object.
-
-=back
-
-=head1 BUGS
-
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
-
-=head1 AUTHOR
-
-Stevan Little E<lt>stevan at iinteractive.comE<gt>
-
-Brandon L. Black, E<lt>blblack at gmail.comE<gt>
-
-Yuval Kogman, E<lt>nothingmuch at woobling.orgE<gt>
-
-=head1 CONTRIBUTORS
-
-Ryan D Johnson, E<lt>ryan at innerfence.comE<gt>
-
-Drew Taylor, E<lt>drew at drewtaylor.comE<gt>
-
-Shlomi Fish E<lt>shlomif at cpan.orgE<gt>
+=head2 new_with_options
+
+See L<MooseX::Getopt/new_with_options>.
=head1 COPYRIGHT AND LICENSE
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/GLD.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/GLD.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/GLD.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/GLD.pm Fri Nov 27 14:48:05 2009
@@ -1,25 +1,21 @@
+
package MooseX::Getopt::GLD;
-
use Moose::Role;
-around '_getopt_spec' => sub {
- my $orig = shift;
- my $self = shift;
+use Getopt::Long::Descriptive;
- return $self->_gld_spec(@_);
- # Ignore $orig, code for _gld_spec here
+with 'MooseX::Getopt::Basic';
+
+around _getopt_spec => sub {
+ shift;
+ shift->_gld_spec(@_);
};
-around '_get_options' => sub {
- my $orig = shift;
- my $class = shift;
-
- my ($params, $opt_spec) = @_;
- return Getopt::Long::Descriptive::describe_options(
- $class->_usage_format(%$params), @$opt_spec
- );
+around _getopt_get_options => sub {
+ shift;
+ my ($class, $params, $opt_spec) = @_;
+ return Getopt::Long::Descriptive::describe_options($class->_usage_format(%$params), @$opt_spec);
};
-
sub _gld_spec {
my ( $class, %params ) = @_;
@@ -44,7 +40,7 @@
},
];
- my $identifier = $opt->{name};
+ my $identifier = lc($opt->{name});
$identifier =~ s/\W/_/g; # Getopt::Long does this to all option names
$name_to_init_arg{$identifier} = $opt->{init_arg};
@@ -53,7 +49,7 @@
return ( \@options, \%name_to_init_arg );
}
-1;
+no Moose::Role; 1;
__END__
@@ -61,42 +57,37 @@
=head1 NAME
-MooseX::Getopt::GLD - role to implement specific functionality for
-L<Getopt::Long::Descriptive>
+MooseX::Getopt::GLD - A Moose role for processing command line options with Getopt::Long::Descriptive
=head1 SYNOPSIS
-
-For internal use.
+
+ ## In your class
+ package My::App;
+ use Moose;
+
+ with 'MooseX::Getopt::GLD';
+
+ has 'out' => (is => 'rw', isa => 'Str', required => 1);
+ has 'in' => (is => 'rw', isa => 'Str', required => 1);
+
+ # ... rest of the class here
+
+ ## in your script
+ #!/usr/bin/perl
+
+ use My::App;
+
+ my $app = My::App->new_with_options();
+ # ... rest of the script here
+
+ ## on the command line
+ % perl my_app_script.pl -in file.input -out file.dump
=head1 DESCRIPTION
-This is a role for C<MooseX::Getopt>.
-
-=head1 METHODS
-
-=over 4
-
-=item meta
-
-=back
-
-=head1 BUGS
-
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
-
-=head1 AUTHOR
-
-Dagfinn Ilmari MannsE<aring>ker E<lt>ilmari at ilmari.orgE<gt>
-
-Stevan Little E<lt>stevan at iinteractive.comE<gt>
-
-Yuval Kogman C<< <nuffin at cpan.org> >>
-
=head1 COPYRIGHT AND LICENSE
-Copyright 2007-2008 by Infinity Interactive, Inc.
+Copyright 2007-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
@@ -104,4 +95,3 @@
it under the same terms as Perl itself.
=cut
-=head1
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute.pm Fri Nov 27 14:48:05 2009
@@ -3,7 +3,7 @@
use Moose;
use Moose::Util::TypeConstraints;
-our $VERSION = '0.20';
+our $VERSION = '0.25';
our $AUTHORITY = 'cpan:STEVAN';
extends 'Moose::Meta::Attribute'; # << Moose extending Moose :)
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm Fri Nov 27 14:48:05 2009
@@ -2,7 +2,7 @@
package MooseX::Getopt::Meta::Attribute::NoGetopt;
use Moose;
-our $VERSION = '0.20';
+our $VERSION = '0.25';
our $AUTHORITY = 'cpan:STEVAN';
extends 'Moose::Meta::Attribute'; # << Moose extending Moose :)
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait.pm Fri Nov 27 14:48:05 2009
@@ -3,7 +3,7 @@
use Moose::Role;
use Moose::Util::TypeConstraints;
-our $VERSION = '0.20';
+our $VERSION = '0.25';
our $AUTHORITY = 'cpan:STEVAN';
has 'cmd_flag' => (
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm Fri Nov 27 14:48:05 2009
@@ -2,7 +2,7 @@
package MooseX::Getopt::Meta::Attribute::Trait::NoGetopt;
use Moose::Role;
-our $VERSION = '0.20';
+our $VERSION = '0.25';
our $AUTHORITY = 'cpan:STEVAN';
no Moose::Role;
Modified: branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/OptionTypeMap.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/OptionTypeMap.pm?rev=47850&op=diff
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/OptionTypeMap.pm (original)
+++ branches/upstream/libmoosex-getopt-perl/current/lib/MooseX/Getopt/OptionTypeMap.pm Fri Nov 27 14:48:05 2009
@@ -4,7 +4,7 @@
use Moose 'confess', 'blessed';
use Moose::Util::TypeConstraints 'find_type_constraint';
-our $VERSION = '0.20';
+our $VERSION = '0.25';
our $AUTHORITY = 'cpan:STEVAN';
my %option_type_map = (
Added: branches/upstream/libmoosex-getopt-perl/current/t/104_override_usage.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-getopt-perl/current/t/104_override_usage.t?rev=47850&op=file
==============================================================================
--- branches/upstream/libmoosex-getopt-perl/current/t/104_override_usage.t (added)
+++ branches/upstream/libmoosex-getopt-perl/current/t/104_override_usage.t Fri Nov 27 14:48:05 2009
@@ -1,0 +1,57 @@
+use strict;
+use warnings;
+use Test::More 0.88;
+use Test::Exception;
+
+{
+ package MyScript;
+ use Moose;
+
+ with 'MooseX::Getopt';
+
+ has foo => ( isa => 'Int', is => 'ro', documentation => 'A foo' );
+ has help => ( isa => 'Bool', is => 'ro', default => 0, documentation => 'Help');
+
+ our $usage = 0;
+ before _getopt_full_usage => sub { $usage++; };
+ our @warnings;
+ before _getopt_spec_warnings => sub { shift; push(@warnings, @_) };
+ our @exception;
+ before _getopt_spec_exception => sub { shift; push(@exception, @{ shift() }, shift()) };
+}
+{
+ local $MyScript::usage; local @MyScript::warnings; local @MyScript::exception;
+ local @ARGV = ('--foo', '1');
+ my $i = MyScript->new_with_options;
+ ok $i;
+ is $i->foo, 1;
+ is $MyScript::usage, undef;
+}
+{
+ local $MyScript::usage; local @MyScript::warnings; local @MyScript::exception;
+ local @ARGV = ('--help');
+ throws_ok { MyScript->new_with_options } qr/A foo/;
+ is $MyScript::usage, 1;
+}
+{
+ local $MyScript::usage; local @MyScript::warnings; local @MyScript::exception;
+ local @ARGV = ('-q'); # Does not exist
+ throws_ok { MyScript->new_with_options } qr/A foo/;
+ is_deeply \@MyScript::warnings, [
+ 'Unknown option: q
+'
+ ];
+ my $exp = [
+ 'Unknown option: q
+',
+ qq{usage: 104_override_usage.t [long options...]
+\t--help Help
+\t--foo A foo
+}
+ ];
+
+ is_deeply \@MyScript::exception, $exp;
+}
+
+done_testing;
+
More information about the Pkg-perl-cvs-commits
mailing list