Merge pull request #941 from metacpan/oalders/some-path-tiny

Begin using Path::Tiny in more places

Author: mickeyn

lib/MetaCPAN/Model/Release.pm

@@ -15,7 +15,7 @@ use MetaCPAN::Types qw(ArrayRef AbsFile Str);
 use MetaCPAN::Util qw( fix_version);
 use Module::Metadata 1.000012 ();    # Improved package detection.
 use MooseX::StrictConstructor;
-use Path::Class ();
+use Path::Tiny qw(path);
 use Parse::PMFile;
 use Try::Tiny qw( catch try );
 
@@ -337,10 +337,7 @@ sub _build_files {
     my $extract_dir = $self->extract;
     File::Find::find(
         sub {
-            my $child
-                = -d $File::Find::name
-                ? Path::Class::Dir->new($File::Find::name)
-                : Path::Class::File->new($File::Find::name);
+            my $child = path($File::Find::name);
             return if $self->_is_broken_file($File::Find::name);
             my $relative = $child->relative($extract_dir);
             my $stat     = do {

lib/MetaCPAN/Role/Logger.pm

@@ -5,7 +5,7 @@ use Moose::Role;
 use MetaCPAN::Types qw(:all);
 use Log::Contextual qw( set_logger );
 use Log::Log4perl ':easy';
-use Path::Class ();
+use Path::Tiny qw( path );
 
 has level => (
     is            => 'ro',
@@ -58,7 +58,7 @@ sub _build_logger {
         if ( $c->{class} =~ /Appender::File$/ && $c->{filename} ) {
 
             # Create the log file's parent directory if necessary.
-            Path::Class::File->new( $c->{filename} )->parent->mkpath;
+            path( $c->{filename} )->parent->mkpath;
         }
 
         my $app = Log::Log4perl::Appender->new( $c->{class}, %$c );

t/00_setup.t

@@ -4,7 +4,6 @@ use lib 't/lib';
 
 use CPAN::Faker 0.010;
 use Devel::Confess;
-use File::Copy qw( copy );
 use MetaCPAN::Script::Tickets ();
 use MetaCPAN::Server::Test;
 use MetaCPAN::TestHelpers qw(
@@ -31,7 +30,7 @@ BEGIN {
 
 # Ensure we're starting fresh
 my $tmp_dir = tmp_dir();
-$tmp_dir->rmtree;
+$tmp_dir->remove_tree;
 $tmp_dir->mkpath;
 
 ok( $tmp_dir->stat, "$tmp_dir exists for testing" );
@@ -46,26 +45,26 @@ my $mod_faker = 'Module::Faker::Dist::WithPerl';
 eval "require $mod_faker" or die $@;    ## no critic (StringyEval)
 
 my $fakecpan_dir = fakecpan_dir();
-$fakecpan_dir->rmtree;
+$fakecpan_dir->remove_tree;
 $fakecpan_dir = fakecpan_dir();         # recreate dir
 
 my $fakecpan_configs = fakecpan_configs_dir();
 
 my $cpan = CPAN::Faker->new(
     {
-        source     => $fakecpan_configs->subdir('configs')->stringify,
+        source     => $fakecpan_configs->child('configs')->stringify,
         dest       => $fakecpan_dir->stringify,
         dist_class => $mod_faker,
     }
 );
 
 ok( $cpan->make_cpan, 'make fake cpan' );
-$fakecpan_dir->subdir('authors')->mkpath;
-$fakecpan_dir->subdir('indices')->mkpath;
+$fakecpan_dir->child('authors')->mkpath;
+$fakecpan_dir->child('indices')->mkpath;
 
 # make some changes to 06perms.txt
 {
-    my $perms_file = $fakecpan_dir->subdir('modules')->file('06perms.txt');
+    my $perms_file = $fakecpan_dir->child('modules')->child('06perms.txt');
     my $perms      = $perms_file->slurp;
     $perms =~ s/^Some,LOCAL,f$/Some,MO,f/m;
     my $fh = $perms_file->openw;
@@ -84,16 +83,16 @@ local $Parse::PMFile::VERBOSE = $ENV{TEST_VERBOSE} ? 9 : 0;
 
 my $src_dir = $fakecpan_configs;
 
-$src_dir->file('00whois.xml')
-    ->copy_to( $fakecpan_dir->file(qw(authors 00whois.xml)) );
+$src_dir->child('00whois.xml')
+    ->copy( $fakecpan_dir->child(qw(authors 00whois.xml)) );
 
-copy( $src_dir->file('author-1.0.json'),
-    $fakecpan_dir->file(qw(authors id M MO MO author-1.0.json)) );
+$src_dir->child('author-1.0.json')
+    ->copy( $fakecpan_dir->child(qw(authors id M MO MO author-1.0.json)) );
 
-copy( $src_dir->file('bugs.tsv'), $fakecpan_dir->file('bugs.tsv') );
+$src_dir->child('bugs.tsv')->copy( $fakecpan_dir->child('bugs.tsv') );
 
-copy( $src_dir->file('mirrors.json'),
-    $fakecpan_dir->file(qw(indices mirrors.json)) );
+$src_dir->child('mirrors.json')
+    ->copy( $fakecpan_dir->child(qw(indices mirrors.json)) );
 
 $server->index_permissions;
 $server->index_packages;
@@ -113,11 +112,11 @@ ok(
             %{$config},
             rt_summary_url => uri(
                 scheme => 'file',
-                path => $fakecpan_dir->file('bugs.tsv')->absolute->stringify,
+                path => $fakecpan_dir->child('bugs.tsv')->absolute->stringify,
             ),
             github_issues => uri(
                 scheme => 'file',
-                path   => $fakecpan_dir->subdir('github')->absolute->stringify
+                path   => $fakecpan_dir->child('github')->absolute->stringify
                     . '/%s/%s.json?per_page=100'
             ),
         }

t/lib/MetaCPAN/TestHelpers.pm

@@ -8,7 +8,7 @@ use Cpanel::JSON::XS;
 use FindBin;
 use Git::Helpers qw( checkout_root );
 use MetaCPAN::Script::Runner;
-use Path::Class qw( dir );
+use Path::Tiny qw( path );
 use Test::More;
 use Test::Routine::Util;
 use Try::Tiny qw( catch try );
@@ -84,7 +84,7 @@ sub test_release {
 
     # If the first arg is a string, treat it like 'AUTHOR/Release-Name'.
     if ( !ref( $_[0] ) ) {
-        my ( $author, $name ) = split /\//, shift;
+        my ( $author, $name ) = split m{/}, shift;
         $release = { name => $name, author => $author };
     }
 
@@ -98,27 +98,27 @@ sub get_config {
     my $config = do {
 
         # build_config expects test to be t/*.t
-        local $FindBin::RealBin = dir( undef, checkout_root(), 't' );
+        local $FindBin::RealBin = path( checkout_root(), 't' );
         MetaCPAN::Script::Runner->build_config;
     };
     return $config;
 }
 
 sub tmp_dir {
-    my $dir = dir( checkout_root(), 'var', 't', 'tmp' );
+    my $dir = path( checkout_root(), 'var', 't', 'tmp' );
     $dir->mkpath;
     return $dir;
 }
 
 sub fakecpan_dir {
     my $dir      = tmp_dir();
-    my $fakecpan = $dir->subdir('fakecpan');
+    my $fakecpan = $dir->child('fakecpan');
     $fakecpan->mkpath;
     return $fakecpan;
 }
 
 sub fakecpan_configs_dir {
-    my $source = dir( undef, checkout_root(), 'test-data', 'fakecpan' );
+    my $source = path( checkout_root(), 'test-data', 'fakecpan' );
     $source->mkpath;
     return $source;
 }

t/model/archive.t

@@ -2,9 +2,9 @@ use strict;
 use warnings;
 use lib 't/lib';
 
+use Digest::SHA qw( sha1_hex );
 use MetaCPAN::TestHelpers qw( fakecpan_dir );
 use Test::Most;
-use Digest::SHA qw( sha1_hex );
 
 my $CLASS = 'MetaCPAN::Model::Archive';
 require_ok $CLASS;
@@ -35,8 +35,8 @@ subtest 'archive extraction' => sub {
     );
 
     my $archive = $CLASS->new(
-        file => fakecpan_dir->file(
-            '/authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')
+        file => fakecpan_dir->child(
+            '/authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')->stringify
     );
 
     ok !$archive->is_impolite;
@@ -62,8 +62,8 @@ subtest 'temp cleanup' => sub {
 
     {
         my $archive = $CLASS->new(
-            file => fakecpan_dir->file(
-                'authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')
+            file => fakecpan_dir->child(
+                'authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')->stringify
         );
 
         $tempdir = $archive->extract;
@@ -79,8 +79,8 @@ subtest 'temp cleanup' => sub {
 
 subtest 'extract once' => sub {
     my $archive = $CLASS->new(
-        file => fakecpan_dir->file(
-            'authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')
+        file => fakecpan_dir->child(
+            'authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')->stringify
     );
 
     is $archive->extract, $archive->extract;
@@ -91,8 +91,8 @@ subtest 'set extract dir' => sub {
 
     {
         my $archive = $CLASS->new(
-            file => fakecpan_dir->file(
-                'authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz'),
+            file => fakecpan_dir->child(
+                'authors/id/L/LO/LOCAL/Some-1.00-TRIAL.tar.gz')->stringify,
             extract_dir => $temp->dirname
         );
 

t/model/release/dependencies.t

@@ -12,7 +12,7 @@ my $config = get_config();
 
 subtest 'basic dependencies' => sub {
     my $file
-        = fakecpan_dir->file(
+        = fakecpan_dir->child(
         '/authors/id/M/MS/MSCHWERN/Prereqs-Basic-0.01.tar.gz');
 
     my $release = MetaCPAN::Model::Release->new(

t/model/release/metadata.t

@@ -8,7 +8,7 @@ use MetaCPAN::Script::Runner;
 use MetaCPAN::TestHelpers qw( fakecpan_dir get_config );
 use Test::More;
 
-my $authordir = fakecpan_dir->file('authors/id/L/LO/LOCAL');
+my $authordir = fakecpan_dir->child('authors/id/L/LO/LOCAL');
 
 my $config = get_config();
 

t/server/controller/pod.t

@@ -6,16 +6,16 @@ use Cpanel::JSON::XS ();
 use HTTP::Request::Common qw( GET );
 use MetaCPAN::Server ();
 use MetaCPAN::TestHelpers;
-use Path::Class qw(dir);
+use Path::Tiny qw(path);
 use Plack::Test;
 use Test::More;
 use Try::Tiny qw( catch try );
 
-my $dir = dir( MetaCPAN::Server->model('Source')->base_dir,
+my $dir = path( MetaCPAN::Server->model('Source')->base_dir,
     'DOY/Moose-0.02/Moose-0.02' );
 $dir->mkpath;
 
-my $file = $dir->file('binary.bin');
+my $file = $dir->child('binary.bin');
 $file->openw->print( "\x00" x 10 );
 
 my %tests = (