Remove most of the horrible

diff --git a/TODO.scripts b/TODO.scripts
index 50af8dd..7e779d7 100644 (file)
--- a/TODO.scripts
+++ b/TODO.scripts
@@ -1,2 +1 @@
-* Fix the horrible hacking that is Catalyst::ScriptRole::Useage
 * Fix TODO tests

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index 9e67685..bef547a 100644 (file)
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -9,6 +9,7 @@ with 'MooseX::Getopt' => {
     excludes => [qw/
         _getopt_spec_warnings
         _getopt_spec_exception
+        _getopt_full_usage
     /],
 };
 
@@ -33,7 +34,7 @@ sub _getopt_spec_warnings {
     warn @_;
 }
 
-sub _exit_with_usage {
+sub _getopt_full_usage {
     my $self = shift;
     pod2usage();
     exit 0;
@@ -41,7 +42,7 @@ sub _exit_with_usage {
 
 before run => sub {
     my $self = shift;
-    $self->_exit_with_usage if $self->help;
+    $self->_getopt_full_usage if $self->help;
 };
 
 sub run {
@@ -60,25 +61,6 @@ sub _run_application {
     $app->run($self->_application_args);
 }
 
-# GROSS HACK, temporary until MX::Getopt gets some proper refactoring and unfucking..
-around '_parse_argv' => sub {
-    my ($orig, $self, @args) = @_;
-    my %data = eval { $self->$orig(@args) };
-    $self->_exit_with_usage($@) if $@;
-    $data{usage} = Catalyst::ScriptRole::Useage->new(code => sub { shift; $self->_exit_with_usage(@_) });
-    return %data;
-};
-
-# This package is going away.
-package # Hide from PAUSE
-    Catalyst::ScriptRole::Useage;
-use Moose;
-use namespace::autoclean;
-
-has code => ( is => 'ro', required => 1 );
-
-sub die { shift->code->(@_) }
-
 1;
 
 =head1 NAME