X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FConfig.pm;h=76a605085b6fc0a8777fde3669abe033505c18f2;hb=caf4ff14ac06ea364ea51f725d041fd715e9682f;hp=90afe3b35cf58b9147ef135710de14eaaca1a814;hpb=0c3a62e21d624c6076fc69dd2310bea0dd556ab8;p=perl%2Fmodules%2Frgit.git diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm index 90afe3b..76a6050 100644 --- a/lib/App/Rgit/Config.pm +++ b/lib/App/Rgit/Config.pm @@ -7,22 +7,22 @@ use Carp qw/croak/; use Cwd qw/abs_path/; use File::Spec::Functions qw/file_name_is_absolute/; -use Object::Tiny qw/root git cwd_repo debug/; - use App::Rgit::Repository; use App::Rgit::Utils qw/validate :levels/; +use constant IS_WIN32 => $^O eq 'MSWin32'; + =head1 NAME App::Rgit::Config - Base class for App::Rgit configurations. =head1 VERSION -Version 0.05 +Version 0.06 =cut -our $VERSION = '0.05'; +our $VERSION = '0.06'; =head1 DESCRIPTION @@ -40,20 +40,34 @@ 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 $git = $args{git}; + return unless defined $git; + if (IS_WIN32) { + unless (-x $git) { + $git .= '.bat'; + return unless -x $git; + } + } else { + return unless -x $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( + + bless { root => $root, - git => $args{git}, + git => $git, cwd_repo => $r, debug => defined $args{debug} ? int $args{debug} : WARN, - ); + }, $conf; } =head2 C @@ -96,7 +110,13 @@ sub crit { shift->_notify(CRIT, @_) } =head2 C -Accessors. +Read-only accessors. + +=cut + +BEGIN { + eval "sub $_ { \$_[0]->{$_} }" for qw/root git cwd_repo debug/; +} =head1 SEE ALSO @@ -105,7 +125,7 @@ L. =head1 AUTHOR Vincent Pit, C<< >>, L. - + You can contact me by mail or on C (vincent). =head1 BUGS @@ -120,7 +140,7 @@ You can find documentation for this module with the perldoc command. =head1 COPYRIGHT & LICENSE -Copyright 2008 Vincent Pit, all rights reserved. +Copyright 2008-2009 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.