fixed FindBin support in Mojolicious applications

mojolicious · Sep 11, 2012 · b9a80d8 · b9a80d8
1 parent 7baf988
commit b9a80d8
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 56 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@
 3.40  2012-09-11
   - Improved tests.
   - Fixed Perl 5.10.1 compatibility.
+  - Fixed FindBin support in Mojolicious applications.
 
 3.39  2012-09-10
   - Improved Mojo::URL and Mojo::Parameters performance.

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -2,6 +2,7 @@ package Mojo::Server;
 use Mojo::Base 'Mojo::EventEmitter';
 
 use Carp 'croak';
+use FindBin;
 use Mojo::Loader;
 use Mojo::Util 'md5_sum';
 use Scalar::Util 'blessed';
@@ -27,21 +28,27 @@ sub build_tx { shift->app->build_tx }
 sub load_app {
   my ($self, $path) = @_;
 
-  # Clean up environment
-  local $ENV{MOJO_APP_LOADER} = 1;
-  local $ENV{MOJO_EXE};
-
-  # Try to load application from script into sandbox
-  my $app = eval <<EOF;
-package Mojo::Server::SandBox::@{[md5_sum($path . $$)]};
-my \$app = do \$path;
-if (!\$app && (my \$e = \$@ || \$!)) { die \$e }
-\$app;
+  # Clean environment
+  {
+    local $0 = $path;
+    FindBin::again();
+    local $ENV{MOJO_APP_LOADER} = 1;
+    local $ENV{MOJO_EXE};
+
+    # Try to load application from script into sandbox
+    $self->app(my $app = eval sprintf <<'EOF', md5_sum($path . $$));
+package Mojo::Server::SandBox::%s;
+my $app = do $path;
+if (!$app && (my $e = $@ || $!)) { die $e }
+$app;
 EOF
-  die qq{Couldn't load application from file "$path": $@} if !$app && $@;
-  die qq{File "$path" did not return an application object.\n}
-    unless blessed $app && $app->isa('Mojo');
-  return $self->app($app)->app;
+    die qq{Couldn't load application from file "$path": $@} if !$app && $@;
+    die qq{File "$path" did not return an application object.\n}
+      unless blessed $app && $app->isa('Mojo');
+  };
+  FindBin::again();
+
+  return $self->app;
 }
 
 sub run { croak 'Method "run" not implemented by subclass' }

diff --git a/lib/Mojolicious/Command/generate/app.pm b/lib/Mojolicious/Command/generate/app.pm
@@ -52,15 +52,12 @@ __DATA__
 @@ mojo
 % my $class = shift;
 #!/usr/bin/env perl
-use Mojo::Base -strict;
 
-use File::Basename 'dirname';
-use File::Spec::Functions qw(catdir splitdir);
+use strict;
+use warnings;
 
-# Source directory has precedence
-my @base = (splitdir(dirname(__FILE__)), '..');
-my $lib = join('/', @base, 'lib');
--e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 # Start commands for application
 require Mojolicious::Commands;

diff --git a/lib/Mojolicious/Guides/Growing.pod b/lib/Mojolicious/Guides/Growing.pod
@@ -652,13 +652,8 @@ environments.
   use strict;
   use warnings;
 
-  use File::Basename 'dirname';
-  use File::Spec::Functions qw(catdir splitdir);
-
-  # Source directory has precedence
-  my @base = (splitdir(dirname(__FILE__)), '..');
-  my $lib = join('/', @base, 'lib');
-  -e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
+  use FindBin;
+  use lib "$FindBin::Bin/../lib";
 
   # Start commands for application
   require Mojolicious::Commands;

diff --git a/script/hypnotoad b/script/hypnotoad
@@ -3,14 +3,10 @@
 use strict;
 use warnings;
 
-use File::Basename 'dirname';
-use File::Spec::Functions qw(catdir splitdir);
-use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
-# Source directory has precedence
-my @base = (splitdir(dirname(__FILE__)), '..');
-my $lib = join('/', @base, 'lib');
--e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
+use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
 
 GetOptions(
   'f|foreground' => sub { $ENV{HYPNOTOAD_FOREGROUND} = 1 },

diff --git a/script/mojo b/script/mojo
@@ -3,13 +3,8 @@
 use strict;
 use warnings;
 
-use File::Basename 'dirname';
-use File::Spec::Functions qw(catdir splitdir);
-
-# Source directory has precedence
-my @base = (splitdir(dirname(__FILE__)), '..');
-my $lib = join('/', @base, 'lib');
--e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 require Mojolicious::Commands;
 Mojolicious::Commands->start;

diff --git a/script/morbo b/script/morbo
@@ -3,14 +3,10 @@
 use strict;
 use warnings;
 
-use File::Basename 'dirname';
-use File::Spec::Functions qw(catdir splitdir);
-use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
-# Source directory has precedence
-my @base = (splitdir(dirname(__FILE__)), '..');
-my $lib = join('/', @base, 'lib');
--e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
+use Getopt::Long qw(GetOptions :config no_auto_abbrev no_ignore_case);
 
 GetOptions(
   'h|help'     => \my $help,

diff --git a/t/mojolicious/external/script/my_app b/t/mojolicious/external/script/my_app
@@ -3,13 +3,8 @@
 use strict;
 use warnings;
 
-use File::Basename 'dirname';
-use File::Spec::Functions qw(catdir splitdir);
-
-# Source directory has precedence
-my @base = (splitdir(dirname(__FILE__)), '..');
-my $lib = join('/', @base, 'lib');
--e catdir(@base, 't') ? unshift(@INC, $lib) : push(@INC, $lib);
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 # Start commands for application
 require Mojolicious::Commands;