@@ -3,7 +3,8 @@

         "silex/silex": "1.0.*",

         "twig/twig": "1.9.*",

         "symfony/twig-bridge": "2.1.*",

-        "symfony/filesystem": "2.1.*"

+        "symfony/filesystem": "2.1.*",

+        "klaussilveira/gitter": "*"

     },

     "require-dev": {

         "symfony/browser-kit": "2.1.*",

@@ -1,6 +1,12 @@

 {

-    "hash": "1790d6792c8544b8d1c9efbf8f5fe2de",

+    "hash": "9820789efd58e6b6bb6b746efb8500fe",

     "packages": [

+        {

+            "package": "klaussilveira/gitter",

+            "version": "dev-master",

+            "source-reference": "209908f247194b1adc836f2e50f957cb1f11f41c",

+            "commit-date": "1347372763"

+        },

         {

             "package": "pimple/pimple",

             "version": "dev-master",

@@ -10,8 +16,8 @@

         {

             "package": "pimple/pimple",

             "version": "dev-master",

-            "source-reference": "db836b8cfadc0f39dacafa2bf311a1ab603600bb",

-            "commit-date": "1343051648"

+            "source-reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3",

+            "commit-date": "1347278988"

         },

         {

             "package": "silex/silex",

@@ -22,14 +28,14 @@

         {

             "package": "silex/silex",

             "version": "dev-master",

-            "source-reference": "ad563dde113092aa603e2b399d10ea43aece8006",

-            "commit-date": "1347084669"

+            "source-reference": "a9e34f08ab00c4cc6c97e7ae8fdf7d0fc367e5f5",

+            "commit-date": "1347298149"

         },

         {

             "package": "symfony/event-dispatcher",

             "version": "2.1.x-dev",

-            "source-reference": "v2.1.0-RC2",

-            "commit-date": "1345643321"

+            "source-reference": "v2.1.1",

+            "commit-date": "1347274422"

         },

         {

             "package": "symfony/filesystem",

@@ -40,26 +46,32 @@

         {

             "package": "symfony/http-foundation",

             "version": "2.1.x-dev",

-            "source-reference": "v2.1.0",

+            "source-reference": "v2.1.1",

             "commit-date": "1346761482"

         },

         {

             "package": "symfony/http-kernel",

             "version": "2.1.x-dev",

-            "source-reference": "ec5cdb100c20537e9d806facd4d121c985658e8b",

-            "commit-date": "1346926323"

+            "source-reference": "584499e64026f41c4be938ed35d8f0a9a9eebd38",

+            "commit-date": "1347354770"

+        },

+        {

+            "package": "symfony/process",

+            "version": "2.1.x-dev",

+            "source-reference": "v2.1.1",

+            "commit-date": "1346330945"

         },

         {

             "package": "symfony/routing",

             "version": "2.1.x-dev",

-            "source-reference": "v2.1.0",

-            "commit-date": "1346859854"

+            "source-reference": "v2.1.1",

+            "commit-date": "1347274422"

         },

         {

             "package": "symfony/twig-bridge",

             "version": "2.1.x-dev",

-            "source-reference": "v2.1.0",

-            "commit-date": "1345643321"

+            "source-reference": "v2.1.1",

+            "commit-date": "1347274422"

         },

         {

             "package": "twig/twig",

@@ -7,8 +7,9 @@

          convertNoticesToExceptions="true"

          convertWarningsToExceptions="true"

          processIsolation="false"

-         stopOnFailure="false"

+         stopOnFailure="true"

          syntaxCheck="true"

+         bootstrap="./vendor/autoload.php"

 >

     <testsuites>

         <testsuite name="GitList Test Suite">

deleted file mode 100644

@@ -1,194 +0,0 @@

-<?php

-

-namespace GitList\Component\Git;

-

-use Silex\Application;

-

-class Client

-{

-    protected $path;

-    protected $hidden;

-

-    public function __construct($options = null)

-    {

-        $this->setPath($options['path']);

-        $this->setHidden($options['hidden']);

-    }

-

-    /**

-     * Creates a new repository on the specified path

-     *

-     * @param  string     $path Path where the new repository will be created

-     * @return Repository Instance of Repository

-     */

-    public function createRepository($path)

-    {

-        if (file_exists($path . '/.git/HEAD') && !file_exists($path . '/HEAD')) {

-            throw new \RuntimeException('A GIT repository already exists at ' . $path);

-        }

-

-        $repository = new Repository($path, $this);

-

-        return $repository->create();

-    }

-

-    /**

-     * Opens a repository at the specified path

-     *

-     * @param  string     $path Path where the repository is located

-     * @return Repository Instance of Repository

-     */

-    public function getRepository($path)

-    {

-        if (!file_exists($path) || !file_exists($path . '/.git/HEAD') && !file_exists($path . '/HEAD')) {

-            throw new \RuntimeException('There is no GIT repository at ' . $path);

-        }

-

-        if (in_array($path, $this->getHidden())) {

-            throw new \RuntimeException('You don\'t have access to this repository');

-        }

-

-        return new Repository($path, $this);

-    }

-

-    /**

-     * Searches for valid repositories on the specified path

-     *

-     * @param  string $path Path where repositories will be searched

-     * @return array  Found repositories, containing their name, path and description

-     */

-    public function getRepositories($path)

-    {

-        $repositories = $this->recurseDirectory($path);

-

-        if (empty($repositories)) {

-            throw new \RuntimeException('There are no GIT repositories in ' . $path);

-        }

-

-        sort($repositories);

-

-        return $repositories;

-    }

-

-    private function recurseDirectory($path)

-    {

-        $dir = new \DirectoryIterator($path);

-

-        $repositories = array();

-

-        foreach ($dir as $file) {

-            if ($file->isDot()) {

-                continue;

-            }

-

-            if (($pos = strrpos($file->getFilename(), '.')) === 0) {

-                continue;

-            }

-

-            if ($file->isDir()) {

-                $isBare = file_exists($file->getPathname() . '/HEAD');

-                $isRepository = file_exists($file->getPathname() . '/.git/HEAD');

-

-                if ($isRepository || $isBare) {

-                    $pathName = str_replace('\\', '/', $file->getPathname());

-

-                    if (in_array($pathName, $this->getHidden())) {

-                        continue;

-                    }

-

-                    if ($isBare) {

-                        $description = $file->getPathname() . '/description';

-                    } else {

-                        $description = $file->getPathname() . '/.git/description';

-                    }

-

-                    if (file_exists($description)) {

-                        $description = file_get_contents($description);

-                    } else {

-                        $description = 'There is no repository description file. Please, create one to remove this message.';

-                    }

-

-                    $repositories[] = array('name' => $file->getFilename(), 'path' => $pathName, 'description' => $description);

-                    continue;

-                }

-            }

-        }

-

-        return $repositories;

-    }

-

-    /**

-     * Execute a git command on the repository being manipulated

-     *

-     * This method will start a new process on the current machine and

-     * run git commands. Once the command has been run, the method will

-     * return the command line output.

-     *

-     * @param  Repository $repository Repository where the command will be run

-     * @param  string     $command    Git command to be run

-     * @return string     Returns the command output

-     */

-    public function run(Repository $repository, $command)

-    {

-        $descriptors = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w"));

-        $process = proc_open($this->getPath() . ' -c "color.ui"=false ' . $command, $descriptors, $pipes, $repository->getPath());

-

-        if (!is_resource($process)) {

-            throw new \RuntimeException('Unable to execute command: ' . $command);

-        }

-

-        $stdout = stream_get_contents($pipes[1]);

-        fclose($pipes[1]);

-

-        $stderr = stream_get_contents($pipes[2]);

-        fclose($pipes[2]);

-

-        $status = proc_close($process);

-

-        if ($status != 0) {

-            throw new \RuntimeException($stderr);

-        }

-

-        return $stdout;

-    }

-

-    /**

-     * Get the current Git binary path

-     *

-     * @return string Path where the Git binary is located

-     */

-    protected function getPath()

-    {

-        return $this->path;

-    }

-

-    /**

-     * Set the current Git binary path

-     *

-     * @param string $path Path where the Git binary is located

-     */

-    protected function setPath($path)

-    {

-        $this->path = $path;

-    }

-

-    /**

-     * Get hidden repository list

-     *

-     * @return array List of repositories to hide

-     */

-    protected function getHidden()

-    {

-        return $this->hidden;

-    }

-

-    /**

-     * Set the hidden repository list

-     *

-     * @param array $hidden List of repositories to hide

-     */

-    protected function setHidden($hidden)

-    {

-        $this->hidden = $hidden;

-    }

-}

deleted file mode 100644

@@ -1,35 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Commit;

-

-class Author

-{

-    protected $name;

-    protected $email;

-

-    public function __construct($name, $email)

-    {

-        $this->setName($name);

-        $this->setEmail($email);

-    }

-

-    public function getName()

-    {

-        return $this->name;

-    }

-

-    public function setName($name)

-    {

-        $this->name = $name;

-    }

-

-    public function getEmail()

-    {

-        return $this->email;

-    }

-

-    public function setEmail($email)

-    {

-        $this->email = $email;

-    }

-}

deleted file mode 100644

@@ -1,148 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Commit;

-

-class Commit

-{

-    protected $hash;

-    protected $shortHash;

-    protected $treeHash;

-    protected $parentHash;

-    protected $author;

-    protected $date;

-    protected $commiter;

-    protected $commiterDate;

-    protected $message;

-    protected $diffs;

-

-    public function importData(array $data)

-    {

-        $this->setHash($data['hash']);

-        $this->setShortHash($data['short_hash']);

-        $this->setTreeHash($data['tree']);

-        $this->setParentHash($data['parent']);

-

-        $this->setAuthor(

-            new Author($data['author'], $data['author_email'])

-        );

-

-        $this->setDate(

-            new \DateTime('@' . $data['date'])

-        );

-

-        $this->setCommiter(

-            new Author($data['commiter'], $data['commiter_email'])

-        );

-

-        $this->setCommiterDate(

-            new \DateTime('@' . $data['commiter_date'])

-        );

-

-        $this->setMessage($data['message']);

-    }

-

-    public function getHash()

-    {

-        return $this->hash;

-    }

-

-    public function setHash($hash)

-    {

-        $this->hash = $hash;

-    }

-

-    public function getShortHash()

-    {

-        return $this->shortHash;

-    }

-

-    public function setShortHash($shortHash)

-    {

-        $this->shortHash = $shortHash;

-    }

-

-    public function getTreeHash()

-    {

-        return $this->treeHash;

-    }

-

-    public function setTreeHash($treeHash)

-    {

-        $this->treeHash = $treeHash;

-    }

-

-    public function getParentHash()

-    {

-        return $this->parentHash;

-    }

-

-    public function setParentHash($parentHash)

-    {

-        $this->parentHash = $parentHash;

-    }

-

-    public function getAuthor()

-    {

-        return $this->author;

-    }

-

-    public function setAuthor($author)

-    {

-        $this->author = $author;

-    }

-

-    public function getDate()

-    {

-        return $this->date;

-    }

-

-    public function setDate($date)

-    {

-        $this->date = $date;

-    }

-

-    public function getCommiter()

-    {

-        return $this->commiter;

-    }

-

-    public function setCommiter($commiter)

-    {

-        $this->commiter = $commiter;

-    }

-

-    public function getCommiterDate()

-    {

-        return $this->commiterDate;

-    }

-

-    public function setCommiterDate($commiterDate)

-    {

-        $this->commiterDate = $commiterDate;

-    }

-

-    public function getMessage()

-    {

-        return $this->message;

-    }

-

-    public function setMessage($message)

-    {

-        $this->message = $message;

-    }

-

-    public function getDiffs()

-    {

-        return $this->diffs;

-    }

-

-    public function setDiffs($diffs)

-    {

-        $this->diffs = $diffs;

-    }

-

-    public function getChangedFiles()

-    {

-        return sizeof($this->diffs);

-    }

-}

deleted file mode 100644

@@ -1,69 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Model;

-

-use GitList\Component\Git\Client;

-use GitList\Component\Git\Repository;

-use GitList\Component\Git\ScopeAware;

-

-class Blob extends ScopeAware

-{

-    protected $mode;

-    protected $hash;

-    protected $name;

-    protected $size;

-

-    public function __construct($hash, Client $client, Repository $repository)

-    {

-        $this->setClient($client);

-        $this->setRepository($repository);

-        $this->setHash($hash);

-    }

-

-    public function output()

-    {

-        $data = $this->getClient()->run($this->getRepository(), 'show ' . $this->getHash());

-

-        return $data;

-    }

-

-    public function getMode()

-    {

-        return $this->mode;

-    }

-

-    public function setMode($mode)

-    {

-        $this->mode = $mode;

-    }

-

-    public function getHash()

-    {

-        return $this->hash;

-    }

-

-    public function setHash($hash)

-    {

-        $this->hash = $hash;

-    }

-

-    public function getName()

-    {

-        return $this->name;

-    }

-

-    public function setName($name)

-    {

-        $this->name = $name;

-    }

-

-    public function getSize()

-    {

-        return $this->size;

-    }

-

-    public function setSize($size)

-    {

-        $this->size = $size;

-    }

-}

deleted file mode 100644

@@ -1,64 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Model;

-

-use GitList\Component\Git\Model\DiffLine;

-

-class Diff

-{

-    protected $lines;

-    protected $index;

-    protected $old;

-    protected $new;

-    protected $file;

-

-    public function addLine($line, $oldNo, $newNo)

-    {

-        $this->lines[] = new DiffLine($line, $oldNo, $newNo);

-    }

-

-    public function getLines()

-    {

-        return $this->lines;

-    }

-

-    public function setIndex($index)

-    {

-        $this->index = $index;

-    }

-

-    public function getIndex()

-    {

-        return $this->index;

-    }

-

-    public function setOld($old)

-    {

-        $this->old = $old;

-    }

-

-    public function getOld()

-    {

-        return $this->old;

-    }

-

-    public function setNew($new)

-    {

-        $this->new = $new;

-    }

-

-    public function getNew()

-    {

-        return $this->new;

-    }

-

-    public function setFile($file)

-    {

-        $this->file = $file;

-    }

-

-    public function getFile()

-    {

-        return $this->file;

-    }

-}

deleted file mode 100644

@@ -1,59 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Model;

-

-use GitList\Component\Git\Model\Line;

-

-class DiffLine extends Line

-{

-    protected $numNew;

-    protected $numOld;

-

-    public function __construct($data, $numOld, $numNew)

-    {

-        parent::__construct($data);

-

-        if (!empty($data)) {

-            switch ($data[0]) {

-                case '@':

-                    $this->numOld = '...';

-                    $this->numNew = '...';

-                    break;

-                case '-':

-                    $this->numOld = $numOld;

-                    $this->numNew = '';

-                    break;

-                case '+':

-                    $this->numOld = '';

-                    $this->numNew = $numNew;

-                    break;

-                default:

-                    $this->numOld = $numOld;

-                    $this->numNew = $numNew;

-            }

-        } else {

-            $this->numOld = $numOld;

-            $this->numNew = $numNew;

-        }

-    }

-

-    public function getNumOld()

-    {

-        return $this->numOld;

-    }

-

-    public function setNumOld($num)

-    {

-        $this->numOld = $num;

-    }

-

-    public function getNumNew()

-    {

-        return $this->numNew;

-    }

-

-    public function setNumNew($num)

-    {

-        $this->numNew = $num;

-    }

-}

deleted file mode 100644

@@ -1,48 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Model;

-

-class Line

-{

-    protected $line;

-    protected $type;

-

-    public function __construct($data)

-    {

-        if (!empty($data)) {

-            if ($data[0] == '@') {

-                $this->setType('chunk');

-            }

-

-            if ($data[0] == '-') {

-                $this->setType('old');

-            }

-

-            if ($data[0] == '+') {

-                $this->setType('new');

-            }

-        }

-

-        $this->setLine($data);

-    }

-

-    public function getLine()

-    {

-        return $this->line;

-    }

-

-    public function setLine($line)

-    {

-        $this->line = $line;

-    }

-

-    public function getType()

-    {

-        return $this->type;

-    }

-

-    public function setType($type)

-    {

-        $this->type = $type;

-    }

-}

deleted file mode 100644

@@ -1,40 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Model;

-

-class Symlink

-{

-    protected $mode;

-    protected $name;

-    protected $path;

-

-    public function getMode()

-    {

-        return $this->mode;

-    }

-

-    public function setMode($mode)

-    {

-        $this->mode = $mode;

-    }

-

-    public function getName()

-    {

-        return $this->name;

-    }

-

-    public function setName($name)

-    {

-        $this->name = $name;

-    }

-

-    public function getPath()

-    {

-        return $this->path;

-    }

-

-    public function setPath($path)

-    {

-        $this->path = $path;

-    }

-}

deleted file mode 100644

@@ -1,180 +0,0 @@

-<?php

-

-namespace GitList\Component\Git\Model;

-

-use GitList\Component\Git\Client;

-use GitList\Component\Git\Repository;

-use GitList\Component\Git\ScopeAware;

-

-class Tree extends ScopeAware implements \RecursiveIterator

-{

-    protected $mode;

-    protected $hash;

-    protected $name;

-    protected $data;

-    protected $position = 0;

-

-    public function __construct($hash, Client $client, Repository $repository)

-    {

-        $this->setClient($client);

-        $this->setRepository($repository);

-        $this->setHash($hash);

-    }

-

-    public function parse()

-    {

-        $data = $this->getClient()->run($this->getRepository(), 'ls-tree -l ' . $this->getHash());

-        $lines = explode("\n", $data);

-        $files = array();

-        $root = array();

-

-        foreach ($lines as $key => $line) {

-            if (empty($line)) {

-                unset($lines[$key]);

-                continue;

-            }

-

-            $files[] = preg_split("/[\s]+/", $line, 5);

-        }

-

-        foreach ($files as $file) {

-            if ($file[1] == 'commit') {

-                // submodule

-                continue;

-            }

-

-            if ($file[0] == '120000') {

-                $show = $this->getClient()->run($this->getRepository(), 'show ' . $file[2]);

-                $tree = new Symlink;

-                $tree->setMode($file[0]);

-                $tree->setName($file[4]);

-                $tree->setPath($show);

-                $root[] = $tree;

-                continue;

-            }

-

-            if ($file[1] == 'blob') {

-                $blob = new Blob($file[2], $this->getClient(), $this->getRepository());

-                $blob->setMode($file[0]);

-                $blob->setName($file[4]);

-                $blob->setSize($file[3]);

-                $root[] = $blob;

-                continue;

-            }

-

-            $tree = new Tree($file[2], $this->getClient(), $this->getRepository());

-            $tree->setMode($file[0]);

-            $tree->setName($file[4]);

-            $root[] = $tree;

-        }

-

-        $this->data = $root;

-    }

-

-    public function output()

-    {

-        $files = $folders = array();

-

-        foreach ($this as $node) {

-            if ($node instanceof Blob) {

-                $file['type'] = 'blob';

-                $file['name'] = $node->getName();