removed MooseX::Command::* stuff for now

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index 5013fc7..c46f51c 100644 (file)
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -1,12 +1,13 @@
 package Catalyst::Script::Create;
 use Moose;
-use Getopt::Long;
 use Pod::Usage;
 use Catalyst::Helper;
 use MooseX::Types::Moose qw/Str Bool/;
 use namespace::autoclean;
 
 with "MooseX::Getopt";
+#extends qw(MooseX::App::Cmd);
+
 
 has _app => (
     reader   => 'app',

diff --git a/lib/Catalyst/Script/Deploy.pm b/lib/Catalyst/Script/Deploy.pm
index 8b98393..2b06270 100644 (file)
--- a/lib/Catalyst/Script/Deploy.pm
+++ b/lib/Catalyst/Script/Deploy.pm
@@ -9,6 +9,9 @@ use Config::General;
 use FindBin;
 use lib "$FindBin::Bin/../lib";
 
+#extends qw(MooseX::App::Cmd);
+
+
 has _app => (
     reader   => 'app',
     init_arg => 'app',

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index b3776fd..04d5372 100644 (file)
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -15,6 +15,7 @@ use MooseX::Types::Moose qw/Str Bool Int/;
 use namespace::autoclean;
 
 with 'MooseX::Getopt';
+#extends qw(MooseX::App::Cmd);
 
 has debug => (
     traits => [qw(Getopt)],

diff --git a/lib/Catalyst/Script/Test.pm b/lib/Catalyst/Script/Test.pm
index a17ec98..4fe10c4 100644 (file)
--- a/lib/Catalyst/Script/Test.pm
+++ b/lib/Catalyst/Script/Test.pm
@@ -7,6 +7,8 @@ with 'MooseX::Getopt';
 use MooseX::Types::Moose qw/Str Bool/;
 use namespace::autoclean;
 
+#extends qw(MooseX::App::Cmd);
+
 has _app => (
     reader   => 'app',
     init_arg => 'app',

diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index b20faf5..cc28094 100644 (file)
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -1,5 +1,7 @@
 package Catalyst::ScriptRunner;
 use Moose;
+extends qw(MooseX::App::Cmd::Command);
+
 
 sub run {
     my ($self, $class, $scriptclass) = @_;

diff --git a/t/TestApp/script/testapp_server.pl b/t/TestApp/script/testapp_server.pl
index 8069e7a..864708b 100755 (executable)
--- a/t/TestApp/script/testapp_server.pl
+++ b/t/TestApp/script/testapp_server.pl
@@ -9,5 +9,5 @@ BEGIN {
 
 ## because this is a test
 use lib "$Bin/../../../lib";
-use Catalyst::ScriptRunner;
-Catalyst::ScriptRunner->run('TestApp','Server');
+use Catalyst::ScriptRunner -run 'TestApp' 'Server';
+