X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FGetopt.pm;h=01904f30fcece7aa1cc159e5e95f957f1632e443;hb=ef47fe440114bcfc790464f79e476ef7defb0a67;hp=67725e9100d5bc1211fd09b7690fdc90814bc34f;hpb=590c2587a91355885e6d512a3824c5e3caa97b0d;p=gitmo%2FMooseX-Getopt.git diff --git a/lib/MooseX/Getopt.pm b/lib/MooseX/Getopt.pm index 67725e9..01904f3 100644 --- a/lib/MooseX/Getopt.pm +++ b/lib/MooseX/Getopt.pm @@ -14,6 +14,11 @@ use constant HAVE_GLD => not not eval { require Getopt::Long::Descriptive }; our $VERSION = '0.20'; our $AUTHORITY = 'cpan:STEVAN'; +my @roles = ('MooseX::Getopt::Basic'); +if (HAVE_GLD) { push @roles, 'MooseX::Getopt::GLD' } + +with @roles; + has ARGV => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt"); has extra_argv => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt"); @@ -69,9 +74,9 @@ sub new_with_options { sub _parse_argv { my ( $class, %params ) = @_; - local @ARGV = @{ $params{argv} || \@ARGV }; + local @ARGV = @{ $params{params}{argv} || \@ARGV }; - my ( $opt_spec, $name_to_init_arg ) = ( HAVE_GLD ? $class->_gld_spec(%params) : $class->_traditional_spec(%params) ); + my ( $opt_spec, $name_to_init_arg ) = $class->_getopt_spec(%params); # Get a clean copy of the original @ARGV my $argv_copy = [ @ARGV ]; @@ -81,13 +86,7 @@ sub _parse_argv { 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 ); - } + return $class->_get_options(\%params, $opt_spec); }; die join "", grep { defined } @err, $@ if @err or $@; @@ -426,6 +425,9 @@ and then return a newly constructed object. The special parameter C, if specified should point to an array reference with an array to use instead of C<@ARGV>. +The paramater C, if specified and a true value will disable +the use of L . + If L fails (due to invalid arguments), C will throw an exception. @@ -456,6 +458,10 @@ un-mangled. This returns the role meta object. +=item B + +A constant for internal use. + =back =head1 BUGS