X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FGetopt%2FBasic.pm;h=9ef96ba2144ac7303a0ef4728e1d01b5206d3d41;hb=94c4db8f1964c733727b413556c46c922d3fa6eb;hp=e2d27404d7ddc2697539bb7715d10f2940d216e3;hpb=60321fa1aa5b3c94e62c54b70e8c74e3b7e675b0;p=gitmo%2FMooseX-Getopt.git diff --git a/lib/MooseX/Getopt/Basic.pm b/lib/MooseX/Getopt/Basic.pm index e2d2740..9ef96ba 100644 --- a/lib/MooseX/Getopt/Basic.pm +++ b/lib/MooseX/Getopt/Basic.pm @@ -1,5 +1,6 @@ - package MooseX::Getopt::Basic; +# ABSTRACT: MooseX::Getopt::Basic - role to implement the Getopt::Long functionality + use Moose::Role; use MooseX::Getopt::OptionTypeMap; @@ -7,9 +8,7 @@ use MooseX::Getopt::Meta::Attribute; use MooseX::Getopt::Meta::Attribute::NoGetopt; use Carp (); -use Getopt::Long (); - -our $VERSION = '0.25'; +use Getopt::Long 2.37 (); has ARGV => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt"); has extra_argv => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt"); @@ -21,8 +20,10 @@ sub new_with_options { if($class->meta->does_role('MooseX::ConfigFromFile')) { local @ARGV = @ARGV; + # just get the configfile arg now; the rest of the args will be + # fetched later my $configfile; - my $opt_parser = Getopt::Long::Parser->new( config => [ qw( pass_through ) ] ); + my $opt_parser = Getopt::Long::Parser->new( config => [ qw( no_auto_help pass_through ) ] ); $opt_parser->getoptions( "configfile=s" => \$configfile ); if(!defined $configfile) { @@ -145,7 +146,7 @@ sub _traditional_spec { foreach my $opt ( @{ $params{options} } ) { push @options, $opt->{opt_string}; - my $identifier = lc($opt->{name}); + my $identifier = $opt->{name}; $identifier =~ s/\W/_/g; # Getopt::Long does this to all option names $name_to_init_arg{$identifier} = $opt->{init_arg}; @@ -207,9 +208,9 @@ sub _attrs_to_options { 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 + # 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 @@ -222,15 +223,8 @@ sub _attrs_to_options { return @options; } -no Moose::Role; 1; - -__END__ - -=pod - -=head1 NAME - -MooseX::Getopt::Basic - role to implement the Getopt::Long functionality +no Moose::Role; +1; =head1 SYNOPSIS @@ -261,20 +255,8 @@ MooseX::Getopt::Basic - role to implement the Getopt::Long functionality This is like L and can be used instead except that it doesn't make use of L (or "GLD" for short). -=head1 METHODS - -=head2 new_with_options +=method new_with_options See L. -=head1 COPYRIGHT AND LICENSE - -Copyright 2007-2008 by Infinity Interactive, Inc. - -L - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. - =cut -