Reverting broken change to ::Project::diff.

[catagits/Gitalist.git] / lib / Gitalist / Git / Util.pm

diff --git a/lib/Gitalist/Git/Util.pm b/lib/Gitalist/Git/Util.pm
index 8f7dd0f..a38eb70 100644 (file)
--- a/lib/Gitalist/Git/Util.pm
+++ b/lib/Gitalist/Git/Util.pm
@@ -1,8 +1,17 @@
 use MooseX::Declare;
 
 class Gitalist::Git::Util {
-    has git      => ( isa => NonEmptySimpleStr, is => 'ro', lazy_build => 1 );
-    sub _build_git {
+    use File::Which;
+    use Git::PurePerl;
+    use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
+    has project => (
+        isa => 'Gitalist::Git::Project',
+        handles => { gitdir => 'project_dir' },
+        is => 'bare', # No accessor
+        weak_ref => 1, # Weak, you have to hold onto me.
+    );
+    has _git      => ( isa => NonEmptySimpleStr, is => 'ro', lazy_build => 1 );
+    sub _build__git {
         my $git = File::Which::which('git');
 
         if (!$git) {
@@ -15,11 +24,27 @@ EOR
         return $git;
     }
 
-    
+    has _gpp      => (
+        isa => 'Git::PurePerl', is => 'ro', lazy => 1,
+        default => sub { Git::PurePerl->new(gitdir => shift->gitdir) },
+    );
 
+    method run_cmd (@args) {
+        unshift @args, ( '--git-dir' => $self->gitdir );
+#        print STDERR 'RUNNING: ', $self->_git, qq[ @args], $/;
 
+        open my $fh, '-|', $self->_git, @args
+            or die "failed to run git command";
+        binmode $fh, ':encoding(UTF-8)';
 
+        my $output = do { local $/ = undef; <$fh> };
+        close $fh;
 
+        return $output;
+    }
+
+    method get_gpp_object (NonEmptySimpleStr $sha1) {
+        return $self->_gpp->get_object($sha1) || undef;
+    }
 
-#
 } # end class