fujin/thefuck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move get_all_matched_commands over to utils

Browse Source
This commit is contained in:
Pablo Santiago Blum de Aguiar
2015-07-27 22:29:02 -03:00
parent 742200a500
commit 4e854a575e
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thefuck/rules/git_not_command.py
+3 -11
View File
@@ -1,5 +1,6 @@
import re
from thefuck.utils import get_closest, git_support, replace_argument
from thefuck.utils import (get_closest, git_support, replace_argument,
get_all_matched_commands)
@git_support
@@ -8,20 +9,11 @@ def match(command, settings):
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()
@git_support
def get_new_command(command, settings):
broken_cmd = re.findall(r"git: '([^']*)' is not a git command",
command.stderr)[0]
new_cmd = get_closest(broken_cmd,
_get_all_git_matched_commands(command.stderr))
get_all_matched_commands(command.stderr))
return replace_argument(command.script, broken_cmd, new_cmd)
thefuck/utils.py
+9
View File
@@ -159,3 +159,12 @@ def replace_argument(script, from_, to):
else:
return script.replace(
u' {} '.format(from_), u' {} '.format(to), 1)
def get_all_matched_commands(stderr, separator='Did you mean'):
should_yield = False
for line in stderr.split('\n'):
if separator in line:
should_yield = True
elif should_yield and line:
yield line.strip()