Be able to override the autodetected repo name

[catagits/Gitalist.git] / lib / Gitalist / Git / CollectionOfRepositories / FromDirectoryRecursive.pm

diff --git a/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm b/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
index 4f576bc..fc17eed 100644 (file)
--- a/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
+++ b/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
@@ -2,9 +2,13 @@ use MooseX::Declare;
 
 class Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive
     with Gitalist::Git::CollectionOfRepositories {
+
     use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
     use MooseX::Types::Path::Class qw/Dir/;
 
+    use Moose::Autobox;
+    use List::Util 'first';
+
     has repo_dir => (
         isa => Dir,
         is => 'ro',
@@ -13,41 +17,32 @@ class Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive
     );
 
     method BUILD {
-        # Make sure repo_dir is an absolute path so that
-        # ->contains() works correctly.
-        $self->repo_dir->resolve;
+      # Make sure repo_dir is an absolute path so that ->contains() works correctly.
+      $self->repo_dir->resolve;
+    }
+
+    method _find_repos(Dir $dir) {
+      return map {
+        $self->_is_git_repo($_) ? $_ : $self->_find_repos($_)
+      } grep $_->is_dir, $dir->children;
     }
 
     method _get_path_for_repository_name (NonEmptySimpleStr $name) {
-        my $path = $self->repo_dir->subdir($name)->resolve;
-        die "Directory traversal prohibited"
-            unless $self->repo_dir->contains($path);
-        return $path;
+      my $repo = first { $_->name eq $name } $self->repositories->flatten
+        or return;
+      return $repo->path;
+    }
+
+    method _get_repo_name (NonEmptySimpleStr $name) {
+        # strip off the repo_dir part from a path
+               return Path::Class::Dir->new($name)->relative($self->repo_dir)->stringify;
     }
 
     ## Builders
     method _build_repositories {
-        my @ret;
-        $self->repo_dir->recurse( 
-            callback => sub {
-                my ( $dir ) = @_;
-                if ( $dir->is_dir ) {
-                    for my $repo ( @ret ) {
-                        # no need to go further if parent is git dir
-                        # never have a git repo in a git repo?
-                        return if ( $repo->path->contains( $dir ) );
-                    }
-                    eval {
-                        # slight hack since get_repo expects string
-                        my @list = $dir->dir_list();
-                        my $p = $self->get_repository($list[$#list]);
-                        push @ret, $p;
-                    };
-                }
-                return;
-            }
-        );
-        return \@ret;
+      return [
+        map { Gitalist::Git::Repository->new($_, $self->_get_repo_name("$_")) } $self->_find_repos( $self->repo_dir )
+      ];
     }
 }                         # end class