MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-02-07 13:41:21 +00:00
Code Issues Releases Wiki Activity

#229 Use closest git command

Browse Source
This commit is contained in:
nvbn 2015-07-08 21:33:30 +03:00
parent c0eae8b85c
commit 27b5b9de6a
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/rules/test_git_not_command.py
View File

@ -25,6 +25,16 @@ stats
""" """
@pytest.fixture
def git_not_command_closest():
return '''git: 'tags' is not a git command. See 'git --help'.
Did you mean one of these?
stage
tag
'''
@pytest.fixture @pytest.fixture
def git_command(): def git_command():
return "* master" return "* master"
@ -37,8 +47,11 @@ def test_match(git_not_command, git_command, git_not_command_one_of_this):
assert not match(Command('git branch', stderr=git_command), None) assert not match(Command('git branch', stderr=git_command), None)
def test_get_new_command(git_not_command, git_not_command_one_of_this): def test_get_new_command(git_not_command, git_not_command_one_of_this,
git_not_command_closest):
assert get_new_command(Command('git brnch', stderr=git_not_command), None) \ assert get_new_command(Command('git brnch', stderr=git_not_command), None) \
== 'git branch' == 'git branch'
assert get_new_command(Command('git st', stderr=git_not_command_one_of_this), assert get_new_command(Command('git st', stderr=git_not_command_one_of_this),
None) == 'git status' None) == 'git status'
assert get_new_command(Command('git tags', stderr=git_not_command_closest),
None) == 'git tag'

15
thefuck/rules/git_not_command.py
View File

@ -1,4 +1,6 @@
from difflib import get_close_matches
import re import re
from thefuck.utils import get_closest
def match(command, settings): def match(command, settings):
@ -7,10 +9,19 @@ def match(command, settings):
and 'Did you mean' in command.stderr) and 'Did you mean' in command.stderr)
def _get_all_git_matched_commands(stderr):
should_yield = False
for line in stderr.split('\n'):
if 'Did you mean' in line:
should_yield = True
elif should_yield and line:
yield line.strip()
def get_new_command(command, settings): def get_new_command(command, settings):
broken_cmd = re.findall(r"git: '([^']*)' is not a git command", broken_cmd = re.findall(r"git: '([^']*)' is not a git command",
command.stderr)[0] command.stderr)[0]
new_cmd = re.findall(r'Did you mean[^\n]*\n\s*([^\n]*)', new_cmd = get_closest(broken_cmd,
command.stderr)[0] _get_all_git_matched_commands(command.stderr))
return command.script.replace(broken_cmd, new_cmd, 1) return command.script.replace(broken_cmd, new_cmd, 1)