package MooseX::Getopt;
use Moose::Role;
-use Getopt::Long ();
+use Getopt::Long::Descriptive ();
use MooseX::Getopt::OptionTypeMap;
use MooseX::Getopt::Meta::Attribute;
}
sub _parse_argv {
+ my ( $class, @args ) = @_;
+
+ my ( $params, $argv_copy, $argv_mangled ) = $class->_call_getopt(@args);
+
+ return (
+ argv_copy => $argv_copy,
+ argv => $argv_mangled,
+ params => $params,
+ );
+}
+
+sub _call_getopt {
my ( $class, %params ) = @_;
local @ARGV = @{ $params{argv} || \@ARGV };
- my ( @options, %name_to_init_arg, %options );
-
- foreach my $opt ( @{ $params{options} } ) {
- push @options, $opt->{opt_string};
- $name_to_init_arg{ $opt->{name} } = $opt->{init_arg};
- }
+ my ( $opt_spec, $name_to_init_arg ) = $class->_gld_spec(%params);
# Get a clean copy of the original @ARGV
my $argv_copy = [ @ARGV ];
- {
- local $SIG{__WARN__} = sub { die $_[0] };
- Getopt::Long::GetOptions(\%options, @options);
- }
+ my @err;
+
+ my ( $parsed_options, $usage ) = eval {
+ local $SIG{__WARN__} = sub { push @err, @_ };
+ Getopt::Long::Descriptive::describe_options("usage: %c %o", @$opt_spec)
+ };
+
+ die join "", grep { defined } @err, $@ if @err or $@;
# Get a copy of the Getopt::Long-mangled @ARGV
my $argv_mangled = [ @ARGV ];
- return (
- argv_copy => $argv_copy,
- argv => $argv_mangled,
- params => {
- map {
- $name_to_init_arg{$_} => $options{$_}
- } keys %options,
- }
+ my %constructor_args = (
+ map {
+ $name_to_init_arg->{$_} => $parsed_options->{$_}
+ } keys %$parsed_options,
);
+
+ return ( \%constructor_args, $argv_copy, $argv_mangled );
+}
+
+sub _gld_spec {
+ my ( $class, %params ) = @_;
+
+ my ( @options, %name_to_init_arg );
+
+ foreach my $opt ( @{ $params{options} } ) {
+ push @options, [
+ $opt->{opt_string},
+ $opt->{doc} || ' ', # FIXME new GLD shouldn't need this hack
+ {
+ ( $opt->{required} ? (required => $opt->{required}) : () ),
+ ( exists $opt->{default} ? (default => $opt->{default}) : () ),
+ },
+ ];
+
+ $name_to_init_arg{ $opt->{name} } = $opt->{init_arg};
+ }
+
+ return ( \@options, \%name_to_init_arg );
}
sub _compute_getopt_attrs {
if ($attr->has_type_constraint) {
my $type_name = $attr->type_constraint->name;
- if (MooseX::Getopt::OptionTypeMap->has_option_type($type_name)) {
- $opt_string .= MooseX::Getopt::OptionTypeMap->get_option_type($type_name);
+ if (MooseX::Getopt::OptionTypeMap->has_option_type($type_name)) {
+ $opt_string .= MooseX::Getopt::OptionTypeMap->get_option_type($type_name)
}
}
init_arg => $attr->init_arg,
opt_string => $opt_string,
required => $attr->is_required,
+ ( ( $attr->has_default && ( $attr->is_default_a_coderef xor $attr->is_lazy ) ) ? ( default => $attr->default({}) ) : () ),
( $attr->has_documentation ? ( doc => $attr->documentation ) : () ),
}
}