MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-02-22 04:48:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #562 from josephfrazier/man-help

Browse Source 
Suggest `foo --help` when `man foo` shows no pages
This commit is contained in:
Vladimir Iakovlev 2016-10-07 10:37:33 +02:00 committed by GitHub
commit 02f717a0e8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/rules/test_man.py
View File

@ -23,7 +23,8 @@ def test_not_match(command):
@pytest.mark.parametrize('command, new_command', [ @pytest.mark.parametrize('command, new_command', [
(Command('man read'), ['man 3 read', 'man 2 read']), (Command('man read'), ['man 3 read', 'man 2 read', 'read --help']),
(Command('man missing', stderr="No manual entry for missing\n"), ['missing --help']),
(Command('man 2 read'), 'man 3 read'), (Command('man 2 read'), 'man 3 read'),
(Command('man 3 read'), 'man 2 read'), (Command('man 3 read'), 'man 2 read'),
(Command('man -s2 read'), 'man -s3 read'), (Command('man -s2 read'), 'man -s3 read'),

14
thefuck/rules/man.py
View File

@ -12,10 +12,22 @@ def get_new_command(command):
if '2' in command.script: if '2' in command.script:
return command.script.replace("2", "3") return command.script.replace("2", "3")
last_arg = command.script_parts[-1]
help_command = last_arg + ' --help'
# If there are no man pages for last_arg, suggest `last_arg --help` instead.
# Otherwise, suggest `--help` after suggesting other man page sections.
if command.stderr.strip() == 'No manual entry for ' + last_arg:
return [help_command]
split_cmd2 = command.script_parts split_cmd2 = command.script_parts
split_cmd3 = split_cmd2[:] split_cmd3 = split_cmd2[:]
split_cmd2.insert(1, ' 2 ') split_cmd2.insert(1, ' 2 ')
split_cmd3.insert(1, ' 3 ') split_cmd3.insert(1, ' 3 ')
return ["".join(split_cmd3), "".join(split_cmd2)] return [
"".join(split_cmd3),
"".join(split_cmd2),
help_command,
]