X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=78c293a6ca6c935350bff3a051a32bb3fc5b0394;hb=4f96d61ccf40febbf2f80a376cd3ec7b456c699c;hp=ff4f53da0d3072617cd575567834a43fb2ca1e2b;hpb=4477b313f9ef93789650b63e5ce408fe65ca54b2;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index ff4f53d..78c293a 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -393,17 +393,24 @@ sub term_width { my $width; eval ' - require Term::Size::Any; - my ($columns, $rows) = Term::Size::Any::chars; - $width = $columns; - 1; + 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+$/; }; - $width = 80 unless ($width && $width >= 80); + do { + warn "Cannot determine desired terminal width, using default of 80 columns\n"; + $width = 80 } unless ($width && $width >= 80); return $_term_width = $width; } @@ -505,7 +512,7 @@ Localize C<$env> under the current controller path prefix: my $env = $c->Catalyst::Utils::env_at_path_prefix; } -Assuming you have a requst like GET /user/name: +Assuming you have a request like GET /user/name: In the example case C<$env> will have PATH_INFO of '/name' instead of '/user/name' and SCRIPT_NAME will now be '/user'. @@ -548,7 +555,7 @@ Assuming you have a request like GET /user/name: In the example case C<$env> will have PATH_INFO of '/' instead of '/user/name' and SCRIPT_NAME will now be '/user/name'. -Alternatively, assuming you have a requst like GET /user/name/foo: +Alternatively, assuming you have a request like GET /user/name/foo: In this example case C<$env> will have PATH_INFO of '/foo' instead of '/user/name/foo' and SCRIPT_NAME will now be '/user/name'. @@ -593,7 +600,7 @@ Localize C<$env> under the current request URI: my $env = $c->Catalyst::Utils::env_at_request_uri } -Assuming you have a requst like GET /user/name/hello: +Assuming you have a request like GET /user/name/hello: In the example case C<$env> will have PATH_INFO of '/' instead of '/user/name' and SCRIPT_NAME will now be '/user/name/hello'.