use MooseX::Getopt::OptionTypeMap;
use MooseX::Getopt::Meta::Attribute;
use MooseX::Getopt::Meta::Attribute::NoGetopt;
+use MooseX::Getopt::ProcessedArgv;
use Carp ();
use Getopt::Long 2.37 ();
-has ARGV => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
-has extra_argv => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
+has ARGV => (is => 'rw', isa => 'ArrayRef', traits => ['NoGetopt']);
+has extra_argv => (is => 'rw', isa => 'ArrayRef', traits => ['NoGetopt']);
-sub new_with_options {
+sub process_argv {
my ($class, @params) = @_;
+ my $constructor_params = ( @params == 1 ? $params[0] : {@params} );
+
my $config_from_file;
if($class->meta->does_role('MooseX::ConfigFromFile')) {
local @ARGV = @ARGV;
+ # just get the configfile arg now out of @ARGV; 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 no_auto_version ) ] );
$opt_parser->getoptions( "configfile=s" => \$configfile );
+ my $cfmeta = $class->meta->find_attribute_by_name('configfile');
+
+ # was it passed to the constructor?
+ if (!defined $configfile)
+ {
+ my $key = $cfmeta->init_arg;
+ $configfile = $constructor_params->{$key} if $key;
+ }
+
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
}
}
- 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 $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}) )
- {
- $class->_getopt_full_usage($processed{usage});
+ if ( $processed{usage} and $params->{help_flag} ) {
+ $class->print_usage_text($processed{usage});
}
+ return MooseX::Getopt::ProcessedArgv->new(
+ argv_copy => $processed{argv_copy},
+ extra_argv => $processed{argv},
+ usage => $processed{usage},
+ constructor_params => $constructor_params, # explicit params to ->new
+ cli_params => $params, # params from CLI
+ );
+}
+
+sub new_with_options {
+ my ($class, @params) = @_;
+
+ my $pa = $class->process_argv(@params);
+
$class->new(
- ARGV => $processed{argv_copy},
- extra_argv => $processed{argv},
- %$constructor_params, # explicit params to ->new
- %$params, # params from CLI
+ ARGV => $pa->argv_copy,
+ extra_argv => $pa->extra_argv,
+ ( $pa->usage ? ( usage => $pa->usage ) : () ),
+ %{ $pa->constructor_params }, # explicit params to ->new
+ %{ $pa->cli_params }, # params from CLI
);
}
die @$warnings, $exception;
}
-sub _getopt_full_usage {
+# maintained for backwards compatibility only
+sub _getopt_full_usage
+{
my ($self, $usage) = @_;
- $usage->die;
+ print $usage->text;
+ exit 0;
}
+#(this is already documented in MooseX::Getopt. But FIXME later, via RT#82195)
+=for Pod::Coverage
+ print_usage_text
+=cut
+sub print_usage_text { shift->_getopt_full_usage(@_) }
sub _usage_format {
return "usage: %c %o";
sub _compute_getopt_attrs {
my $class = shift;
+ sort { $a->insertion_order <=> $b->insertion_order }
grep {
$_->does("MooseX::Getopt::Meta::Attribute::Trait")
or
See L<MooseX::Getopt/new_with_options>.
+=method process_argv
+
+See L<MooseX::Getopt/process_argv>.
+
=cut