X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=70d6ac3bcc6140ae56784a1fa720fb85f735d225;hb=aba0841d12cbaa53592f6792ca4ff175070fd86a;hp=46fc5223a89bf7fcb1c8a8d6af00f050313ce92c;hpb=ff942beb0bff49b955364171d35961fa1b5aae93;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 46fc522..70d6ac3 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1022,8 +1022,8 @@ EOF
         $class->debug and
         my $comps = $class->container->get_all_component_services($class)
     ) {
-        my $column_width = Catalyst::Utils::term_width() - 8 - 9;
-        my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Lifecycle' ] );
+        my $column_width = Catalyst::Utils::term_width() - 16 - 9;
+        my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 16, 'Lifecycle' ] );
 
         # FIXME
         # I don't really know what we're going to show here
@@ -1473,7 +1473,10 @@ sub components {
         $container->add_component( $_ ) for keys %$comps;
     }
 
-    return $container->get_all_components($class);
+    return
+        ref($class) ? $container->get_all_components($class)
+                    : $container->get_all_singleton_lifecycle_components
+                    ;
 }
 
 =head2 $c->context_class