From: Sebastian Riedel Date: Wed, 27 Apr 2005 21:15:19 +0000 (+0000) Subject: Fixed manifest and the uninitialized value warning in tests X-Git-Tag: 5.7099_04~1421 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=75aeff23c055c680a7293a9642f556fc253274db Fixed manifest and the uninitialized value warning in tests --- diff --git a/MANIFEST b/MANIFEST index 3185767..08c7721 100644 --- a/MANIFEST +++ b/MANIFEST @@ -6,12 +6,19 @@ lib/Catalyst/Build.pm lib/Catalyst/Dispatcher.pm lib/Catalyst/Engine.pm lib/Catalyst/Engine/Apache.pm +lib/Catalyst/Engine/Apache/Base.pm lib/Catalyst/Engine/Apache/MP13.pm lib/Catalyst/Engine/Apache/MP19.pm lib/Catalyst/Engine/Apache/MP20.pm lib/Catalyst/Engine/CGI.pm -lib/Catalyst/Engine/FCGI.pm +lib/Catalyst/Engine/CGI/APR.pm +lib/Catalyst/Engine/CGI/Base.pm +lib/Catalyst/Engine/FastCGI.pm +lib/Catalyst/Engine/FastCGI/APR.pm +lib/Catalyst/Engine/FastCGI/Base.pm lib/Catalyst/Engine/HTTP.pm +lib/Catalyst/Engine/HTTP/Base.pm +lib/Catalyst/Engine/HTTP/Daemon.pm lib/Catalyst/Engine/Test.pm lib/Catalyst/Helper.pm lib/Catalyst/Log.pm @@ -72,6 +79,7 @@ t/lib/TestApp/Controller/Action/Path.pm t/lib/TestApp/Controller/Action/Private.pm t/lib/TestApp/Controller/Action/Regexp.pm t/lib/TestApp/Controller/Dump.pm +t/lib/TestApp/Controller/Engine/Request/Uploads.pm t/lib/TestApp/Controller/Engine/Response/Cookies.pm t/lib/TestApp/Controller/Engine/Response/Errors.pm t/lib/TestApp/Controller/Engine/Response/Headers.pm diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 48291b7..26b4cac 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -248,14 +248,16 @@ sub import { # Find home my $name = $caller; $name =~ s/\:\:/\//g; - my $path = $INC{"$name.pm"}; - my $home = file($path)->absolute->dir; - $name =~ /(\w+)$/; - my $append = $1; - my $subdir = dir($home)->subdir($append); - for ( split '/', $name ) { $home = dir($home)->parent } - if ( $home =~ /blib$/ ) { $home = dir($home)->parent } - elsif ( !-f file( $home, 'Makefile.PL' ) ) { $home = $subdir } + my $home; + if ( my $path = $INC{"$name.pm"} ) { + $home = file($path)->absolute->dir; + $name =~ /(\w+)$/; + my $append = $1; + my $subdir = dir($home)->subdir($append); + for ( split '/', $name ) { $home = dir($home)->parent } + if ( $home =~ /blib$/ ) { $home = dir($home)->parent } + elsif ( !-f file( $home, 'Makefile.PL' ) ) { $home = $subdir } + } if ( $caller->debug ) { $home @@ -264,8 +266,8 @@ sub import { : $caller->log->debug(qq/Home "$home" doesn't exist/) : $caller->log->debug(q/Couldn't find home/); } - $caller->config->{home} = $home; - $caller->config->{root} = dir($home)->subdir('root'); + $caller->config->{home} = $home || ''; + $caller->config->{root} = defined $home ? dir($home)->subdir('root') : ''; } =item $c->engine @@ -356,8 +358,9 @@ Sebastian Riedel, C Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen, Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton, -Gary Ashton Jones, Jesse Sheidlower, Jody Belka, Johan Lindstrom, Leon Brocard, -Marcus Ramberg, Tatsuhiko Miyagawa and all the others who've helped. +Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka, +Johan Lindstrom, Leon Brocard, Marcus Ramberg, Tatsuhiko Miyagawa +and all the others who've helped. =head1 LICENSE diff --git a/lib/Catalyst/Build.pm b/lib/Catalyst/Build.pm index 570802b..7b246a7 100644 --- a/lib/Catalyst/Build.pm +++ b/lib/Catalyst/Build.pm @@ -27,6 +27,8 @@ L extension for Catalyst. =head1 METHODS +=over4 + =item ACTION_install =cut