X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=ba3993de3a9dee049506b4440d7cc0180f5e5c14;hb=1a0250cbc5e7146d5840d17dd223bad0139aa92b;hp=e7cf1d523e0fe445bf4bbfec3fbe09039b7bca74;hpb=6dc87a0f8301391acfe25ee5bcaad0fe48dad559;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e7cf1d5..ba3993d 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'Catalyst::Base';
 use UNIVERSAL::require;
 use Catalyst::Log;
+use Text::ASCIITable;
 
 __PACKAGE__->mk_classdata($_) for qw/engine log/;
 
@@ -144,17 +145,17 @@ sub import {
         $caller->log->debug('Debug messages enabled');
     }
 
-    my $engine ='Catalyst::Engine::CGI';
+    my $engine = 'Catalyst::Engine::CGI';
 
     if ( $ENV{MOD_PERL} ) {
 
         require mod_perl;
 
         if ( $mod_perl::VERSION >= 1.99 ) {
-            $engine ='Catalyst::Engine::Apache::MP2';
+            $engine = 'Catalyst::Engine::Apache::MP2';
         }
         else {
-            $engine ='Catalyst::Engine::Apache::MP1';
+            $engine = 'Catalyst::Engine::Apache::MP1';
         }
     }
 
@@ -171,19 +172,23 @@ sub import {
         else {
             my $plugin = "Catalyst::Plugin::$_";
 
-            # Plugin caller should be our application class
-            eval "package $caller; require $plugin";
+            $plugin->require;
+
             if ($@) {
                 $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
             }
             else {
-                push @plugins, "  $plugin";
+                push @plugins, $plugin;
                 no strict 'refs';
                 push @{"$caller\::ISA"}, $plugin;
             }
         }
     }
-    $caller->log->debug( 'Loaded plugins', @plugins )
+    my $t = Text::ASCIITable->new;
+    $t->setCols('Class');
+    $t->setColWidth( 'Class', 75, 1 );
+    $t->addRow($_) for @plugins;
+    $caller->log->debug( 'Loaded plugins', $t->draw )
       if ( @plugins && $caller->debug );
 
     # Engine