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=fabbb816328f39cae13986a9de9a0cb633a9b645;hp=babcfa3c8115a1308cb4da6ef756b200add543f9;hb=HEAD;hpb=ec4d72594fb7a701c2f36e85ecf9a680ca1abba2

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index babcfa3..fabbb81 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -12,6 +12,7 @@ use String::RewritePrefix;
 use Class::Load ();
 use namespace::clean;
 use Devel::InnerPackage;
+use Moose::Util;
 
 =head1 NAME
 
@@ -393,6 +394,7 @@ this
 =cut
 
 my $_term_width;
+my $_use_term_size_any;
 
 sub term_width {
     my $force_reset = shift;
@@ -401,26 +403,41 @@ sub term_width {
 
     return $_term_width if $_term_width;
 
+    if ($ENV{COLUMNS} && $ENV{COLUMNS} =~ /\A\d+\z/) {
+        return $_term_width = $ENV{COLUMNS};
+    }
+
+    if (!-t STDOUT && !-t STDERR) {
+        return $_term_width = 80;
+    }
+
+    if (!defined $_use_term_size_any) {
+        eval {
+            require Term::Size::Any;
+            Term::Size::Any->import();
+            $_use_term_size_any = 1;
+            1;
+        } or do {
+            if ( $@ =~ m[Can't locate Term/Size/Any\.pm] ) {
+                warn "Term::Size::Any is not installed, can't autodetect terminal column width\n";
+            }
+            else {
+                warn "There was an error trying to detect your terminal size: $@\n";
+            }
+            $_use_term_size_any = 0;
+        };
+    }
+
     my $width;
-    eval '
-      use Term::Size::Any;
-      ($width) = Term::Size::Any::chars;
-      1;
-    ' or do {
-          if($@ =~m[Can't locate Term/Size/Any.pm]) {
-            warn "Term::Size::Any is not installed, can't autodetect terminal column width\n";
-          } else {
-            warn "There was an error trying to detect your terminal size: $@\n";
-          }
-        warn 'Trouble trying to detect your terminal size, looking at $ENV{COLUMNS}'."\n";
-        $width = $ENV{COLUMNS}
-            if exists($ENV{COLUMNS})
-            && $ENV{COLUMNS} =~ m/^\d+$/;
-    };
 
-    do {
-      warn "Cannot determine desired terminal width, using default of 80 columns\n";
-      $width = 80 } unless ($width && $width >= 80);
+    if ($_use_term_size_any) {
+        $width = Term::Size::Any::chars(*STDERR) || Term::Size::Any::chars(*STDOUT);
+    }
+
+    if (!$width || $width < 80) {
+        $width = 80;
+    }
+
     return $_term_width = $width;
 }
 
@@ -509,6 +526,7 @@ Used to add components at runtime:
 
     into        The Catalyst package to inject into (e.g. My::App)
     component   The component package to inject
+    traits      (Optional) ArrayRef of L<Moose::Role>s that the component should consume.
     as          An optional moniker to use as the package name for the derived component
 
 For example:
@@ -532,6 +550,11 @@ B<NOTE:> This is basically a core version of L<CatalystX::InjectComponent>.  If
 you can now use this safely instead.  Going forward changes required to make this work will be
 synchronized with the core method.
 
+B<NOTE:> The 'traits' option is unique to the L<Catalyst::Utils> version of this feature.
+
+B<NOTE:> These injected components really need to be a L<Catalyst::Component> and a L<Moose>
+based class.
+
 =cut
 
 sub inject_component {
@@ -560,20 +583,18 @@ sub inject_component {
     unless ( Class::Load::is_class_loaded $component_package ) {
         eval "package $component_package; use base qw/$component/; 1;" or
             croak "Unable to build component package for \"$component_package\": $@";
+        Moose::Util::apply_all_roles($component_package, @{$given{traits}}) if $given{traits};
         (my $file = "$component_package.pm") =~ s{::}{/}g;
-        $INC{$file} ||= 1;    
+        $INC{$file} ||= 1;
     }
 
     my $_setup_component = sub {
       my $into = shift;
       my $component_package = shift;
-      $into->components->{$component_package} = $into->setup_component( $component_package );
+      $into->components->{$component_package} = $into->delayed_setup_component( $component_package );
     };
 
     $_setup_component->( $into, $component_package );
-    for my $inner_component_package ( Devel::InnerPackage::list_packages( $component_package ) ) {
-        $_setup_component->( $into, $inner_component_package );
-    }
 }
 
 =head1 PSGI Helpers