improved exception handling of all scripts

mojolicious · May 7, 2012 · 77f1557 · 77f1557
1 parent a36c162
commit 77f1557
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 42 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@ This file documents the revision history for Perl extension Mojolicious.
 2.94  2012-05-07
   - Added support for 308 redirects to Mojo::UserAgent.
   - Added support for new HTTP status codes.
+  - Improved exception handling of all scripts.
   - Improved built-in web servers to log inactivity timeouts as debug messages
     instead of errors.
   - Improved documentation.

diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -61,14 +61,8 @@ my @base = (splitdir(dirname(__FILE__)), '..');
 my $lib = join('/', @base, 'lib');
 -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
 
-# Check if Mojolicious is installed;
-die <<EOF unless eval 'use Mojolicious::Commands; 1';
-It looks like you don't have the Mojolicious framework installed.
-Please visit http://mojolicio.us for detailed installation instructions.
-
-EOF
-
 # Start commands for application
+require Mojolicious::Commands;
 Mojolicious::Commands->start_app('<%= $class %>');
 
 @@ appclass

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -660,14 +660,8 @@ environments.
   my $lib = join('/', @base, 'lib');
   -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
 
-  # Check if Mojolicious is installed
-  die <<EOF unless eval 'use Mojolicious::Commands; 1';
-  It looks like you don't have the Mojolicious framework installed.
-  Please visit http://mojolicio.us for detailed installation instructions.
-
-  EOF
-
   # Start commands for application
+  require Mojolicious::Commands;
   Mojolicious::Commands->start_app('MyApp');
 
 =head2 Simplified tests

diff --git a/script/hypnotoad b/script/hypnotoad
@@ -12,13 +12,6 @@ my @base = (splitdir(dirname(__FILE__)), '..');
 my $lib = join('/', @base, 'lib');
 -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
 
-# Check if Mojolicious is installed
-die <<EOF unless eval 'use Mojo::Server::Hypnotoad; 1';
-It looks like you don't have the Mojolicious framework installed.
-Please visit http://mojolicio.us for detailed installation instructions.
-
-EOF
-
 # "Hey sexy mama, wanna kill all humans?"
 my $help;
 GetOptions(
@@ -46,6 +39,7 @@ EOF
 
 # "This is it.
 #  The moment we should've trained for."
+require Mojo::Server::Hypnotoad;
 Mojo::Server::Hypnotoad->new->run($app);
 
 =head1 NAME

diff --git a/script/mojo b/script/mojo
@@ -11,14 +11,8 @@ my @base = (splitdir(dirname(__FILE__)), '..');
 my $lib = join('/', @base, 'lib');
 -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
 
-# Check if Mojolicious is installed
-die <<EOF unless eval 'use Mojolicious::Commands; 1';
-It looks like you don't have the Mojolicious framework installed.
-Please visit http://mojolicio.us for detailed installation instructions.
-
-EOF
-
 # "My eyes! The goggles do nothing!"
+require Mojolicious::Commands;
 Mojolicious::Commands->start;
 
 =head1 NAME

diff --git a/script/morbo b/script/morbo
@@ -12,13 +12,6 @@ my @base = (splitdir(dirname(__FILE__)), '..');
 my $lib = join('/', @base, 'lib');
 -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
 
-# Check if Mojolicious is installed
-die <<EOF unless eval 'use Mojo::Server::Morbo; 1';
-It looks like you don't have the Mojolicious framework installed.
-Please visit http://mojolicio.us for detailed installation instructions.
-
-EOF
-
 # "Welcome to 'Entertainment And Earth Invasion Tonite'.
 #  Across the galaxy my people are completing the mighty space fleet that
 #  will exterminate the human race!
@@ -58,6 +51,7 @@ EOF
 #  global warming.
 #  Morbo is pleased but sticky."
 $ENV{MOJO_LISTEN} = join(',', @listen) if @listen;
+require Mojo::Server::Morbo;
 my $morbo = Mojo::Server::Morbo->new;
 $morbo->watch(\@watch) if @watch;
 $morbo->run($app);

diff --git a/t/mojolicious/external/script/my_app b/t/mojolicious/external/script/my_app
@@ -17,12 +17,6 @@ my @base = (splitdir(dirname(__FILE__)), '..');
 my $lib = join('/', @base, 'lib');
 -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
 
-# Check if Mojolicious is installed
-die <<EOF unless eval 'use Mojolicious::Commands; 1';
-It looks like you don't have the Mojolicious framework installed.
-Please visit http://mojolicio.us for detailed installation instructions.
-
-EOF
-
 # Start commands for application
+require Mojolicious::Commands;
 Mojolicious::Commands->start_app('MyApp');