Kind of, sort of make the server work, except it doesn't

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 01a066f..7ddad3e 100644 (file)
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -42,7 +42,7 @@ sub run {
            restart           => $self->restart,
            restart_delay     => $self->restart_delay,
            restart_regex     => qr/$self->restart_regex/,
-           restart_directory => $self->restart_directory,
+# FIXME    restart_directory => $self->restart_directory,
            follow_symlinks   => $self->follow_symlinks,
         }  
     );

diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index ec5555e..b20faf5 100644 (file)
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -3,13 +3,14 @@ use Moose;
 
 sub run {
     my ($self, $class, $scriptclass) = @_;
-    my $classtoload = "${class}::Script::$scriptclass"; 
-    
-    if ( Class::MOP::load_class($classtoload) ) {  
-        $classtoload->new_with_options->run;
+    my $classtoload = "${class}::Script::$scriptclass";
+
+    # FIXME - Error handling / reporting
+    if ( eval { Class::MOP::load_class($classtoload) } ) {
     } else {
         $classtoload = "Catalyst::Script::$scriptclass";
-        $classtoload->new_with_options->run;
+        Class::MOP::load_class($classtoload);
     }
+    $classtoload->new_with_options( app => $class )->run;
 }
 1;