Allow user-defined policies. Enable interactive failure handling when Term::ReadKey...

diff --git a/bin/rgit b/bin/rgit
index 6a56df7c8b0e5051ffa20dd777e58525cf399e83..e6bc9100cbb01edd930de2373521b6b353d5547c 100755 (executable)
--- a/bin/rgit
+++ b/bin/rgit
@@ -8,10 +8,44 @@ use Cwd qw/cwd/;
 use File::Spec::Functions qw/catfile path/;
 use List::Util qw/first/;
 
+use App::Rgit::Utils qw/:codes/;
 use App::Rgit;
 
 our $VERSION = '0.03';
 
+BEGIN {
+ if (-t && eval { use Term::ReadKey; 1 }) {
+  *policy = sub {
+   my ($cmd, $conf, $repo, $status) = @_;
+   return NEXT unless $status;
+   print STDERR "git returned $status\n";
+   print STDERR "[a]bort, [i]gnore, [I]gnore all, [r]etry, open [s]hell ?";
+   ReadMode 4;
+   my $key = ReadKey 0;
+   ReadMode 1;
+   print STDERR "\n";
+   my %codes = (
+    'a' => LAST,
+    'i' => NEXT,
+    'I' => NEXT | SAVE,
+    'r' => REDO,
+    's' => LAST,
+   );
+   $key = 'a' unless defined $key;
+   my $code = $codes{$key};
+   $code = $codes{a} unless defined $code;
+   return $code;
+  };
+ } else {
+  *policy = sub {
+   my ($cmd, $conf, $repo, $status) = @_;
+   return NEXT unless $status;
+   print STDERR "git returned $status, aborting\n";
+   return LAST;
+  };
+ }
+}
+
 my $cmd = first { !/^-/ } @ARGV;
 $cmd = ' ' unless defined $cmd;
 
@@ -31,10 +65,11 @@ my $root = $ENV{GIT_DIR};
 $root = cwd unless defined $root;
 
 exit App::Rgit->new(
- git  => $git,
- root => $root,
- cmd  => $cmd,
- args => \@ARGV
+ git    => $git,
+ root   => $root,
+ cmd    => $cmd,
+ args   => \@ARGV,
+ policy => \&policy,
 )->run;
 
 __END__

diff --git a/lib/App/Rgit.pm b/lib/App/Rgit.pm
index f877d7882580e24c9624393b7c8ddd9c4b9bdddc..a21e248706c9b976bc8b6bc4f78bd6836eaa2c53 100644 (file)
--- a/lib/App/Rgit.pm
+++ b/lib/App/Rgit.pm
@@ -43,8 +43,9 @@ sub new {
  );
  return unless defined $config;
  my $command = App::Rgit::Command->new(
-  cmd  => $args{cmd},
-  args => $args{args},
+  cmd    => $args{cmd},
+  args   => $args{args},
+  policy => $args{policy},
  );
  return unless defined $command;
  $class->SUPER::new(

diff --git a/lib/App/Rgit/Command.pm b/lib/App/Rgit/Command.pm
index 026c73a7047a2082bda40a3f52a9b81dc14a7381..f2f043bd05b0b65aed70e2a0607e9515a7e65268 100644 (file)
--- a/lib/App/Rgit/Command.pm
+++ b/lib/App/Rgit/Command.pm
@@ -5,9 +5,9 @@ use warnings;
 
 use Carp qw/croak/;
 
-use Object::Tiny qw/cmd args/;
+use Object::Tiny qw/cmd args policy/;
 
-use App::Rgit::Utils qw/validate/;
+use App::Rgit::Utils qw/validate :codes/;
 
 =head1 NAME
 
@@ -51,8 +51,9 @@ sub new {
  }
  eval "require $action; 1" or croak "Couldn't load $action: $@";
  $class->SUPER::new(
-  cmd  => $cmd,
-  args => $args{args} || [ ],
+  cmd    => $cmd,
+  args   => $args{args} || [ ],
+  policy => $args{policy},
  );
 }
 
