Combine install and uninstall.

pre_commit/commands/install_uninstall.py

@@ -54,3 +54,11 @@ def install(runner, overwrite=False):
 
     print('pre-commit installed at {0}'.format(runner.pre_commit_path))
     return 0
+
+
+def uninstall(runner):
+    """Uninstall the pre-commit hooks."""
+    if os.path.exists(runner.pre_commit_path):
+        os.remove(runner.pre_commit_path)
+        print('pre-commit uninstalled')
+    return 0

pre_commit/commands/uninstall.py

@@ -1,13 +0,0 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import os
-import os.path
-
-
-def uninstall(runner):
-    """Uninstall the pre-commit hooks."""
-    if os.path.exists(runner.pre_commit_path):
-        os.remove(runner.pre_commit_path)
-        print('pre-commit uninstalled')
-    return 0

pre_commit/main.py

@@ -6,9 +6,9 @@ import pkg_resources
 from pre_commit import color
 from pre_commit.commands.autoupdate import autoupdate
 from pre_commit.commands.clean import clean
-from pre_commit.commands.install import install
+from pre_commit.commands.install_uninstall import install
+from pre_commit.commands.install_uninstall import uninstall
 from pre_commit.commands.run import run
-from pre_commit.commands.uninstall import uninstall
 from pre_commit.runner import Runner
 from pre_commit.util import entry
 

tests/commands/install_uninstall_test.py

@@ -10,9 +10,10 @@ import subprocess
 import stat
 from plumbum import local
 
-from pre_commit.commands.install import install
+from pre_commit.commands.install_uninstall import install
-from pre_commit.commands.install import is_our_pre_commit
+from pre_commit.commands.install_uninstall import is_our_pre_commit
-from pre_commit.commands.install import make_executable
+from pre_commit.commands.install_uninstall import make_executable
+from pre_commit.commands.install_uninstall import uninstall
 from pre_commit.runner import Runner
 from testing.fixtures import git_dir
 from testing.fixtures import make_consuming_repo
@@ -46,6 +47,23 @@ def test_install_pre_commit(tmpdir_factory):
     assert stat_result.st_mode & (stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
 
 
+def test_uninstall_does_not_blow_up_when_not_there(tmpdir_factory):
+    path = git_dir(tmpdir_factory)
+    runner = Runner(path)
+    ret = uninstall(runner)
+    assert ret == 0
+
+
+def test_uninstall(tmpdir_factory):
+    path = git_dir(tmpdir_factory)
+    runner = Runner(path)
+    assert not os.path.exists(runner.pre_commit_path)
+    install(runner)
+    assert os.path.exists(runner.pre_commit_path)
+    uninstall(runner)
+    assert not os.path.exists(runner.pre_commit_path)
+
+
 def _get_commit_output(tmpdir_factory, touch_file='foo'):
     local['touch'](touch_file)
     local['git']('add', touch_file)

tests/commands/uninstall_test.py

@@ -1,26 +0,0 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import os.path
-
-from pre_commit.runner import Runner
-from pre_commit.commands.install import install
-from pre_commit.commands.uninstall import uninstall
-from testing.fixtures import git_dir
-
-
-def test_uninstall_does_not_blow_up_when_not_there(tmpdir_factory):
-    path = git_dir(tmpdir_factory)
-    runner = Runner(path)
-    ret = uninstall(runner)
-    assert ret == 0
-
-
-def test_uninstall(tmpdir_factory):
-    path = git_dir(tmpdir_factory)
-    runner = Runner(path)
-    assert not os.path.exists(runner.pre_commit_path)
-    install(runner)
-    assert os.path.exists(runner.pre_commit_path)
-    uninstall(runner)
-    assert not os.path.exists(runner.pre_commit_path)