merged conflicts

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Script / Create.pm

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index 575f9e7..a74653b 100644 (file)
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -1,43 +1,52 @@
 package Catalyst::Script::Create;
 use Moose;
-use Catalyst::Helper;
-use MooseX::Types::Moose qw/Bool/;
+use Class::Load 'load_class';
 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',
+    builder => '_build_helper_class',
+);
+
+sub _build_helper_class { 'Catalyst::Helper' }
+
 sub run {
     my ($self) = @_;
 
-    $self->_display_help if ( !$ARGV[0] );
+    $self->print_usage_text if !$self->ARGV->[0];
 
-    my $helper = Catalyst::Helper->new( { '.newfiles' => !$self->force, mech => $self->mech } );
+    my $helper_class = $self->helper_class;
+    load_class($helper_class);
+    my $helper = $helper_class->new( { '.newfiles' => !$self->force, mech => $self->mechanize } );
 
-    $self->_display_help unless $helper->mk_component( $self->app, @ARGV );
+    $self->print_usage_text unless $helper->mk_component( $self->application_name, @{$self->extra_argv} );
 
 }
 
@@ -53,14 +62,14 @@ Catalyst::Script::Create - Create a new Catalyst Component
  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
    myapp_create.pl controller My::Controller BindLex
-   myapp_create.pl -mechanize controller My::Controller
+   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
@@ -80,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
 
@@ -92,3 +105,4 @@ This library is free software, you can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
+