remove event dispatcher, replace with logger

Author: alexandresalome

composer.json

@@ -23,8 +23,7 @@
     },
 
     "require": {
-        "symfony/process": "<3",
-        "symfony/event-dispatcher": "<3"
+        "symfony/process": "<3"
     },
     "require-dev": {
         "psr/log": "~1"

doc/api/repository.rst

@@ -49,17 +49,25 @@ Your ``HEAD`` can be attached (using a reference) or detached (using a commit).
         echo "Sorry man\n";
     }
 
-Event dispatcher
-----------------
+Logger
+------
 
-Each repository has an event dispatcher. You can listen to ``pre_command`` and
-``post_command`` using method *addListener* on *Repository*:
+If you are developing, you may appreciate to have a logger inside repository, telling
+you every executed command.
+
+To do so, inject a logger inside the Repository:
 
 .. code-block:: php
 
-    $repository->addListener(Events::POST_COMMAND, function ($event) {
-        echo 'Command: '.$event->getCommand().' '.implode(' ', $event->getArgs())."\n";
-        echo 'Execution time: '.round($event->getDuration(), 2).'s';
-    });
+    $repository->setLogger(new Monolog\Logger('repository'));
+
+    $repository->run('fetch', array('--all'));
+
+This will output:
+
+.. code-block:: text
 
-    $repository->getReferences()->getBranch('master')->getCommit()->getMessage();
+    info run command: fetch "--all"
+    debug last command (fetch) duration: 23.24ms
+    debug last command (fetch) return code: 0
+    debug last command (fetch) output: Fetching origin

src/Gitonomy/Git/Event/CommandEvent.php

@@ -12,14 +12,10 @@
 
 namespace Gitonomy\Git;
 
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Process\ProcessBuilder;
 use Symfony\Component\Process\Process;
 use Psr\Log\LoggerInterface;
 
-use Gitonomy\Git\Event\Events;
-use Gitonomy\Git\Event\PreCommandEvent;
-use Gitonomy\Git\Event\PostCommandEvent;
 use Gitonomy\Git\Exception\RuntimeException;
 
 /**
@@ -98,8 +94,6 @@ public function __construct($dir, $workingDir = null, LoggerInterface $logger =
         $this->objects    = array();
 
         $this->logger     = $logger;
-
-        $this->eventDispatcher = new EventDispatcher();
     }
 
     public function isBare()
@@ -355,35 +349,25 @@ public function run($command, $args = array())
     {
         $process = $this->getProcess($command, $args);
 
-        if ($this->eventDispatcher->hasListeners()) {
-            $event = new PreCommandEvent($process, $command, $args);
-            $this->eventDispatcher->dispatch(Events::PRE_COMMAND, $event);
-        }
-
         if ($this->logger) {
-            $this->logger->info(sprintf('run command: "%", args: "%s"', $command, print_r($args, true)));
+            $this->logger->info(sprintf('run command: %s "%s" ', $command, implode('", "', $args)));
         }
 
         $before = microtime(true);
         $process->run();
         $duration = microtime(true) - $before;
 
-        if ($this->eventDispatcher->hasListeners()) {
-            $event = new PostCommandEvent($process, $command, $args);
-            $event->setDuration($duration);
-            $this->eventDispatcher->dispatch(Events::POST_COMMAND, $event);
-        }
-
         $output = $process->getOutput();
 
         if ($this->logger) {
-            $this->logger->debug(sprintf('last command ("%s") return code: "%s"', $command, $process->getExitCode()));
-            $this->logger->debug(sprintf('last command ("%s") output: "%s"', $command, $output));
+            $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()));
+            $this->logger->debug(sprintf('last command (%s) output: %s', $command, $output));
         }
 
         if (!$process->isSuccessful()) {
             if ($this->logger) {
-                $this->logger->error(sprintf('last command ("%s") error output: "%s"', $command, $process->getErrorOutput()));
+                $this->logger->error(sprintf('last command (%s) error output: "%s"', $command, $process->getErrorOutput()));
             }
 
             throw new RuntimeException($process);
@@ -392,11 +376,6 @@ public function run($command, $args = array())
         return $output;
     }
 
-    public function addListener($eventName, $listener, $priority = 0)
-    {
-        $this->eventDispatcher->addListener($eventName, $listener, $priority);
-    }
-
     /**
      * @return WorkingCopy
      */

