X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRunner.pm;h=247ce309c7172508ce938f15fd4b53e3302ad8fa;hb=fb34eb9c063c53abd061d260a30f0ca7c57a0833;hp=58a65fc146ee2e3b78f6ab3341f1458b6302bd33;hpb=d3082facb5273f9970121638c0385ecfc0f7b090;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index 58a65fc..247ce30 100644
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -1,36 +1,49 @@
 package Catalyst::ScriptRunner;
 use Moose;
+use FindBin;
+use lib;
+use File::Spec;
 use namespace::autoclean;
 
 sub run {
     my ($self, $class, $scriptclass) = @_;
     my $classtoload = "${class}::Script::$scriptclass";
 
-    # FIXME - Error handling / reporting
-    if ( eval { Class::MOP::load_class($classtoload) } ) {
-    }
-    else {
+    lib->import(File::Spec->catdir($FindBin::Bin, '..', 'lib'));
+
+    unless ( eval { Class::MOP::load_class($classtoload) } ) {
+        warn("Could not load $classtoload - falling back to Catalyst::Script::$scriptclass : $@\n")
+            if $@ !~ /Can't locate/;
         $classtoload = "Catalyst::Script::$scriptclass";
         Class::MOP::load_class($classtoload);
     }
-    $classtoload->new_with_options( app => $class )->run;
+    $classtoload->new_with_options( application_name => $class )->run;
 }
 
 __PACKAGE__->meta->make_immutable;
 
 =head1 NAME
 
-Catalyst::ScriptRunner - The Catalyst Framework Script runner
+Catalyst::ScriptRunner - The Catalyst Framework script runner
 
 =head1 SYNOPSIS
 
-See L<Catalyst>.
+    # Will run MyApp::Script::Server if it exists, otherwise
+    # will run Catalyst::Script::Server.
+    Catalyst::ScriptRunner->run('MyApp', 'Server');
 
 =head1 DESCRIPTION
 
 This class is responsible for running scripts, either in the application specific namespace
 (e.g. C<MyApp::Script::Server>), or the Catalyst namespace (e.g. C<Catalyst::Script::Server>)
 
+=head1 METHODS
+
+=head2 run ($application_class, $scriptclass)
+
+Called with two parameters, the application classs (e.g. MyApp)
+and the script class, (i.e. one of Server/FastCGI/CGI/Create/Test)
+
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm