Merge pull request #306 from mcarton/hub

Support GitHub's hub command

tests/rules/test_git_push.py

@@ -20,5 +20,5 @@ def test_match(stderr):
 
 
 def test_get_new_command(stderr):
-    assert get_new_command(Command(stderr=stderr), None)\
+    assert get_new_command(Command('git push', stderr=stderr), None)\
         == "git push --set-upstream origin master"

tests/test_utils.py

@@ -36,6 +36,20 @@ def test_git_support(called, command, stderr):
     assert fn(Command(script=called, stderr=stderr), None) == command
 
 
+@pytest.mark.parametrize('command, is_git', [
+    ('git pull', True),
+    ('hub pull', True),
+    ('git push --set-upstream origin foo', True),
+    ('hub push --set-upstream origin foo', True),
+    ('ls', False),
+    ('cat git', False),
+    ('cat hub', False)])
+def test_git_support_match(command, is_git):
+    @git_support
+    def fn(command, settings): return True
+    assert fn(Command(script=command), None) == is_git
+
+
 def test_memoize():
     fn = Mock(__name__='fn')
     memoized = memoize(fn)

thefuck/rules/git_add.py

@@ -4,8 +4,7 @@ from thefuck import utils, shells
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script
+    return ('did not match any file(s) known to git.' in command.stderr
-            and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" in command.stderr)
 
 

thefuck/rules/git_branch_delete.py

@@ -3,7 +3,7 @@ from thefuck import utils
 
 @utils.git_support
 def match(command, settings):
-    return ('git branch -d' in command.script
+    return ('branch -d' in command.script
             and 'If you are sure you want to delete it' in command.stderr)
 
 

thefuck/rules/git_branch_list.py

@@ -4,7 +4,7 @@ from thefuck import utils, shells
 @utils.git_support
 def match(command, settings):
     # catches "git branch list" in place of "git branch"
-    return command.script.split() == 'git branch list'.split()
+    return command.script.split()[1:] == 'branch list'.split()
 
 
 @utils.git_support

thefuck/rules/git_checkout.py

@@ -5,8 +5,7 @@ from thefuck import shells, utils
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script
+    return ('did not match any file(s) known to git.' in command.stderr
-            and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
 
 

thefuck/rules/git_diff_staged.py

@@ -3,8 +3,7 @@ from thefuck import utils
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script and
+    return ('diff' in command.script and
-            'diff' in command.script and
             '--staged' not in command.script)
 
 

thefuck/rules/git_not_command.py

@@ -4,8 +4,7 @@ from thefuck.utils import get_closest, git_support
 
 @git_support
 def match(command, settings):
-    return ('git' in command.script
+    return (" is not a git command. See 'git --help'." in command.stderr
-            and " is not a git command. See 'git --help'." in command.stderr
             and 'Did you mean' in command.stderr)
 
 

thefuck/rules/git_pull.py

@@ -3,8 +3,7 @@ from thefuck import shells, utils
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script
+    return ('pull' in command.script
-            and 'pull' in command.script
             and 'set-upstream' in command.stderr)
 
 

thefuck/rules/git_pull_clone.py

@@ -1,11 +1,9 @@
-import re
+from thefuck import utils
-from thefuck import utils, shells
 
 
 @utils.git_support
 def match(command, settings):
-    return ('git pull' in command.script
+    return ('fatal: Not a git repository' in command.stderr
-            and 'fatal: Not a git repository' in command.stderr
             and "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." in command.stderr)
 
 

thefuck/rules/git_push.py

@@ -3,8 +3,7 @@ from thefuck import utils
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script
+    return ('push' in command.script
-            and 'push' in command.script
             and 'set-upstream' in command.stderr)
 
 

thefuck/rules/git_push_force.py

@@ -3,8 +3,7 @@ from thefuck import utils
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script
+    return ('push' in command.script
-            and 'push' in command.script
             and '! [rejected]' in command.stderr
             and 'failed to push some refs to' in command.stderr
             and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)

thefuck/rules/git_push_pull.py

@@ -4,8 +4,7 @@ from thefuck.shells import and_
 
 @utils.git_support
 def match(command, settings):
-    return ('git' in command.script
+    return ('push' in command.script
-            and 'push' in command.script
             and '! [rejected]' in command.stderr
             and 'failed to push some refs to' in command.stderr
             and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)

thefuck/rules/git_stash.py

@@ -5,7 +5,7 @@ from thefuck import shells, utils
 def match(command, settings):
     # catches "Please commit or stash them" and "Please, commit your changes or
     # stash them before you can switch branches."
-    return 'git' in command.script and 'or stash them' in command.stderr
+    return 'or stash them' in command.stderr
 
 
 @utils.git_support

thefuck/utils.py

@@ -75,12 +75,19 @@ def sudo_support(fn):
 
 
 def git_support(fn):
-    """Resolve git aliases."""
+    """Resolves git aliases and supports testing for both git and hub."""
     @wraps(fn)
     def wrapper(command, settings):
-        if (command.script.startswith('git') and
+        # supports GitHub's `hub` command
-                'trace: alias expansion:' in command.stderr):
+        # which is recommended to be used with `alias git=hub`
+        # but at this point, shell aliases have already been resolved
+        is_git_cmd = command.script.startswith(('git', 'hub'))
 
+        if not is_git_cmd:
+            return False
+
+        # perform git aliases expansion
+        if 'trace: alias expansion:' in command.stderr:
             search = re.search("trace: alias expansion: ([^ ]*) => ([^\n]*)",
                                command.stderr)
             alias = search.group(1)
@@ -93,6 +100,7 @@ def git_support(fn):
             new_script = command.script.replace(alias, expansion)
 
             command = Command._replace(command, script=new_script)
+
         return fn(command, settings)
 
     return wrapper