use MooseX::Types::Moose qw/Str Bool/;
use Pod::Usage;
use MooseX::Getopt;
+use Catalyst::Engine::Loader;
+use MooseX::Types::LoadableClass qw/LoadableClass/;
use namespace::autoclean;
with 'MooseX::Getopt' => {
- excludes => [qw/
+ -excludes => [qw/
_getopt_spec_warnings
_getopt_spec_exception
+ _getopt_full_usage
/],
};
has application_name => (
- traits => ['NoGetopt'],
- isa => Str,
- is => 'ro',
+ traits => ['NoGetopt'],
+ isa => Str,
+ is => 'ro',
required => 1,
);
-has help => (
- traits => ['Getopt'],
- isa => Bool,
+has loader_class => (
+ isa => LoadableClass,
is => 'ro',
- documentation => q{Display this help and exit},
+ coerce => 1,
+ default => 'Catalyst::Engine::Loader',
+ documentation => 'The class to use to detect and load the PSGI engine',
+);
+
+has _loader => (
+ isa => 'Plack::Loader',
+ default => sub {
+ shift->loader_class->new
+ },
+ handles => {
+ load_engine => 'load',
+ autoload_engine => 'auto',
+ },
+ lazy => 1,
);
sub _getopt_spec_exception {}
warn @_;
}
-sub _exit_with_usage {
+sub _getopt_full_usage {
my $self = shift;
pod2usage();
exit 0;
}
-before run => sub {
- my $self = shift;
- $self->_exit_with_usage if $self->help;
-};
-
sub run {
my $self = shift;
$self->_run_application;
()
}
+sub _plack_loader_args {
+ my @app_args = shift->_application_args;
+ return (port => $app_args[0]);
+}
+
sub _run_application {
my $self = shift;
my $app = $self->application_name;
Class::MOP::load_class($app);
- $app->run($self->_application_args);
+ my $server;
+ if (my $e = $self->can('_plack_engine_name') ) {
+ $server = $self->load_engine($self->$e, $self->_plack_loader_args);
+ }
+ else {
+ $server = $self->autoload_engine($self->_plack_loader_args);
+ }
+ $app->run($self->_application_args, $server);
}
-# GROSS HACK, temporary until MX::Getopt gets some proper refactoring and unfucking..
-around '_parse_argv' => sub {
- my ($orig, $self, @args) = @_;
- my %data = eval { $self->$orig(@args) };
- $self->_exit_with_usage($@) if $@;
- $data{usage} = Catalyst::ScriptRole::Useage->new(code => sub { shift; $self->_exit_with_usage(@_) });
- return %data;
-};
-
-# This package is going away.
-package # Hide from PAUSE
- Catalyst::ScriptRole::Useage;
-use Moose;
-use namespace::autoclean;
-
-has code => ( is => 'ro', required => 1 );
-
-sub die { shift->code->(@_) }
-
1;
=head1 NAME
use Moose;
use namespace::autoclean;
- with 'Catalyst::Script::Role';
+ with 'Catalyst::ScriptRole';
- sub _application_args { ... }
+ sub _application_args { ... }
=head1 DESCRIPTION
it under the same terms as Perl itself.
=cut
-