X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FConfig.pm;h=23874c5f0784a94c8d19508f1459d7011ac477c6;hb=a2a9110d666dcd61af2573a7ad977cf441587d21;hp=76a605085b6fc0a8777fde3669abe033505c18f2;hpb=caf4ff14ac06ea364ea51f725d041fd715e9682f;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 76a6050..23874c5 100644
--- 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       (); # confess
+use Cwd        (); # cwd
+use File::Spec (); # canonpath, catfile, path
 
 use App::Rgit::Repository;
-use App::Rgit::Utils qw/validate :levels/;
+use App::Rgit::Utils qw/:levels/; # :levels, abs_path
 
 use constant IS_WIN32 => $^O eq 'MSWin32';
 
@@ -18,11 +18,11 @@ App::Rgit::Config - Base class for App::Rgit configurations.
 
 =head1 VERSION
 
-Version 0.06
+Version 0.07
 
 =cut
 
-our $VERSION = '0.06';
+our $VERSION = '0.07';
 
 =head1 DESCRIPTION
 
@@ -39,25 +39,45 @@ Creates a new configuration object based on the root directory C<$root> and usin
 =cut
 
 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;
-
- my $git = $args{git};
- return unless defined $git;
+ my $class = shift;
+ $class = ref $class || $class;
+
+ my %args = @_;
+
+ my $root = defined $args{root}
+              ? $args{root}
+              : defined $ENV{GIT_DIR}
+                  ? $ENV{GIT_DIR}
+                  : Cwd::cwd;
+ Carp::confess("Invalid root directory") unless -d $root;
+ $root = File::Spec->canonpath(App::Rgit::Utils::abs_path($root));
+
+ my $git;
+ my @candidates = (
+  defined $args{git}
+    ? $args{git}
+    : defined $ENV{GIT_EXEC_PATH}
+        ? $ENV{GIT_EXEC_PATH}
+        : map File::Spec->catfile($_, 'git'), File::Spec->path
+ );
  if (IS_WIN32) {
-  unless (-x $git) {
-   $git .= '.bat';
-   return unless -x $git;
+  my @acc;
+  for my $c (@candidates) {
+   push @acc, $c, map "$c.$_", qw/exe com bat cmd/;
+  }
+  @candidates = @acc;
+ }
+ for my $c (@candidates) {
+  if (-x $c) {
+   $git = $c;
+   last;
   }
- } else {
-  return unless -x $git;
  }
+ Carp::confess("Couldn't find a proper git executable") unless defined $git;
+ $git = File::Spec->canonpath(App::Rgit::Utils::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;
@@ -130,7 +150,8 @@ You can contact me by mail or on C<irc.perl.org> (vincent).
 
 =head1 BUGS
 
-Please report any bugs or feature requests to C<bug-rgit at rt.cpan.org>, or through the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=rgit>.  I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
+Please report any bugs or feature requests to C<bug-rgit at rt.cpan.org>, or through the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=rgit>.
+I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
 
 =head1 SUPPORT
 
@@ -140,7 +161,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.