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

diff --git a/lib/MooseX/Getopt/Basic.pm b/lib/MooseX/Getopt/Basic.pm
index 9a6c79a..6b4d40e 100644
--- a/lib/MooseX/Getopt/Basic.pm
+++ b/lib/MooseX/Getopt/Basic.pm
@@ -6,6 +6,7 @@ use Moose::Role;
 use MooseX::Getopt::OptionTypeMap;
 use MooseX::Getopt::Meta::Attribute;
 use MooseX::Getopt::Meta::Attribute::NoGetopt;
+use MooseX::Getopt::ProcessedArgv;
 use Carp ();
 
 use Getopt::Long 2.37 ();
@@ -13,7 +14,7 @@ use Getopt::Long 2.37 ();
 has ARGV       => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
 has extra_argv => (is => 'rw', isa => 'ArrayRef', metaclass => "NoGetopt");
 
-sub new_with_options {
+sub process_argv {
     my ($class, @params) = @_;
 
     my $config_from_file;
@@ -23,7 +24,7 @@ sub new_with_options {
         # just get the configfile arg now; 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 );
 
         if(!defined $configfile) {
@@ -63,17 +64,30 @@ sub new_with_options {
     my $params = $config_from_file ? { %$config_from_file, %{$processed{params}} } : $processed{params};
 
     # did the user request usage information?
-    if ( $processed{usage} and $params->{help_flag} )
-    {
+    if ( $processed{usage} and $params->{help_flag} ) {
         $class->_getopt_full_usage($processed{usage});
     }
 
+    return MooseX::Getopt::ProcessedArgv->new(
+         argv_copy          => $processed{argv_copy},
+         extra_argv         => $processed{argv},
+         usage              => $processed{usage},
+         constructor_params => $constructor_params, # explicit params to ->new
+         cli_params         => $params, # params from CLI
+    );
+}
+
+sub new_with_options {
+    my ($class, @params) = @_;
+
+    my $pa = $class->process_argv(@params);
+
     $class->new(
-        ARGV       => $processed{argv_copy},
-        extra_argv => $processed{argv},
-        ( $processed{usage} ? ( usage => $processed{usage} ) : () ),
-        %$constructor_params, # explicit params to ->new
-        %$params, # params from CLI
+        ARGV       => $pa->argv_copy,
+        extra_argv => $pa->extra_argv,
+        ( $pa->usage ? ( usage => $pa->usage ) : () ),
+        %{ $pa->constructor_params }, # explicit params to ->new
+        %{ $pa->cli_params }, # params from CLI
     );
 }
 
@@ -132,7 +146,8 @@ sub _getopt_spec_exception {
 
 sub _getopt_full_usage {
     my ($self, $usage) = @_;
-    $usage->die;
+    print $usage->text;
+    exit 0;
 }
 
 sub _usage_format {
@@ -158,6 +173,7 @@ sub _traditional_spec {
 
 sub _compute_getopt_attrs {
     my $class = shift;
+    sort { $a->insertion_order <=> $b->insertion_order }
     grep {
         $_->does("MooseX::Getopt::Meta::Attribute::Trait")
             or
@@ -260,4 +276,8 @@ doesn't make use of L<Getopt::Long::Descriptive> (or "GLD" for short).
 
 See L<MooseX::Getopt/new_with_options>.
 
+=method process_argv
+
+See L<MooseX::Getopt/process_agv>.
+
 =cut