Merge pull request BrainMaestro#97 from black-silence/accept_existing_correct_hooks

change message when hooks already exist with correct contents

Author: BrainMaestro

cghooks

@@ -22,7 +22,7 @@ use BrainMaestro\GitHooks\Commands\ListCommand;
 use BrainMaestro\GitHooks\Commands\HookCommand;
 use Symfony\Component\Console\Application;
 
-$application = new Application('Composer Git Hooks', '2.8.0');
+$application = new Application('Composer Git Hooks', '2.8.1');
 
 $application->add(new AddCommand());
 $application->add(new UpdateCommand());

src/Commands/AddCommand.php

@@ -8,6 +8,7 @@
 class AddCommand extends Command
 {
     private $addedHooks = [];
+    private $upToDateHooks = [];
 
     protected $force;
     protected $noLock;
@@ -51,7 +52,10 @@ protected function command()
             $this->addHook($hook, $contents);
         }
 
-        if (! count($this->addedHooks)) {
+        if (! empty($this->hooks) && count($this->upToDateHooks) === count($this->hooks)) {
+            $this->info('All hooks are up to date');
+            return;
+        } elseif (! count($this->addedHooks)) {
             $this->error('No hooks were added. Try updating');
             return;
         }
@@ -78,13 +82,22 @@ private function addHook($hook, $contents)
         // See: https://github.com/BrainMaestro/composer-git-hooks/issues/7
         $shebang = ($this->windows ? '#!/bin/bash' : '#!/bin/sh') . PHP_EOL . PHP_EOL;
         $contents = is_array($contents) ? implode(PHP_EOL, $contents) : $contents;
+        $hookContents = $shebang . $contents . PHP_EOL;
 
         if (! $this->force && $exists) {
+            $actualContents = file_get_contents($filename);
+
+            if ($actualContents === $hookContents) {
+                $this->debug("[{$hook}] is up to date");
+                $this->upToDateHooks[] = $hook;
+                return;
+            }
+
             $this->debug("[{$hook}] already exists");
             return;
         }
 
-        file_put_contents($filename, $shebang . $contents . PHP_EOL);
+        file_put_contents($filename, $hookContents);
         chmod($filename, 0755);
 
         $operation = $exists ? 'Updated' : 'Added';

tests/AddCommandTest.php

@@ -63,6 +63,28 @@ public function it_does_not_add_hooks_that_already_exist()
         $this->assertContains('No hooks were added. Try updating', $this->commandTester->getDisplay());
     }
 
+    /**
+     * @test
+     */
+    public function it_detects_existing_correct_hooks()
+    {
+        $originalHooks = self::$hooks;
+        self::$hooks = [
+            'pre-commit' => '#!/bin/sh' . PHP_EOL . PHP_EOL . 'echo before-commit' . PHP_EOL,
+            'post-commit' => '#!/bin/sh' . PHP_EOL . PHP_EOL . 'echo after-commit' . PHP_EOL,
+        ];
+
+        self::createHooks();
+        $this->commandTester->execute([], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
+
+        foreach (array_keys(self::$hooks) as $hook) {
+            $this->assertContains("{$hook} is up to date", $this->commandTester->getDisplay());
+        }
+        $this->assertContains('All hooks are up to date', $this->commandTester->getDisplay());
+
+        self::$hooks = $originalHooks;
+    }
+
     /**
      * @test
      */