cleanup

mojolicious · Mar 2, 2010 · 74fe0da · 74fe0da
1 parent 4a7360a
commit 74fe0da
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 5 deletions.
diff --git a/lib/Mojo/Asset/File.pm b/lib/Mojo/Asset/File.pm
@@ -12,13 +12,12 @@ use base 'Mojo::Asset';
 use Carp 'croak';
 use File::Copy ();
 use File::Spec;
-use File::Temp;
 use IO::File;
 use Mojo::ByteStream 'b';
 
 __PACKAGE__->attr([qw/cleanup path end_range/]);
 __PACKAGE__->attr(start_range => 0);
-__PACKAGE__->attr(tmpdir => sub { $ENV{MOJO_TMPDIR} || File::Temp::tempdir });
+__PACKAGE__->attr(tmpdir => sub { $ENV{MOJO_TMPDIR} || File::Spec->tmpdir });
 __PACKAGE__->attr(
     handle => sub {
         my $self   = shift;

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -10,7 +10,6 @@ use base 'Mojo::Server';
 use Carp 'croak';
 use Fcntl ':flock';
 use File::Spec;
-use File::Temp;
 use IO::File;
 use Mojo::Command;
 use Mojo::IOLoop;
@@ -23,7 +22,7 @@ __PACKAGE__->attr(keep_alive_timeout => 15);
 __PACKAGE__->attr(
     lock_file => sub {
         my $self = shift;
-        return File::Spec->catfile(File::Spec->splitdir(File::Temp::tempdir),
+        return File::Spec->catfile($ENV{MOJO_TMPDIR} || File::Spec->tmpdir,
             Mojo::Command->class_to_file(ref $self->app) . '.lock');
     }
 );
@@ -32,7 +31,7 @@ __PACKAGE__->attr(max_keep_alive_requests => 100);
 __PACKAGE__->attr(
     pid_file => sub {
         my $self = shift;
-        return File::Spec->catfile(File::Spec->splitdir(File::Temp::tempdir),
+        return File::Spec->catfile($ENV{MOJO_TMPDIR} || File::Spec->tmpdir,
             Mojo::Command->class_to_file(ref $self->app) . '.pid');
     }
 );

diff --git a/t/mojo/app.t b/t/mojo/app.t
@@ -19,9 +19,13 @@ package main;
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/app.t b/t/mojolicious/app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/charset_lite_app.t b/t/mojolicious/charset_lite_app.t
@@ -7,9 +7,13 @@ use warnings;
 
 use utf8;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/embedded_lite_app.t b/t/mojolicious/embedded_lite_app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/i18n_lite_app.t b/t/mojolicious/i18n_lite_app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/json_config_lite_app.t b/t/mojolicious/json_config_lite_app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -7,9 +7,13 @@ use warnings;
 
 use utf8;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/pod_renderer_lite_app.t b/t/mojolicious/pod_renderer_lite_app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/production_app.t b/t/mojolicious/production_app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;

diff --git a/t/mojolicious/websocket_lite_app.t b/t/mojolicious/websocket_lite_app.t
@@ -5,9 +5,13 @@
 use strict;
 use warnings;
 
+use File::Temp;
 use Mojo::IOLoop;
 use Test::More;
 
+# Use a clean temporary directory
+BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
+
 # Make sure sockets are working
 plan skip_all => 'working sockets required for this test!'
   unless Mojo::IOLoop->new->generate_port;