simplified application detection

mojolicious · Sep 6, 2012 · 68dec2f · 68dec2f
1 parent 94e35d1
commit 68dec2f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -17,6 +17,7 @@ sub new {
 sub build_app {
   my ($self, $app) = @_;
   local $ENV{MOJO_EXE};
+  local $ENV{MOJO_APP} = $app;
   if (my $e = Mojo::Loader->new->load($app)) { die $e if ref $e }
   return $app->new;
 }

diff --git a/lib/Mojolicious/Commands.pm b/lib/Mojolicious/Commands.pm
@@ -117,7 +117,7 @@ sub start {
 
 sub start_app {
   my $self = shift;
-  return Mojo::Server->new->build_app($ENV{MOJO_APP} = shift)->start(@_);
+  return Mojo::Server->new->build_app(shift)->start(@_);
 }
 
 sub _command {
@@ -323,9 +323,8 @@ disabled with the C<MOJO_NO_DETECT> environment variable.
   Mojolicious::Commands->start;
   Mojolicious::Commands->start(@ARGV);
 
-Start the command line interface for automatically detected application,
-usually the value of the C<MOJO_APP> environment variable or
-L<Mojo::HelloWorld>.
+Start the command line interface for application from the value of the
+C<MOJO_APP> environment variable or L<Mojo::HelloWorld>.
 
   # Always start daemon and ignore @ARGV
   Mojolicious::Commands->start('daemon', '-l', 'http://*:8080');

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -23,8 +23,7 @@ $ENV{MOJO_LOG_LEVEL} ||= $ENV{HARNESS_IS_VERBOSE} ? 'debug' : 'fatal';
 sub new {
   my $self = shift->SUPER::new;
   return $self unless my $app = shift;
-  return $self->app(
-    ref $app ? $app : Mojo::Server->new->build_app($ENV{MOJO_APP} = $app));
+  return $self->app(ref $app ? $app : Mojo::Server->new->build_app($app));
 }
 
 sub app {