MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-18 20:11:17 +00:00
Code Issues Releases Wiki Activity

#960: Improve pacman_invalid_option rule (#1072)

Browse Source 
The rule now matches all possible lower case options and only those, not
failing for those that cannot be fixed.
This commit is contained in:
Pablo Aguiar 2020-04-06 21:46:40 +02:00 committed by GitHub
parent 3c542a5b8c
commit 6975d30818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/rules/test_pacman_invalid_option.py
View File

@ -1,21 +1,30 @@
import pytest
from thefuck.rules.pacman_invalid_option import get_new_command, match from thefuck.rules.pacman_invalid_option import get_new_command, match
from thefuck.types import Command from thefuck.types import Command
good_output = "community/shared_meataxe 1.0-3\n A set of programs for working with matrix representations over finite fields\n " good_output = """community/shared_meataxe 1.0-3
A set of programs for working with matrix representations over finite fields
"""
bad_output = "error: invalid option '-s'" bad_output = "error: invalid option '-"
def test_match(): @pytest.mark.parametrize("option", "SURQFDVT")
assert not match(Command('pacman -Ss meat', good_output)) def test_not_match_good_output(option):
assert not match(Command('sudo pacman -Ss meat', good_output)) assert not match(Command("pacman -{}s meat".format(option), good_output))
assert match(Command('pacman -ss meat', bad_output))
assert match(Command('sudo pacman -ss meat', bad_output))
def test_get_new_command(): @pytest.mark.parametrize("option", "azxcbnm")
new_command = get_new_command(Command('pacman -ss meat', bad_output)) def test_not_match_bad_output(option):
assert new_command == 'pacman -Ss meat' assert not match(Command("pacman -{}v meat".format(option), bad_output))
new_command = get_new_command(Command('sudo pacman -s meat', bad_output))
assert new_command == 'sudo pacman -S meat' @pytest.mark.parametrize("option", "surqfdvt")
def test_match(option):
assert match(Command("pacman -{}v meat".format(option), bad_output))
@pytest.mark.parametrize("option", "surqfdvt")
def test_get_new_command(option):
new_command = get_new_command(Command("pacman -{}v meat".format(option), ""))
assert new_command == "pacman -{}v meat".format(option.upper())

12
thefuck/rules/pacman_invalid_option.py
View File

@ -1,14 +1,20 @@
from thefuck.specific.archlinux import archlinux_env from thefuck.specific.archlinux import archlinux_env
from thefuck.specific.sudo import sudo_support
from thefuck.utils import for_app
import re import re
@sudo_support
@for_app("pacman")
def match(command): def match(command):
return "error: invalid option '-s'" in command.output return command.output.startswith("error: invalid option '-") and any(
" -{}".format(option) in command.script for option in "surqfdvt"
)
def get_new_command(command): def get_new_command(command):
opt = re.findall(r" -[dqrstuf]", command.script)[0] option = re.findall(r" -[dfqrstuv]", command.script)[0]
return re.sub(opt, opt.upper(), command.script) return re.sub(option, option.upper(), command.script)
enabled_by_default = archlinux_env() enabled_by_default = archlinux_env()