WIP

frioux · Apr 20, 2014 · fd64445 · fd64445
1 parent 7b11256
commit fd64445
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 31 deletions.
diff --git a/cpanfile b/cpanfile
@@ -5,6 +5,7 @@ requires 'Config::GitLike';
 requires 'Data::Stream::Bulk';
 requires 'DateTime';
 requires 'File::Find::Rule';
+requires 'IO::All';
 requires 'IO::Digest';
 requires 'Moo';
 requires 'MooX::Types::MooseLike';

diff --git a/lib/Cogit.pm b/lib/Cogit.pm
@@ -19,18 +19,13 @@ use Cogit::Pack::WithIndex;
 use Cogit::Pack::WithoutIndex;
 use Cogit::Protocol;
 use Path::Class;
+use IO::All;
 use namespace::clean;
 
-has directory => (
-    is       => 'ro',
-    isa      => InstanceOf['Path::Class::Dir'],
-    coerce   => sub { return dir($_[0]); },
-);
+has directory => ( is => 'ro' );
 
 has gitdir => (
     is       => 'ro',
-    isa      => InstanceOf['Path::Class::Dir'],
-    coerce   => sub { return dir($_[0]); },
     required => 1,
 );
 
@@ -157,7 +152,7 @@ sub ref_sha1 {
 
     if ($wantref eq "HEAD") {
         my $file = file($self->gitdir, 'HEAD');
-        my $sha1 = file($file)->slurp
+        my $sha1 = io->file($file)->slurp
             || confess("Error reading $file: $!");
         chomp $sha1;
         return _ensure_sha1_is_sha1( $self, $sha1 );
@@ -166,7 +161,7 @@ sub ref_sha1 {
     foreach my $file ( File::Find::Rule->new->file->in($dir) ) {
         my $ref = 'refs/' . file($file)->relative($dir)->as_foreign('Unix');
         if ( $ref eq $wantref ) {
-            my $sha1 = file($file)->slurp
+            my $sha1 = io->file($file)->slurp
                 || confess("Error reading $file: $!");
             chomp $sha1;
             return _ensure_sha1_is_sha1( $self, $sha1 );
@@ -296,7 +291,7 @@ sub create_object {
 
 sub all_sha1s {
     my $self = shift;
-    my $dir = dir( $self->gitdir, 'objects' );
+    my $dir = io->dir( $self->gitdir, 'objects' );
 
     my @streams;
     push @streams, $self->loose->all_sha1s;
@@ -355,15 +350,15 @@ sub init {
         if ( not defined $arguments{gitdir} ) {
             $git_dir = $arguments{gitdir} = dir( $directory, '.git' );
         }
-        dir($directory)->mkpath;
+        io->dir($directory)->mkpath;
     }
 
-    dir($git_dir)->mkpath;
-    dir( $git_dir, 'refs',    'tags' )->mkpath;
-    dir( $git_dir, 'objects', 'info' )->mkpath;
-    dir( $git_dir, 'objects', 'pack' )->mkpath;
-    dir( $git_dir, 'branches' )->mkpath;
-    dir( $git_dir, 'hooks' )->mkpath;
+    io->dir($git_dir)->mkpath;
+    io->dir( $git_dir, 'refs',    'tags' )->mkpath;
+    io->dir( $git_dir, 'objects', 'info' )->mkpath;
+    io->dir( $git_dir, 'objects', 'pack' )->mkpath;
+    io->dir( $git_dir, 'branches' )->mkpath;
+    io->dir( $git_dir, 'hooks' )->mkpath;
 
     my $bare = defined($directory) ? 'false' : 'true';
     $class->_add_file(
@@ -395,7 +390,7 @@ sub init {
     $class->_add_file( file( $git_dir, 'hooks', 'update' ),
         "# add shell script and make executable to enable\n" );
 
-    dir( $git_dir, 'info' )->mkpath;
+    io->dir( $git_dir, 'info' )->mkpath;
     $class->_add_file( file( $git_dir, 'info', 'exclude' ),
         "# *.[oa]\n# *~\n" );
 
@@ -417,7 +412,7 @@ sub checkout {
             chmod( oct( '0' . $mode ), $filename )
                 || die "Error chmoding $filename to $mode: $!";
         } elsif ( $object->kind eq 'tree' ) {
-            dir($filename)->mkpath;
+            io->dir($filename)->mkpath;
             $self->checkout( $filename, $object );
         } else {
             die $object->kind;

diff --git a/lib/Cogit/Config.pm b/lib/Cogit/Config.pm
@@ -2,6 +2,7 @@ package Cogit::Config;
 
 use Moo;
 use MooX::Types::MooseLike::Base qw( InstanceOf );
+use Path::Class;
 use namespace::clean;
 
 extends 'Config::GitLike';
@@ -17,7 +18,7 @@ has git => (
 
 sub dir_file {
     my $self = shift;
-    return $self->git->gitdir->file("config");
+    return dir($self->git->gitdir)->file("config");
 };
 
 1;
diff --git a/lib/Cogit/Loose.pm b/lib/Cogit/Loose.pm
@@ -9,9 +9,7 @@ use namespace::clean;
 
 has directory => (
     is       => 'ro',
-    isa      => InstanceOf['Path::Class::Dir'],
     required => 1,
-    coerce   => sub { dir($_[0]) if !obj($_[0], 'Path::Class::Dir'); $_[0]; },
 );
 
 sub get_object {

diff --git a/lib/Cogit/Pack.pm b/lib/Cogit/Pack.pm
@@ -2,7 +2,6 @@ package Cogit::Pack;
 
 use Moo;
 use MooX::Types::MooseLike::Base 'InstanceOf';
-use Path::Class;
 use Compress::Raw::Zlib;
 use IO::File;
 use Carp 'confess';
@@ -11,9 +10,7 @@ use namespace::clean;
 
 has filename => (
     is => 'ro',
-    isa => InstanceOf['Path::Class::File'],
     required => 1,
-    coerce   => sub { file($_[0]) if !obj($_[0], 'Path::Class::File'); $_[0]; },
 );
 
 has fh => (

diff --git a/lib/Cogit/Pack/WithIndex.pm b/lib/Cogit/Pack/WithIndex.pm
@@ -4,16 +4,13 @@ use Moo;
 use Cogit::PackIndex::Version1;
 use Cogit::PackIndex::Version2;
 use MooX::Types::MooseLike::Base 'InstanceOf';
-use Path::Class;
 use Check::ISA;
 use namespace::clean;
 
 extends 'Cogit::Pack';
 
 has index_filename => (
     is => 'rw',
-    coerce => sub { file($_[0]) if !obj($_[0], 'Path::Class::File'); $_[0]; },
-    #isa => InstanceOf['Path::Class::File'],
 );
 
 has index => (

diff --git a/lib/Cogit/PackIndex.pm b/lib/Cogit/PackIndex.pm
@@ -1,16 +1,13 @@
 package Cogit::PackIndex;
 
 use Moo;
-use Path::Class 'file';
 use Check::ISA;
 use IO::File;
 use MooX::Types::MooseLike::Base qw( InstanceOf ArrayRef Str Int );
 use namespace::clean;
 
 has filename => (
     is => 'ro',
-    isa      => InstanceOf['Path::Class::File'],
-    coerce   => sub { file($_[0]) },
     required => 1,
 );