[Catalyst-commits] r10910 -
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script
dhoss at dev.catalyst.perl.org
dhoss at dev.catalyst.perl.org
Fri Jul 17 01:24:44 GMT 2009
Author: dhoss
Date: 2009-07-17 01:24:44 +0000 (Fri, 17 Jul 2009)
New Revision: 10910
Modified:
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Deploy.pm
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Test.pm
Log:
added MX::Types::Moose, cleaned up moar
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm 2009-07-17 01:15:04 UTC (rev 10909)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm 2009-07-17 01:24:44 UTC (rev 10910)
@@ -6,31 +6,60 @@
use MooseX::Types::Moose qw/Str Bool/;
use namespace::autoclean;
-has app => (isa => Str, is => 'ro', required => 1);
+with "MooseX::Getopt";
-sub new_with_options { shift->new(@_) }
+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;
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Deploy.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Deploy.pm 2009-07-17 01:15:04 UTC (rev 10909)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Deploy.pm 2009-07-17 01:24:44 UTC (rev 10910)
@@ -13,22 +13,18 @@
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 @@
}
-no Moose;
__PACKAGE__->meta->make_immutable;
1;
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm 2009-07-17 01:15:04 UTC (rev 10909)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm 2009-07-17 01:24:44 UTC (rev 10910)
@@ -13,7 +13,7 @@
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 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 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 manager => (
- isa => 'Str',
+ isa => Str,
is => 'ro',
traits => [qw(Getopt)],
cmd_aliases => 'm',
@@ -54,7 +54,7 @@
has keep_stderr => (
traits => [qw(Getopt)],
cmd_aliases => 'std',
- isa => 'Bool',
+ isa => Bool,
is => 'ro',
documentation => qq{ log STDERR }
);
@@ -62,7 +62,7 @@
has nproc => (
traits => [qw(Getopt)],
cmd_aliases => 'np',
- isa => 'Int',
+ isa => Int,
is => 'ro',
documentation => qq{ specify an nproc }
);
@@ -70,7 +70,7 @@
has detach => (
traits => [qw(Getopt)],
cmd_aliases => 'det',
- isa => 'Bool',
+ isa => Bool,
is => 'ro',
documentation => qq{ detach this FastCGI process }
);
@@ -79,7 +79,7 @@
reader => 'app',
init_arg => 'app',
traits => [qw(NoGetopt)],
- isa => 'Str',
+ isa => Str,
is => 'ro',
);
@@ -102,4 +102,6 @@
}
+__PACKAGE__->meta->make_immutable;
+
1;
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm 2009-07-17 01:15:04 UTC (rev 10909)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm 2009-07-17 01:24:44 UTC (rev 10910)
@@ -19,22 +19,21 @@
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 fork => (
traits => [qw(Getopt)],
cmd_aliases => 'f',
- isa => 'Bool',
+ isa => Bool,
is => 'ro',
documentation => qq{ fork the server }
);
@@ -51,7 +50,7 @@
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 pidfile => (
traits => [qw(Getopt)],
cmd_aliases => 'pid',
- isa => 'Str',
+ isa => Str,
is => 'ro',
documentation => qq{ specify a pidfile }
);
@@ -68,7 +67,7 @@
has keepalive => (
traits => [qw(Getopt)],
cmd_aliases => 'k',
- isa => 'Bool',
+ isa => Bool,
is => 'ro',
documentation => qq{ server keepalive },
@@ -77,7 +76,7 @@
has background => (
traits => [qw(Getopt)],
cmd_aliases => 'bg',
- isa => 'Bool',
+ isa => Bool,
is => 'ro',
documentation => qq{ run in the background }
);
@@ -87,14 +86,14 @@
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_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_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 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 @@
}
-no Moose;
__PACKAGE__->meta->make_immutable;
1;
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Test.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Test.pm 2009-07-17 01:15:04 UTC (rev 10909)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Test.pm 2009-07-17 01:24:44 UTC (rev 10910)
@@ -11,14 +11,14 @@
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 @@
}
-no Moose;
+
__PACKAGE__->meta->make_immutable;
1;
More information about the Catalyst-commits
mailing list