[Catalyst-commits] r10796 - in Catalyst-Runtime/5.80/branches/better_scripts: lib/Catalyst/Script t/TestApp/script

[dhoss at dev.catalyst.perl.org]

Author: dhoss
Date: 2009-07-04 02:01:44 +0000 (Sat, 04 Jul 2009)
New Revision: 10796

Modified:
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
   Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl
Log:
Updated testapp_server
broke Script::Server, why?!


Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm	2009-07-04 00:58:02 UTC (rev 10795)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm	2009-07-04 02:01:44 UTC (rev 10796)
@@ -73,7 +73,13 @@
     required => 0 
 );
 
-has app => ( isa => 'Str',    is => 'ro', required => 1 ); # THIS IS FUCKING RETARDED HALP PLZ
+has app => ( 
+    traits => [qw(NoGetopt)],
+    isa => 'Str',    
+    is => 'ro', 
+    required => 1,
+); 
+
 has restart => (
     traits => [qw(Getopt)],
     cmd_aliases => 'r', 
@@ -117,11 +123,11 @@
     $app->run(
         $self->listen, $self->host,
         {  
-           'fork'     => $self->fork,
-           keepalive  => $self->keepalive,
-           background => $self->background,
-           pidfile    => $self->pidfile,
+           'fork'            => $self->fork,
            keepalive         => $self->keepalive,
+           background        => $self->background,
+           pidfile           => $self->pidfile,
+           keepalive         => $self->keepalive,
            restart           => $self->restart,
            restart_delay     => $self->restart_delay,
            restart_regex     => qr/$self->restart_regex/,
@@ -144,27 +150,27 @@
 [% appprefix %]_server.pl [options]
 
  Options:
-   -d -debug          force debug mode
-   -f -fork           handle each request in a new process
+   -d     --debug          force debug mode
+   -f     --fork           handle each request in a new process
                       (defaults to false)
-   -? -help           display this help and exits
-      -host           host (defaults to all)
-   -p -port           port (defaults to 3000)
-   -k -keepalive      enable keep-alive connections
-   -r -restart        restart when files get modified
-                      (defaults to false)
-   -rd -restartdelay  delay between file checks
+   -h     --help           display this help and exits
+          --host           host (defaults to all)
+   -p     --port           port (defaults to 3000)
+   -k     --keepalive      enable keep-alive connections
+   -r     --restart        restart when files get modified
+                       (defaults to false)
+   --rd   --restartdelay  delay between file checks
                       (ignored if you have Linux::Inotify2 installed)
-   -rr -restartregex  regex match files that trigger
+   --rr   --restartregex  regex match files that trigger
                       a restart when modified
                       (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
-   -restartdirectory  the directory to search for
+   --rdir --restartdirectory  the directory to search for
                       modified files, can be set mulitple times
                       (defaults to '[SCRIPT_DIR]/..')
-   -follow_symlinks   follow symlinks in search directories
+   --sym  --follow_symlinks   follow symlinks in search directories
                       (defaults to false. this is a no-op on Win32)
-   -background        run the process in the background
-   -pidfile           specify filename for pid file
+   --bg   --background        run the process in the background
+   --pid  --pidfile           specify filename for pid file
 
  See also:
    perldoc Catalyst::Manual

Modified: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl	2009-07-04 00:58:02 UTC (rev 10795)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl	2009-07-04 02:01:44 UTC (rev 10796)
@@ -11,54 +11,3 @@
 use lib "$Bin/../../../lib";
 use Catalyst::ScriptRunner;
 Catalyst::ScriptRunner->run('Catalyst','Server');
-
-
-=head1 NAME
-
-testapp_server.pl - Catalyst Testserver
-
-=head1 SYNOPSIS
-
-testapp_server.pl [options]
-
- Options:
-   -d -debug          force debug mode
-   -f -fork           handle each request in a new process
-                      (defaults to false)
-   -? -help           display this help and exits
-      -host           host (defaults to all)
-   -p -port           port (defaults to 3000)
-   -k -keepalive      enable keep-alive connections
-   -r -restart        restart when files get modified
-                      (defaults to false)
-   -rd -restartdelay  delay between file checks
-                      (ignored if you have Linux::Inotify2 installed)
-   -rr -restartregex  regex match files that trigger
-                      a restart when modified
-                      (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
-   -restartdirectory  the directory to search for
-                      modified files, can be set mulitple times
-                      (defaults to '[SCRIPT_DIR]/..')
-   -follow_symlinks   follow symlinks in search directories
-                      (defaults to false. this is a no-op on Win32)
-   -background        run the process in the background
-   -pidfile           specify filename for pid file
-
- See also:
-   perldoc Catalyst::Manual
-   perldoc Catalyst::Manual::Intro
-
-=head1 DESCRIPTION
-
-Run a Catalyst Testserver for this application.
-
-=head1 AUTHORS
-
-Catalyst Contributors, see Catalyst.pm
-
-=head1 COPYRIGHT
-
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut