use MooseX::Getopt::Meta::Attribute;
use MooseX::Getopt::Meta::Attribute::NoGetopt;
use MooseX::Getopt::ProcessedArgv;
+use Try::Tiny;
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 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; the rest of the args will be
- # fetched later
+ # 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( no_auto_help 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');
+ my $init_arg = $cfmeta->init_arg;
+
+ # was it passed to the constructor?
+ if (!defined $configfile)
+ {
+ $configfile = $constructor_params->{$init_arg} if defined $init_arg;
+ }
+
if(!defined $configfile) {
- my $cfmeta = $class->meta->find_attribute_by_name('configfile');
- $configfile = $cfmeta->default if $cfmeta->has_default;
+ # this is a classic legacy usecase documented in
+ # MooseX::ConfigFromFile that we should continue to support
+ $configfile = try { $class->configfile };
+
+ $configfile = $cfmeta->default
+ if not defined $configfile and $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 {
+ $config_from_file = try {
$class->get_config_from_file($configfile);
- };
- if ($@) {
- die $@ unless $@ =~ /Specified configfile '\Q$configfile\E' does not exist/;
}
+ catch {
+ die $_ unless /Specified configfile '\Q$configfile\E' does not exist/;
+ };
}
+
+ $constructor_params->{$init_arg} = $configfile
+ if defined $configfile and defined $init_arg;
}
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';
# did the user request usage information?
if ( $processed{usage} and $params->{help_flag} ) {
- $class->_getopt_full_usage($processed{usage});
+ $class->print_usage_text($processed{usage});
}
return MooseX::Getopt::ProcessedArgv->new(
my $argv_copy = [ @ARGV ];
my @warnings;
- my ( $parsed_options, $usage ) = eval {
+ my ( $parsed_options, $usage ) = try {
local $SIG{__WARN__} = sub { push @warnings, @_ };
return $class->_getopt_get_options(\%params, $opt_spec);
+ }
+ catch {
+ $class->_getopt_spec_exception(\@warnings, $_);
};
$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 ];
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";
=method process_argv
-See L<MooseX::Getopt/process_agv>.
+See L<MooseX::Getopt/process_argv>.
=cut