Always canonify the root, the git path and the repo directory

[perl/modules/rgit.git] / lib / App / Rgit / Config.pm

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 76a605085b6fc0a8777fde3669abe033505c18f2..2ac22b23c149cc268412cabf80d9b52097cf560d 100644 (file)
--- a/lib/App/Rgit/Config.pm
+++ b/lib/App/Rgit/Config.pm
@@ -3,12 +3,12 @@ package App::Rgit::Config;
 use strict;
 use warnings;
 
-use Carp qw/croak/;
-use Cwd qw/abs_path/;
-use File::Spec::Functions qw/file_name_is_absolute/;
+use Carp                  ();
+use Cwd                   qw/abs_path/;
+use File::Spec::Functions qw/canonpath/;
 
 use App::Rgit::Repository;
-use App::Rgit::Utils qw/validate :levels/;
+use App::Rgit::Utils qw/:levels/;
 
 use constant IS_WIN32 => $^O eq 'MSWin32';
 
@@ -39,11 +39,14 @@ Creates a new configuration object based on the root directory C<$root> and usin
 =cut
 
 sub new {
- my ($class, %args) = &validate;
+ my $class = shift;
+ $class = ref $class || $class;
+
+ my %args = @_;
 
  my $root = $args{root};
  return unless defined $root and -d $root;
- $root = abs_path $root unless file_name_is_absolute $root;
+ $root = canonpath abs_path $root;
 
  my $git = $args{git};
  return unless defined $git;
@@ -55,9 +58,10 @@ sub new {
  } else {
   return unless -x $git;
  }
+ $git = canonpath abs_path $git;
 
  my $conf = 'App::Rgit::Config::Default';
- eval "require $conf; 1" or croak "Couldn't load $conf: $@";
+ eval "require $conf; 1" or Carp::confess("Couldn't load $conf: $@");
 
  my $r = App::Rgit::Repository->new(fake => 1);
  return unless defined $r;
@@ -140,7 +144,7 @@ You can find documentation for this module with the perldoc command.
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008-2009 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.