Merge pull request klaussilveira#200 from cschorn/nested-repos

Recursive scanning (should fix klaussilveira#2)
sethunath · Nov 6, 2012 · 5664854 · 5664854
2 parents 6a93bdd 11e662c
commit 5664854
Show file tree

Hide file tree

Showing 14 changed files with 190 additions and 45 deletions.
diff --git a/boot.php b/boot.php
@@ -1,7 1,9 @@
 <?php
 
-// Load configuration
-$config = new GitList\Config('config.ini');
 if (!isset($config)) {
  die("No configuration object provided.");
 }
 
 $config->set('git', 'repositories', rtrim($config->get('git', 'repositories'), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR);
 
 // Startup and configure Silex application

diff --git a/composer.json b/composer.json
@@ -4,7 4,7 @@
  "twig/twig": "1.9.*",
  "symfony/twig-bridge": "2.1.*",
  "symfony/filesystem": "2.1.*",
- "klaussilveira/gitter": "0.1.2"
  "klaussilveira/gitter": "dev-master"
  },
  "require-dev": {
  "symfony/browser-kit": "2.1.*",

diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -11,5 11,9 @@
 }
 
 require 'vendor/autoload.php';
 
 // Load configuration
 $config = GitList\Config::fromFile('config.ini');
 
 $app = require 'boot.php';
-$app->run();
 $app->run();
diff --git a/src/GitList/Application.php b/src/GitList/Application.php
@@ -8,6 8,7 @@
 use GitList\Provider\GitServiceProvider;
 use GitList\Provider\RepositoryUtilServiceProvider;
 use GitList\Provider\ViewUtilServiceProvider;
 use GitList\Provider\RoutingUtilServiceProvider;
 
 /**
  * GitList application.
@@ -44,6 45,7 @@ public function __construct(Config $config, $root = null)
  $this->register(new ViewUtilServiceProvider());
  $this->register(new RepositoryUtilServiceProvider());
  $this->register(new UrlGeneratorServiceProvider());
  $this->register(new RoutingUtilServiceProvider());
 
  $this['twig'] = $this->share($this->extend('twig', function($twig, $app) {
  $twig->addFilter('md5', new \Twig_Filter_Function('md5'));

diff --git a/src/GitList/Config.php b/src/GitList/Config.php
@@ -6,13 6,17 @@ class Config
 {
  protected $data;
 
- public function __construct($file)
- {
  public static function fromFile($file) {
  if (!file_exists($file)) {
  die(sprintf('Please, create the %1$s file.', $file));
  }
  $data = parse_ini_file($file, true);
  return new static($data);
  }
 
- $this->data = parse_ini_file($file, true);
  public function __construct($data)
  {
  $this->data = $data;
  $this->validateOptions();
  }
 

diff --git a/src/GitList/Controller/BlobController.php b/src/GitList/Controller/BlobController.php
@@ -39,7 39,7 @@ public function connect(Application $app)
  'tags' => $repository->getTags(),
  ));
  })->assert('file', '. ')
- ->assert('repo', '[\w-._] ')
  ->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->bind('blob');
 
@@ -59,7 59,7 @@ public function connect(Application $app)
 
  return new Response($blob, 200, $headers);
  })->assert('file', '. ')
- ->assert('repo', '[\w-._] ')
  ->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->bind('blob_raw');
 

diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php
@@ -38,7 38,7 @@ public function connect(Application $app)
  'commits' => $categorized,
  'file' => $file,
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->assert('file', '. ')
  ->value('branch', 'master')
@@ -63,7 63,7 @@ public function connect(Application $app)
  'branches' => $repository->getBranches(),
  'tags' => $repository->getTags(),
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->bind('searchcommits');
 
  $route->get('{repo}/commit/{commit}/', function($repo, $commit) use ($app) {
@@ -75,7 75,7 @@ public function connect(Application $app)
  'repo' => $repo,
  'commit' => $commit,
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('commit', '[a-f0-9^] ')
  ->bind('commit');
 
@@ -94,7 94,7 @@ public function connect(Application $app)
  'tags' => $repository->getTags(),
  'blames' => $blames,
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('file', '. ')
  ->assert('branch', '[\w-._\/] ')
  ->bind('blame');

diff --git a/src/GitList/Controller/MainController.php b/src/GitList/Controller/MainController.php
@@ -13,7 13,13 @@ public function connect(Application $app)
  $route = $app['controllers_factory'];
 
  $route->get('/', function() use ($app) {
- $repositories = $app['git']->getRepositories($app['git.repos']);
  $repositories = array_map(
  function ($repo) use ($app) {
  $repo['relativePath'] = $app['util.routing']->getRelativePath($repo['path']);
  return $repo;
  },
  $app['git']->getRepositories($app['git.repos'])
  );
 
  return $app['twig']->render('index.twig', array(
  'repositories' => $repositories,
@@ -33,7 39,7 @@ public function connect(Application $app)
  'stats' => $stats,
  'authors' => $authors,
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->value('branch', 'master')
  ->bind('stats');
@@ -49,7 55,7 @@ public function connect(Application $app)
  ));
 
  return new Response($html, 200, array('Content-Type' => 'application/rss xml'));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->bind('rss');
 

diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php
@@ -41,7 41,7 @@ public function connect(Application $app)
  'tags' => $repository->getTags(),
  'readme' => $app['util.repository']->getReadme($repo, $branch),
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->assert('tree', '. ')
  ->bind('tree');
@@ -65,19 65,19 @@ public function connect(Application $app)
  'branches' => $repository->getBranches(),
  'tags' => $repository->getTags(),
  ));
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->bind('search');
 
  $route->get('{repo}/{branch}/', function($repo, $branch) use ($app, $treeController) {
  return $treeController($repo, $branch);
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->bind('branch');
 
  $route->get('{repo}/', function($repo) use ($app, $treeController) {
  return $treeController($repo);
- })->assert('repo', '[\w-._] ')
  })->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->bind('repository');
 
  $route->get('{repo}/{format}ball/{branch}', function($repo, $format, $branch) use ($app) {
@@ -108,7 108,7 @@ public function connect(Application $app)
  'Content-Transfer-Encoding' => 'binary',
  ));
  })->assert('format', '(zip|tar)')
- ->assert('repo', '[\w-._] ')
  ->assert('repo', $app['util.routing']->getRepositoryRegex())
  ->assert('branch', '[\w-._\/] ')
  ->bind('archive');
 

diff --git a/src/GitList/Provider/RoutingUtilServiceProvider.php b/src/GitList/Provider/RoutingUtilServiceProvider.php
@@ -0,0 1,26 @@
 <?php
 
 namespace GitList\Provider;
 
 use GitList\Util\Routing;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
 
 class RoutingUtilServiceProvider implements ServiceProviderInterface
 {
  /**
  * Register the Util\Repository class on the Application ServiceProvider
  *
  * @param Application $app Silex Application
  */
  public function register(Application $app)
  {
  $app['util.routing'] = $app->share(function () use ($app) {
  return new Routing($app);
  });
  }
 
  public function boot(Application $app)
  {
  }
 }
