* MooseX::Getopt: Combine new options also from old options.

[gitmo/MooseX-Getopt.git] / lib / MooseX / Getopt.pm

diff --git a/lib/MooseX/Getopt.pm b/lib/MooseX/Getopt.pm
index 27c17c8..30eb306 100644 (file)
--- a/lib/MooseX/Getopt.pm
+++ b/lib/MooseX/Getopt.pm
@@ -1,5 +1,9 @@
 
 package MooseX::Getopt;
+
+our $VERSION   = '0.150001';
+our $AUTHORITY = 'cpan:STEVAN';
+
 use Moose::Role;
 
 use Moose::Util::TypeConstraints;
@@ -12,18 +16,17 @@ use MooseX::Getopt::Meta::Attribute;
 use MooseX::Getopt::Meta::Attribute::NoGetopt;
 
 
-our $VERSION   = '0.15';
-our $AUTHORITY = 'cpan:STEVAN';
+use Getopt::Long ();
 
 
 use constant _default_getopt_session => 'MooseX::Getopt::Session';
 
 
 has getopt => (
-    is => 'rw',
-    isa => 'MooseX::Getopt::Session',
+    is        => 'rw',
+    isa       => 'MooseX::Getopt::Session',
     metaclass => 'NoGetopt',
-    handles => [ 'ARGV', 'extra_argv' ],
+    handles   => [ 'ARGV', 'extra_argv' ],
 );
 
 
@@ -37,52 +40,63 @@ sub new_with_options {
 sub get_options_from_argv {
     my $class = shift;
 
-    Moose->throw_error("Single parameters to get_options_from_argv() must be a HASH ref")
-        if ref $_[0] and ref $_ ne 'HASH';
+    Moose->throw_error(
+        "Single parameters to get_options_from_argv() must be a HASH ref"
+    ) if ref $_[0] and ref $_ ne 'HASH';
 
-    my %params = ( $class->_get_options_from_configfile, @_ == 1 ? %{ $_[0] } : @_ );
+    my %args = @_ == 1 ? %{ $_[0] } : @_;
 
-    my $getopt = defined $params{getopt}
-                 ? $params{getopt}
+    my $getopt = defined $args{getopt}
+                 ? $args{getopt}
                  : $class->_default_getopt_session->new(
                        classes_filter => sub { $_ eq $class },
-                       params => \%params,
-                   );
-
-    my %new_params = (
-        %{ $getopt->params },                   # params from session object
-        %params,                                # explicit params to ->new
-        %{ $getopt->options },                  # params from CLI
-        getopt => $getopt,
+                 );
+
+    # Combine explicit options and resend to session object
+    my %options = (
+        %{ $getopt->options },                  # options from getopt session
+        $class->get_options_from_configfile,    # options from --configfile
+        %args,                                  # options from @_
     );
+    $getopt->options( { %options } );
 
-    return %new_params;
+    # Call Getopt parser only once.
+    $getopt->build_options if not $getopt->has_status;
+
+    # Combine final options
+    my %new_options = (
+        %options,                 # explicit options
+        %{ $getopt->options },    # options from CLI
+        getopt => $getopt,        # session object itself
+    );
+
+    return wantarray ? %new_options : \%new_options;
 };
 
 
-sub _get_options_from_configfile {
+sub get_options_from_configfile {
     my $class = shift;
 
-    my %params = ();
+    my %options;
 
-    if ($class->meta->does_role('MooseX::ConfigFromFile')) {
+    if ( $class->meta->does_role('MooseX::ConfigFromFile') ) {
         local @ARGV = @ARGV;
 
         my $configfile;
-        my $opt_parser = Getopt::Long::Parser->new( config => [ 'pass_through' ] );
+        my $opt_parser = Getopt::Long::Parser->new( config => ['pass_through'] );
         $opt_parser->getoptions( "configfile=s" => \$configfile );
 
-        if (not defined $configfile) {
+        if ( not defined $configfile ) {
             my $cfmeta = $class->meta->find_attribute_by_name('configfile');
             $configfile = $cfmeta->default if $cfmeta->has_default;
         };
 
-        if (defined $configfile) {
-            %params = %{ $class->get_config_from_file($configfile) };
+        if ( defined $configfile ) {
+            %options = %{ $class->get_config_from_file($configfile) };
         };
     };
 
-    return %params;
+    return wantarray ? %options : \%options;
 };
 
 
@@ -91,8 +105,7 @@ sub _compute_getopt_attrs {
 
     return grep {
         $_->does('MooseX::Getopt::Meta::Attribute::Trait')
-            or
-        $_->name !~ /^_/
+        or $_->name !~ /^_/
     } grep {
         !$_->does('MooseX::Getopt::Meta::Attribute::Trait::NoGetopt')
     } $class->meta->compute_all_applicable_attributes;
@@ -101,6 +114,7 @@ sub _compute_getopt_attrs {
 
 no Moose::Role; 1;
 
+
 __END__
 
 =pod
@@ -198,6 +212,11 @@ which would enable the following command line options:
 These type constraints are set up as properly typed options with
 Getopt::Long, using the C<=i>, C<=f> and C<=s> modifiers as appropriate.
 
+=item I<Defined|Int>, I<Defined|Float>, I<Defined|Str>
+
+These type constaints are set up as properly typed options with
+Getopt::Long, using the C<:i>, C<:f> and C<:s> modifiers as appropriate.
+
 =item I<ArrayRef>
 
 An I<ArrayRef> type constraint is set up as a multiple value option
@@ -339,6 +358,11 @@ C<new>.
 This method returns the list of parameters collected from command line
 without creating the new object.
 
+=item B<get_options_from_configfile>
+
+This method returns the list of parameters collected with
+L<MooseX::ConfigFromFile> mechanism.
+
 =item B<ARGV>
 
 This accessor contains a reference to a copy of the C<@ARGV> array as it
@@ -392,12 +416,12 @@ Brandon L. Black, E<lt>blblack@gmail.comE<gt>
 
 Yuval Kogman, E<lt>nothingmuch@woobling.orgE<gt>
 
+Piotr Roszatycki, E<lt>dexter@cpan.orgE<gt>
+
 =head1 CONTRIBUTORS
 
 Ryan D Johnson, E<lt>ryan@innerfence.comE<gt>
 
-Piotr Roszatycki, E<lt>dexter@cpan.orgE<gt>
-
 =head1 COPYRIGHT AND LICENSE
 
 Copyright 2007-2008 by Infinity Interactive, Inc.