use warnings;
use Cwd qw/cwd abs_path/;
-use File::Spec::Functions qw/catdir splitdir abs2rel file_name_is_absolute/;
+use File::Spec::Functions qw/canonpath catdir splitdir abs2rel file_name_is_absolute/;
+use POSIX qw/WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG SIGINT SIGQUIT/;
+
+BEGIN {
+ no warnings 'redefine';
+ *WIFEXITED = sub { 1 } unless eval { WIFEXITED(0); 1 };
+ *WEXITSTATUS = sub { shift() >> 8 } unless eval { WEXITSTATUS(0); 1 };
+ *WIFSIGNALED = sub { shift() & 127 } unless eval { WIFSIGNALED(0); 1 };
+}
use Object::Tiny qw/fake repo bare name work/;
=head1 VERSION
-Version 0.02
+Version 0.06
=cut
-our $VERSION = '0.02';
+our $VERSION = '0.06';
=head1 DESCRIPTION
$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;
}
}
return unless defined $repo;
+ $repo = canonpath $repo;
@chunks = splitdir $repo;
$last = pop @chunks;
if ($last eq '.git') {
$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;
+ }
+ unshift @args, $conf->git;
+ $conf->info('Executing "', join(' ', @args), '" into ', $self->work, "\n");
+ {
+ 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 { $args[0] } @args;
+ }
+ if ($? == -1) {
+ $conf->crit("Failed to execute git: $!\n");
+ return;
+ }
+ my $ret;
+ $ret = WEXITSTATUS($?) if WIFEXITED($?);
+ my $sig;
+ if (WIFSIGNALED($?)) {
+ $sig = WTERMSIG($?);
+ $conf->warn("git died with signal $sig\n");
+ if ($sig == SIGINT || $sig == SIGQUIT) {
+ $conf->err("Aborting\n");
+ exit $sig;
+ }
+ } elsif ($ret) {
+ $conf->info("git returned $ret\n");
}
- system { $conf->git } $conf->git, @args;
+ return wantarray ? ($ret, $sig) : $ret;
}
=head2 C<fake>
=head1 COPYRIGHT & LICENSE
-Copyright 2008 Vincent Pit, all rights reserved.
+Copyright 2008-2009 Vincent Pit, all rights reserved.
This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.