Move root and git checks from App::Rgit::new to App::Rgit::Config::new

diff --git a/lib/App/Rgit.pm b/lib/App/Rgit.pm
index d2fe602f4c6b41814da2f57792d7d80e7431f7f9..3d244a1bff509f805f1efd91d30c7264c368080f 100644 (file)
--- a/lib/App/Rgit.pm
+++ b/lib/App/Rgit.pm
@@ -3,9 +3,6 @@ package App::Rgit;
 use strict;
 use warnings;
 
-use Cwd qw/abs_path/;
-use File::Spec::Functions qw/file_name_is_absolute/;
-
 use Object::Tiny qw/config command/;
 
 use App::Rgit::Command;
@@ -40,14 +37,11 @@ Creates a new L<App::Rgit> object that's bound to execute the command C<$cmd> on
 
 sub new {
  my ($class, %args) = &validate;
- my $root = $args{root};
- return unless defined $root and -d $root;
- $root = abs_path $root unless file_name_is_absolute $root;
- return unless defined $args{git} and -x $args{git};
  my $config = App::Rgit::Config->new(
-  root => $root,
+  root => $args{root},
   git  => $args{git},
  );
+ return unless defined $config;
  $class->SUPER::new(
   config  => $config,
   command => App::Rgit::Command->new(

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 20ef2234d77f0c58b00ea268cc4f71776b619079..212fa334628f79f93c14db637a76ceaf67b73c76 100644 (file)
--- a/lib/App/Rgit/Config.pm
+++ b/lib/App/Rgit/Config.pm
@@ -4,6 +4,8 @@ use strict;
 use warnings;
 
 use Carp qw/croak/;
+use Cwd qw/abs_path/;
+use File::Spec::Functions qw/file_name_is_absolute/;
 
 use Object::Tiny qw/root git/;
 
@@ -33,6 +35,10 @@ Creates a new configuration object based on the root directory C<$root> and usin
 
 sub new {
  my ($class, %args) = &validate;
+ my $root = $args{root};
+ return unless defined $root and -d $root;
+ $root = abs_path $root unless file_name_is_absolute $root;
+ 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: $@";
  $conf->SUPER::new(