use strict;
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/;
-
-use App::Rgit::Utils qw/validate/;
+use Cwd (); # cwd
+use File::Spec (); # canonpath, catdir, splitdir, abs2rel
+use POSIX (); # WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG SIGINT SIGQUIT
+
+use App::Rgit::Utils (); # abs_path
+
+my ($WIFEXITED, $WEXITSTATUS, $WIFSIGNALED, $WTERMSIG);
+
+BEGIN {
+ $WIFEXITED = eval { POSIX::WIFEXITED(0); 1 } ? \&POSIX::WIFEXITED
+ : sub { 1 };
+ $WEXITSTATUS = eval { POSIX::WEXITSTATUS(0); 1 } ? \&POSIX::WEXITSTATUS
+ : sub { shift() >> 8 };
+ $WIFSIGNALED = eval { POSIX::WIFSIGNALED(0); 1 } ? \&POSIX::WIFSIGNALED
+ : sub { shift() & 127 };
+ $WTERMSIG = eval { POSIX::WTERMSIG(0); 1 } ? \&POSIX::WTERMSIG
+ : sub { shift() & 127 };
+}
=head1 NAME
=head1 VERSION
-Version 0.04
+Version 0.08
=cut
-our $VERSION = '0.04';
+our $VERSION = '0.08';
=head1 DESCRIPTION
=head1 METHODS
-=head2 C<< new dir => $dir [, fake => 1 ] >>
+=head2 C<new>
+
+ my $arr = App::Rgit::Repository->new(
+ dir => $dir,
+ fake => $bool,
+ );
Creates a new repository starting from C<$dir>.
If the C<fake> option is passed, C<$dir> isn't checked to be a valid C<git> repository.
=cut
sub new {
- my ($class, %args) = &validate;
+ my $class = shift;
+ $class = ref $class || $class;
+
+ my %args = @_;
+
my $dir = $args{dir};
- $dir = abs_path $dir if defined $dir and not file_name_is_absolute $dir;
- $dir = cwd unless defined $dir;
+ if (defined $dir) {
+ $dir = App::Rgit::Utils::abs_path($dir);
+ } else {
+ $dir = Cwd::cwd;
+ }
+ $dir = File::Spec->canonpath($dir);
+
my ($repo, $bare, $name, $work);
if ($args{fake}) {
$repo = $work = $dir;
- } else {
- my @tries = ($dir);
- my @chunks = splitdir $dir;
- my $last = pop @chunks;
- push @tries, "$dir.git" unless $last =~ /\.git$/;
- push @tries, catdir($dir, '.git') unless $last eq '.git';
- for (@tries) {
- if (-d $_ && -d "$_/refs" and -d "$_/objects" and -e "$_/HEAD") {
- $repo = $_;
- last;
- }
- }
- return unless defined $repo;
- @chunks = splitdir $repo;
- $last = pop @chunks;
- if ($last eq '.git') {
+ } else {
+ return unless -d $dir
+ and -d "$dir/refs"
+ and -d "$dir/objects"
+ and -e "$dir/HEAD";
+
+ my @chunks = File::Spec->splitdir($dir);
+ my $last = pop @chunks;
+ return unless defined $last;
+
+ if (@chunks and $last eq '.git') {
$bare = 0;
$name = $chunks[-1];
- $work = catdir @chunks;
- } else {
+ $work = File::Spec->catdir(@chunks);
+ } elsif ($last =~ /(.+)\.git$/) {
$bare = 1;
- ($name) = $last =~ /(.*)\.git$/;
- $work = $repo;
+ $name = $1;
+ $work = File::Spec->catdir(@chunks, $last);
+ } else {
+ return;
}
+
+ $repo = $dir;
}
- $class->SUPER::new(
+
+ bless {
fake => !!$args{fake},
repo => $repo,
bare => $bare,
name => $name,
work => $work,
- );
+ }, $class;
}
=head2 C<chdir>
return 1;
}
-=head2 C<run $conf, @args>
+=head2 C<run>
+
+ my $code = $arr->run($conf, @args);
Runs C<git @args> on the repository for the L<App::Rgit::Config> configuration C<$conf>.
When the repository isn't fake, the format substitutions applies to C<@args> elements.
=cut
-sub _abs2rel {
- my $a = &abs2rel;
+my $abs2rel = sub {
+ my $a = File::Spec->abs2rel(@_);
$a = $_[0] unless defined $a;
$a;
-}
+};
my %escapes = (
- '^' => sub { '^' },
+ '%' => sub { '%' },
'n' => sub { shift->name },
- 'g' => sub { _abs2rel(shift->repo, shift->root) },
+ 'g' => sub { $abs2rel->(shift->repo, shift->root) },
'G' => sub { shift->repo },
- 'w' => sub { _abs2rel(shift->work, shift->root) },
+ '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)
+ $abs2rel->(
+ $self->bare ? $self->repo : $self->work . '.git',
+ $conf->root
+ );
},
'B' => sub { $_[0]->bare ? $_[0]->repo : $_[0]->work . '.git' },
'R' => sub { $_[1]->root },
my $self = shift;
my $conf = shift;
return unless $conf->isa('App::Rgit::Config');
+
my @args = @_;
+
unless ($self->fake) {
- s/\^($e)/$escapes{$1}->($self, $conf)/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 { $conf->git } $conf->git, @args;
+ system { $args[0] } @args;
}
+
if ($? == -1) {
- warn "Failed to execute git: $!\n";
+ $conf->crit("Failed to execute git: $!\n");
return;
}
+
my $ret;
- $ret = WEXITSTATUS($?) if WIFEXITED($?);
+ $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";
+ if ($WIFSIGNALED->($?)) {
+ $sig = $WTERMSIG->($?);
+ $conf->warn("git died with signal $sig\n");
+ if ($sig == POSIX::SIGINT() || $sig == POSIX::SIGQUIT()) {
+ $conf->err("Aborting\n");
exit $sig;
}
} elsif ($ret) {
- warn "git returned $ret\n";
+ $conf->info("git returned $ret\n");
}
+
return wantarray ? ($ret, $sig) : $ret;
}
=head2 C<work>
-Accessors.
+Read-only accessors.
+
+=cut
+
+BEGIN {
+ eval "sub $_ { \$_[0]->{$_} }" for qw/fake repo bare name work/;
+}
=head1 SEE ALSO
=head1 AUTHOR
Vincent Pit, C<< <perl at profvince.com> >>, L<http://profvince.com>.
-
+
You can contact me by mail or on C<irc.perl.org> (vincent).
=head1 BUGS
-Please report any bugs or feature requests to C<bug-rgit at rt.cpan.org>, or through the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=rgit>. I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
+Please report any bugs or feature requests to C<bug-rgit at rt.cpan.org>, or through the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=rgit>.
+I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
=head1 SUPPORT
=head1 COPYRIGHT & LICENSE
-Copyright 2008 Vincent Pit, all rights reserved.
+Copyright 2008,2009,2010 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.
projects / perl / modules / rgit.git / blobdiff