Build escapes once for all

[perl/modules/rgit.git] / lib / App / Rgit / Repository.pm

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index 82c9f5607e79af6bed3a25da58ae043f5fc3f33c..b8cd5eb7a6204cbcdd86c765db4a20bcb928a68f 100644 (file)
--- a/lib/App/Rgit/Repository.pm
+++ b/lib/App/Rgit/Repository.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use Cwd qw/cwd abs_path/;
 use File::Spec::Functions qw/catdir splitdir abs2rel file_name_is_absolute/;
+use POSIX qw/WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG SIGINT SIGQUIT/;
 
 use Object::Tiny qw/fake repo bare name work/;
 
@@ -16,11 +17,11 @@ App::Rgit::Repository - Class representing a Git repository.
 
 =head1 VERSION
 
-Version 0.03
+Version 0.04
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 DESCRIPTION
 
@@ -44,7 +45,7 @@ sub new {
  $dir = cwd       unless defined $dir;
  my ($repo, $bare, $name, $work);
  if ($args{fake}) {
-  $work = $dir;
+  $repo = $work = $dir;
  } else { 
   my @tries = ($dir);
   my @chunks = splitdir $dir;
@@ -109,26 +110,54 @@ sub _abs2rel {
  $a;
 }
 
+my %escapes = (
+ '^' => sub { '^' },
+ 'n' => sub { shift->name },
+ 'g' => sub { _abs2rel(shift->repo, shift->root) },
+ 'G' => sub { shift->repo },
+ 'w' => sub { _abs2rel(shift->work, shift->root) },
+ 'W' => sub { shift->work },
+ 'b' => sub {
+  my ($self, $conf) = @_;
+  _abs2rel($self->bare ? $self->repo : $self->work . '.git', $conf->root)
+ },
+ 'B' => sub { $_[0]->bare ? $_[0]->repo : $_[0]->work . '.git' },
+ 'R' => sub { $_[1]->root },
+);
+my $e = quotemeta join '', keys %escapes;
+$e = "[$e]";
+
 sub run {
  my $self = shift;
  my $conf = shift;
  return unless $conf->isa('App::Rgit::Config');
  my @args = @_;
  unless ($self->fake) {
-  my %escapes = (
-   '^' => sub { '^' },
-   'n' => sub { $self->name },
-   'g' => sub { _abs2rel($self->repo, $conf->root) },
-   'G' => sub { $self->repo },
-   'w' => sub { _abs2rel($self->work, $conf->root) },
-   'W' => sub { $self->work },
-   'b' => sub { _abs2rel($self->bare ? $self->repo : $self->work . '.git', $conf->root) },
-   'B' => sub { $self->bare ? $self->repo : $self->work . '.git' },
-   'R' => sub { $conf->root },
-  );
-  s/\^([\^ngGwWbBR])/$escapes{$1}->()/eg for @args;
+  s/\^($e)/$escapes{$1}->($self, $conf)/eg for @args;
+ }
+ {
+  local $ENV{GIT_DIR} = $self->repo if exists $ENV{GIT_DIR};
+  local $ENV{GIT_EXEC_PATH} = $conf->git if exists $ENV{GIT_EXEC_PATH};
+  system { $conf->git } $conf->git, @args;
+ }
+ if ($? == -1) {
+  warn "Failed to execute git: $!\n";
+  return;
+ }
+ my $ret;
+ $ret = WEXITSTATUS($?) if WIFEXITED($?);
+ my $sig;
+ if (WIFSIGNALED($?)) {
+  $sig = WTERMSIG($?);
+  warn "git died with signal $sig\n";
+  if ($sig == SIGINT || $sig == SIGQUIT) {
+   warn "Aborting.\n";
+   exit $sig;
+  }
+ } elsif ($ret) {
+  warn "git returned $ret\n";
  }
- system { $conf->git } $conf->git, @args;
+ return wantarray ? ($ret, $sig) : $ret;
 }
 
 =head2 C<fake>