WIP

Author: cromedome

lib/Dancer2/CLI/Gen.pm

@@ -23,14 +23,23 @@ option application => (
     doc           => 'application name',
     format        => 's',
     format_doc    => 'appname',
-    required      => 1,
+    required      => 0,
     spacer_before => 1,
 );
 
+option plugin => (
+    is            => 'ro',
+    short         => 'p',
+    doc           => 'plugin name',
+    format        => 's',
+    format_doc    => 'plugin',
+    required      => 0,
+);
+
 option directory => (
     is         => 'ro',
     short      => 'd',
-    doc        => 'application directory (default: same as application name)',
+    doc        => 'application/plugin directory (default: same as application/plugin name)',
     format     => 's',
     format_doc => 'directory',
     required   => 0,
@@ -39,11 +48,11 @@ option directory => (
 
 # This was causing conflict with Path::Tiny's path(), so renaming to avoid
 # the overhead of making Path::Tiny an object.
-option app_path => (
+option output_path => (
     is         => 'ro',
-    short      => 'p',
+    short      => 'o',
     option     => 'path',
-    doc        => 'application path (default: current directory)',
+    doc        => 'output path (default: current directory)',
     format     => 's',
     format_doc => 'directory',
     required   => 0,
@@ -52,8 +61,8 @@ option app_path => (
 
 option overwrite => (
     is       => 'ro',
-    short    => 'o',
-    doc      => 'overwrite existing files',
+    short    => 'f',
+    doc      => 'force overwrite of existing files',
     required => 0,
     default  => 0,
 );
@@ -122,6 +131,10 @@ has _engine => (
 sub BUILD {
     my ( $self, $args ) = @_;
 
+    $self->osprey_usage( 1, qq{
+Must provide wither an application name or plugin name.
+    } ) unless $self->application || $self->plugin;
+
     $self->osprey_usage( 1, qq{
 Invalid application name. Application names must not contain single colons,
 dots, hyphens or start with a number.
@@ -133,7 +146,7 @@ dots, hyphens or start with a number.
             unless $scheme =~ / ^ git \@ .+ : .+ \.git $ | ^ http /x;
     }
 
-    my $path = $self->app_path;
+    my $path = $self->output_path;
     -d $path or $self->osprey_usage( 1, "path: directory '$path' does not exist" );
     -w $path or $self->osprey_usage( 1, "path: directory '$path' is not writeable" );
 
@@ -148,16 +161,16 @@ sub run {
 
     my $app_name = $self->application;
     my $app_file = $self->_get_app_file( $app_name );
-    my $app_path = $self->_get_app_path( $self->app_path, $app_name );
+    my $output_path = $self->_get_output_path( $self->output_path, $app_name );
 
     if( my $dir = $self->directory ) {
-        $app_path = path( $self->app_path, $dir );
+        $output_path = path( $self->output_path, $dir );
     }
 
-    my $files_to_copy = $self->_build_file_list( $self->skel, $app_path );
+    my $files_to_copy = $self->_build_file_list( $self->skel, $output_path );
     foreach my $pair( @$files_to_copy ) {
         if( $pair->[0] =~ m/lib\/AppFile.pm$/ ) {
-            $pair->[1] = path( $app_path, $app_file );
+            $pair->[1] = path( $output_path, $app_file );
             last;
         }
     }
@@ -169,9 +182,9 @@ sub run {
     my $vars = {
         appname          => $app_name,
         appfile          => $app_file->stringify,
-        apppath          => $app_path,
-        appdir           => File::Spec->rel2abs( $app_path ),
-        apppath          => $app_path,
+        apppath          => $output_path,
+        appdir           => File::Spec->rel2abs( $output_path ),
+        apppath          => $output_path,
         perl_interpreter => $self->_get_perl_interpreter,
         cleanfiles       => $self->_get_dashed_name( $app_name ),
         dancer_version   => $self->parent_command->_dancer2_version,
@@ -180,8 +193,8 @@ sub run {
 
     $self->_copy_templates( $files_to_copy, $vars, $self->overwrite );
     unless( $self->no_package_files ) {
-        $self->_create_manifest( $files_to_copy, $app_path );
-        $self->_add_to_manifest_skip( $app_path );
+        $self->_create_manifest( $files_to_copy, $output_path );
+        $self->_add_to_manifest_skip( $output_path );
     }
 
     $self->_check_git( $vars );
@@ -211,11 +224,11 @@ commands:
         -x $git or die "Can't execute git: $!";
 
         #my $dist_dir  = $self->parent_command->_dist_dir;
-        my $app_path  = $vars->{ apppath };
+        my $output_path  = $vars->{ apppath };
         my $gitignore = path( $self->parent_command->_dist_dir, '.gitignore' );
-        path( $gitignore )->copy( $app_path );
+        path( $gitignore )->copy( $output_path );
 
-        chdir File::Spec->rel2abs( $app_path ) or die "Can't cd to $app_path: $!";
+        chdir File::Spec->rel2abs( $output_path ) or die "Can't cd to $output_path: $!";
         if( _run_shell_cmd( 'git', 'init') != 0 or
             _run_shell_cmd( 'git', 'add', '.') != 0 or
             _run_shell_cmd( 'git', 'commit', "-m 'Initial commit of $app_name by Dancer2'" ) != 0 ) {
@@ -256,14 +269,14 @@ following commands:
 sub _how_to_run {
     my( $self, $vars ) = @_;
 
-    my $app_path = $vars->{ apppath };
+    my $output_path = $vars->{ apppath };
     my $app_name = $vars->{ appname };
     if( $vars->{ docker } ) {
         my $image = lc $app_name;
         print qq{
 Your new application is ready! To run it:
 
-        cd $app_path
+        cd $output_path
         docker build -t ${image} .
         docker run -d -p 5000:4000 --name $app_name ${image}
 
@@ -278,7 +291,7 @@ You may also run your app without Docker:
         print "\nYour new application is ready! To run it:\n";
     }
     print qq{
-        cd $app_path
+        cd $output_path
         plackup bin/app.psgi
 
 To access your application, point your browser to http://localhost:5000
@@ -396,7 +409,7 @@ sub _process_template {
 
 # These are good candidates to move to Dancer2::CLI if other commands
 # need them later.
-sub _get_app_path {
+sub _get_output_path {
     my ( $self, $path, $appname ) = @_;
     return path( $path, $self->_get_dashed_name( $appname ));
 }