From: Tomas Doran Date: Sat, 11 Jul 2009 18:10:02 +0000 (+0000) Subject: Strip trailing spaces X-Git-Tag: 5.80014_02~94 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=57dc50b07c8e492f4eb4a0e946b38725fbdb5eb8 Strip trailing spaces --- diff --git a/lib/Catalyst/Script/CGI.pm b/lib/Catalyst/Script/CGI.pm index 48e1d43..1014854 100644 --- a/lib/Catalyst/Script/CGI.pm +++ b/lib/Catalyst/Script/CGI.pm @@ -15,7 +15,7 @@ has help => ( isa => 'Bool', is => 'ro', required => 0, default => sub { 0 } ) sub run { my $self = shift; - + pod2usage() if $self->help; my $app = $self->app; Class::MOP::load_class($app); diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm index 9ef4f63..6cee858 100644 --- a/lib/Catalyst/Script/FastCGI.pm +++ b/lib/Catalyst/Script/FastCGI.pm @@ -21,19 +21,19 @@ has app => ( isa => 'Str', is => 'ro', required => 1 ); sub run { my $self = shift; - + pod2usage() if $self->help; my $app = $self->app; Class::MOP::load_class($app); $app->run( $self->listen, - { + { nproc => $self->nproc, pidfile => $self->pidfile, manager => $self->manager, detach => $self->detach, keep_stderr => $self->keep_stderr, - } + } ); } diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index d087eb6..1094998 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -19,88 +19,88 @@ with 'MooseX::Getopt'; has debug => ( traits => [qw(Getopt)], cmd_aliases => 'd', - isa => 'Bool', + isa => 'Bool', is => 'ro', documentation => qq{ - -d --debug force debug mode + -d --debug force debug mode } ); -has help => ( +has help => ( traits => [qw(Getopt)], cmd_aliases => 'h', - isa => 'Bool', - is => 'ro', + isa => 'Bool', + is => 'ro', documentation => qq{ - -h --help display this help and exits - }, + -h --help display this help and exits + }, ); -has host => ( - isa => 'Str', - is => 'ro', - , - default => "localhost" +has host => ( + isa => 'Str', + is => 'ro', + , + default => "localhost" ); -has fork => ( +has fork => ( traits => [qw(Getopt)], cmd_aliases => 'f', isa => 'Bool', - is => 'ro', - + is => 'ro', + ); -has listen => ( +has listen => ( traits => [qw(Getopt)], cmd_aliases => 'l', isa => 'Int', - is => 'ro', - , - default => "3000" + is => 'ro', + , + default => "3000" ); -has pidfile => ( +has pidfile => ( traits => [qw(Getopt)], cmd_aliases => 'pid', - isa => 'Str', - is => 'ro', - + isa => 'Str', + is => 'ro', + ); -has keepalive => ( +has keepalive => ( traits => [qw(Getopt)], cmd_aliases => 'k', - isa => 'Bool', - is => 'ro', - , - + isa => 'Bool', + is => 'ro', + , + ); -has background => ( +has background => ( traits => [qw(Getopt)], cmd_aliases => 'bg', - isa => 'Bool', - is => 'ro', + isa => 'Bool', + is => 'ro', ); -has _app => ( - reader => 'app', +has _app => ( + reader => 'app', init_arg => 'app', traits => [qw(NoGetopt)], - isa => 'Str', - is => 'ro', -); + isa => 'Str', + is => 'ro', +); has restart => ( traits => [qw(Getopt)], - cmd_aliases => 'r', - isa => 'Bool', - is => 'ro', - -); + cmd_aliases => 'r', + isa => 'Bool', + is => 'ro', + +); has restart_directory => ( traits => [qw(Getopt)], @@ -109,33 +109,33 @@ has restart_directory => ( is => 'ro', ); -has restart_delay => ( +has restart_delay => ( traits => [qw(Getopt)], cmd_aliases => 'rdel', - isa => 'Int', - is => 'ro', - + isa => 'Int', + is => 'ro', + ); -has restart_regex => ( +has restart_regex => ( traits => [qw(Getopt)], cmd_aliases => 'rxp', - isa => 'Str', - is => 'ro', - + isa => 'Str', + is => 'ro', + ); -has follow_symlinks => ( +has follow_symlinks => ( traits => [qw(Getopt)], cmd_aliases => 'sym', - isa => 'Bool', - is => 'ro', - + isa => 'Bool', + is => 'ro', + ); sub usage { my ($self) = shift; - + return pod2usage(); } @@ -144,9 +144,9 @@ my @argv = @ARGV; sub run { my $self = shift; - + $self->usage if $self->help; - + if ( $self->debug ) { $ENV{CATALYST_DEBUG} = 1; } @@ -178,11 +178,11 @@ sub run { } -} - +} + sub runner { my ($self) = shift; - + # If we load this here, then in the case of a restarter, it does not # need to be reloaded for each restart. require Catalyst; @@ -190,8 +190,8 @@ sub runner { # If this isn't done, then the Catalyst::Devel tests for the restarter # fail. $| = 1 if $ENV{HARNESS_ACTIVE}; - - + + $self->usage if $self->help; my $app = $self->app; Class::MOP::load_class($app); @@ -200,17 +200,17 @@ sub runner { $ENV{CATALYST_DEBUG} = 1; } - + $app->run( $self->listen, $self->host, - { + { 'fork' => $self->fork, keepalive => $self->keepalive, background => $self->background, pidfile => $self->pidfile, keepalive => $self->keepalive, follow_symlinks => $self->follow_symlinks, - } + } ); } diff --git a/lib/Catalyst/Script/Test.pm b/lib/Catalyst/Script/Test.pm index 724a692..ed4ad64 100644 --- a/lib/Catalyst/Script/Test.pm +++ b/lib/Catalyst/Script/Test.pm @@ -15,10 +15,10 @@ sub run { Class::MOP::load_class("Catalyst::Test"); Catalyst::Test->import($self->app); - + pod2usage(1) if ( $self->help || !$ARGV[1] ); print request($ARGV[1])->content . "\n"; - + } 1;