X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FGetopt.pm;h=0c16a20154114a6309e89e6499eb173c219a9640;hb=ee69c4ba080aacb8eaa084320e9f96bb1ab40c9f;hp=1417d08e2ba214c142ad2011ae01f8a58b7330a5;hpb=26be7f7ed5cd799ab80bf512505ca3474626236e;p=gitmo%2FMooseX-Getopt.git

diff --git a/lib/MooseX/Getopt.pm b/lib/MooseX/Getopt.pm
index 1417d08..0c16a20 100644
--- a/lib/MooseX/Getopt.pm
+++ b/lib/MooseX/Getopt.pm
@@ -6,27 +6,38 @@ use Getopt::Long ();
 
 use MooseX::Getopt::OptionTypeMap;
 use MooseX::Getopt::Meta::Attribute;
+use MooseX::Getopt::Meta::Attribute::NoGetopt;
 
-our $VERSION   = '0.06';
+our $VERSION   = '0.07';
 our $AUTHORITY = 'cpan:STEVAN';
 
 has ARGV       => (is => 'rw', isa => 'ArrayRef');
 has extra_argv => (is => 'rw', isa => 'ArrayRef');
 
 sub new_with_options {
-    my ($class, %params) = @_;
+    my ($class, @params) = @_;
 
     my %processed = $class->_parse_argv( 
         options => [ 
-            $class->_attrs_to_options( %params ) 
+            $class->_attrs_to_options( @params ) 
         ] 
     );
 
+    my $params = $processed{params};
+
+    if($class->meta->does_role('MooseX::ConfigFromFile')
+       && defined $params->{configfile}) {
+        %$params = (
+            %{$class->get_config_from_file($params->{configfile})},
+            %$params,
+        );
+    }
+
     $class->new(
         ARGV       => $processed{argv_copy},
         extra_argv => $processed{argv},
-        %params, # explicit params to ->new
-        %{ $processed{params} }, # params from CLI
+        @params, # explicit params to ->new
+        %$params, # params from CLI
     );
 }
 
@@ -64,12 +75,23 @@ sub _parse_argv {
     );
 }
 
+sub _compute_getopt_attrs {
+    my $class = shift;
+    grep {
+        $_->isa("MooseX::Getopt::Meta::Attribute")
+            or
+        $_->name !~ /^_/
+            &&
+        !$_->isa('MooseX::Getopt::Meta::Attribute::NoGetopt')
+    } $class->meta->compute_all_applicable_attributes
+}
+
 sub _attrs_to_options {
     my $class = shift;
 
     my @options;
 
-    foreach my $attr ($class->meta->compute_all_applicable_attributes) {
+    foreach my $attr ($class->_compute_getopt_attrs) {
         my $name = $attr->name;
 
         my $aliases;
@@ -78,9 +100,6 @@ sub _attrs_to_options {
             $name = $attr->cmd_flag if $attr->has_cmd_flag;
             $aliases = $attr->cmd_aliases if $attr->has_cmd_aliases;
         }
-        else {
-            next if $name =~ /^_/;
-        }
 
         my $opt_string = $aliases
             ? join(q{|}, $name, @$aliases)
@@ -153,6 +172,9 @@ accordingly.
 You can use the attribute metaclass L<MooseX::Getopt::Meta::Attribute>
 to get non-default commandline option names and aliases.
 
+You can use the attribute metaclass L<MooseX::Getopt::Meta::Attribute::NoGetOpt>
+to have C<MooseX::Getopt> ignore your attribute in the commandline options.
+
 By default, attributes which start with an underscore are not given
 commandline argument support, unless the attribute's metaclass is set
 to L<MooseX::Getopt::Meta::Attribute>. If you don't want you accessors
@@ -167,6 +189,11 @@ to have the leading underscore in thier name, you can do this:
 This will mean that Getopt will not handle a --foo param, but your 
 code can still call the C<foo> method. 
 
+If your class also uses a configfile-loading role based on
+L<MooseX::ConfigFromFile>, such as L<MooseX::SimpleConfig>,
+L<MooseX::Getopt>'s C<new_with_options> will load the configfile
+specified by the C<--configfile> option for you.
+
 =head2 Supported Type Constraints
 
 =over 4