src/Gitonomy/Git/Event/Events.php

@@ -61,8 +61,11 @@ public static function provideFoobar()
     public static function createFoobarRepository($bare = true)
     {
         if (null === self::$localRepository) {
-            self::$localRepository = Admin::cloneTo(self::createTempDir(), self::REPOSITORY_URL);
-            self::registerDeletion(self::$localRepository);
+            if (is_dir('/tmp/foobar_test')) {
+                self::$localRepository = new Repository('/tmp/foobar_test');
+            } else {
+                self::$localRepository = Admin::cloneTo('/tmp/foobar_test', self::REPOSITORY_URL);
+            }
         }
 
         $repository = self::$localRepository->cloneTo(self::createTempDir(), $bare);

src/Gitonomy/Git/Event/PostCommandEvent.php

@@ -14,9 +14,6 @@
 
 use Gitonomy\Git\Repository;
 use Gitonomy\Git\Blob;
-use Gitonomy\Git\Event\Events;
-use Gitonomy\Git\Event\PreCommandEvent;
-use Gitonomy\Git\Event\PostCommandEvent;
 
 class RepositoryTest extends AbstractTest
 {
@@ -49,56 +46,6 @@ public function testIsBare()
         $this->assertFalse($notBare->isBare(), "Working copy is not bare");
     }
 
-    /**
-     * @dataProvider provideFoobar
-     */
-    public function testEventDispatcher_Basis($repository)
-    {
-        $test = $this;
-
-        $before = false;
-        $repository->addListener(Events::PRE_COMMAND, function ($event) use ($test, &$before) {
-            $test->assertTrue($event instanceof PreCommandEvent);
-            $test->assertEquals('remote', $event->getCommand(), "command is remote");
-            $test->assertEquals(array('-v'), $event->getArgs(), "args is -v");
-            $before = true;
-        });
-
-        $after = false;
-        $repository->addListener(Events::POST_COMMAND, function ($event) use ($test, &$after) {
-            $test->assertTrue($event instanceof PostCommandEvent);
-            $test->assertEquals('remote', $event->getCommand(), "command is remote");
-            $test->assertEquals(array('-v'), $event->getArgs(), "args is -v");
-            $after = true;
-        });
-
-        $repository->run('remote', array('-v'));
-
-        $this->assertTrue($before, "pre-command called");
-        $this->assertTrue($after,  "post-command called");
-    }
-
-    /**
-     * @dataProvider provideFoobar
-     */
-    public function testEventDispatcher_Error($repository)
-    {
-        $test = $this;
-
-        $after = false;
-        $repository->addListener(Events::POST_COMMAND, function ($event) use ($test, &$after) {
-            $after = true;
-        });
-
-        try {
-            $repository->run('foobar');
-            $this->fail("expected exception on invalid command");
-        } catch (\RuntimeException $e) {
-        }
-
-        $this->assertTrue($after,  "post-command called");
-    }
-
     /**
      * @dataProvider provideFoobar
      */
@@ -114,7 +61,7 @@ public function testLoggerOk($repository)
             ->method('info')
         ;
         $logger
-            ->expects($this->exactly(2))
+            ->expects($this->exactly(3)) // duration, return code and output
             ->method('debug')
         ;
 
@@ -139,7 +86,7 @@ public function testLoggerNOk($repository)
             ->method('info')
         ;
         $logger
-            ->expects($this->exactly(2))
+            ->expects($this->exactly(3)) // duration, return code and output
             ->method('debug')
         ;
         $logger