X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=95eedc4d624036e50048c3a697571f563ce7f540;hp=05248fc5824af0e647ee7637260ed917cd715afa;hb=c47c75173f84e35fcd30c4931b04b3f4fb1938c8;hpb=c282a40a618b3ccb228b49c88117f8c92144d199

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 05248fc..95eedc4 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -1,15 +1,15 @@
 package Catalyst::Utils;
 
 use strict;
-use Catalyst::Exception;
 use File::Spec;
 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;
 
@@ -124,7 +124,7 @@ sub class2prefix {
 Returns a tempdir for a class. If create is true it will try to create the path.
 
     My::App becomes /tmp/my/app
-    My::App::C::Foo::Bar becomes /tmp/my/app/c/foo/bar
+    My::App::Controller::Foo::Bar becomes /tmp/my/app/c/foo/bar
 
 =cut
 
@@ -140,6 +140,13 @@ sub class2tempdir {
         eval { $tmpdir->mkpath };
 
         if ($@) {
+            # don't load Catalyst::Exception as a BEGIN in Utils,
+            # because Utils often gets loaded before MyApp.pm, and if
+            # Catalyst::Exception is loaded before MyApp.pm, it does
+            # not honor setting
+            # $Catalyst::Exception::CATALYST_EXCEPTION_CLASS in
+            # MyApp.pm
+            require Catalyst::Exception;
             Catalyst::Exception->throw(
                 message => qq/Couldn't create tmpdir '$tmpdir', "$@"/ );
         }
@@ -148,10 +155,22 @@ sub class2tempdir {
     return $tmpdir->stringify;
 }
 
+=head2 dist_indicator_file_list
+
+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.ini /;
+}
+
 =head2 home($class)
 
 Returns home directory for given class.
 
+Note that the class must be loaded for the home directory to be found using this function.
+
 =cut
 
 sub home {
@@ -166,26 +185,8 @@ sub home {
 
             # find the @INC entry in which $file was found
             (my $path = $inc_entry) =~ s/$file$//;
-            $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
-            if (-f $home->file("Makefile.PL") or -f $home->file("Build.PL")) {
-
-                # 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;
-            }
+            my $home = find_home_unloaded_in_checkout($path);
+            return $home if $home;
         }
 
         {
@@ -201,7 +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, script or blib components
+will be removed, then the directory produced will be checked
+for the existence of a C<< dist_indicator_file_list() >>.
+
+If one is found, the directory will be returned, otherwise false.
+
+=cut
+
+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
+    # pop off /script if it's there.
+    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;
+        }
+        $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);