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=1a66be51762f5b3739c63d65a2bdea6b03a86128;hpb=e8e1e4b3f6ffedc24b309b05d8bfdbf2695d5d42;p=gitmo%2FMooseX-Getopt.git

diff --git a/lib/MooseX/Getopt/Basic.pm b/lib/MooseX/Getopt/Basic.pm
index 1a66be5..6b4d40e 100644
--- a/lib/MooseX/Getopt/Basic.pm
+++ b/lib/MooseX/Getopt/Basic.pm
@@ -24,7 +24,7 @@ sub process_argv {
         # 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) {
@@ -64,25 +64,23 @@ sub process_argv {
     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
-        (
+    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);    
+    my $pa = $class->process_argv(@params);
 
     $class->new(
         ARGV       => $pa->argv_copy,
@@ -90,7 +88,7 @@ sub new_with_options {
         ( $pa->usage ? ( usage => $pa->usage ) : () ),
         %{ $pa->constructor_params }, # explicit params to ->new
         %{ $pa->cli_params }, # params from CLI
-        );
+    );
 }
 
 sub _getopt_spec { shift->_traditional_spec(@_); }
@@ -148,7 +146,8 @@ sub _getopt_spec_exception {
 
 sub _getopt_full_usage {
     my ($self, $usage) = @_;
-    $usage->die;
+    print $usage->text;
+    exit 0;
 }
 
 sub _usage_format {