@@ -77,10 +78,24 @@ sub action {
  $commands{$cmd} = $pkg;
 }
 
+=head2 C<report $conf, $repo, $status>
+
+=cut
+
+sub report {
+ my ($self) = @_;
+ my $cb = $self->policy;
+ return NEXT | SAVE unless $cb;
+ my $code = $cb->(@_);
+ return defined $code ? $code : NEXT;
+}
+
 =head2 C<cmd>
 
 =head2 C<args>
 
+=head2 C<policy>
+
 Accessors.
 
 =head2 C<run $conf>

diff --git a/lib/App/Rgit/Command/Each.pm b/lib/App/Rgit/Command/Each.pm
index a42ddb886d988b06ed55fc2ce0e73e6261a93cd7..7996f3d1795f515ad3f9057368f1128c95f06f73 100644 (file)
--- a/lib/App/Rgit/Command/Each.pm
+++ b/lib/App/Rgit/Command/Each.pm
@@ -5,6 +5,8 @@ use warnings;
 
 use base qw/App::Rgit::Command/;
 
+use App::Rgit::Utils qw/:codes/;
+
 =head1 NAME
 
 App::Rgit::Command::Each - Class for commands to execute for each repository.
@@ -37,13 +39,20 @@ sub run {
  my $self = shift;
  my $conf = shift;
  my $status = 0;
+ my $code;
  for (@{$conf->repos}) {
   $_->chdir or next;
   $status = $_->run($conf, @{$self->args});
-  last if $status;
+  $code = $self->report($conf, $_, $status) unless defined $code;
+  if ($code & REDO) {
+   undef $code; # Don't save it, that would be very dumb
+   redo;
+  }
+  last if $code & LAST;
+  undef $code unless $code & SAVE;
  }
  $conf->cwd_repo->chdir;
- return $status;
+ return wantarray ? ($status, $code) : $status;
 }
 
 =head1 SEE ALSO

diff --git a/lib/App/Rgit/Utils.pm b/lib/App/Rgit/Utils.pm
index 651ea77cf05a3903e00c11e70634a5c84e862d6e..0804c012c1377012a4f922f27539ef201b8d513b 100644 (file)
--- a/lib/App/Rgit/Utils.pm
+++ b/lib/App/Rgit/Utils.pm
@@ -23,6 +23,21 @@ Miscellanous utilities for L<App::Rgit> classes.
 
 This is an internal module to L<rgit>.
 
+=head1 CONSTANTS
+
+=head2 C<NEXT>, C<REDO>, C<LAST>, C<SAVE>
+
+Codes to return from the C<report> callback to respectively proceed to the next repository, retry the current one, end it all, and save the return code.
+
+=cut
+
+use constant {
+ SAVE => 0x1,
+ NEXT => 0x2,
+ REDO => 0x4,
+ LAST => 0x8,
+};
+
 =head1 FUNCTIONS
 
 =head2 C<validate @method_args>
@@ -41,7 +56,9 @@ sub validate {
 
 =head1 EXPORT
 
-C<validate> is only exported on request.
+C<validate> is only exported on request, either by its name or by the C<'funcs'> tag.
+
+C<NEXT> C<REDO>, C<LAST> and C<SAVE> are only exported on request, either by their name or by the C<'codes'> tags.
 
 =cut
 
@@ -49,7 +66,8 @@ use base qw/Exporter/;
 
 our @EXPORT         = ();
 our %EXPORT_TAGS    = (
- funcs => [ qw/validate/ ]
+ funcs => [ qw/validate/ ],
+ codes => [ qw/SAVE NEXT REDO LAST/ ],
 );
 our @EXPORT_OK      = map { @$_ } values %EXPORT_TAGS;
 $EXPORT_TAGS{'all'} = [ @EXPORT_OK ];