use lib "$Bin/../lib";
use Pod::Usage;
use Moose;
-#use Catalyst::Engine::HTTP;
+use Catalyst::Restarter;
use namespace::autoclean;
with 'MooseX::Getopt';
-has help => (
+has debug => (
+ traits => [qw(Getopt)],
+ cmd_aliases => 'd',
+ isa => 'Bool',
+ is => 'ro',
+ documentation => qq{
+ -d --debug force debug mode
+ }
+
+);
+
+has help => (
traits => [qw(Getopt)],
cmd_aliases => 'h',
- isa => 'Bool',
- is => 'ro',
- required => 0,
- default => 0,
+ isa => 'Bool',
+ is => 'ro',
+ documentation => qq{
+ -h --help display this help and exits
+ },
);
-has host => (
- isa => 'Str',
- is => 'ro',
- required => 0,
- default => "localhost"
+has host => (
+ isa => 'Str',
+ is => 'ro',
+ ,
+ default => "localhost"
);
-has fork => (
+has fork => (
traits => [qw(Getopt)],
cmd_aliases => 'f',
isa => 'Bool',
- is => 'ro',
- required => 0
+ is => 'ro',
+
);
-has listen => (
+has listen => (
traits => [qw(Getopt)],
cmd_aliases => 'l',
isa => 'Int',
- is => 'ro',
- required => 0,
- default => "3000"
+ is => 'ro',
+ ,
+ default => "3000"
);
-has pidfile => (
+has pidfile => (
traits => [qw(Getopt)],
cmd_aliases => 'pid',
- isa => 'Str',
- is => 'ro',
- required => 0
+ isa => 'Str',
+ is => 'ro',
+
);
-has keepalive => (
+has keepalive => (
traits => [qw(Getopt)],
cmd_aliases => 'k',
- isa => 'Bool',
- is => 'ro',
- required => 0,
- default => 0
+ isa => 'Bool',
+ is => 'ro',
+ ,
+
);
-has background => (
+has background => (
traits => [qw(Getopt)],
cmd_aliases => 'bg',
- isa => 'Bool',
- is => 'ro',
- required => 0
+ isa => 'Bool',
+ is => 'ro',
);
-## broken now, WHY?!
-has app => (
- #traits => [qw(NoGetopt)],
- isa => 'Str',
- is => 'ro',
- required => 1,
-);
+has _app => (
+ reader => 'app',
+ init_arg => 'app',
+ traits => [qw(NoGetopt)],
+ isa => 'Str',
+ is => 'ro',
+);
has restart => (
traits => [qw(Getopt)],
- cmd_aliases => 'r',
- isa => 'Bool',
- is => 'ro',
- required => 0
+ cmd_aliases => 'r',
+ isa => 'Bool',
+ is => 'ro',
+
+);
+
+has restart_directory => (
+ traits => [qw(Getopt)],
+ cmd_aliases => 'rdir',
+ isa => 'ArrayRef[Str]',
+ is => 'ro',
+ predicate => '_has_restart_directory',
);
-has restart_delay => (
+has restart_delay => (
traits => [qw(Getopt)],
cmd_aliases => 'rdel',
- isa => 'Int',
- is => 'ro',
- required => 0
+ isa => 'Int',
+ is => 'ro',
+ predicate => '_has_restart_delay',
);
-has restart_regex => (
+has restart_regex => (
traits => [qw(Getopt)],
cmd_aliases => 'rxp',
- isa => 'Str',
- is => 'ro',
- required => 0
+ isa => 'Str',
+ is => 'ro',
+ predicate => '_has_restart_regex',
);
-has follow_symlinks => (
+has follow_symlinks => (
traits => [qw(Getopt)],
cmd_aliases => 'sym',
- isa => 'Bool',
- is => 'ro',
- required => 0
+ isa => 'Bool',
+ is => 'ro',
+ predicate => '_has_follow_symlinks',
+
);
-my @argv = @ARGV;
+sub usage {
+ my ($self) = shift;
+
+ return pod2usage();
+
+}
+
sub run {
- my $self = shift;
-
- pod2usage() if $self->help;
+ my ($self) = shift;
+
+ $self->usage if $self->help;
+
+ if ( $self->debug ) {
+ $ENV{CATALYST_DEBUG} = 1;
+ }
+
+ # If we load this here, then in the case of a restarter, it does not
+ # need to be reloaded for each restart.
+ require Catalyst;
+
+ # If this isn't done, then the Catalyst::Devel tests for the restarter
+ # fail.
+ $| = 1 if $ENV{HARNESS_ACTIVE};
+
+ if ( $self->restart ) {
+ die "Cannot run in the background and also watch for changed files.\n"
+ if $self->background;
+
+ require Catalyst::Restarter;
+
+ my $subclass = Catalyst::Restarter->pick_subclass;
+
+ my %args;
+ $args{follow_symlinks} = $self->follow_symlinks
+ if $self->_has_follow_symlinks;
+ $args{directories} = $self->restart_directory
+ if $self->_has_restart_directory;
+ $args{sleep_interval} = $self->restart_delay
+ if $self->_has_restart_delay;
+ $args{filter} = qr/$self->restart_regex/
+ if $self->_has_restart_regex;
+
+ my $restarter = $subclass->new(
+ %args,
+ start_sub => sub { $self->_run },
+ argv => \$self->ARGV,
+ );
+
+ $restarter->run_and_watch;
+ }
+ else {
+ $self->_run;
+ }
+
+
+}
+
+sub _run {
+ my ($self) = shift;
+
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,
keepalive => $self->keepalive,
- restart => $self->restart,
- restart_delay => $self->restart_delay,
- restart_regex => qr/$self->restart_regex/,
-# FIXME restart_directory => $self->restart_directory,
follow_symlinks => $self->follow_symlinks,
- }
+ }
);
-
}
+no Moose;
+__PACKAGE__->meta->make_immutable;
+
1;
=head1 NAME