Fix for tests

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Utils.pm

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index fd7b376..6ba6f86 100644 (file)
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -6,10 +6,10 @@ use HTTP::Request;
 use Path::Class;
 use URI;
 use Carp qw/croak/;
-use Cwd;
 use Class::MOP;
 use String::RewritePrefix;
 use List::MoreUtils qw/ any /;
+use Cwd qw/ cwd /;
 
 use namespace::clean;
 
@@ -162,7 +162,7 @@ Returns a list of files which can be tested to check if you're inside a checkout
 =cut
 
 sub dist_indicator_file_list {
-    qw/ Makefile.PL Build.PL dist.init /;
+    qw/ Makefile.PL Build.PL dist.ini /;
 }
 
 =head2 home($class)
@@ -202,43 +202,45 @@ sub home {
     }
 
     # we found nothing
-    return 0;
+    return;
 }
 
 =head2 find_home_unloaded_in_checkout ($path)
 
-Tries to determine if C<$path> (or cwd if not supplied)
-looks like a checkout. Any leading lib or blib components
+Tries to determine if C<$path> (or the current working directory if not supplied)
+looks like a checkout. Any leading lib, script or blib components
 will be removed, then the directory produced will be checked
-for the existance of a C<< dist_indicator_file_list() >>.
+for the existence of a C<< dist_indicator_file_list() >>.
 
 If one is found, the directory will be returned, otherwise false.
 
 =cut
 
+# XXX - Is this actually sane - should we just split into two simpler routines
+#       one for when we do have an @INC entry and one for when we don't?
 sub find_home_unloaded_in_checkout {
     my ($path) = @_;
     $path ||= cwd() if !defined $path || !length $path;
     my $home = dir($path)->absolute->cleanup;
-
-    # pop off /lib and /blib if they're there
-    $home = $home->parent while $home =~ /b?lib$/;
-
-    # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
-    if (any { $_ } map { -f $home->file($_) } dist_indicator_file_list()) {
-
-        # clean up relative path:
-        # MyApp/script/.. -> MyApp
-
-        my $dir;
-        my @dir_list = $home->dir_list();
-        while (($dir = pop(@dir_list)) && $dir eq '..') {
-            $home = dir($home)->parent->parent;
+    my $last_home;
+    do {
+        # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
+        if (any { $_ } map { -f $home->file($_) } dist_indicator_file_list()) {
+            # clean up relative path:
+            # MyApp/script/.. -> MyApp
+
+            my $dir;
+            my @dir_list = $home->dir_list();
+            while (($dir = pop(@dir_list)) && $dir eq '..') {
+                $home = dir($home)->parent->parent;
+            }
+            return $home->stringify;
         }
-
-        return $home->stringify;
+        $last_home = $home;
+        $home = $home->parent;
     }
-
+    while # pop off /lib and /blib or /script or /t/ if they're there
+        ($last_home =~ /b?lib$/ || $last_home =~ /script$/ || $last_home =~ /\/t(\/|$)/);
 }
 
 =head2 prefix($class, $name);