X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FGetopt%2FBasic.pm;h=691f67299726033ae720070018275d0e5ff254b0;hb=bde911ddcfdec86961080d6292ff414753671793;hp=808ff18c4a09cf5e3b6830e651e070b25fff8759;hpb=0a386894d3dec0e948fc40d9f0019a4d2752edf6;p=gitmo%2FMooseX-Getopt.git

diff --git a/lib/MooseX/Getopt/Basic.pm b/lib/MooseX/Getopt/Basic.pm
index 808ff18..691f672 100644
--- a/lib/MooseX/Getopt/Basic.pm
+++ b/lib/MooseX/Getopt/Basic.pm
@@ -7,12 +7,13 @@ use MooseX::Getopt::OptionTypeMap;
 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) = @_;
@@ -30,29 +31,37 @@ sub process_argv {
         $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)
         {
-            my $key = $cfmeta->init_arg;
-            $configfile = $constructor_params->{$key} if $key;
+            $configfile = $constructor_params->{$init_arg} if defined $init_arg;
         }
 
         if(!defined $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);
@@ -73,7 +82,7 @@ sub process_argv {
 
     # 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(
@@ -112,14 +121,16 @@ sub _parse_argv {
     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 ];
@@ -152,11 +163,18 @@ sub _getopt_spec_exception {
     die @$warnings, $exception;
 }
 
-sub _getopt_full_usage {
+# maintained for backwards compatibility only
+sub _getopt_full_usage
+{
     my ($self, $usage) = @_;
     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";
@@ -286,6 +304,6 @@ See L<MooseX::Getopt/new_with_options>.
 
 =method process_argv
 
-See L<MooseX::Getopt/process_agv>.
+See L<MooseX::Getopt/process_argv>.
 
 =cut