From: Devin Austin <devin.austin@gmail.com>
Date: Thu, 25 Jun 2009 02:03:00 +0000 (+0000)
Subject: fixed Server and testapp_server.pl. Test still wonky
X-Git-Tag: 5.80014_02~130
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=a3ca446895872bbfbb21f264f6ef95d266822cae

fixed Server and testapp_server.pl. Test still wonky
---

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 888119a..859721a 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -1,53 +1,43 @@
 package Catalyst::Script::Server;
 
-=head1 NAME
 
-testapp_server.pl - Catalyst Testserver
+use FindBin qw/$Bin/;
+use lib "$Bin/../lib";
+use Pod::Usage;
+use Moose;
+use Catalyst::Engine::HTTP;
+use namespace::clean -except => [ qw(meta) ];
+
+with 'MooseX::Getopt';
+
+has help        => ( isa => 'Bool',   is => 'ro', required => 0, default => sub { 0 } );
+has host        => ( isa => 'Str',    is => 'ro', required => 0 );
+has fork        => ( isa => 'Bool',   is => 'ro', required => 0 );
+has listen      => ( isa => 'Int',    is => 'ro', required => 0, default => sub{ 3000 } );
+has pidfile     => ( isa => 'Str',    is => 'ro', required => 0 );
+has keepalive   => ( isa => 'Bool',   is => 'ro', required => 0, default => sub { 0 } );
+has background  => ( isa => 'Bool',   is => 'ro', required => 0 );
+has app         => ( isa => 'Str',    is => 'ro', required => 1 );
+
+my @argv = @ARGV;
+
+sub run {
+    my $self = shift;
+    
+    pod2usage() if $self->help;
+    my $app = $self->app;
+    Class::MOP::load_class($app);
+    $app->run(
+        $self->listen, $self->host,
+        {  
+           'fork'     => $self->fork,
+           keepalive  => $self->keepalive,
+           background => $self->background,
+           pidfile    => $self->pidfile,
+        }  
+    );
+
+}
 
-=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
 
 1;
diff --git a/t/TestApp/script/testapp_server.pl b/t/TestApp/script/testapp_server.pl
index c25a85e..b4f3ba8 100755
--- a/t/TestApp/script/testapp_server.pl
+++ b/t/TestApp/script/testapp_server.pl
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 
 use FindBin qw/$Bin/;
+BEGIN { 
+    $ENV{CATALYST_ENGINE} ||= 'HTTP';
+    $ENV{CATALYST_SCRIPT_GEN} = 31;
+    require Catalyst::Engine::HTTP;
+} 
 
 ## because this is a test
 use lib "$Bin/../../../lib";
diff --git a/t/start_dev_server.t b/t/start_dev_server.t
index 31fc26f..b6f12b2 100644
--- a/t/start_dev_server.t
+++ b/t/start_dev_server.t
@@ -8,7 +8,11 @@ use File::Spec;
 use lib "$Bin/TestApp/lib";
 use TestApp;
 use Test::WWW::Mechanize;
-
+BEGIN { 
+    $ENV{CATALYST_ENGINE} ||= 'HTTP';
+    $ENV{CATALYST_SCRIPT_GEN} = 31;
+    require Catalyst::Engine::HTTP;
+} 
 my $dir = tempdir(); # CLEANUP => 1 );
 my $devnull = File::Spec->devnull;