Build escapes once for all

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index c7981004ffcfb97719567c4db490db87a3111c96..b8cd5eb7a6204cbcdd86c765db4a20bcb928a68f 100644 (file)
--- a/lib/App/Rgit/Repository.pm
+++ b/lib/App/Rgit/Repository.pm
@@ -110,24 +110,30 @@ sub _abs2rel {
  $a;
 }
 
  $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) {
 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_DIR} = $self->repo if exists $ENV{GIT_DIR};

diff --git a/t/20-each.t b/t/20-each.t
index 55e70855effbfc245c02258fa2632b0e77d06126..23692aa1d67c0cf84214fdaccfa558509765c686 100644 (file)
--- a/t/20-each.t
+++ b/t/20-each.t
@@ -7,7 +7,7 @@ use Cwd qw/cwd abs_path/;
 use File::Spec::Functions qw/catdir catfile/;
 use File::Temp qw/tempfile tempdir/;
 
 use File::Spec::Functions qw/catdir catfile/;
 use File::Temp qw/tempfile tempdir/;
 

-use Test::More tests => 2 + 2 * 4 + 11 * (3 + 1 + 3 + 6);
+use Test::More tests => 2 + 2 * 4 + 12 * (3 + 1 + 3 + 6);

 
 use App::Rgit::Utils qw/:codes/;
 use App::Rgit;
 
 use App::Rgit::Utils qw/:codes/;
 use App::Rgit;


@@ -89,7 +89,7 @@ is(grep({ ref eq 'ARRAY' } @expected), 3, 'all of them are array references');
              @$_,
              map({ catdir($tmpdir, $_) } @{$_}[1 .. 3]),
              $tmpdir,
              @$_,
              map({ catdir($tmpdir, $_) } @{$_}[1 .. 3]),
              $tmpdir,

-             '^n'
+             '^n', '^x'

             ], @expected;
 
 sub try {
             ], @expected;
 
 sub try {


@@ -99,7 +99,7 @@ sub try {
   git    => abs_path('t/bin/git'),
   root   => $tmpdir,
   cmd    => $cmd,
   git    => abs_path('t/bin/git'),
   root   => $tmpdir,
   cmd    => $cmd,

-  args   => [ abs_path($filename), $cmd, qw/^n ^g ^w ^b ^G ^W ^B ^R ^^n/ ],
+  args   => [ abs_path($filename), $cmd, qw/^n ^g ^w ^b ^G ^W ^B ^R ^^n ^x/ ],

   policy => $policy,
  );
  isnt($ar, undef, "each $cmd has a defined object");
   policy => $policy,
  );
  isnt($ar, undef, "each $cmd has a defined object");


@@ -122,7 +122,7 @@ SKIP:
   {
    skip 'didn\'t visited that repo' => 10 unless defined $r;
    is($r->[$_], $e->[$_], "each $cmd argument $_ for repository $i is ok")
   {
    skip 'didn\'t visited that repo' => 10 unless defined $r;
    is($r->[$_], $e->[$_], "each $cmd argument $_ for repository $i is ok")

-    for 0 .. 9;
+    for 0 .. 10;

   }
  }
 }
   }
  }
 }