Merge pull request #16 from Cheppers/move-hooks

Move hooks

.gitignore

@@ -5,5 +5,5 @@
 /release/
 /vendor/
 
-/cheppers-git-hooks-robo-*.tar
-/cheppers-git-hooks-robo-*.zip
+/cheppers-git-hooks-*.tar
+/cheppers-git-hooks-*.zip

README.md

@@ -1,11 +1,11 @@
 
-# Trigger Robo tasks from Git hooks
+# Trigger custom scripts from Git hooks
 
 This package provides a bridge between the un-versioned `.git/hooks/*` scripts
 and scripts in your Git repository.
 
-[![Build Status](https://travis-ci.org/Cheppers/git-hooks-robo.svg?branch=master)](https://travis-ci.org/Cheppers/git-hooks-robo)
-[![Total Downloads](https://poser.pugx.org/cheppers/git-hooks-robo/downloads.png)](https://packagist.org/packages/cheppers/git-hooks-robo)
+[![Build Status](https://travis-ci.org/Cheppers/git-hooks.svg?branch=master)](https://travis-ci.org/Cheppers/git-hooks)
+[![Total Downloads](https://poser.pugx.org/cheppers/git-hooks/downloads.png)](https://packagist.org/packages/cheppers/git-hooks)
 
 
 ## When to use
@@ -43,16 +43,16 @@ teammates then this is the tool you are looking for.
         {
             "type": "package",
             "package": {
-                "name": "cheppers/git-hooks-robo",
+                "name": "cheppers/git-hooks",
                 "version": "0.0.5",
                 "type": "git-hook",
                 "dist": {
                     "type": "tar",
-                    "url": "https://github.com/Cheppers/git-hooks-robo/releases/download/v0.0.5/v0.0.5.tar.gz"
+                    "url": "https://github.com/Cheppers/git-hooks/releases/download/v0.0.5/v0.0.5.tar.gz"
                 },
                 "source": {
                     "type": "git",
-                    "url": "https://github.com/Cheppers/git-hooks-robo.git",
+                    "url": "https://github.com/Cheppers/git-hooks.git",
                     "reference": "v0.0.5"
                 }
             }

RoboFile.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Robo task definitions for cheppers/git-hooks-robo.
+ * Robo task definitions for cheppers/git-hooks.
  */
 
 use Robo\Tasks;
@@ -41,6 +41,7 @@ class RoboFile extends Tasks
      * @var string[]
      */
     protected $filesToDeploy = [
+        '_common' => ['base_mask' => 0666],
         'applypatch-msg' => ['base_mask' => 0777],
         'commit-msg' => ['base_mask' => 0777],
         'post-applypatch' => ['base_mask' => 0777],
@@ -91,41 +92,33 @@ public function releaseCreate($version)
         /** @var \Robo\Collection\Collection $collection */
         $collection = $this->collection();
 
-        $collection->add($this
-            ->taskFilesystemStack()
-            ->remove('release'));
+        $name = "{$this->packageVendor}-{$this->packageName}-{$version}";
 
-        $cmd = sprintf(
-            'composer archive --format=%s --dir=%s --file=%s',
-            escapeshellarg('zip'),
-            escapeshellarg('release'),
-            escapeshellarg("v{$version}")
-        );
-        $collection->add($this->taskExec($cmd));
+        $fs_stack = $this->taskFilesystemStack();
+        $collection->add($fs_stack);
 
-        $collection->add($this
-            ->taskExtract("release/v{$version}.zip")
-            ->to("release/{$this->packageName}-{$version}"));
+        $fs_stack
+            ->remove("release/$name")
+            ->remove("release/$name.tar.gz");
 
-        $collection->add($this
-            ->taskFilesystemStack()
-            ->remove("release/v{$version}.zip"));
-
-        $fs_stack_chmod = $this->taskFilesystemStack();
         foreach ($this->filesToDeploy as $file_name => $file_meta) {
-            $fs_stack_chmod->chmod(
-                "release/{$this->packageName}-{$version}/$file_name",
+            $fs_stack->copy(
+                "hooks/$file_name",
+                "release/$name/$file_name"
+            );
+
+            $fs_stack->chmod(
+                "release/$name/$file_name",
                 $file_meta['base_mask'],
                 0022
             );
         }
-        $collection->add($fs_stack_chmod);
 
-        foreach (['tar.gz', 'zip'] as $extension) {
-            $collection->add($this
-                ->taskPack("release/{$this->packageVendor}-{$this->packageName}-{$version}.$extension")
-                ->addDir("{$this->packageName}-{$version}", "release/{$this->packageName}-{$version}"));
-        }
+        $collection->add(
+            $this
+                ->taskPack("release/$name.tar.gz")
+                ->addDir($name, "release/$name")
+        );
 
         $collection->run();
     }
@@ -243,7 +236,7 @@ protected function getTaskDeployGitHooks()
         $git_dir = preg_replace('@^' . preg_quote("$current_dir/", '@') . '@', './', $git_dir);
         foreach ($this->filesToDeploy as $file_name => $file_meta) {
             $dst = "$git_dir/hooks/$file_name";
-            $fsStack->copy($file_name, $dst);
+            $fsStack->copy("hooks/$file_name", $dst);
             $fsStack->chmod($dst, $file_meta['base_mask'], umask());
         }
 

composer.json

@@ -19,25 +19,26 @@
         "exclude": [
             "/*",
             "/.*",
+            "!/hooks/_common",
+            "!/hooks/applypatch-msg",
+            "!/hooks/commit-msg",
+            "!/hooks/post-applypatch",
+            "!/hooks/post-checkout",
+            "!/hooks/post-commit",
+            "!/hooks/post-merge",
+            "!/hooks/post-receive",
+            "!/hooks/post-rewrite",
+            "!/hooks/post-update",
+            "!/hooks/pre-applypatch",
+            "!/hooks/pre-auto-gc",
+            "!/hooks/pre-commit",
+            "!/hooks/pre-push",
+            "!/hooks/pre-rebase",
+            "!/hooks/pre-receive",
+            "!/hooks/prepare-commit-msg",
+            "!/hooks/push-to-checkout",
+            "!/hooks/update",
             "!/composer.json",
-            "!/applypatch-msg",
-            "!/commit-msg",
-            "!/post-applypatch",
-            "!/post-checkout",
-            "!/post-commit",
-            "!/post-merge",
-            "!/post-receive",
-            "!/post-rewrite",
-            "!/post-update",
-            "!/pre-applypatch",
-            "!/pre-auto-gc",
-            "!/pre-commit",
-            "!/pre-push",
-            "!/pre-rebase",
-            "!/pre-receive",
-            "!/prepare-commit-msg",
-            "!/push-to-checkout",
-            "!/update",
             "!/README.md"
         ]
     },

features/bootstrap/FeatureContext.php

@@ -51,24 +51,25 @@ class FeatureContext extends \PHPUnit_Framework_Assert implements Context
      * @var string[]
      */
     protected static $gitHooks = [
-        'applypatch-msg' => 0777,
-        'commit-msg' => 0777,
-        'post-applypatch' => 0777,
-        'post-checkout' => 0777,
-        'post-commit' => 0777,
-        'post-merge' => 0777,
-        'post-receive' => 0666,
-        'post-rewrite' => 0666,
-        'post-update' => 0777,
-        'pre-applypatch' => 0777,
-        'pre-auto-gc' => 0777,
-        'pre-commit' => 0777,
-        'pre-push' => 0777,
-        'pre-rebase' => 0777,
-        'pre-receive' => 0666,
-        'prepare-commit-msg' => 0777,
-        'push-to-checkout' => 0777,
-        'update' => 0777,
+        '_common' => ['base_mask' => 0666],
+        'applypatch-msg' => ['base_mask' => 0777],
+        'commit-msg' => ['base_mask' => 0777],
+        'post-applypatch' => ['base_mask' => 0777],
+        'post-checkout' => ['base_mask' => 0777],
+        'post-commit' => ['base_mask' => 0777],
+        'post-merge' => ['base_mask' => 0777],
+        'post-receive' => ['base_mask' => 0666],
+        'post-rewrite' => ['base_mask' => 0666],
+        'post-update' => ['base_mask' => 0777],
+        'pre-applypatch' => ['base_mask' => 0777],
+        'pre-auto-gc' => ['base_mask' => 0777],
+        'pre-commit' => ['base_mask' => 0777],
+        'pre-push' => ['base_mask' => 0777],
+        'pre-rebase' => ['base_mask' => 0777],
+        'pre-receive' => ['base_mask' => 0666],
+        'prepare-commit-msg' => ['base_mask' => 0777],
+        'push-to-checkout' => ['base_mask' => 0777],
+        'update' => ['base_mask' => 0777],
     ];
 
     /**
@@ -119,11 +120,11 @@ protected static function initGitTemplate()
         static::$fs->mkdir($dir);
 
         $mask = umask();
-        foreach (static::$gitHooks as $file => $mode) {
-            $src = static::$projectRootDir . "/$file";
-            $dst = "$git_template_dir/hooks/$file";
+        foreach (static::$gitHooks as $file_name => $info) {
+            $src = static::$projectRootDir . "/hooks/$file_name";
+            $dst = "$git_template_dir/hooks/$file_name";
             static::$fs->copy($src, $dst, true);
-            static::$fs->chmod($dst, $mode, $mask);
+            static::$fs->chmod($dst, $info['base_mask'], $mask);
         }
     }
 

fixtures/git-template/config

@@ -1,4 +1,4 @@
 
 [user]
-  name  = git-hooks-robo
-  email = git-hooks-robo@example.com
+  name  = git-hooks
+  email = [email protected]

fixtures/project-template/basic/composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "cheppers/git-hooks-robo-helper",
-    "description": "Helper project for cheppers/git-hooks-robo",
+    "name": "cheppers/git-hooks-helper",
+    "description": "Helper project for cheppers/git-hooks",
     "license": "proprietary",
     "minimum-stability": "dev",
     "prefer-stable": true,

pre-auto-gc → hooks/_common

@@ -1,13 +1,5 @@
 #!/usr/bin/env bash
-##
-# The hook is called with the following parameters:
-#   No parameters.
-#
-# Standard input format:
-#   NULL
-##
 
-hasInput='true'
 if [ "$(git rev-parse --is-bare-repository)" = 'true' ]; then
     gitHooksBridge='./.git-hooks'
 else

hooks/applypatch-msg

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_applypatch_msg
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/commit-msg

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_commit_msg
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-applypatch

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_post_applypatch
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-checkout

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_post_checkout
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-commit

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_post_commit
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-merge

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_post_merge
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-receive

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#post-receive
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-rewrite

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_post_rewrite
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/post-update

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#post-update
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"

hooks/pre-applypatch

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+##
+# @see https://git-scm.com/docs/githooks#_pre_applypatch
+##
+
+hasInput='true'
+. "$(dirname $0)/_common"