X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FCreate.pm;h=529b8c6db99666ce27547417fe4020839bacaf04;hp=5013fc759eea57b8ebc377e7a1471364287a35f3;hb=f4de8c998c61fd442cb9590a3c052cf41b4c0d67;hpb=73e4f0f19c278740fa95796e30efb90a7b779713

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index 5013fc7..529b8c6 100644
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -1,62 +1,52 @@
 package Catalyst::Script::Create;
 use Moose;
-use Getopt::Long;
-use Pod::Usage;
-use Catalyst::Helper;
-use MooseX::Types::Moose qw/Str Bool/;
+use MooseX::Types::Moose qw/Bool Str/;
 use namespace::autoclean;
 
-with "MooseX::Getopt";
-
-has _app => (
-    reader   => 'app',
-    init_arg => 'app',
-    traits => [qw(NoGetopt)],
-    isa => Str,
-    is => 'ro',
-);
+with 'Catalyst::ScriptRole';
 
 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 },
+    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',
-    documentation => qq{ force debug mode }
+    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',
-    documentation => qq{ use WWW::Mechanize },
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'mech',
+    isa           => Bool,
+    is            => 'ro',
+    documentation => 'use WWW::Mechanize',
+);
+
+has helper_class => (
+    isa     => Str,
+    is      => 'ro',
+    builder => '_build_helper_class',
 );
 
+sub _build_helper_class { 'Catalyst::Helper' }
+
 sub run {
     my ($self) = @_;
 
+    $self->_getopt_full_usage if !$self->ARGV->[0];
 
-    pod2usage(1) if ( $self->help || !$ARGV[0] );
-
-    my $helper = Catalyst::Helper->new( { '.newfiles' => !$self->force, mech => $self->mech } );
+    my $helper_class = $self->helper_class;
+    Class::MOP::load_class($helper_class);
+    my $helper = $helper_class->new( { '.newfiles' => !$self->force, mech => $self->mechanize } );
 
-    pod2usage(1) unless $helper->mk_component( $self->app, @ARGV );
+    $self->_getopt_full_usage unless $helper->mk_component( $self->application_name, @{$self->extra_argv} );
 
 }
 
@@ -65,28 +55,28 @@ __PACKAGE__->meta->make_immutable;
 
 =head1 NAME
 
-boyosplace_create.pl - Create a new Catalyst Component
+Catalyst::Script::Create - Create a new Catalyst Component
 
 =head1 SYNOPSIS
 
-boyosplace_create.pl [options] model|view|controller name [helper] [options]
+ 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:
-   boyosplace_create.pl controller My::Controller
-   boyosplace_create.pl controller My::Controller BindLex
-   boyosplace_create.pl -mechanize controller My::Controller
-   boyosplace_create.pl view My::View
-   boyosplace_create.pl view MyView TT
-   boyosplace_create.pl view TT TT
-   boyosplace_create.pl model My::Model
-   boyosplace_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\
+   myapp_create.pl controller My::Controller
+   myapp_create.pl controller My::Controller BindLex
+   myapp_create.pl --mechanize controller My::Controller
+   myapp_create.pl view My::View
+   myapp_create.pl view MyView TT
+   myapp_create.pl view TT TT
+   myapp_create.pl model My::Model
+   myapp_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\
    dbi:SQLite:/tmp/my.db
-   boyosplace_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\
+   myapp_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\
    dbi:Pg:dbname=foo root 4321
 
  See also:
@@ -99,7 +89,11 @@ Create a new Catalyst Component.
 
 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 SEE ALSO
+
+L<Catalyst::ScriptRunner>
 
 =head1 AUTHORS
 
@@ -111,3 +105,4 @@ This library is free software, you can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
+