From: Devin Austin <devin.austin@gmail.com>
Date: Wed, 15 Jul 2009 21:41:11 +0000 (+0000)
Subject: -d and --debug work for me
X-Git-Tag: 5.80014_02~90
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d10145401a3bd87700c13e71b0f791b473951b2c

-d and --debug work for me
---

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 619177d..0e5054f 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -11,7 +11,6 @@ use lib "$Bin/../lib";
 use Pod::Usage;
 use Moose;
 use Catalyst::Restarter;
-#use Catalyst::Engine::HTTP;
 use namespace::autoclean;
 
 with 'MooseX::Getopt';
@@ -142,10 +141,9 @@ sub usage {
 
 }
 
-my @argv = @ARGV;
 
 sub run {
-    my $self = shift;
+    my ($self) = shift;
 
     $self->usage if $self->help;
 
@@ -182,7 +180,7 @@ sub run {
         my $restarter = $subclass->new(
             %args,
             start_sub => sub { $self->_run },
-            argv      => $self->ARGV,
+            argv      => \$self->ARGV,
         );
 
         $restarter->run_and_watch;
diff --git a/t/TestApp/lib/TestApp.pm b/t/TestApp/lib/TestApp.pm
index fc3bb88..5dd463a 100644
--- a/t/TestApp/lib/TestApp.pm
+++ b/t/TestApp/lib/TestApp.pm
@@ -14,7 +14,7 @@ use Catalyst::Runtime 5.80;
 #                 directory
 
 use parent qw/Catalyst/;
-use Catalyst qw/-Debug
+use Catalyst qw/
                 ConfigLoader
                 Static::Simple/;
 our $VERSION = '0.01';
diff --git a/t/TestApp/lib/TestApp/Controller/Root.pm b/t/TestApp/lib/TestApp/Controller/Root.pm
index 0b3a3b4..bf6e1f4 100644
--- a/t/TestApp/lib/TestApp/Controller/Root.pm
+++ b/t/TestApp/lib/TestApp/Controller/Root.pm
@@ -42,7 +42,7 @@ sub default :Path {
 sub test : Local {
   my ($self, $c) = @_;
   
-  $c->res->body("herro!!");
+  $c->res->body("herro!");
 }
 
 =head2 end
diff --git a/t/TestApp/script/testapp_create.pl b/t/TestApp/script/testapp_create.pl
index 8d6a4d2..16922aa 100755
--- a/t/TestApp/script/testapp_create.pl
+++ b/t/TestApp/script/testapp_create.pl
@@ -1,38 +1,12 @@
 #!/usr/bin/env perl
 
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-eval "use Catalyst::Helper;";
-
-if ($@) {
-  die <<END;
-To use the Catalyst development tools including catalyst.pl and the
-generated script/myapp_create.pl you need Catalyst::Helper, which is
-part of the Catalyst-Devel distribution. Please install this via a
-vendor package or by running one of -
-
-  perl -MCPAN -e 'install Catalyst::Devel'
-  perl -MCPANPLUS -e 'install Catalyst::Devel'
-END
-}
-
-my $force = 0;
-my $mech  = 0;
-my $help  = 0;
-
-GetOptions(
-    'nonew|force'    => \$force,
-    'mech|mechanize' => \$mech,
-    'help|?'         => \$help
- );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-my $helper = Catalyst::Helper->new( { '.newfiles' => !$force, mech => $mech } );
-
-pod2usage(1) unless $helper->mk_component( 'TestApp', @ARGV );
+use FindBin qw/$Bin/;
+
+## because this is a test
+use lib "$Bin/../../../lib";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('TestApp','Create');
+
 
 1;