Backend support for user configs.

2 files changed, 36 insertions, 1 deletions

diff --git a/libpiny/lib/Piny/Config.pm b/libpiny/lib/Piny/Config.pm
index 7ba1fd5..535df33 100644
--- a/libpiny/lib/Piny/Config.pm
+++ b/libpiny/lib/Piny/Config.pm
@@ -208,6 +208,7 @@ sub tweakable {
 
 # The tweakables
 
+# Repo-specific tweakables, in the repos' .git/config files.
 tweakable "piny_ikiwikidestdir"         => "/srv/www/piny.be/", 'PathDir';
 tweakable "piny_ikiwikisrcdir"          => "/srv/ikiwiki/", 'PathDir';
 tweakable "piny_ikiwikiurl"             => "http://piny.be/", 'HttpUrl';
@@ -215,6 +216,9 @@ tweakable "piny_ikiwikisecureurl"       => "https://secure.piny.be/", 'HttpsUrl'
 tweakable "piny_ikiwikisecurepath"      => "/srv/www/secure.piny.be/", 'PathDir';
 tweakable "receive_denynonfastforwards" => "true", 'GitBool';
 
+# User-specific tweakables, in the users' ~/.gitconfig files.
+tweakable "user_email"                  => undef, 'Maybe[Str]';
+
 # Moose boilerplate
 
 __PACKAGE__->meta->make_immutable;
diff --git a/libpiny/lib/Piny/User.pm b/libpiny/lib/Piny/User.pm
index 6267ecb..aa01ba7 100644
--- a/libpiny/lib/Piny/User.pm
+++ b/libpiny/lib/Piny/User.pm
@@ -10,6 +10,7 @@ use Moose;
 use Moose::Util::TypeConstraints;
 use MooseX::StrictConstructor;
 
+use Piny::Config;
 use Piny::Email;
 use Piny::Group;
 
@@ -49,6 +50,20 @@ has 'password_hash' =>
   , init_arg    => undef
   );
 
+has 'home' =>
+  ( is          => 'ro'
+  , isa         => 'Path'
+  , lazy_build  => 1
+  , init_arg    => undef
+  );
+
+has 'config' =>
+  ( is          => 'ro'
+  , isa         => 'Piny::Config'
+  , lazy_build  => 1
+  , init_arg    => undef
+  );
+
 has 'email' =>
   ( is          => 'ro'
   , isa         => 'Piny::Email'
@@ -180,10 +195,26 @@ sub _build_password_hash {
   return $s->pwent( )->[1];
 };
 
+sub _build_home {
+  my ( $s ) = @_;
+
+  return $s->pwent( )->[7];
+};
+
+sub _build_config {
+  my ( $s ) = @_;
+
+  return Piny::Config->new( confpath => $s->home . "/.gitconfig" );
+};
+
 sub _build_email {
   my ( $s ) = @_;
 
-  return Piny::Email->new( address => $s->pwent( )->[6] );
+  if ( not defined $s->config->user_email ) {
+    die "You must provide a user.email attribute in your .gitconfig!";
+  };
+
+  return Piny::Email->new( address => $s->config->user_email );
 };
 
 sub _build_groups {