X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=56c2a800edc076947ba1c308728ffe2c4a2385e5;hb=ab61f02179c9c59c9a250a7db9a6f43d8fee824b;hp=6ba6f86dc9287490ea5fe75a790f731a22baea6b;hpb=b9b257cc297aa70b53e13d3dde802705965afe0a;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 6ba6f86..56c2a80 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -6,10 +6,9 @@ use HTTP::Request;
 use Path::Class;
 use URI;
 use Carp qw/croak/;
-use Class::MOP;
+use Cwd;
+use Class::Load 'is_class_loaded';
 use String::RewritePrefix;
-use List::MoreUtils qw/ any /;
-use Cwd qw/ cwd /;
 
 use namespace::clean;
 
@@ -137,9 +136,8 @@ sub class2tempdir {
 
     if ( $create && !-e $tmpdir ) {
 
-        eval { $tmpdir->mkpath };
-
-        if ($@) {
+        eval { $tmpdir->mkpath; 1 }
+        or do {
             # 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
@@ -155,24 +153,35 @@ sub class2tempdir {
     return $tmpdir->stringify;
 }
 
+=head2 home($class)
+
+Returns home directory for given class.
+
 =head2 dist_indicator_file_list
 
-Returns a list of files which can be tested to check if you're inside a checkout
+Returns a list of files which can be tested to check if you're inside
+a CPAN distribution which is not yet installed.
 
-=cut
+These are:
 
-sub dist_indicator_file_list {
-    qw/ Makefile.PL Build.PL dist.ini /;
-}
+=over
 
-=head2 home($class)
+=item Makefile.PL
 
-Returns home directory for given class.
+=item Build.PL
+
+=item dist.ini
 
-Note that the class must be loaded for the home directory to be found using this function.
+=item L<cpanfile>
+
+=back
 
 =cut
 
+sub dist_indicator_file_list {
+    qw{Makefile.PL Build.PL dist.ini cpanfile};
+}
+
 sub home {
     my $class = shift;
 
@@ -185,8 +194,25 @@ sub home {
 
             # find the @INC entry in which $file was found
             (my $path = $inc_entry) =~ s/$file$//;
-            my $home = find_home_unloaded_in_checkout($path);
-            return $home if $home;
+            $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 (grep { -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;
+            }
         }
 
         {
@@ -202,45 +228,7 @@ sub home {
     }
 
     # we found nothing
-    return;
-}
-
-=head2 find_home_unloaded_in_checkout ($path)
-
-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 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;
-    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(\/|$)/);
+    return 0;
 }
 
 =head2 prefix($class, $name);
@@ -308,7 +296,7 @@ sub ensure_class_loaded {
     # if it already has symbol table entries. This is to support things like Schema::Loader, which
     # part-generate classes in memory, but then also load some of their contents from disk.
     return if !$opts->{ ignore_loaded }
-        && Class::MOP::is_class_loaded($class); # if a symbol entry exists we don't load again
+        && is_class_loaded($class); # if a symbol entry exists we don't load again
 
     # this hack is so we don't overwrite $@ if the load did not generate an error
     my $error;
@@ -323,7 +311,7 @@ sub ensure_class_loaded {
     die $error if $error;
 
     warn "require $class was successful but the package is not defined."
-        unless Class::MOP::is_class_loaded($class);
+        unless is_class_loaded($class);
 
     return 1;
 }
@@ -402,17 +390,17 @@ my $_term_width;
 sub term_width {
     return $_term_width if $_term_width;
 
-    my $width = eval '
-        use Term::Size::Any;
+    my $width;
+    eval '
+        require Term::Size::Any;
         my ($columns, $rows) = Term::Size::Any::chars;
-        return $columns;
-    ';
-
-    if ($@) {
+        $width = $columns;
+        1;
+    ' or do {
         $width = $ENV{COLUMNS}
             if exists($ENV{COLUMNS})
             && $ENV{COLUMNS} =~ m/^\d+$/;
-    }
+    };
 
     $width = 80 unless ($width && $width >= 80);
     return $_term_width = $width;