X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRole.pm;h=af47fd236141afa0df81d98808d70e0448f75929;hb=c821df216d6d7e7e0386516e43c0c09fd4a295e7;hp=aa319f3589eb5a9ad715377eb8f0c753576aabe4;hpb=1628b022d9ba6ae63b8b4780065f4e3e71b4e1f8;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm index aa319f3..af47fd2 100644 --- a/lib/Catalyst/ScriptRole.pm +++ b/lib/Catalyst/ScriptRole.pm @@ -1,27 +1,42 @@ package Catalyst::ScriptRole; use Moose::Role; +use Plack::Runner; use MooseX::Types::Moose qw/Str Bool/; use Pod::Usage; +use MooseX::Getopt; use namespace::autoclean; -with 'MooseX::Getopt'; +with 'MooseX::Getopt' => { + 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'], - cmd_aliases => 'h', - isa => Bool, - is => 'ro', - documentation => q{Display this help and exit}, + traits => ['Getopt'], + isa => Bool, + is => 'ro', + documentation => 'Display this help and exit', + cmd_aliases => ['?', 'h'], ); -sub _display_help { +sub _getopt_spec_exception {} + +sub _getopt_spec_warnings { + shift; + warn @_; +} + +sub _getopt_full_usage { my $self = shift; pod2usage(); exit 0; @@ -29,7 +44,7 @@ sub _display_help { before run => sub { my $self = shift; - $self->_display_help if $self->help; + $self->_getopt_full_usage if $self->help; }; sub run { @@ -41,11 +56,23 @@ sub _application_args { () } +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 = Plack::Loader->load($self->$e, $self->_plack_loader_args); + } + else { + $server = Plack::Loader->auto($self->_plack_loader_args); + } + $app->run($server, $self->_application_args); } 1; @@ -56,11 +83,35 @@ Catalyst::ScriptRole - Common functionality for Catalyst scripts. =head1 SYNOPSIS - FIXME - + package MyApp::Script::Foo; + use Moose; + use namespace::autoclean; + + with 'Catalyst::ScriptRole'; + + sub _application_args { ... } + =head1 DESCRIPTION - FIXME +Role with the common functionality of Catalyst scripts. + +=head1 METHODS + +=head2 run + +The method invoked to run the application. + +=head1 ATTRIBUTES + +=head2 application_name + +The name of the application class, e.g. MyApp + +=head1 SEE ALSO + +L + +L =head1 AUTHORS @@ -72,4 +123,3 @@ This library is free software, you can redistribute it and/or modify it under the same terms as Perl itself. =cut - \ No newline at end of file