From: Tomas Doran <bobtfish@bobtfish.net>
Date: Tue, 22 Nov 2011 21:42:30 +0000 (+0000)
Subject: A basic --repo_dir now works again
X-Git-Tag: 0.003007~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=commitdiff_plain;h=6537d25ec02932c27e2c86381e65980fd0a00cac

A basic --repo_dir now works again
---

diff --git a/lib/Gitalist/Model/CollectionOfRepos.pm b/lib/Gitalist/Model/CollectionOfRepos.pm
index 090cb8c..9f37fc5 100644
--- a/lib/Gitalist/Model/CollectionOfRepos.pm
+++ b/lib/Gitalist/Model/CollectionOfRepos.pm
@@ -67,13 +67,6 @@ has whitelist => (
     predicate => '_has_whitelist',
 );
 
-has repo_dir => (
-    is         => 'ro',
-    isa        => DirOrUndef,
-    coerce     => 1,
-    predicate => '_has_repo_dir',
-);
-
 # Simple directory of repositories (for list)
 has repos_dir => (
     is => 'ro',
@@ -92,9 +85,7 @@ has repos => (
 
 sub _build_repos_dir {
     my $self = shift;
-    my $opts = $self->_application->run_options || {};
-    return $self->_has_repo_dir && $self->repo_dir
-        || $opts->{repos_dir} || $ENV{GITALIST_REPO_DIR} || undef;
+    return $ENV{GITALIST_REPO_DIR};
 }
 
 sub build_per_context_instance {
@@ -115,6 +106,8 @@ sub build_per_context_instance {
 
     my $class = $self->class;
 
+    $ctx->log->debug("Building $class with " . join(", ", map { $_ . " => " . (defined($args{$_}) ? "'" . $args{$_}  . "'" : 'undef') } keys %args))
+        if $ctx->debug;
     my $model = $class->new(%args);
 
     $ctx->log->debug("Using class '$class' " . $model->debug_string) if $ctx->debug;
diff --git a/lib/Gitalist/TraitFor/Script.pm b/lib/Gitalist/TraitFor/Script.pm
index 17ad1f9..73e31b3 100644
--- a/lib/Gitalist/TraitFor/Script.pm
+++ b/lib/Gitalist/TraitFor/Script.pm
@@ -13,6 +13,14 @@ has repo_dir => (
     },
 );
 
+around run => sub {
+    my $orig = shift;
+    my $self = shift;
+    warn("Script repo dir" . $self->repo_dir);
+    local $ENV{GITALIST_REPO_DIR} = $self->repo_dir;
+    $self->$orig(@_);
+};
+
 1;
 
 =head1 NAME