Merge pull request #32 from gitonomy/feat-closest-exception

Fixed some code

Author: Alexandre Salomé

src/Gitonomy/Git/Commit.php

@@ -14,6 +14,7 @@
 
 use Gitonomy\Git\Util\StringHelper;
 use Gitonomy\Git\Diff\Diff;
+use Gitonomy\Git\Exception\ReferenceNotFoundException;
 
 /**
  * Representation of a Git commit.
@@ -139,7 +140,12 @@ private function initialize()
         }
 
         $parser = new Parser\CommitParser();
-        $result = $this->repository->run('cat-file', array('commit', $this->hash));
+        try {
+            $result = $this->repository->run('cat-file', array('commit', $this->hash));
+        } catch (\RuntimeException $e) {
+            throw new ReferenceNotFoundException(sprintf('Can not find reference "%s"', $this->hash));
+        }
+
         $parser->parse($result);
 
         $this->treeHash       = $parser->tree;
@@ -252,12 +258,16 @@ public function getTree()
     /**
      * @return Commit
      */
-    public function getLastModification($path, $lastHash = null)
+    public function getLastModification($path)
     {
-        if (preg_match('#^/#', $path)) {
+        if (0 === strpos($path, '/')) {
             $path = StringHelper::substr($path, 1);
         }
 
+        if ($getWorkingDir = $this->repository->getWorkingDir()) {
+            $path = $getWorkingDir.'/'.$path;
+        }
+
         $result = $this->repository->run('log', array('--format=%H', '-n', 1, $this->hash, '--', $path));
 
         return $this->repository->getCommit(trim($result));

src/Gitonomy/Git/Repository.php

@@ -514,16 +514,16 @@ public function run($command, $args = array())
     {
         $process = $this->getProcess($command, $args);
 
-        if (null !== $this->logger) {
-            $this->logger->info(sprintf('run command: %s "%s" ', $command, implode('", "', $args)));
+        if ($this->logger) {
+            $this->logger->info(sprintf('run command: %s "%s" ', $command, implode(' ', $args)));
             $before = microtime(true);
         }
 
         $process->run();
 
         $output = $process->getOutput();
 
-        if (null !== $this->logger && true === $this->debug) {
+        if ($this->logger && $this->debug) {
             $duration = microtime(true) - $before;
             $this->logger->debug(sprintf('last command (%s) duration: %sms', $command, sprintf('%.2f', $duration*1000)));
             $this->logger->debug(sprintf('last command (%s) return code: %s', $command, $process->getExitCode()));
@@ -533,11 +533,11 @@ public function run($command, $args = array())
         if (!$process->isSuccessful()) {
             $error = sprintf("error while running %s\n output: \"%s\"", $command, $process->getErrorOutput());
 
-            if (null !== $this->logger) {
+            if ($this->logger) {
                 $this->logger->error($error);
             }
 
-            if (true === $this->debug) {
+            if ($this->debug) {
                 throw new RuntimeException($process);
             }
 

src/Gitonomy/Git/Revision.php

@@ -12,6 +12,8 @@
 
 namespace Gitonomy\Git;
 
+use Gitonomy\Git\Exception\ReferenceNotFoundException;
+
 /**
  * @author Alexandre Salomé <[email protected]>
  */
@@ -57,7 +59,11 @@ public function getResolved()
             return $this->resolved;
         }
 
-        $result = $this->repository->run('rev-parse', array('--verify', $this->name));
+        try {
+            $result = $this->repository->run('rev-parse', array('--verify', $this->name));
+        } catch (\RuntimeException $e) {
+            throw new ReferenceNotFoundException(sprintf('Can not find reference "%s"', $this->name));
+        }
 
         return $this->resolved = $this->repository->getCommit(trim($result));
     }

tests/Gitonomy/Git/Tests/CommitTest.php

@@ -39,6 +39,19 @@ public function testGetHash($repository)
         $this->assertEquals(self::LONGFILE_COMMIT, $commit->getHash());
     }
 
+    /**
+     * @dataProvider provideFoobar
+     *
+     * @expectedException Gitonomy\Git\Exception\ReferenceNotFoundException
+     * @expectedExceptionMessage Can not find reference "that-hash-doest-not-exists"
+     */
+    public function testInvalideHashThrowException($repository)
+    {
+        $commit = new Commit($repository, 'that-hash-doest-not-exists');
+
+        $commit->getTreeHash();
+    }
+
     /**
      * @dataProvider provideFoobar
      */

tests/Gitonomy/Git/Tests/RevisionTest.php

@@ -34,6 +34,16 @@ public function testGetCommit($repository)
         $this->assertEquals(self::BEFORE_LONGFILE_COMMIT, $commit->getHash(), "Resolution is correct");
     }
 
+    /**
+     * @dataProvider provideFoobar
+     * @expectedException Gitonomy\Git\Exception\ReferenceNotFoundException
+     * @expectedExceptionMessage Can not find reference "non-existent-commit"
+     */
+    public function testGetFailingReference($repository)
+    {
+        $revision = $repository->getRevision('non-existent-commit')->getResolved();
+    }
+
     /**
      * @dataProvider provideFoobar
      */