cgmartin · August 29, 2015 14:22 · Jun 7, 2015 · Jun 7, 2015 · Jun 7, 2015 · Jun 7, 2015
diff --git a/git-hooks∕pre-commit b/git-hooks∕pre-commit
@@ -8,6 +8,7 @@ npm.load(function (err) {
     npm.commands.test(function(err) {
         if (err) failed('test', err);
 
+        // Chain additional commands...
         //npm.commands['run-script'](['foo'], function(err) {
         //    if (err) failed('foo', err);
         //});

diff --git a/README.md b/README.md
@@ -1,14 +1,13 @@
 Here's how this works:
 
-* Include a `git_hooks/` directory in your project, with these two files (plus other hooks if you want, written in a similar style).
-* Add `"npm"` to your `devDependencies` in `package.json`, so that the `pre-commit` hook can do its magic.
-* Add `test` and `lint` scripts to your `package.json`, e.g.
+* Include a `git-hooks/` directory in your project, with these two files (plus other hooks if you want, written in a similar style).
+* Ensure the files under the `git-hooks/` directory are executable: `chmod 755 git-hooks/*`
+* Add `test` script to your `package.json`, e.g.
 
 ```json
     "scripts": {
-        "test": "mocha",
-        "lint": "jshint ./lib --show-non-errors"
+        "test": "mocha"
     }
 ```
 
-* Whenever you clone the repository, run `node git_hooks/link.js` to symlink the hooks stored in the repository, in `git_hooks`, to the hidden `.git/hooks` directory.
+* Whenever you clone the repository, run `git-hooks/install-hooks` to symlink the hooks stored in the repository, in `git-hooks`, to the hidden `.git/hooks` directory.
diff --git a/git_hooks∕install-hooks → git-hooks∕install-hooks b/git_hooks∕install-hooks → git-hooks∕install-hooks
diff --git a/git_hooks∕pre-commit → git-hooks∕pre-commit b/git_hooks∕pre-commit → git-hooks∕pre-commit
diff --git a/git_hooks∕link.js → git_hooks∕install-hooks b/git_hooks∕link.js → git_hooks∕install-hooks
@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 var fs = require("fs");
 var path = require("path");
 var gitHookDir = path.resolve(__dirname, '..', '.git', 'hooks');

diff --git a/git_hooks∕pre-commit b/git_hooks∕pre-commit
@@ -1,21 +1,20 @@
 #!/usr/bin/env node
-
-var npm = require("npm");
+var npm = require('npm');
 
 npm.load(function (err) {
-    if (err) {
-        throw err;
-    }
+    if (err) throw err;
 
-    npm.commands.test(function (err) {
-        if (err) {
-            process.exit(1);
-        }
+    // run `npm test`
+    npm.commands.test(function(err) {
+        if (err) failed('test', err);
 
-        npm.commands["run-script"](["lint"], function (err) {
-            if (err) {
-                process.exit(1);
-            }
-        });
+        //npm.commands['run-script'](['foo'], function(err) {
+        //    if (err) failed('foo', err);
+        //});
     });
 });
+
+function failed(msg, err) {
+    console.error('\npre-commit failure:', msg, err);
+    process.exit(1);
+}
diff --git a/git_hooks∕link.js b/git_hooks∕link.js
@@ -1,17 +1,20 @@
+#!/usr/bin/env node
+
 var fs = require("fs");
 var path = require("path");
+var gitHookDir = path.resolve(__dirname, '..', '.git', 'hooks');
 
 ["applypatch-msg", "commit-msg", "post-commit", "post-receive", "post-update", "pre-applypatch", "pre-commit",
  "prepare-commit-msg", "pre-rebase", "update"].forEach(function (hook) {
-    var hookInSourceControl = path.resolve(__dirname, hook);
 
-    if (path.existsSync(hookInSourceControl)) {
-        var hookInHiddenDirectory = path.resolve(__dirname, "..", ".git", "hooks", hook);
+    var hookInSourceControl = path.resolve(__dirname, hook);
+    if (fs.existsSync(hookInSourceControl)) {
+        var hookInHiddenDirectory = path.resolve(gitHookDir, hook);
 
-        if (path.existsSync(hookInHiddenDirectory)) {
+        if (fs.existsSync(hookInHiddenDirectory)) {
             fs.unlinkSync(hookInHiddenDirectory);
         }
 
-        fs.linkSync(hookInSourceControl, hookInHiddenDirectory);
+        fs.symlinkSync(path.relative(gitHookDir, hookInSourceControl), hookInHiddenDirectory);
     }
-});
+});
diff --git a/git_hooks∕pre-commit b/git_hooks∕pre-commit
@@ -11,10 +11,11 @@ npm.load(function (err) {
         if (err) {
             process.exit(1);
         }
-    });
-    npm.commands["run-script"](["lint"], function (err) {
-        if (err) {
-            process.exit(1);
-        }
+
+        npm.commands["run-script"](["lint"], function (err) {
+            if (err) {
+                process.exit(1);
+            }
+        });
     });
 });
diff --git a/git_hooks∕link.js b/git_hooks∕link.js
@@ -3,10 +3,10 @@ var path = require("path");
 
 ["applypatch-msg", "commit-msg", "post-commit", "post-receive", "post-update", "pre-applypatch", "pre-commit",
  "prepare-commit-msg", "pre-rebase", "update"].forEach(function (hook) {
-    var hookInSourceControl = path.resolve(__dirname, "pre-commit");
+    var hookInSourceControl = path.resolve(__dirname, hook);
 
     if (path.existsSync(hookInSourceControl)) {
-        var hookInHiddenDirectory = path.resolve(__dirname, "..", ".git", "hooks", "pre-commit");
+        var hookInHiddenDirectory = path.resolve(__dirname, "..", ".git", "hooks", hook);
 
         if (path.existsSync(hookInHiddenDirectory)) {
             fs.unlinkSync(hookInHiddenDirectory);

diff --git a/README.md b/README.md
@@ -0,0 +1,14 @@
+Here's how this works:
+
+* Include a `git_hooks/` directory in your project, with these two files (plus other hooks if you want, written in a similar style).
+* Add `"npm"` to your `devDependencies` in `package.json`, so that the `pre-commit` hook can do its magic.
+* Add `test` and `lint` scripts to your `package.json`, e.g.
+
+```json
+    "scripts": {
+        "test": "mocha",
+        "lint": "jshint ./lib --show-non-errors"
+    }
+```
+
+* Whenever you clone the repository, run `node git_hooks/link.js` to symlink the hooks stored in the repository, in `git_hooks`, to the hidden `.git/hooks` directory.
diff --git a/git_hooks∕link.js b/git_hooks∕link.js
@@ -0,0 +1,17 @@
+var fs = require("fs");
+var path = require("path");
+
+["applypatch-msg", "commit-msg", "post-commit", "post-receive", "post-update", "pre-applypatch", "pre-commit",
+ "prepare-commit-msg", "pre-rebase", "update"].forEach(function (hook) {
+    var hookInSourceControl = path.resolve(__dirname, "pre-commit");
+
+    if (path.existsSync(hookInSourceControl)) {
+        var hookInHiddenDirectory = path.resolve(__dirname, "..", ".git", "hooks", "pre-commit");
+
+        if (path.existsSync(hookInHiddenDirectory)) {
+            fs.unlinkSync(hookInHiddenDirectory);
+        }
+
+        fs.linkSync(hookInSourceControl, hookInHiddenDirectory);
+    }
+});
diff --git a/git_hooks∕pre-commit b/git_hooks∕pre-commit
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+var npm = require("npm");
+
+npm.load(function (err) {
+    if (err) {
+        throw err;
+    }
+
+    npm.commands.test(function (err) {
+        if (err) {
+            process.exit(1);
+        }
+    });
+    npm.commands["run-script"](["lint"], function (err) {
+        if (err) {
+            process.exit(1);
+        }
+    });
+});
No results found