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 7d318fe..a74653b 100644 (file)
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -1,6 +1,6 @@
 package Catalyst::Script::Create;
 use Moose;
-use MooseX::Types::Moose qw/Bool Str/;
+use Class::Load 'load_class';
 use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
@@ -8,7 +8,7 @@ with 'Catalyst::ScriptRole';
 has force => (
     traits        => [qw(Getopt)],
     cmd_aliases   => 'nonew',
-    isa           => Bool,
+    isa           => 'Bool',
     is            => 'ro',
     documentation => 'Force new scripts',
 );
@@ -16,7 +16,7 @@ has force => (
 has debug => (
     traits        => [qw(Getopt)],
     cmd_aliases   => 'd',
-    isa           => Bool,
+    isa           => 'Bool',
     is            => 'ro',
     documentation => 'Force debug mode',
 );
@@ -24,13 +24,13 @@ has debug => (
 has mechanize => (
     traits        => [qw(Getopt)],
     cmd_aliases   => 'mech',
-    isa           => Bool,
+    isa           => 'Bool',
     is            => 'ro',
     documentation => 'use WWW::Mechanize',
 );
 
 has helper_class => (
-    isa     => Str,
+    isa     => 'Str',
     is      => 'ro',
     builder => '_build_helper_class',
 );
@@ -40,17 +40,18 @@ sub _build_helper_class { 'Catalyst::Helper' }
 sub run {
     my ($self) = @_;
 
-    $self->_exit_with_usage if !$self->ARGV->[0];
+    $self->print_usage_text if !$self->ARGV->[0];
 
     my $helper_class = $self->helper_class;
-    Class::MOP::load_class($helper_class);
+    load_class($helper_class);
     my $helper = $helper_class->new( { '.newfiles' => !$self->force, mech => $self->mechanize } );
 
-    $self->_exit_with_usage unless $helper->mk_component( $self->application_name, @ARGV );
+    $self->print_usage_text unless $helper->mk_component( $self->application_name, @{$self->extra_argv} );
 
 }
 
 __PACKAGE__->meta->make_immutable;
+1;
 
 =head1 NAME
 
@@ -68,7 +69,7 @@ Catalyst::Script::Create - Create a new Catalyst Component
  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
@@ -90,6 +91,10 @@ 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.
 
+=head1 SEE ALSO
+
+L<Catalyst::ScriptRunner>
+
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm