MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-19 04:21:14 +00:00
Code Issues Releases Wiki Activity

More generic a solution, now works with any command that follows the same pattern of error message

Browse Source
This commit is contained in:
Michael Lee 2015-08-13 17:19:16 +01:00
parent 2cdfe105fb
commit c08a8bddc9
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/rules/test_hadoop_dfs_missing_dash.py
View File

@ -22,9 +22,14 @@ def test_not_match(command):
@pytest.mark.parametrize('command, new_command', [
(Command('hdfs dfs ls'), 'hdfs dfs -ls'),
(Command('hdfs dfs ls /foo/bar'), 'hdfs dfs -ls /foo/bar'),
(Command('./bin/hdfs dfs ls -R /foo/bar'), './bin/hdfs dfs -ls -R /foo/bar')])
(Command('hdfs dfs ls',
stderr='ls: Unknown command\nDid you mean -ls? This command begins with a dash.'), ['hdfs dfs -ls']),
(Command('hdfs dfs rm /foo/bar',
stderr='rm: Unknown command\nDid you mean -rm? This command begins with a dash.'), ['hdfs dfs -rm /foo/bar']),
(Command('./bin/hdfs dfs ls -R /foo/bar',
stderr='ls: Unknown command\nDid you mean -ls? This command begins with a dash.'), ['./bin/hdfs dfs -ls -R /foo/bar']),
(Command('./bin/hdfs dfs -Dtest=fred ls -R /foo/bar',
stderr='ls: Unknown command\nDid you mean -ls? This command begins with a dash.'), ['./bin/hdfs dfs -Dtest=fred -ls -R /foo/bar'])])
def test_get_new_command(command, new_command):
assert get_new_command(command, None) == new_command

13
thefuck/rules/hadoop_dfs_missing_dash.py
View File

@ -1,10 +1,13 @@
import re
from thefuck.utils import (replace_command, get_all_matched_commands)
def match(command, settings):
return ('hdfs dfs' in command.script
and "this command begins with a dash." in command.stderr.lower())
return (re.search(r"([^:]*): Unknown command.*", command.stderr) != None
and re.search(r"Did you mean ([^?]*)?", command.stderr) != None)
def get_new_command(command, settings):
data = command.script.split()
data[2] = '-' + data[2]
return ' '.join(data)
broken_cmd = re.findall(r"([^:]*): Unknown command.*", command.stderr)[0]
matched = re.findall(r"Did you mean ([^?]*)?", command.stderr)
return replace_command(command, broken_cmd, matched)