fixed tmpdir detection

Changes

@@ -11,6 +11,7 @@ This file documents the revision history for Perl extension Mojolicious.
         - Removed bundled RFCs.
         - Fixed IRI handling. (sharifulin)
         - Fixed mixed IRI/IDNA handling.
+        - Fixed tmpdir detection.
         - Fixed typos.
 
 0.999922 2010-02-11 00:00:00

lib/Mojo/Asset/File.pm

@@ -12,12 +12,13 @@ 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::Spec->tmpdir });
+__PACKAGE__->attr(tmpdir => sub { $ENV{MOJO_TMPDIR} || File::Temp::tempdir });
 __PACKAGE__->attr(
     handle => sub {
         my $self   = shift;

lib/Mojo/Server/Daemon.pm

@@ -10,6 +10,7 @@ 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;
@@ -22,7 +23,7 @@ __PACKAGE__->attr(keep_alive_timeout => 15);
 __PACKAGE__->attr(
     lock_file => sub {
         my $self = shift;
-        return File::Spec->catfile(File::Spec->splitdir(File::Spec->tmpdir),
+        return File::Spec->catfile(File::Spec->splitdir(File::Temp::tempdir),
             Mojo::Command->class_to_file(ref $self->app) . '.lock');
     }
 );
@@ -31,7 +32,7 @@ __PACKAGE__->attr(max_keep_alive_requests => 100);
 __PACKAGE__->attr(
     pid_file => sub {
         my $self = shift;
-        return File::Spec->catfile(File::Spec->splitdir(File::Spec->tmpdir),
+        return File::Spec->catfile(File::Spec->splitdir(File::Temp::tempdir),
             Mojo::Command->class_to_file(ref $self->app) . '.pid');
     }
 );

t/mojo/apache_cgi.t

@@ -25,7 +25,7 @@ use_ok('Mojo::Server::CGI');
 # Apache setup
 my $server = Test::Mojo::Server->new;
 my $port   = $server->generate_port_ok;
-my $dir    = File::Temp::tempdir();
+my $dir    = File::Temp::tempdir;
 my $config = File::Spec->catfile($dir, 'cgi.config');
 my $mt     = Mojo::Template->new;
 

t/mojo/apache_fastcgi.t

@@ -23,7 +23,7 @@ use_ok('Mojo::Server::FastCGI');
 # Setup
 my $server = Test::Mojo::Server->new;
 my $port   = $server->generate_port_ok;
-my $dir    = File::Temp::tempdir();
+my $dir    = File::Temp::tempdir;
 my $config = File::Spec->catfile($dir, 'fcgi.config');
 my $mt     = Mojo::Template->new;
 

t/mojo/loader.t

@@ -69,7 +69,7 @@ ok(LoaderTest::C->can('new'));
 
 # Reload
 my $file = IO::File->new;
-my $dir  = File::Temp::tempdir();
+my $dir  = File::Temp::tempdir;
 my $path = File::Spec->catfile($dir, 'MojoTestReloader.pm');
 $file->open("> $path");
 $file->syswrite("package MojoTestReloader;\nsub test { 23 }\n1;");

t/mojo/message.t

@@ -380,7 +380,7 @@ is($req->upload('upload')->filename,    'hello.pl');
 is(ref $req->upload('upload')->asset,   'Mojo::Asset::File');
 is($req->upload('upload')->asset->size, 69);
 my $file =
-  File::Spec->catfile(File::Temp::tempdir(), ("MOJO_TMP." . time . ".txt"));
+  File::Spec->catfile(File::Temp::tempdir, ("MOJO_TMP." . time . ".txt"));
 ok($req->upload('upload')->move_to($file));
 is((unlink $file), 1);
 

t/mojo/template.t

@@ -469,7 +469,7 @@ like($output, qr/23Hello World!/);
 $mt = Mojo::Template->new;
 $mt->tag_start('[$-');
 $mt->tag_end('-$]');
-my $dir = File::Temp::tempdir();
+my $dir = File::Temp::tempdir;
 $file = File::Spec->catfile($dir, 'test.mt');
 is($mt->render_to_file(<<"EOF", $file), undef);
 <% my \$i = 23; %> foo bar