use file::temp for tempdir instead of path::tiny

This may fix the spurious failures on Travis...
preaction · Nov 6, 2017 · 1e0eec7 · 1e0eec7
1 parent 8b6c500
commit 1e0eec7
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 14 deletions.
diff --git a/lib/Statocles/Test.pm b/lib/Statocles/Test.pm
@@ -4,6 +4,7 @@ our $VERSION = '0.087';
 
 use Statocles::Base;
 use Statocles::Util qw( dircopy derp );
+use File::Temp;
 
 use base qw( Exporter );
 our @EXPORT_OK = qw(
@@ -68,8 +69,8 @@ deploy dir.
 sub build_test_site_apps {
     my ( $share_dir, %site_args ) = @_;
 
-    my $build_dir = Path::Tiny->tempdir;
-    my $deploy_dir = Path::Tiny->tempdir;
+    my $build_dir = File::Temp->newdir;
+    my $deploy_dir = File::Temp->newdir;
 
     $site_args{build_store}{path} = $build_dir;
     $site_args{deploy}{path} = $deploy_dir;
@@ -250,7 +251,7 @@ temporary directories
 sub build_temp_site {
     my ( $share_dir ) = @_;
 
-    my $tmp = Path::Tiny->tempdir;
+    my $tmp = File::Temp->newdir;
     dircopy $share_dir->child( qw( app blog ) ), $tmp->child( 'blog' );
     dircopy $share_dir->child( 'theme' ), $tmp->child( 'theme' );
     $tmp->child( 'build_site' )->mkpath;

diff --git a/t/site/build_and_deploy.t b/t/site/build_and_deploy.t
@@ -4,7 +4,9 @@ use My::Test;
 use Statocles::Site;
 my $SHARE_DIR = path( __DIR__, '..', 'share' );
 
-my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps( $SHARE_DIR );
+my ( $site, $build_t, $deploy_t ) = build_test_site_apps( $SHARE_DIR );
+my $build_dir = path( $build_t );
+my $deploy_dir = path( $deploy_t );
 
 sub test_page_content {
     my ( $site, $page, $dir ) = @_;
@@ -110,13 +112,15 @@ subtest 'deploy' => sub {
 };
 
 subtest 'base URL with folder rewrites content' => sub {
-    my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+    my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
         $SHARE_DIR,
         base_url => '/', # The default
         deploy => {
             base_url => 'http://example.com/deploy/',
         },
     );
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     subtest 'build' => sub {
         $site->build;

diff --git a/t/site/data.t b/t/site/data.t
@@ -3,7 +3,7 @@ use Test::Lib;
 use My::Test;
 my $SHARE_DIR = path( __DIR__, '..', 'share' );
 
-my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
     $SHARE_DIR,
     base_url => 'http://example.com/test',
     deploy => {
@@ -13,6 +13,8 @@ my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
         profile_url => '/profile',
     },
 );
+my $build_dir = path( $build_t );
+my $deploy_dir = path( $deploy_t );
 
 sub test_page_content {
     my ( $site, $page, $dir, $deploy ) = @_;

diff --git a/t/site/events.t b/t/site/events.t
@@ -5,7 +5,9 @@ use Statocles::Page::Plain;
 my $SHARE_DIR = path( __DIR__, '..', 'share' );
 
 subtest 'build events' => sub {
-    my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps( $SHARE_DIR );
+    my ( $site, $build_t, $deploy_t ) = build_test_site_apps( $SHARE_DIR );
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     $site->on( 'before_build_write', sub {
         subtest 'before_build_write' => sub {

diff --git a/t/site/index.t b/t/site/index.t
@@ -7,7 +7,9 @@ use Mojo::DOM;
 my $SHARE_DIR = path( __DIR__, '..', 'share' );
 
 sub test_site {
-    my ( $site, $build_dir, $deploy_dir ) = @_;
+    my ( $site, $build_t, $deploy_t ) = @_;
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     subtest 'build' => sub {
         $site->build;
@@ -82,14 +84,16 @@ subtest 'index links in basic app' => sub {
         store => $SHARE_DIR->child( qw( app basic ) ),
     );
 
-    my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+    my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
         $SHARE_DIR,
         base_url => 'http://example.com/mysite',
         index => '/page/foo/other.html',
         apps => {
             basic => $basic,
         },
     );
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     $site->build;
 
@@ -120,13 +124,15 @@ subtest 'allow document path in index' => sub {
         store => $SHARE_DIR->child( qw( app basic ) ),
     );
 
-    my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+    my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
         $SHARE_DIR,
         index => '/page/foo/other.markdown',
         apps => {
             basic => $basic,
         },
     );
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     $site->build;
 

diff --git a/t/site/nav.t b/t/site/nav.t
@@ -3,7 +3,7 @@ use Test::Lib;
 use My::Test;
 my $SHARE_DIR = path( __DIR__, '..', 'share' );
 
-my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
     $SHARE_DIR,
     base_url => 'http://example.com',
     deploy => {
@@ -23,6 +23,8 @@ my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
         ],
     },
 );
+my $build_dir = path( $build_t );
+my $deploy_dir = path( $deploy_t );
 
 subtest 'nav( NAME ) method' => sub {
     my @links = $site->nav( 'main' );

diff --git a/t/site/sitemap_and_robots.t b/t/site/sitemap_and_robots.t
@@ -11,14 +11,16 @@ my $blog = Statocles::App::Blog->new(
     page_size => 2,
 );
 
-my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
     $SHARE_DIR,
     apps => {
         blog => $blog,
     },
     index => '/blog',
     base_url => 'http://example.com',
 );
+my $build_dir = path( $build_t );
+my $deploy_dir = path( $deploy_t );
 
 my @pages = map { $_->pages } values %{ $site->apps };
 my $today = DateTime::Moonpig->now( time_zone => 'local' )->strftime( '%Y-%m-%d' );

diff --git a/t/site/warnings.t b/t/site/warnings.t
@@ -29,13 +29,15 @@ subtest 'build two pages with same path' => sub {
         ],
     );
 
-    my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+    my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
         $SHARE_DIR,
         apps => {
             static => $static,
             basic => $basic,
         },
     );
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     my ( $out, $err, $exit ) = capture {
         $site->build;
@@ -68,12 +70,14 @@ subtest 'app generates two pages with the same path' => sub {
         ],
     );
 
-    my ( $site, $build_dir, $deploy_dir ) = build_test_site_apps(
+    my ( $site, $build_t, $deploy_t ) = build_test_site_apps(
         $SHARE_DIR,
         apps => {
             test => $app,
         },
     );
+    my $build_dir = path( $build_t );
+    my $deploy_dir = path( $deploy_t );
 
     my ( $out, $err, $exit ) = capture {
         $site->build;