Move the fake root repository from the Command to the Config object

diff --git a/lib/App/Rgit/Command.pm b/lib/App/Rgit/Command.pm
index a73c9b4e688e2fb4e7cd2cd9505027327c6973fe..aa709c1140396e11980111711706db378b1a8e06 100644 (file)
--- a/lib/App/Rgit/Command.pm
+++ b/lib/App/Rgit/Command.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use Carp qw/croak/;
 
-use Object::Tiny qw/cmd cwd_as_repo args/;
+use Object::Tiny qw/cmd args/;
 
 use App::Rgit::Utils qw/validate/;
 use App::Rgit::Repository;
@@ -51,12 +51,9 @@ sub new {
                                unless $class->isa($action);
  }
  eval "require $action; 1" or croak "Couldn't load $action: $@";
- my $r = App::Rgit::Repository->new(fake => 1);
- return unless defined $r;
  $class->SUPER::new(
-  cmd         => $cmd,
-  args        => $args{args} || [ ],
-  cwd_as_repo => $r,
+  cmd  => $cmd,
+  args => $args{args} || [ ],
  );
 }
 
@@ -83,8 +80,6 @@ sub action {
 
 =head2 C<cmd>
 
-=head2 C<cwd_as_repo>
-
 =head2 C<args>
 
 Accessors.

diff --git a/lib/App/Rgit/Command/Each.pm b/lib/App/Rgit/Command/Each.pm
index 2825ef67eed03bb6956cde4d6bd9e71f76adebc4..c313dc815b760250378c0b95a591a3e827418aac 100644 (file)
--- a/lib/App/Rgit/Command/Each.pm
+++ b/lib/App/Rgit/Command/Each.pm
@@ -42,7 +42,7 @@ sub run {
   $status = $_->run($conf, @{$self->args});
   last if $status;
  }
- $self->cwd_as_repo->chdir;
+ $conf->root_repo->chdir;
  return $status;
 }
 

diff --git a/lib/App/Rgit/Command/Once.pm b/lib/App/Rgit/Command/Once.pm
index 93d1bb9dc76739e699fe599921c21f9105f363c2..24530a668dd91fbb614267ce9a802ee3d3df75d6 100644 (file)
--- a/lib/App/Rgit/Command/Once.pm
+++ b/lib/App/Rgit/Command/Once.pm
@@ -35,7 +35,7 @@ It implements :
 
 sub run {
  my ($self, $conf) = @_;
- $self->cwd_as_repo->run($conf, @{$self->args});
+ $conf->root_repo->run($conf, @{$self->args});
 }
 
 =head1 SEE ALSO

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 846006ee97ddab1ddc7b00662527cba95b1507d1..8044f57c15b9a398d7953b6c593539becbdb021b 100644 (file)
--- a/lib/App/Rgit/Config.pm
+++ b/lib/App/Rgit/Config.pm
@@ -7,8 +7,9 @@ use Carp qw/croak/;
 use Cwd qw/abs_path/;
 use File::Spec::Functions qw/file_name_is_absolute/;
 
-use Object::Tiny qw/root git/;
+use Object::Tiny qw/root root_repo git/;
 
+use App::Rgit::Repository;
 use App::Rgit::Utils qw/validate/;
 
 =head1 NAME
@@ -45,14 +46,19 @@ sub new {
  return unless defined $args{git} and -x $args{git};
  my $conf = 'App::Rgit::Config::Default';
  eval "require $conf; 1" or croak "Couldn't load $conf: $@";
+ my $r = App::Rgit::Repository->new(fake => 1);
+ return unless defined $r;
  $conf->SUPER::new(
-  root => $args{root},
-  git  => $args{git},
+  root      => $args{root},
+  root_repo => $r,
+  git       => $args{git},
  );
 }
 
 =head2 C<root>
 
+=head2 C<root_repo>
+
 =head2 C<git>
 
 =head2 C<repos>