Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py

pre_commit/git.py

@@ -0,0 +1,27 @@
+import os
+import pkg_resources
+from plumbum import local
+
+
+def get_root():
+    return local['git']['rev-parse', '--show-toplevel']().strip()
+
+
+def get_pre_commit_path():
+    return os.path.join(get_root(), '.git/hooks/pre-commit')
+
+
+def create_pre_commit():
+    path = get_pre_commit_path()
+    pre_commit_file = pkg_resources.resource_filename('pre_commit', 'resources/pre-commit.sh')
+    local.path(path).write(local.path(pre_commit_file).read())
+
+
+def remove_pre_commit():
+    local.path(get_pre_commit_path()).delete()
+
+
+
+
+
+

pre_commit/resources/pre-commit.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+pre-commit

pre_commit/run.py

@@ -1,11 +1,10 @@
 
 import argparse
-
+from pre_commit import git
 
 def install():
     """Install the pre-commit hook."""
-    raise NotImplementedError
-
+    git.create_pre_commit()
 
 def uninstall():
     """Uninstall the pre-commit hook."""
@@ -39,4 +38,4 @@ def run(argv):
     elif args.uninstall:
         return uninstall()
     else:
-        return run_hooks(args)
+        return run_hooks(args)