X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FConfig.pm;h=c384203a69d0cdac90ca12626ed0f3c4688b9b78;hb=e833c52a64e7aac9c18d7051285bf4d9906c4faf;hp=dd6dff2af7f24ad8b2d7224255eea8878cf90bfd;hpb=e295d1865b0480223b82fe2373ba79cf5485466e;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index dd6dff2..c384203 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 ();
-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/: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.08
 
 =cut
 
-our $VERSION = '0.06';
+our $VERSION = '0.08';
 
 =head1 DESCRIPTION
 
@@ -32,7 +32,12 @@ This is an internal class to L<rgit>.
 
 =head1 METHODS
 
-=head2 C<< new root => $root, git => $git >>
+=head2 C<new>
+
+    my $arc = App::Rgit::Config->new(
+     root => $root,
+     git  => $git,
+    );
 
 Creates a new configuration object based on the root directory C<$root> and using C<$git> as F<git> executable.
 
@@ -44,21 +49,37 @@ sub new {
 
  my %args = @_;
 
- 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 $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;
  }
- $git = abs_path $git unless file_name_is_absolute $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 Carp::confess("Couldn't load $conf: $@");
@@ -74,13 +95,21 @@ sub new {
  }, $conf;
 }
 
-=head2 C<info $msg>
+=head2 C<info>
+
+    $arr->info($msg);
+
+=head2 C<warn>
+
+    $arr->warn($msg);
+
+=head2 C<err>
 
-=head2 C<warn $msg>
+    $arr->err($msg);
 
-=head2 C<err $msg>
+=head2 C<crit>
 
-=head2 C<crit $msg>
+    $arr->crit($msg);
 
 Notifies a message C<$msg> of the corresponding level.
 
@@ -134,7 +163,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