X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FGetopt%2FBasic.pm;h=240f683f263b893e1046b67f6bf5c22e86b28198;hb=b150707212285aa9a67390a15ececeb9ef204cdd;hp=6b4d40ec655af55279072ace77352f4a7465d751;hpb=c885acae4797dc3ce50e91445ceb96c971e87671;p=gitmo%2FMooseX-Getopt.git

diff --git a/lib/MooseX/Getopt/Basic.pm b/lib/MooseX/Getopt/Basic.pm
index 6b4d40e..240f683 100644
--- a/lib/MooseX/Getopt/Basic.pm
+++ b/lib/MooseX/Getopt/Basic.pm
@@ -11,24 +11,34 @@ 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 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
@@ -49,8 +59,6 @@ sub process_argv {
         }
     }
 
-    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';
 
@@ -65,7 +73,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(
@@ -144,11 +152,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";
@@ -278,6 +293,6 @@ See L<MooseX::Getopt/new_with_options>.
 
 =method process_argv
 
-See L<MooseX::Getopt/process_agv>.
+See L<MooseX::Getopt/process_argv>.
 
 =cut