[Catalyst-commits] r12071 - in Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst: . Script

rafl at dev.catalyst.perl.org rafl at dev.catalyst.perl.org
Sun Nov 29 15:33:56 GMT 2009


Author: rafl
Date: 2009-11-29 15:33:55 +0000 (Sun, 29 Nov 2009)
New Revision: 12071

Modified:
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm
Log:
Tidy things up a little and fix pod usage.

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-11-29 15:33:48 UTC (rev 12070)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm	2009-11-29 15:33:55 UTC (rev 12071)
@@ -1,36 +1,42 @@
 package Catalyst::Script::Create;
 use Moose;
-use MooseX::Types::Moose qw/Bool/;
+use MooseX::Types::Moose qw/Bool Str/;
 use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
 
 has force => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'nonew',
-    isa => Bool,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'nonew',
+    isa           => Bool,
+    is            => 'ro',
     documentation => 'Force new scripts',
 );
 
 has debug => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'd',
-    isa => Bool,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'd',
+    isa           => Bool,
+    is            => 'ro',
     documentation => 'Force debug mode',
 );
 
 has mechanize => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'mech',
-    isa => Bool,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'mech',
+    isa           => Bool,
+    is            => 'ro',
     documentation => 'use WWW::Mechanize',
 );
 
-has helper_class => ( isa => 'Str', is => 'ro', default => 'Catalyst::Helper' );
+has helper_class => (
+    isa     => Str,
+    is      => 'ro',
+    builder => '_build_helper_class',
+);
 
+sub _build_helper_class { 'Catalyst::Helper' }
+
 sub run {
     my ($self) = @_;
 
@@ -55,9 +61,9 @@
  myapp_create.pl [options] model|view|controller name [helper] [options]
 
  Options:
-   -force        don't create a .new file where a file to be created exists
-   -mechanize    use Test::WWW::Mechanize::Catalyst for tests if available
-   -help         display this help and exits
+   --force        don't create a .new file where a file to be created exists
+   --mechanize    use Test::WWW::Mechanize::Catalyst for tests if available
+   --help         display this help and exits
 
  Examples:
    myapp_create.pl controller My::Controller
@@ -82,7 +88,7 @@
 
 Existing component files are not overwritten.  If any of the component files
 to be created already exist the file will be written with a '.new' suffix.
-This behavior can be suppressed with the C<-force> option.
+This behavior can be suppressed with the C<--force> option.
 
 =head1 AUTHORS
 

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-11-29 15:33:48 UTC (rev 12070)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm	2009-11-29 15:33:55 UTC (rev 12071)
@@ -8,58 +8,58 @@
 with 'Catalyst::ScriptRole';
 
 has listen => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'l',
-    isa => Str,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'l',
+    isa           => Str,
+    is            => 'ro',
     documentation => 'Specify a listening port/socket',
 );
 
 has pidfile => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'pid',
-    isa => Str,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'pid',
+    isa           => Str,
+    is            => 'ro',
     documentation => 'Specify a pidfile',
 );
 
 has daemon => (
-    traits => [qw(Getopt)],
-    isa => Bool,
-    is => 'ro',
-    cmd_aliases => 'd',
+    traits        => [qw(Getopt)],
+    isa           => Bool,
+    is            => 'ro',
+    cmd_aliases   => 'd',
     documentation => 'Daemonize (go into the background)',
 );
 
 has manager => (
-    traits => [qw(Getopt)],
-    isa => Str,
-    is => 'ro',
-    cmd_aliases => 'M',
+    traits        => [qw(Getopt)],
+    isa           => Str,
+    is            => 'ro',
+    cmd_aliases   => 'M',
     documentation => 'Use a different FastCGI process manager class',
 );
 
 has keeperr => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'e',
-    isa => Bool,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'e',
+    isa           => Bool,
+    is            => 'ro',
     documentation => 'Log STDERR',
 );
 
 has nproc => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'n',
-    isa => Int,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'n',
+    isa           => Int,
+    is            => 'ro',
     documentation => 'Specify a number of child processes',
 );
 
 has detach => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'det',
-    isa => Bool,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'det',
+    isa           => Bool,
+    is            => 'ro',
     documentation => 'Detach this FastCGI process',
 );
 
@@ -88,22 +88,22 @@
   myapp_fastcgi.pl [options]
 
  Options:
-   -? -help      display this help and exits
-   -l -listen    Socket path to listen on
-                 (defaults to standard input)
-                 can be HOST:PORT, :PORT or a
-                 filesystem path
-   -n -nproc     specify number of processes to keep
-                 to serve requests (defaults to 1,
-                 requires -listen)
-   -p -pidfile   specify filename for pid file
-                 (requires -listen)
-   -d -daemon    daemonize (requires -listen)
-   -M -manager   specify alternate process manager
-                 (FCGI::ProcManager sub-class)
-                 or empty string to disable
-   -e -keeperr   send error messages to STDOUT, not
-                 to the webserver
+   -? --help      display this help and exits
+   -l --listen    Socket path to listen on
+                  (defaults to standard input)
+                  can be HOST:PORT, :PORT or a
+                  filesystem path
+   -n --nproc     specify number of processes to keep
+                  to serve requests (defaults to 1,
+                  requires -listen)
+   -p --pidfile   specify filename for pid file
+                  (requires -listen)
+   -d --daemon    daemonize (requires -listen)
+   -M --manager   specify alternate process manager
+                  (FCGI::ProcManager sub-class)
+                  or empty string to disable
+   -e --keeperr   send error messages to STDOUT, not
+                  to the webserver
 
 =head1 DESCRIPTION
 

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm	2009-11-29 15:33:48 UTC (rev 12070)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm	2009-11-29 15:33:55 UTC (rev 12071)
@@ -14,18 +14,18 @@
 };
 
 has application_name => (
-    traits => ['NoGetopt'],
-    isa => Str,
-    is => 'ro',
+    traits   => ['NoGetopt'],
+    isa      => Str,
+    is       => 'ro',
     required => 1,
 );
 
 has help => (
-    traits => ['Getopt'],
-    isa => Bool,
-    is => 'ro',
-    documentation => q{Display this help and exit},
-    cmd_aliases => ['?', 'h'],
+    traits        => ['Getopt'],
+    isa           => Bool,
+    is            => 'ro',
+    documentation => 'Display this help and exit',
+    cmd_aliases   => ['?', 'h'],
 );
 
 sub _getopt_spec_exception {}
@@ -76,7 +76,7 @@
 
     with 'Catalyst::ScriptRole';
 
-     sub _application_args { ... }
+    sub _application_args { ... }
 
 =head1 DESCRIPTION
 
@@ -110,4 +110,3 @@
 it under the same terms as Perl itself.
 
 =cut
-




More information about the Catalyst-commits mailing list