From: Devin Austin Date: Fri, 17 Jul 2009 01:24:44 +0000 (+0000) Subject: added MX::Types::Moose, cleaned up moar X-Git-Tag: 5.80014_02~80 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=73e4f0f19c278740fa95796e30efb90a7b779713 added MX::Types::Moose, cleaned up moar --- diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm index b0b0b66..5013fc7 100644 --- a/lib/Catalyst/Script/Create.pm +++ b/lib/Catalyst/Script/Create.pm @@ -6,31 +6,60 @@ use Catalyst::Helper; use MooseX::Types::Moose qw/Str Bool/; use namespace::autoclean; -has app => (isa => Str, is => 'ro', required => 1); - -sub new_with_options { shift->new(@_) } +with "MooseX::Getopt"; + +has _app => ( + reader => 'app', + init_arg => 'app', + traits => [qw(NoGetopt)], + isa => Str, + is => 'ro', +); + +has force => ( + traits => [qw(Getopt)], + cmd_aliases => 'nonew', + isa => Bool, + is => 'ro', + documentation => qq{ force new scripts } +); + +has help => ( + traits => [qw(Getopt)], + cmd_aliases => 'h', + isa => Bool, + is => 'ro', + documentation => qq{ display this help and exits }, +); + +has debug => ( + traits => [qw(Getopt)], + cmd_aliases => 'd', + isa => Bool, + is => 'ro', + documentation => qq{ force debug mode } +); + +has mechanize => ( + traits => [qw(Getopt)], + cmd_aliases => 'mech', + isa => Bool, + is => 'ro', + documentation => qq{ use WWW::Mechanize }, +); sub run { my ($self) = @_; -my $force = 0; -my $mech = 0; -my $help = 0; -GetOptions( - 'nonew|force' => \$force, - 'mech|mechanize' => \$mech, - 'help|?' => \$help - ); -pod2usage(1) if ( $help || !$ARGV[0] ); + pod2usage(1) if ( $self->help || !$ARGV[0] ); -my $helper = Catalyst::Helper->new( { '.newfiles' => !$force, mech => $mech } ); + my $helper = Catalyst::Helper->new( { '.newfiles' => !$self->force, mech => $self->mech } ); -pod2usage(1) unless $helper->mk_component( $self->app, @ARGV ); + pod2usage(1) unless $helper->mk_component( $self->app, @ARGV ); } -no Moose; __PACKAGE__->meta->make_immutable; 1; diff --git a/lib/Catalyst/Script/Deploy.pm b/lib/Catalyst/Script/Deploy.pm index ca08072..8b98393 100644 --- a/lib/Catalyst/Script/Deploy.pm +++ b/lib/Catalyst/Script/Deploy.pm @@ -13,22 +13,18 @@ has _app => ( reader => 'app', init_arg => 'app', traits => [qw(NoGetopt)], - isa => 'Str', + isa => Str, is => 'ro', ); has conf => ( is => 'ro', - isa => 'Str', + isa => Str, traits => [qw(Getopt)], cmd_alias => 'c', documentation => qq{ specify a configuration file to read from } ); - - - - sub usage { print "usage: perl script/myapp_deploy_schema.pl myapp.conf\n"; @@ -57,7 +53,6 @@ sub run { } -no Moose; __PACKAGE__->meta->make_immutable; 1; diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm index 74648af..f733171 100644 --- a/lib/Catalyst/Script/FastCGI.pm +++ b/lib/Catalyst/Script/FastCGI.pm @@ -13,7 +13,7 @@ with 'MooseX::Getopt'; has help => ( traits => [qw(Getopt)], cmd_aliases => 'h', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ display this help and exits }, ); @@ -21,7 +21,7 @@ has help => ( has listen => ( traits => [qw(Getopt)], cmd_aliases => 'l', - isa => 'Int', + isa => Int, is => 'ro', default => "3000", documentation => qq{ specify a different listening port } @@ -30,13 +30,13 @@ has listen => ( has pidfile => ( traits => [qw(Getopt)], cmd_aliases => 'pid', - isa => 'Str', + isa => Str, is => 'ro', documentation => qq{ specify a pidfile } ); has daemon => ( - isa => 'Bool', + isa => Bool, is => 'ro', traits => [qw(Getopt)], cmd_aliases => 'd', @@ -44,7 +44,7 @@ has daemon => ( ); has manager => ( - isa => 'Str', + isa => Str, is => 'ro', traits => [qw(Getopt)], cmd_aliases => 'm', @@ -54,7 +54,7 @@ has manager => ( has keep_stderr => ( traits => [qw(Getopt)], cmd_aliases => 'std', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ log STDERR } ); @@ -62,7 +62,7 @@ has keep_stderr => ( has nproc => ( traits => [qw(Getopt)], cmd_aliases => 'np', - isa => 'Int', + isa => Int, is => 'ro', documentation => qq{ specify an nproc } ); @@ -70,7 +70,7 @@ has nproc => ( has detach => ( traits => [qw(Getopt)], cmd_aliases => 'det', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ detach this FastCGI process } ); @@ -79,7 +79,7 @@ has _app => ( reader => 'app', init_arg => 'app', traits => [qw(NoGetopt)], - isa => 'Str', + isa => Str, is => 'ro', ); @@ -102,4 +102,6 @@ sub run { } +__PACKAGE__->meta->make_immutable; + 1; diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm index a1399c5..b3776fd 100644 --- a/lib/Catalyst/Script/Server.pm +++ b/lib/Catalyst/Script/Server.pm @@ -19,22 +19,21 @@ with 'MooseX::Getopt'; has debug => ( traits => [qw(Getopt)], cmd_aliases => 'd', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ force debug mode } - ); has help => ( traits => [qw(Getopt)], cmd_aliases => 'h', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ display this help and exits }, ); has host => ( - isa => 'Str', + isa => Str, is => 'ro', default => "localhost", documentation => qq{ specify a host for the server to run on } @@ -43,7 +42,7 @@ has host => ( has fork => ( traits => [qw(Getopt)], cmd_aliases => 'f', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ fork the server } ); @@ -51,7 +50,7 @@ has fork => ( has listen => ( traits => [qw(Getopt)], cmd_aliases => 'l', - isa => 'Int', + isa => Int, is => 'ro', default => "3000", documentation => qq{ specify a different listening port } @@ -60,7 +59,7 @@ has listen => ( has pidfile => ( traits => [qw(Getopt)], cmd_aliases => 'pid', - isa => 'Str', + isa => Str, is => 'ro', documentation => qq{ specify a pidfile } ); @@ -68,7 +67,7 @@ has pidfile => ( has keepalive => ( traits => [qw(Getopt)], cmd_aliases => 'k', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ server keepalive }, @@ -77,7 +76,7 @@ has keepalive => ( has background => ( traits => [qw(Getopt)], cmd_aliases => 'bg', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ run in the background } ); @@ -87,14 +86,14 @@ has _app => ( reader => 'app', init_arg => 'app', traits => [qw(NoGetopt)], - isa => 'Str', + isa => Str, is => 'ro', ); has restart => ( traits => [qw(Getopt)], cmd_aliases => 'r', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ use Catalyst::Restarter to detect code changes } ); @@ -111,7 +110,7 @@ has restart_directory => ( has restart_delay => ( traits => [qw(Getopt)], cmd_aliases => 'rdel', - isa => 'Int', + isa => Int, is => 'ro', predicate => '_has_restart_delay', documentation => qq{ set a restart delay } @@ -120,7 +119,7 @@ has restart_delay => ( has restart_regex => ( traits => [qw(Getopt)], cmd_aliases => 'rxp', - isa => 'Str', + isa => Str, is => 'ro', predicate => '_has_restart_regex', documentation => qq{ restart regex } @@ -129,7 +128,7 @@ has restart_regex => ( has follow_symlinks => ( traits => [qw(Getopt)], cmd_aliases => 'sym', - isa => 'Bool', + isa => Bool, is => 'ro', predicate => '_has_follow_symlinks', documentation => qq{ follow symbolic links } @@ -214,7 +213,6 @@ sub _run { } -no Moose; __PACKAGE__->meta->make_immutable; 1; diff --git a/lib/Catalyst/Script/Test.pm b/lib/Catalyst/Script/Test.pm index 8297b99..a17ec98 100644 --- a/lib/Catalyst/Script/Test.pm +++ b/lib/Catalyst/Script/Test.pm @@ -11,14 +11,14 @@ has _app => ( reader => 'app', init_arg => 'app', traits => [qw(NoGetopt)], - isa => 'Str', + isa => Str, is => 'ro', ); has help => ( traits => [qw(Getopt)], cmd_aliases => 'h', - isa => 'Bool', + isa => Bool, is => 'ro', documentation => qq{ display this help and exits }, ); @@ -35,6 +35,6 @@ sub run { } -no Moose; + __PACKAGE__->meta->make_immutable; 1;