X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRole.pm;h=6ff8d289ba456e5a223a9923fdb372872efcad5b;hb=cc7738c0fb5c4b5dc601734e7b525391d81d6639;hp=797a0d7769f8607f8ec2ff7f9616dd816c38d23f;hpb=d0a1ec3671580e68252239b2ab5a503fc94b6ed8;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index 797a0d7..6ff8d28 100644
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -4,14 +4,14 @@ use Pod::Usage;
 use MooseX::Getopt;
 use Catalyst::EngineLoader;
 use Moose::Util::TypeConstraints;
-use Catalyst::Utils qw/ ensure_class_loaded /;
-use namespace::autoclean;
+use Catalyst::Utils;
+use namespace::clean -except => [ 'meta' ];
 
 subtype 'Catalyst::ScriptRole::LoadableClass',
   as 'ClassName';
 coerce 'Catalyst::ScriptRole::LoadableClass',
   from 'Str',
-  via { ensure_class_loaded($_); 1 };
+  via { Catalyst::Utils::ensure_class_loaded($_); $_ };
 
 with 'MooseX::Getopt' => {
     -version => 0.48,
@@ -87,7 +87,7 @@ sub _plack_engine_name {}
 sub _run_application {
     my $self = shift;
     my $app = $self->application_name;
-    Class::MOP::load_class($app);
+    Catalyst::Utils::ensure_class_loaded($app);
     my $server;
     if (my $e = $self->_plack_engine_name ) {
         $server = $self->load_engine($e, $self->_plack_loader_args);
@@ -126,7 +126,7 @@ The method invoked to run the application.
 
 =head2 print_usage_text
 
-Prints out the useage text for the script you tried to invoke.
+Prints out the usage text for the script you tried to invoke.
 
 =head1 ATTRIBUTES