diff --git a/src/GitList/Util/Routing.php b/src/GitList/Util/Routing.php
@@ -0,0 1,52 @@
 <?php
 
 namespace Gitlist\Util;
 
 use Silex\Application;
 
 class Routing
 {
  protected $app;
 
  public function __construct(Application $app)
  {
  $this->app = $app;
  }
 
  public function getRepositoryRegex()
  {
  static $regex = null;
 
  if ($regex === null) {
  $app = $this->app;
  $quotedPaths = array_map(
  function ($repo) use ($app) {
  return preg_quote($app['util.routing']->getRelativePath($repo['path']), '#');
  },
  $this->app['git']->getRepositories($this->app['git.repos'])
  );
  usort($quotedPaths, function ($a, $b) { return strlen($b) - strlen($a); });
  $regex = implode('|', $quotedPaths);
  }
 
  return $regex;
  }
 
  /**
  * Strips the base path from a full repository path
  *
  * @param string $repoPath Full path to the repository
  * @return string Relative path to the repository from git.repositories
  */
  public function getRelativePath($repoPath)
  {
  if (strpos($repoPath, $this->app['git.repos']) === 0) {
  $relativePath = substr($repoPath, strlen($this->app['git.repos']));
  return ltrim($relativePath, '/');
  } else {
  throw new \InvalidArgumentException(
  sprintf("Path '%s' does not match configured repository directory", $repoPath)
  );
  }
  }
 }