mirror of
https://github.com/nvbn/thefuck.git
synced 2025-11-03 00:22:10 +00:00
Compare commits
65 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7071763a3 | ||
|
|
27b5b9de6a | ||
|
|
c0eae8b85c | ||
|
|
fbf7b91005 | ||
|
|
3d842fe6eb | ||
|
|
17d359b43f | ||
|
|
22503cdb94 | ||
|
|
a8de919300 | ||
|
|
fac18de242 | ||
|
|
26fc18dfe4 | ||
|
|
0fb5c9a228 | ||
|
|
04a342bbc7 | ||
|
|
669fbff6ce | ||
|
|
e2542915e4 | ||
|
|
1b08a7dcb6 | ||
|
|
8d77a2d528 | ||
|
|
18ea4272ab | ||
|
|
a75c99eb12 | ||
|
|
f3cdfbdbdb | ||
|
|
30082bc9a9 | ||
|
|
3822f62d90 | ||
|
|
25cc98a21a | ||
|
|
409d839e92 | ||
|
|
51b5dd0460 | ||
|
|
cb33c912e5 | ||
|
|
470d66eeb2 | ||
|
|
5552fd3dc9 | ||
|
|
ab55c1cccb | ||
|
|
7173e0dbad | ||
|
|
369ea7ff46 | ||
|
|
40fe604adc | ||
|
|
ef504b6436 | ||
|
|
b59e83cca9 | ||
|
|
6d718a38dc | ||
|
|
330f91f5dc | ||
|
|
e3cc9c52e6 | ||
|
|
01ce65047a | ||
|
|
3203d57b36 | ||
|
|
28ab6c62f8 | ||
|
|
360e4673eb | ||
|
|
c6aead735b | ||
|
|
af3e1a555f | ||
|
|
897b847975 | ||
|
|
a0949b1102 | ||
|
|
2f1460120e | ||
|
|
43ec397190 | ||
|
|
eb537bef81 | ||
|
|
b033d3893b | ||
|
|
633c4f8415 | ||
|
|
5bfe0ac997 | ||
|
|
e8a55220ad | ||
|
|
ea306038f9 | ||
|
|
6a88cc47b6 | ||
|
|
96fe1e77b3 | ||
|
|
c08d9125e4 | ||
|
|
be682170e5 | ||
|
|
5e981d9b01 | ||
|
|
add499af7f | ||
|
|
9c711734aa | ||
|
|
ff7a433f39 | ||
|
|
6bb7d79ddc | ||
|
|
f6c013d033 | ||
|
|
01cf199866 | ||
|
|
3d41a3fb7c | ||
|
|
f55fa35ebf |
15
README.md
15
README.md
@@ -146,18 +146,18 @@ sudo pip install thefuck --upgrade
|
|||||||
The Fuck tries to match a rule for the previous command, creates a new command
|
The Fuck tries to match a rule for the previous command, creates a new command
|
||||||
using the matched rule and runs it. Rules enabled by default are as follows:
|
using the matched rule and runs it. Rules enabled by default are as follows:
|
||||||
|
|
||||||
|
* `cargo` – runs `cargo build` instead of `cargo`;
|
||||||
|
* `cargo_no_command` – fixes wrongs commands like `cargo buid`;
|
||||||
* `cd_correction` – spellchecks and correct failed cd commands;
|
* `cd_correction` – spellchecks and correct failed cd commands;
|
||||||
* `cd_mkdir` – creates directories before cd'ing into them;
|
* `cd_mkdir` – creates directories before cd'ing into them;
|
||||||
* `cd_parent` – changes `cd..` to `cd ..`;
|
* `cd_parent` – changes `cd..` to `cd ..`;
|
||||||
* `composer_not_command` – fixes composer command name;
|
* `composer_not_command` – fixes composer command name;
|
||||||
* `cp_omitting_directory` – adds `-a` when you `cp` directory;
|
* `cp_omitting_directory` – adds `-a` when you `cp` directory;
|
||||||
* `cpp11` – add missing `-std=c++11` to `g++` or `clang++`;
|
* `cpp11` – add missing `-std=c++11` to `g++` or `clang++`;
|
||||||
* `dry` – fix repetitions like "git git push";
|
|
||||||
* `django_south_ghost` – adds `--delete-ghost-migrations` to failed because ghosts django south migration;
|
* `django_south_ghost` – adds `--delete-ghost-migrations` to failed because ghosts django south migration;
|
||||||
* `django_south_merge` – adds `--merge` to inconsistent django south migration;
|
* `django_south_merge` – adds `--merge` to inconsistent django south migration;
|
||||||
|
* `dry` – fix repetitions like "git git push";
|
||||||
* `fix_alt_space` – replaces Alt+Space with Space character;
|
* `fix_alt_space` – replaces Alt+Space with Space character;
|
||||||
* `javac` – appends missing `.java` when compiling Java files;
|
|
||||||
* `java` – removes `.java` extension when running Java programs;
|
|
||||||
* `git_add` – fix *"Did you forget to 'git add'?"*;
|
* `git_add` – fix *"Did you forget to 'git add'?"*;
|
||||||
* `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch;
|
* `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch;
|
||||||
* `git_checkout` – creates the branch before checking-out;
|
* `git_checkout` – creates the branch before checking-out;
|
||||||
@@ -169,6 +169,8 @@ using the matched rule and runs it. Rules enabled by default are as follows:
|
|||||||
* `go_run` – appends `.go` extension when compiling/running Go programs
|
* `go_run` – appends `.go` extension when compiling/running Go programs
|
||||||
* `grep_recursive` – adds `-r` when you trying to grep directory;
|
* `grep_recursive` – adds `-r` when you trying to grep directory;
|
||||||
* `has_exists_script` – prepends `./` when script/binary exists;
|
* `has_exists_script` – prepends `./` when script/binary exists;
|
||||||
|
* `java` – removes `.java` extension when running Java programs;
|
||||||
|
* `javac` – appends missing `.java` when compiling Java files;
|
||||||
* `lein_not_task` – fixes wrong `lein` tasks like `lein rpl`;
|
* `lein_not_task` – fixes wrong `lein` tasks like `lein rpl`;
|
||||||
* `ls_lah` – adds -lah to ls;
|
* `ls_lah` – adds -lah to ls;
|
||||||
* `man` – change manual section;
|
* `man` – change manual section;
|
||||||
@@ -179,12 +181,17 @@ using the matched rule and runs it. Rules enabled by default are as follows:
|
|||||||
* `open` – prepends `http` to address passed to `open`;
|
* `open` – prepends `http` to address passed to `open`;
|
||||||
* `pip_unknown_command` – fixes wrong pip commands, for example `pip instatl/pip install`;
|
* `pip_unknown_command` – fixes wrong pip commands, for example `pip instatl/pip install`;
|
||||||
* `python_command` – prepends `python` when you trying to run not executable/without `./` python script;
|
* `python_command` – prepends `python` when you trying to run not executable/without `./` python script;
|
||||||
|
* `python_execute` – appends missing `.py` when executing Python files;
|
||||||
* `quotation_marks` – fixes uneven usage of `'` and `"` when containing args'
|
* `quotation_marks` – fixes uneven usage of `'` and `"` when containing args'
|
||||||
* `rm_dir` – adds `-rf` when you trying to remove directory;
|
* `rm_dir` – adds `-rf` when you trying to remove directory;
|
||||||
|
* `sed` – adds missing '/' to `sed`'s `s` commands;
|
||||||
* `sl_ls` – changes `sl` to `ls`;
|
* `sl_ls` – changes `sl` to `ls`;
|
||||||
* `ssh_known_hosts` – removes host from `known_hosts` on warning;
|
* `ssh_known_hosts` – removes host from `known_hosts` on warning;
|
||||||
* `sudo` – prepends `sudo` to previous command if it failed because of permissions;
|
* `sudo` – prepends `sudo` to previous command if it failed because of permissions;
|
||||||
* `switch_layout` – switches command from your local layout to en;
|
* `switch_layout` – switches command from your local layout to en;
|
||||||
|
* `systemctl` – correctly orders parameters of confusing systemctl;
|
||||||
|
* `test.py` – runs `py.test` instead of `test.py`;
|
||||||
|
* `tmux` – fixes tmux commands;
|
||||||
* `whois` – fixes `whois` command.
|
* `whois` – fixes `whois` command.
|
||||||
|
|
||||||
Enabled by default only on specific platforms:
|
Enabled by default only on specific platforms:
|
||||||
@@ -207,7 +214,7 @@ in `~/.thefuck/rules`. Rule should contain two functions:
|
|||||||
and `get_new_command(command: Command, settings: Settings) -> str`.
|
and `get_new_command(command: Command, settings: Settings) -> str`.
|
||||||
Also the rule can contain optional function
|
Also the rule can contain optional function
|
||||||
`side_effect(command: Command, settings: Settings) -> None` and
|
`side_effect(command: Command, settings: Settings) -> None` and
|
||||||
optional boolean `enabled_by_default`
|
optional boolean `enabled_by_default`.
|
||||||
|
|
||||||
`Command` has three attributes: `script`, `stdout` and `stderr`.
|
`Command` has three attributes: `script`, `stdout` and `stderr`.
|
||||||
|
|
||||||
|
|||||||
18
setup.py
Normal file → Executable file
18
setup.py
Normal file → Executable file
@@ -1,8 +1,22 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
|
import sys
|
||||||
|
|
||||||
|
if sys.version_info < (2, 7):
|
||||||
|
print('thefuck requires Python version 2.7 or later' +
|
||||||
|
' ({}.{} detected).'.format(*sys.version_info[:2]))
|
||||||
|
sys.exit(-1)
|
||||||
|
elif (3, 0) < sys.version_info < (3, 3):
|
||||||
|
print('thefuck requires Python version 3.3 or later' +
|
||||||
|
' ({}.{} detected).'.format(*sys.version_info[:2]))
|
||||||
|
sys.exit(-1)
|
||||||
|
|
||||||
VERSION = '1.45'
|
VERSION = '1.48'
|
||||||
|
|
||||||
|
install_requires = ['psutil', 'colorama', 'six']
|
||||||
|
|
||||||
|
if sys.version_info < (3, 4):
|
||||||
|
install_requires.append('pathlib')
|
||||||
|
|
||||||
setup(name='thefuck',
|
setup(name='thefuck',
|
||||||
version=VERSION,
|
version=VERSION,
|
||||||
@@ -15,7 +29,7 @@ setup(name='thefuck',
|
|||||||
'tests', 'release']),
|
'tests', 'release']),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
install_requires=['pathlib', 'psutil', 'colorama', 'six'],
|
install_requires=install_requires,
|
||||||
entry_points={'console_scripts': [
|
entry_points={'console_scripts': [
|
||||||
'thefuck = thefuck.main:main',
|
'thefuck = thefuck.main:main',
|
||||||
'thefuck-alias = thefuck.shells:app_alias']})
|
'thefuck-alias = thefuck.shells:app_alias']})
|
||||||
|
|||||||
@@ -4,12 +4,12 @@ from tests.utils import Command
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='brew upgrade')])
|
Command(script='brew upgrade')])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command('brew upgrade'), 'brew upgrade --all')])
|
(Command('brew upgrade'), 'brew upgrade --all')])
|
||||||
def test_get_new_command(command, new_command):
|
def test_get_new_command(command, new_command):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|||||||
21
tests/rules/test_cargo_no_command.py
Normal file
21
tests/rules/test_cargo_no_command.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import pytest
|
||||||
|
from thefuck.rules.cargo_no_command import match, get_new_command
|
||||||
|
from tests.utils import Command
|
||||||
|
|
||||||
|
|
||||||
|
no_such_subcommand = """No such subcommand
|
||||||
|
|
||||||
|
Did you mean `build`?
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command', [
|
||||||
|
Command(script='cargo buid', stderr=no_such_subcommand)])
|
||||||
|
def test_match(command):
|
||||||
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
|
(Command('cargo buid', stderr=no_such_subcommand), 'cargo build')])
|
||||||
|
def test_get_new_command(command, new_command):
|
||||||
|
assert get_new_command(command, None) == new_command
|
||||||
@@ -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,
|
||||||
assert get_new_command(Command('git brnch', stderr=git_not_command), None)\
|
git_not_command_closest):
|
||||||
== 'git branch'
|
assert get_new_command(Command('git brnch', stderr=git_not_command), None) \
|
||||||
|
== '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'
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ from tests.utils import Command
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='go run foo'),
|
Command(script='go run foo'),
|
||||||
Command(script='go run bar')])
|
Command(script='go run bar')])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command('go run foo'), 'go run foo.go'),
|
(Command('go run foo'), 'go run foo.go'),
|
||||||
(Command('go run bar'), 'go run bar.go')])
|
(Command('go run bar'), 'go run bar.go')])
|
||||||
def test_get_new_command(command, new_command):
|
def test_get_new_command(command, new_command):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ from tests.utils import Command
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='java foo.java'),
|
Command(script='java foo.java'),
|
||||||
Command(script='java bar.java')])
|
Command(script='java bar.java')])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command('java foo.java'), 'java foo'),
|
(Command('java foo.java'), 'java foo'),
|
||||||
(Command('java bar.java'), 'java bar')])
|
(Command('java bar.java'), 'java bar')])
|
||||||
def test_get_new_command(command, new_command):
|
def test_get_new_command(command, new_command):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ from tests.utils import Command
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='javac foo'),
|
Command(script='javac foo'),
|
||||||
Command(script='javac bar')])
|
Command(script='javac bar')])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command('javac foo'), 'javac foo.java'),
|
(Command('javac foo'), 'javac foo.java'),
|
||||||
(Command('javac bar'), 'javac bar.java')])
|
(Command('javac bar'), 'javac bar.java')])
|
||||||
def test_get_new_command(command, new_command):
|
def test_get_new_command(command, new_command):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|||||||
@@ -3,9 +3,12 @@ from thefuck.rules.ls_lah import match, get_new_command
|
|||||||
|
|
||||||
|
|
||||||
def test_match():
|
def test_match():
|
||||||
|
assert match(Mock(script='ls'), None)
|
||||||
assert match(Mock(script='ls file.py'), None)
|
assert match(Mock(script='ls file.py'), None)
|
||||||
assert match(Mock(script='ls /opt'), None)
|
assert match(Mock(script='ls /opt'), None)
|
||||||
assert not match(Mock(script='ls -lah /opt'), None)
|
assert not match(Mock(script='ls -lah /opt'), None)
|
||||||
|
assert not match(Mock(script='pacman -S binutils'), None)
|
||||||
|
assert not match(Mock(script='lsof'), None)
|
||||||
|
|
||||||
|
|
||||||
def test_get_new_command():
|
def test_get_new_command():
|
||||||
|
|||||||
134
tests/rules/test_mercurial.py
Normal file
134
tests/rules/test_mercurial.py
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
import pytest
|
||||||
|
|
||||||
|
from tests.utils import Command
|
||||||
|
from thefuck.rules.mercurial import (
|
||||||
|
extract_possisiblities, match, get_new_command
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command', [
|
||||||
|
Command('hg base', stderr=(
|
||||||
|
"hg: unknown command 'base'"
|
||||||
|
'\n(did you mean one of blame, phase, rebase?)'
|
||||||
|
)),
|
||||||
|
Command('hg branchch', stderr=(
|
||||||
|
"hg: unknown command 'branchch'"
|
||||||
|
'\n(did you mean one of branch, branches?)'
|
||||||
|
)),
|
||||||
|
Command('hg vert', stderr=(
|
||||||
|
"hg: unknown command 'vert'"
|
||||||
|
'\n(did you mean one of revert?)'
|
||||||
|
)),
|
||||||
|
Command('hg lgo -r tip', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n(did you mean one of log?)'
|
||||||
|
)),
|
||||||
|
Command('hg rerere', stderr=(
|
||||||
|
"hg: unknown command 'rerere'"
|
||||||
|
'\n(did you mean one of revert?)'
|
||||||
|
)),
|
||||||
|
Command('hg re', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n rebase recover remove rename resolve revert'
|
||||||
|
)),
|
||||||
|
Command('hg re re', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n rebase recover remove rename resolve revert'
|
||||||
|
)),
|
||||||
|
])
|
||||||
|
def test_match(command):
|
||||||
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command', [
|
||||||
|
Command('hg', stderr=(
|
||||||
|
'\nMercurial Distributed SCM\n\nbasic commands:'
|
||||||
|
)),
|
||||||
|
Command('hg asdf', stderr=(
|
||||||
|
"hg: unknown command 'asdf'"
|
||||||
|
'\nMercurial Distributed SCM\n\nbasic commands:'
|
||||||
|
)),
|
||||||
|
Command('hg qwer', stderr=(
|
||||||
|
"hg: unknown command 'qwer'"
|
||||||
|
'\nMercurial Distributed SCM\n\nbasic commands:'
|
||||||
|
)),
|
||||||
|
Command('hg me', stderr=(
|
||||||
|
"\nabort: no repository found in './thefuck' (.hg not found)!"
|
||||||
|
)),
|
||||||
|
Command('hg reb', stderr=(
|
||||||
|
"\nabort: no repository found in './thefuck' (.hg not found)!"
|
||||||
|
)),
|
||||||
|
Command('hg co', stderr=(
|
||||||
|
"\nabort: no repository found in './thefuck' (.hg not found)!"
|
||||||
|
)),
|
||||||
|
])
|
||||||
|
def test_not_match(command):
|
||||||
|
assert not match(command, None)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command, possibilities', [
|
||||||
|
(Command('hg base', stderr=(
|
||||||
|
"hg: unknown command 'base'"
|
||||||
|
'\n(did you mean one of blame, phase, rebase?)'
|
||||||
|
)), ['blame', 'phase', 'rebase']),
|
||||||
|
(Command('hg branchch', stderr=(
|
||||||
|
"hg: unknown command 'branchch'"
|
||||||
|
'\n(did you mean one of branch, branches?)'
|
||||||
|
)), ['branch', 'branches']),
|
||||||
|
(Command('hg vert', stderr=(
|
||||||
|
"hg: unknown command 'vert'"
|
||||||
|
'\n(did you mean one of revert?)'
|
||||||
|
)), ['revert']),
|
||||||
|
(Command('hg lgo -r tip', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n(did you mean one of log?)'
|
||||||
|
)), ['log']),
|
||||||
|
(Command('hg rerere', stderr=(
|
||||||
|
"hg: unknown command 'rerere'"
|
||||||
|
'\n(did you mean one of revert?)'
|
||||||
|
)), ['revert']),
|
||||||
|
(Command('hg re', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n rebase recover remove rename resolve revert'
|
||||||
|
)), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']),
|
||||||
|
(Command('hg re re', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n rebase recover remove rename resolve revert'
|
||||||
|
)), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']),
|
||||||
|
])
|
||||||
|
def test_extract_possisiblities(command, possibilities):
|
||||||
|
assert extract_possisiblities(command) == possibilities
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
|
(Command('hg base', stderr=(
|
||||||
|
"hg: unknown command 'base'"
|
||||||
|
'\n(did you mean one of blame, phase, rebase?)'
|
||||||
|
)), 'hg rebase'),
|
||||||
|
(Command('hg branchch', stderr=(
|
||||||
|
"hg: unknown command 'branchch'"
|
||||||
|
'\n(did you mean one of branch, branches?)'
|
||||||
|
)), 'hg branch'),
|
||||||
|
(Command('hg vert', stderr=(
|
||||||
|
"hg: unknown command 'vert'"
|
||||||
|
'\n(did you mean one of revert?)'
|
||||||
|
)), 'hg revert'),
|
||||||
|
(Command('hg lgo -r tip', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n(did you mean one of log?)'
|
||||||
|
)), 'hg log -r tip'),
|
||||||
|
(Command('hg rerere', stderr=(
|
||||||
|
"hg: unknown command 'rerere'"
|
||||||
|
'\n(did you mean one of revert?)'
|
||||||
|
)), 'hg revert'),
|
||||||
|
(Command('hg re', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n rebase recover remove rename resolve revert'
|
||||||
|
)), 'hg rebase'),
|
||||||
|
(Command('hg re re', stderr=(
|
||||||
|
"hg: command 're' is ambiguous:"
|
||||||
|
'\n rebase recover remove rename resolve revert'
|
||||||
|
)), 'hg rebase re'),
|
||||||
|
])
|
||||||
|
def test_get_new_command(command, new_command):
|
||||||
|
assert get_new_command(command, None) == new_command
|
||||||
@@ -1,19 +1,36 @@
|
|||||||
from mock import patch, Mock
|
from mock import patch, Mock
|
||||||
from thefuck.rules.no_command import match, get_new_command
|
from thefuck.rules.no_command import match, get_new_command, _get_all_callables
|
||||||
|
|
||||||
|
|
||||||
def test_match():
|
@patch('thefuck.rules.no_command._safe', return_value=[])
|
||||||
with patch('thefuck.rules.no_command._get_all_callables',
|
@patch('thefuck.rules.no_command.get_aliases',
|
||||||
return_value=['vim', 'apt-get']):
|
return_value=['vim', 'apt-get', 'fsck', 'fuck'])
|
||||||
assert match(Mock(stderr='vom: not found', script='vom file.py'), None)
|
def test_get_all_callables(*args):
|
||||||
assert not match(Mock(stderr='qweqwe: not found', script='qweqwe'), None)
|
all_callables = _get_all_callables()
|
||||||
assert not match(Mock(stderr='some text', script='vom file.py'), None)
|
assert 'vim' in all_callables
|
||||||
|
assert 'fsck' in all_callables
|
||||||
|
assert 'fuck' not in all_callables
|
||||||
|
|
||||||
|
|
||||||
def test_get_new_command():
|
@patch('thefuck.rules.no_command._safe', return_value=[])
|
||||||
with patch('thefuck.rules.no_command._get_all_callables',
|
@patch('thefuck.rules.no_command.get_aliases',
|
||||||
return_value=['vim', 'apt-get']):
|
return_value=['vim', 'apt-get', 'fsck', 'fuck'])
|
||||||
assert get_new_command(
|
def test_match(*args):
|
||||||
Mock(stderr='vom: not found',
|
assert match(Mock(stderr='vom: not found', script='vom file.py'), None)
|
||||||
script='vom file.py'),
|
assert match(Mock(stderr='fucck: not found', script='fucck'), None)
|
||||||
None) == 'vim file.py'
|
assert not match(Mock(stderr='qweqwe: not found', script='qweqwe'), None)
|
||||||
|
assert not match(Mock(stderr='some text', script='vom file.py'), None)
|
||||||
|
|
||||||
|
|
||||||
|
@patch('thefuck.rules.no_command._safe', return_value=[])
|
||||||
|
@patch('thefuck.rules.no_command.get_aliases',
|
||||||
|
return_value=['vim', 'apt-get', 'fsck', 'fuck'])
|
||||||
|
def test_get_new_command(*args):
|
||||||
|
assert get_new_command(
|
||||||
|
Mock(stderr='vom: not found',
|
||||||
|
script='vom file.py'),
|
||||||
|
None) == 'vim file.py'
|
||||||
|
assert get_new_command(
|
||||||
|
Mock(stderr='fucck: not found',
|
||||||
|
script='fucck'),
|
||||||
|
None) == 'fsck'
|
||||||
|
|||||||
@@ -4,22 +4,22 @@ from tests.utils import Command
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='open foo.com'),
|
Command(script='open foo.com'),
|
||||||
Command(script='open foo.ly'),
|
Command(script='open foo.ly'),
|
||||||
Command(script='open foo.org'),
|
Command(script='open foo.org'),
|
||||||
Command(script='open foo.net'),
|
Command(script='open foo.net'),
|
||||||
Command(script='open foo.se'),
|
Command(script='open foo.se'),
|
||||||
Command(script='open foo.io')])
|
Command(script='open foo.io')])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command('open foo.com'), 'open http://foo.com'),
|
(Command('open foo.com'), 'open http://foo.com'),
|
||||||
(Command('open foo.ly'), 'open http://foo.ly'),
|
(Command('open foo.ly'), 'open http://foo.ly'),
|
||||||
(Command('open foo.org'), 'open http://foo.org'),
|
(Command('open foo.org'), 'open http://foo.org'),
|
||||||
(Command('open foo.net'), 'open http://foo.net'),
|
(Command('open foo.net'), 'open http://foo.net'),
|
||||||
(Command('open foo.se'), 'open http://foo.se'),
|
(Command('open foo.se'), 'open http://foo.se'),
|
||||||
(Command('open foo.io'), 'open http://foo.io')])
|
(Command('open foo.io'), 'open http://foo.io')])
|
||||||
def test_get_new_command(command, new_command):
|
def test_get_new_command(command, new_command):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|||||||
@@ -23,23 +23,25 @@ extra/vim-python3 7.4.712-1 \t/usr/bin/vim
|
|||||||
@pytest.mark.skipif(not getattr(pacman, 'enabled_by_default', True),
|
@pytest.mark.skipif(not getattr(pacman, 'enabled_by_default', True),
|
||||||
reason='Skip if pacman is not available')
|
reason='Skip if pacman is not available')
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='vim', stderr='vim: command not found')])
|
Command(script='vim', stderr='vim: command not found'),
|
||||||
|
Command(script='sudo vim', stderr='sudo: vim: command not found')])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, return_value', [
|
@pytest.mark.parametrize('command, return_value', [
|
||||||
(Command(script='vim', stderr='vim: command not found'), PKGFILE_OUTPUT_VIM)])
|
(Command(script='vim', stderr='vim: command not found'), PKGFILE_OUTPUT_VIM),
|
||||||
|
(Command(script='sudo vim', stderr='sudo: vim: command not found'), PKGFILE_OUTPUT_VIM)])
|
||||||
@patch('thefuck.rules.pacman.subprocess')
|
@patch('thefuck.rules.pacman.subprocess')
|
||||||
@patch.multiple(pacman, create=True, pacman=pacman_cmd)
|
@patch.multiple(pacman, create=True, pacman=pacman_cmd)
|
||||||
def test_match_mocked(subp_mock, command, return_value):
|
def test_match_mocked(subp_mock, command, return_value):
|
||||||
subp_mock.check_output.return_value = return_value
|
subp_mock.check_output.return_value = return_value
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
assert subp_mock.check_output.called
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script='vim', stderr=''), Command()])
|
Command(script='vim', stderr=''), Command(),
|
||||||
|
Command(script='sudo vim', stderr=''), Command()])
|
||||||
def test_not_match(command):
|
def test_not_match(command):
|
||||||
assert not match(command, None)
|
assert not match(command, None)
|
||||||
|
|
||||||
@@ -48,19 +50,20 @@ def test_not_match(command):
|
|||||||
reason='Skip if pacman is not available')
|
reason='Skip if pacman is not available')
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd)),
|
(Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd)),
|
||||||
(Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd))])
|
(Command('sudo vim'), '{} -S extra/gvim && sudo vim'.format(pacman_cmd)),
|
||||||
|
(Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd)),
|
||||||
|
(Command('sudo convert'), '{} -S extra/imagemagick && sudo convert'.format(pacman_cmd))])
|
||||||
def test_get_new_command(command, new_command, mocker):
|
def test_get_new_command(command, new_command, mocker):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command, return_value', [
|
@pytest.mark.parametrize('command, new_command, return_value', [
|
||||||
(Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd),
|
(Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd), PKGFILE_OUTPUT_VIM),
|
||||||
PKGFILE_OUTPUT_VIM),
|
(Command('sudo vim'), '{} -S extra/gvim && sudo vim'.format(pacman_cmd), PKGFILE_OUTPUT_VIM),
|
||||||
(Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd),
|
(Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd), PKGFILE_OUTPUT_CONVERT),
|
||||||
PKGFILE_OUTPUT_CONVERT)])
|
(Command('sudo convert'), '{} -S extra/imagemagick && sudo convert'.format(pacman_cmd), PKGFILE_OUTPUT_CONVERT)])
|
||||||
@patch('thefuck.rules.pacman.subprocess')
|
@patch('thefuck.rules.pacman.subprocess')
|
||||||
@patch.multiple(pacman, create=True, pacman=pacman_cmd)
|
@patch.multiple(pacman, create=True, pacman=pacman_cmd)
|
||||||
def test_get_new_command_mocked(subp_mock, command, new_command, return_value):
|
def test_get_new_command_mocked(subp_mock, command, new_command, return_value):
|
||||||
subp_mock.check_output.return_value = return_value
|
subp_mock.check_output.return_value = return_value
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
assert subp_mock.check_output.called
|
|
||||||
|
|||||||
17
tests/rules/test_python_execute.py
Normal file
17
tests/rules/test_python_execute.py
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import pytest
|
||||||
|
from thefuck.rules.python_execute import match, get_new_command
|
||||||
|
from tests.utils import Command
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command', [
|
||||||
|
Command(script='python foo'),
|
||||||
|
Command(script='python bar')])
|
||||||
|
def test_match(command):
|
||||||
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
|
(Command('python foo'), 'python foo.py'),
|
||||||
|
(Command('python bar'), 'python bar.py')])
|
||||||
|
def test_get_new_command(command, new_command):
|
||||||
|
assert get_new_command(command, None) == new_command
|
||||||
@@ -4,16 +4,16 @@ from tests.utils import Command
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(script="git commit -m \'My Message\""),
|
Command(script="git commit -m \'My Message\""),
|
||||||
Command(script="git commit -am \"Mismatched Quotation Marks\'"),
|
Command(script="git commit -am \"Mismatched Quotation Marks\'"),
|
||||||
Command(script="echo \"hello\'")])
|
Command(script="echo \"hello\'")])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command, None)
|
assert match(command, None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, new_command', [
|
@pytest.mark.parametrize('command, new_command', [
|
||||||
(Command("git commit -m \'My Message\""), "git commit -m \"My Message\""),
|
(Command("git commit -m \'My Message\""), "git commit -m \"My Message\""),
|
||||||
(Command("git commit -am \"Mismatched Quotation Marks\'"), "git commit -am \"Mismatched Quotation Marks\""),
|
(Command("git commit -am \"Mismatched Quotation Marks\'"), "git commit -am \"Mismatched Quotation Marks\""),
|
||||||
(Command("echo \"hello\'"), "echo \"hello\"")])
|
(Command("echo \"hello\'"), "echo \"hello\"")])
|
||||||
def test_get_new_command(command, new_command):
|
def test_get_new_command(command, new_command):
|
||||||
assert get_new_command(command, None) == new_command
|
assert get_new_command(command, None) == new_command
|
||||||
|
|||||||
28
tests/rules/test_sed_unterminated_s.py
Normal file
28
tests/rules/test_sed_unterminated_s.py
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import pytest
|
||||||
|
from thefuck.rules.sed_unterminated_s import match, get_new_command
|
||||||
|
from tests.utils import Command
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def sed_unterminated_s():
|
||||||
|
return "sed: -e expression #1, char 9: unterminated `s' command"
|
||||||
|
|
||||||
|
|
||||||
|
def test_match(sed_unterminated_s):
|
||||||
|
assert match(Command('sed -e s/foo/bar', stderr=sed_unterminated_s), None)
|
||||||
|
assert match(Command('sed -es/foo/bar', stderr=sed_unterminated_s), None)
|
||||||
|
assert match(Command('sed -e s/foo/bar -e s/baz/quz', stderr=sed_unterminated_s), None)
|
||||||
|
assert not match(Command('sed -e s/foo/bar'), None)
|
||||||
|
assert not match(Command('sed -es/foo/bar'), None)
|
||||||
|
assert not match(Command('sed -e s/foo/bar -e s/baz/quz'), None)
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_new_command(sed_unterminated_s):
|
||||||
|
assert get_new_command(Command('sed -e s/foo/bar', stderr=sed_unterminated_s), None) \
|
||||||
|
== 'sed -e s/foo/bar/'
|
||||||
|
assert get_new_command(Command('sed -es/foo/bar', stderr=sed_unterminated_s), None) \
|
||||||
|
== 'sed -es/foo/bar/'
|
||||||
|
assert get_new_command(Command(r"sed -e 's/\/foo/bar'", stderr=sed_unterminated_s), None) \
|
||||||
|
== r"sed -e 's/\/foo/bar/'"
|
||||||
|
assert get_new_command(Command(r"sed -e s/foo/bar -es/baz/quz", stderr=sed_unterminated_s), None) \
|
||||||
|
== r"sed -e s/foo/bar/ -es/baz/quz/"
|
||||||
@@ -8,6 +8,9 @@ from tests.utils import Command
|
|||||||
('permission denied', ''),
|
('permission denied', ''),
|
||||||
("npm ERR! Error: EACCES, unlink", ''),
|
("npm ERR! Error: EACCES, unlink", ''),
|
||||||
('requested operation requires superuser privilege', ''),
|
('requested operation requires superuser privilege', ''),
|
||||||
|
('need to be root', ''),
|
||||||
|
('need root', ''),
|
||||||
|
('must be root', ''),
|
||||||
('', "error: [Errno 13] Permission denied: '/usr/local/lib/python2.7/dist-packages/ipaddr.py'")])
|
('', "error: [Errno 13] Permission denied: '/usr/local/lib/python2.7/dist-packages/ipaddr.py'")])
|
||||||
def test_match(stderr, stdout):
|
def test_match(stderr, stdout):
|
||||||
assert match(Command(stderr=stderr, stdout=stdout), None)
|
assert match(Command(stderr=stderr, stdout=stdout), None)
|
||||||
|
|||||||
18
tests/rules/test_systemctl.py
Normal file
18
tests/rules/test_systemctl.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import pytest
|
||||||
|
from thefuck.rules.systemctl import match, get_new_command
|
||||||
|
from tests.utils import Command
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def test_match():
|
||||||
|
assert match(Command('systemctl nginx start', stderr='Unknown operation \'nginx\'.'), None)
|
||||||
|
assert match(Command('sudo systemctl nginx start', stderr='Unknown operation \'nginx\'.'), None)
|
||||||
|
assert not match(Command('systemctl start nginx'), None)
|
||||||
|
assert not match(Command('systemctl start nginx'), None)
|
||||||
|
assert not match(Command('sudo systemctl nginx', stderr='Unknown operation \'nginx\'.'), None)
|
||||||
|
assert not match(Command('systemctl nginx', stderr='Unknown operation \'nginx\'.'), None)
|
||||||
|
assert not match(Command('systemctl start wtf', stderr='Failed to start wtf.service: Unit wtf.service failed to load: No such file or directory.'), None)
|
||||||
|
|
||||||
|
def test_get_new_command():
|
||||||
|
assert get_new_command(Command('systemctl nginx start'), None) == "systemctl start nginx"
|
||||||
|
assert get_new_command(Command('sudo systemctl nginx start'), None) == "sudo systemctl start nginx"
|
||||||
19
tests/rules/test_tmux.py
Normal file
19
tests/rules/test_tmux.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import pytest
|
||||||
|
from thefuck.rules.tmux import match, get_new_command
|
||||||
|
from tests.utils import Command
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def tmux_ambiguous():
|
||||||
|
return "ambiguous command: list, could be: " \
|
||||||
|
"list-buffers, list-clients, list-commands, list-keys, " \
|
||||||
|
"list-panes, list-sessions, list-windows"
|
||||||
|
|
||||||
|
|
||||||
|
def test_match(tmux_ambiguous):
|
||||||
|
assert match(Command('tmux list', stderr=tmux_ambiguous), None)
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_new_command(tmux_ambiguous):
|
||||||
|
assert get_new_command(Command('tmux list', stderr=tmux_ambiguous), None)\
|
||||||
|
== 'tmux list-buffers'
|
||||||
@@ -33,6 +33,11 @@ class TestGeneric(object):
|
|||||||
def test_get_aliases(self, shell):
|
def test_get_aliases(self, shell):
|
||||||
assert shell.get_aliases() == {}
|
assert shell.get_aliases() == {}
|
||||||
|
|
||||||
|
def test_app_alias(self, shell):
|
||||||
|
assert 'alias fuck' in shell.app_alias()
|
||||||
|
assert 'thefuck' in shell.app_alias()
|
||||||
|
assert 'TF_ALIAS' in shell.app_alias()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.usefixtures('isfile')
|
@pytest.mark.usefixtures('isfile')
|
||||||
class TestBash(object):
|
class TestBash(object):
|
||||||
@@ -44,6 +49,7 @@ class TestBash(object):
|
|||||||
def Popen(self, mocker):
|
def Popen(self, mocker):
|
||||||
mock = mocker.patch('thefuck.shells.Popen')
|
mock = mocker.patch('thefuck.shells.Popen')
|
||||||
mock.return_value.stdout.read.return_value = (
|
mock.return_value.stdout.read.return_value = (
|
||||||
|
b'alias fuck=\'eval $(thefuck $(fc -ln -1))\'\n'
|
||||||
b'alias l=\'ls -CF\'\n'
|
b'alias l=\'ls -CF\'\n'
|
||||||
b'alias la=\'ls -A\'\n'
|
b'alias la=\'ls -A\'\n'
|
||||||
b'alias ll=\'ls -alF\'')
|
b'alias ll=\'ls -alF\'')
|
||||||
@@ -51,6 +57,8 @@ class TestBash(object):
|
|||||||
|
|
||||||
@pytest.mark.parametrize('before, after', [
|
@pytest.mark.parametrize('before, after', [
|
||||||
('pwd', 'pwd'),
|
('pwd', 'pwd'),
|
||||||
|
('fuck', 'eval $(thefuck $(fc -ln -1))'),
|
||||||
|
('awk', 'awk'),
|
||||||
('ll', 'ls -alF')])
|
('ll', 'ls -alF')])
|
||||||
def test_from_shell(self, before, after, shell):
|
def test_from_shell(self, before, after, shell):
|
||||||
assert shell.from_shell(before) == after
|
assert shell.from_shell(before) == after
|
||||||
@@ -67,10 +75,16 @@ class TestBash(object):
|
|||||||
assert shell.and_('ls', 'cd') == 'ls && cd'
|
assert shell.and_('ls', 'cd') == 'ls && cd'
|
||||||
|
|
||||||
def test_get_aliases(self, shell):
|
def test_get_aliases(self, shell):
|
||||||
assert shell.get_aliases() == {'l': 'ls -CF',
|
assert shell.get_aliases() == {'fuck': 'eval $(thefuck $(fc -ln -1))',
|
||||||
|
'l': 'ls -CF',
|
||||||
'la': 'ls -A',
|
'la': 'ls -A',
|
||||||
'll': 'ls -alF'}
|
'll': 'ls -alF'}
|
||||||
|
|
||||||
|
def test_app_alias(self, shell):
|
||||||
|
assert 'alias fuck' in shell.app_alias()
|
||||||
|
assert 'thefuck' in shell.app_alias()
|
||||||
|
assert 'TF_ALIAS' in shell.app_alias()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.usefixtures('isfile')
|
@pytest.mark.usefixtures('isfile')
|
||||||
class TestFish(object):
|
class TestFish(object):
|
||||||
@@ -120,6 +134,11 @@ class TestFish(object):
|
|||||||
'll': 'll',
|
'll': 'll',
|
||||||
'math': 'math'}
|
'math': 'math'}
|
||||||
|
|
||||||
|
def test_app_alias(self, shell):
|
||||||
|
assert 'function fuck' in shell.app_alias()
|
||||||
|
assert 'thefuck' in shell.app_alias()
|
||||||
|
assert 'TF_ALIAS' in shell.app_alias()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.usefixtures('isfile')
|
@pytest.mark.usefixtures('isfile')
|
||||||
class TestZsh(object):
|
class TestZsh(object):
|
||||||
@@ -131,12 +150,14 @@ class TestZsh(object):
|
|||||||
def Popen(self, mocker):
|
def Popen(self, mocker):
|
||||||
mock = mocker.patch('thefuck.shells.Popen')
|
mock = mocker.patch('thefuck.shells.Popen')
|
||||||
mock.return_value.stdout.read.return_value = (
|
mock.return_value.stdout.read.return_value = (
|
||||||
|
b'fuck=\'eval $(thefuck $(fc -ln -1 | tail -n 1))\'\n'
|
||||||
b'l=\'ls -CF\'\n'
|
b'l=\'ls -CF\'\n'
|
||||||
b'la=\'ls -A\'\n'
|
b'la=\'ls -A\'\n'
|
||||||
b'll=\'ls -alF\'')
|
b'll=\'ls -alF\'')
|
||||||
return mock
|
return mock
|
||||||
|
|
||||||
@pytest.mark.parametrize('before, after', [
|
@pytest.mark.parametrize('before, after', [
|
||||||
|
('fuck', 'eval $(thefuck $(fc -ln -1 | tail -n 1))'),
|
||||||
('pwd', 'pwd'),
|
('pwd', 'pwd'),
|
||||||
('ll', 'ls -alF')])
|
('ll', 'ls -alF')])
|
||||||
def test_from_shell(self, before, after, shell):
|
def test_from_shell(self, before, after, shell):
|
||||||
@@ -156,6 +177,13 @@ class TestZsh(object):
|
|||||||
assert shell.and_('ls', 'cd') == 'ls && cd'
|
assert shell.and_('ls', 'cd') == 'ls && cd'
|
||||||
|
|
||||||
def test_get_aliases(self, shell):
|
def test_get_aliases(self, shell):
|
||||||
assert shell.get_aliases() == {'l': 'ls -CF',
|
assert shell.get_aliases() == {
|
||||||
'la': 'ls -A',
|
'fuck': 'eval $(thefuck $(fc -ln -1 | tail -n 1))',
|
||||||
'll': 'ls -alF'}
|
'l': 'ls -CF',
|
||||||
|
'la': 'ls -A',
|
||||||
|
'll': 'ls -alF'}
|
||||||
|
|
||||||
|
def test_app_alias(self, shell):
|
||||||
|
assert 'alias fuck' in shell.app_alias()
|
||||||
|
assert 'thefuck' in shell.app_alias()
|
||||||
|
assert 'TF_ALIAS' in shell.app_alias()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import pytest
|
import pytest
|
||||||
from mock import Mock
|
from mock import Mock
|
||||||
from thefuck.utils import sudo_support, wrap_settings, memoize
|
from thefuck.utils import sudo_support, wrap_settings, memoize, get_closest
|
||||||
from thefuck.types import Settings
|
from thefuck.types import Settings
|
||||||
from tests.utils import Command
|
from tests.utils import Command
|
||||||
|
|
||||||
@@ -32,3 +32,12 @@ def test_memoize():
|
|||||||
memoized()
|
memoized()
|
||||||
memoized()
|
memoized()
|
||||||
fn.assert_called_once_with()
|
fn.assert_called_once_with()
|
||||||
|
|
||||||
|
|
||||||
|
class TestGetClosest(object):
|
||||||
|
|
||||||
|
def test_when_can_match(self):
|
||||||
|
assert 'branch' == get_closest('brnch', ['branch', 'status'])
|
||||||
|
|
||||||
|
def test_when_cant_match(self):
|
||||||
|
assert 'status' == get_closest('st', ['status', 'reset'])
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ def wait_output(settings, popen):
|
|||||||
proc.wait(settings.wait_command)
|
proc.wait(settings.wait_command)
|
||||||
return True
|
return True
|
||||||
except TimeoutExpired:
|
except TimeoutExpired:
|
||||||
for child in proc.get_children(recursive=True):
|
for child in proc.children(recursive=True):
|
||||||
child.kill()
|
child.kill()
|
||||||
proc.kill()
|
proc.kill()
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import difflib
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
from subprocess import check_output
|
from subprocess import check_output
|
||||||
|
from thefuck.utils import get_closest
|
||||||
|
|
||||||
# Formulars are base on each local system's status
|
# Formulars are base on each local system's status
|
||||||
|
|
||||||
brew_formulas = []
|
brew_formulas = []
|
||||||
try:
|
try:
|
||||||
brew_path_prefix = check_output(['brew', '--prefix'],
|
brew_path_prefix = check_output(['brew', '--prefix'],
|
||||||
@@ -17,8 +18,8 @@ except:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def _get_similar_formulars(formula_name):
|
def _get_similar_formula(formula_name):
|
||||||
return difflib.get_close_matches(formula_name, brew_formulas, 1, 0.85)
|
return get_closest(formula_name, brew_formulas, 1, 0.85)
|
||||||
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
@@ -29,7 +30,7 @@ def match(command, settings):
|
|||||||
if is_proper_command:
|
if is_proper_command:
|
||||||
formula = re.findall(r'Error: No available formula for ([a-z]+)',
|
formula = re.findall(r'Error: No available formula for ([a-z]+)',
|
||||||
command.stderr)[0]
|
command.stderr)[0]
|
||||||
has_possible_formulas = len(_get_similar_formulars(formula)) > 0
|
has_possible_formulas = bool(_get_similar_formula(formula))
|
||||||
|
|
||||||
return has_possible_formulas
|
return has_possible_formulas
|
||||||
|
|
||||||
@@ -37,6 +38,6 @@ def match(command, settings):
|
|||||||
def get_new_command(command, settings):
|
def get_new_command(command, settings):
|
||||||
not_exist_formula = re.findall(r'Error: No available formula for ([a-z]+)',
|
not_exist_formula = re.findall(r'Error: No available formula for ([a-z]+)',
|
||||||
command.stderr)[0]
|
command.stderr)[0]
|
||||||
exist_formula = _get_similar_formulars(not_exist_formula)[0]
|
exist_formula = _get_similar_formula(not_exist_formula)
|
||||||
|
|
||||||
return command.script.replace(not_exist_formula, exist_formula, 1)
|
return command.script.replace(not_exist_formula, exist_formula, 1)
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import difflib
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
|
from thefuck.utils import get_closest
|
||||||
|
|
||||||
BREW_CMD_PATH = '/Library/Homebrew/cmd'
|
BREW_CMD_PATH = '/Library/Homebrew/cmd'
|
||||||
TAP_PATH = '/Library/Taps'
|
TAP_PATH = '/Library/Taps'
|
||||||
@@ -78,8 +77,8 @@ if brew_path_prefix:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def _get_similar_commands(command):
|
def _get_similar_command(command):
|
||||||
return difflib.get_close_matches(command, brew_commands)
|
return get_closest(command, brew_commands)
|
||||||
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
@@ -90,7 +89,7 @@ def match(command, settings):
|
|||||||
if is_proper_command:
|
if is_proper_command:
|
||||||
broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
|
broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
|
||||||
command.stderr)[0]
|
command.stderr)[0]
|
||||||
has_possible_commands = len(_get_similar_commands(broken_cmd)) > 0
|
has_possible_commands = bool(_get_similar_command(broken_cmd))
|
||||||
|
|
||||||
return has_possible_commands
|
return has_possible_commands
|
||||||
|
|
||||||
@@ -98,6 +97,6 @@ def match(command, settings):
|
|||||||
def get_new_command(command, settings):
|
def get_new_command(command, settings):
|
||||||
broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
|
broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
|
||||||
command.stderr)[0]
|
command.stderr)[0]
|
||||||
new_cmd = _get_similar_commands(broken_cmd)[0]
|
new_cmd = _get_similar_command(broken_cmd)
|
||||||
|
|
||||||
return command.script.replace(broken_cmd, new_cmd, 1)
|
return command.script.replace(broken_cmd, new_cmd, 1)
|
||||||
|
|||||||
6
thefuck/rules/cargo.py
Normal file
6
thefuck/rules/cargo.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
def match(command, settings):
|
||||||
|
return command.script == 'cargo'
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
return 'cargo build'
|
||||||
14
thefuck/rules/cargo_no_command.py
Normal file
14
thefuck/rules/cargo_no_command.py
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
def match(command, settings):
|
||||||
|
return ('cargo' in command.script
|
||||||
|
and 'No such subcommand' in command.stderr
|
||||||
|
and 'Did you mean' in command.stderr)
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
broken = command.script.split()[1]
|
||||||
|
fix = re.findall(r'Did you mean `([^`]*)`', command.stderr)[0]
|
||||||
|
|
||||||
|
return command.script.replace(broken, fix, 1)
|
||||||
@@ -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)
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
from thefuck import shells
|
||||||
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
return ('git' in command.script
|
return ('git' in command.script
|
||||||
and 'pull' in command.script
|
and 'pull' in command.script
|
||||||
@@ -9,4 +12,4 @@ def get_new_command(command, settings):
|
|||||||
branch = line.split(' ')[-1]
|
branch = line.split(' ')[-1]
|
||||||
set_upstream = line.replace('<remote>', 'origin')\
|
set_upstream = line.replace('<remote>', 'origin')\
|
||||||
.replace('<branch>', branch)
|
.replace('<branch>', branch)
|
||||||
return u'{} && {}'.format(set_upstream, command.script)
|
return shells.and_(set_upstream, command.script)
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
# Example:
|
# Example:
|
||||||
# > java foo.java
|
# > java foo.java
|
||||||
# Error: Could not find or load main class foo.java
|
# Error: Could not find or load main class foo.java
|
||||||
#
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
return (command.script.startswith ('java ')
|
return (command.script.startswith('java ')
|
||||||
and command.script.endswith ('.java'))
|
and command.script.endswith('.java'))
|
||||||
|
|
||||||
|
|
||||||
def get_new_command(command, settings):
|
def get_new_command(command, settings):
|
||||||
return command.script[:-5]
|
return command.script[:-5]
|
||||||
|
|||||||
@@ -4,12 +4,12 @@
|
|||||||
# > javac foo
|
# > javac foo
|
||||||
# error: Class names, 'foo', are only accepted if annotation
|
# error: Class names, 'foo', are only accepted if annotation
|
||||||
# processing is explicitly requested
|
# processing is explicitly requested
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
return (command.script.startswith ('javac ')
|
return (command.script.startswith('javac ')
|
||||||
and not command.script.endswith('.java'))
|
and not command.script.endswith('.java'))
|
||||||
|
|
||||||
|
|
||||||
def get_new_command(command, settings):
|
def get_new_command(command, settings):
|
||||||
return command.script + '.java'
|
return command.script + '.java'
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
return 'ls' in command.script and not ('ls -' in command.script)
|
return (command.script == 'ls'
|
||||||
|
or command.script.startswith('ls ')
|
||||||
|
and not ('ls -' in command.script))
|
||||||
|
|
||||||
|
|
||||||
def get_new_command(command, settings):
|
def get_new_command(command, settings):
|
||||||
|
|||||||
29
thefuck/rules/mercurial.py
Normal file
29
thefuck/rules/mercurial.py
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import re
|
||||||
|
from thefuck.utils import get_closest
|
||||||
|
|
||||||
|
|
||||||
|
def extract_possisiblities(command):
|
||||||
|
possib = re.findall(r'\n\(did you mean one of ([^\?]+)\?\)', command.stderr)
|
||||||
|
if possib:
|
||||||
|
return possib[0].split(', ')
|
||||||
|
possib = re.findall(r'\n ([^$]+)$', command.stderr)
|
||||||
|
if possib:
|
||||||
|
return possib[0].split(' ')
|
||||||
|
return possib
|
||||||
|
|
||||||
|
|
||||||
|
def match(command, settings):
|
||||||
|
return (command.script.startswith('hg ')
|
||||||
|
and ('hg: unknown command' in command.stderr
|
||||||
|
and '(did you mean one of ' in command.stderr
|
||||||
|
or "hg: command '" in command.stderr
|
||||||
|
and "' is ambiguous:" in command.stderr
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
script = command.script.split(' ')
|
||||||
|
possisiblities = extract_possisiblities(command)
|
||||||
|
script[1] = get_closest(script[1], possisiblities)
|
||||||
|
return ' '.join(script)
|
||||||
@@ -2,7 +2,7 @@ from difflib import get_close_matches
|
|||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from thefuck.utils import sudo_support
|
from thefuck.utils import sudo_support
|
||||||
from thefuck.shells import get_aliases
|
from thefuck.shells import thefuck_alias, get_aliases
|
||||||
|
|
||||||
|
|
||||||
def _safe(fn, fallback):
|
def _safe(fn, fallback):
|
||||||
@@ -13,10 +13,12 @@ def _safe(fn, fallback):
|
|||||||
|
|
||||||
|
|
||||||
def _get_all_callables():
|
def _get_all_callables():
|
||||||
|
tf_alias = thefuck_alias()
|
||||||
return [exe.name
|
return [exe.name
|
||||||
for path in os.environ.get('PATH', '').split(':')
|
for path in os.environ.get('PATH', '').split(':')
|
||||||
for exe in _safe(lambda: list(Path(path).iterdir()), [])
|
for exe in _safe(lambda: list(Path(path).iterdir()), [])
|
||||||
if not _safe(exe.is_dir, True)] + get_aliases()
|
if not _safe(exe.is_dir, True)] + [
|
||||||
|
alias for alias in get_aliases() if alias != tf_alias]
|
||||||
|
|
||||||
|
|
||||||
@sudo_support
|
@sudo_support
|
||||||
|
|||||||
@@ -5,20 +5,22 @@
|
|||||||
# The file ~/github.com does not exist.
|
# The file ~/github.com does not exist.
|
||||||
# Perhaps you meant 'http://github.com'?
|
# Perhaps you meant 'http://github.com'?
|
||||||
#
|
#
|
||||||
#
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
return (command.script.startswith ('open')
|
return (command.script.startswith(('open', 'xdg-open', 'gnome-open', 'kde-open'))
|
||||||
and (
|
and (
|
||||||
# Wanted to use this:
|
'.com' in command.script
|
||||||
# 'http' in command.stderr
|
or '.net' in command.script
|
||||||
'.com' in command.script
|
or '.org' in command.script
|
||||||
or '.net' in command.script
|
or '.ly' in command.script
|
||||||
or '.org' in command.script
|
or '.io' in command.script
|
||||||
or '.ly' in command.script
|
or '.se' in command.script
|
||||||
or '.io' in command.script
|
or '.edu' in command.script
|
||||||
or '.se' in command.script
|
or '.info' in command.script
|
||||||
or '.edu' in command.script))
|
or '.me' in command.script
|
||||||
|
or 'www.' in command.script))
|
||||||
|
|
||||||
|
|
||||||
def get_new_command(command, settings):
|
def get_new_command(command, settings):
|
||||||
return 'open http://' + command.script[5:]
|
return 'open http://' + command.script[5:]
|
||||||
|
|||||||
@@ -1,12 +1,21 @@
|
|||||||
import subprocess
|
import subprocess
|
||||||
from thefuck.utils import DEVNULL, which
|
from thefuck.utils import DEVNULL, which
|
||||||
from thefuck import shells
|
from thefuck import shells
|
||||||
|
from thefuck.utils import memoize
|
||||||
|
|
||||||
|
|
||||||
|
@memoize
|
||||||
def __get_pkgfile(command):
|
def __get_pkgfile(command):
|
||||||
try:
|
try:
|
||||||
|
command = command.script
|
||||||
|
|
||||||
|
if command.startswith('sudo'):
|
||||||
|
command = command[5:]
|
||||||
|
|
||||||
|
command = command.split(" ")[0]
|
||||||
|
|
||||||
return subprocess.check_output(
|
return subprocess.check_output(
|
||||||
['pkgfile', '-b', '-v', command.script.split(" ")[0]],
|
['pkgfile', '-b', '-v', command],
|
||||||
universal_newlines=True, stderr=DEVNULL
|
universal_newlines=True, stderr=DEVNULL
|
||||||
).split()
|
).split()
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
|
|||||||
14
thefuck/rules/python_execute.py
Normal file
14
thefuck/rules/python_execute.py
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Appends .py when executing python files
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# > python foo
|
||||||
|
# error: python: can't open file 'foo': [Errno 2] No such file or directory
|
||||||
|
|
||||||
|
|
||||||
|
def match(command, settings):
|
||||||
|
return (command.script.startswith('python ')
|
||||||
|
and not command.script.endswith('.py'))
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
return command.script + '.py'
|
||||||
17
thefuck/rules/sed_unterminated_s.py
Normal file
17
thefuck/rules/sed_unterminated_s.py
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import shlex
|
||||||
|
from thefuck.utils import quote
|
||||||
|
|
||||||
|
|
||||||
|
def match(command, settings):
|
||||||
|
return ('sed' in command.script
|
||||||
|
and "unterminated `s' command" in command.stderr)
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
script = shlex.split(command.script)
|
||||||
|
|
||||||
|
for (i, e) in enumerate(script):
|
||||||
|
if e.startswith(('s/', '-es/')) and e[-1] != '/':
|
||||||
|
script[i] += '/'
|
||||||
|
|
||||||
|
return ' '.join(map(quote, script))
|
||||||
@@ -7,12 +7,13 @@ patterns = ['permission denied',
|
|||||||
'root privilege',
|
'root privilege',
|
||||||
'This command has to be run under the root user.',
|
'This command has to be run under the root user.',
|
||||||
'This operation requires root.',
|
'This operation requires root.',
|
||||||
'You need to be root to perform this command.',
|
|
||||||
'requested operation requires superuser privilege',
|
'requested operation requires superuser privilege',
|
||||||
'must be run as root',
|
'must be run as root',
|
||||||
'must be superuser',
|
'must be superuser',
|
||||||
'Need to be root',
|
'must be root',
|
||||||
'you must be root to run this program.']
|
'need to be root',
|
||||||
|
'need root',
|
||||||
|
'only root can do that']
|
||||||
|
|
||||||
|
|
||||||
def match(command, settings):
|
def match(command, settings):
|
||||||
|
|||||||
21
thefuck/rules/systemctl.py
Normal file
21
thefuck/rules/systemctl.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
"""
|
||||||
|
The confusion in systemctl's param order is massive.
|
||||||
|
"""
|
||||||
|
from thefuck.utils import sudo_support
|
||||||
|
|
||||||
|
|
||||||
|
@sudo_support
|
||||||
|
def match(command, settings):
|
||||||
|
# Catches 'Unknown operation 'service'.' when executing systemctl with
|
||||||
|
# misordered arguments
|
||||||
|
cmd = command.script.split()
|
||||||
|
return ('systemctl' in command.script and
|
||||||
|
'Unknown operation \'' in command.stderr and
|
||||||
|
len(cmd) - cmd.index('systemctl') == 3)
|
||||||
|
|
||||||
|
|
||||||
|
@sudo_support
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
cmd = command.script.split()
|
||||||
|
cmd[-1], cmd[-2] = cmd[-2], cmd[-1]
|
||||||
|
return ' '.join(cmd)
|
||||||
10
thefuck/rules/test.py.py
Normal file
10
thefuck/rules/test.py.py
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
def match(command, settings):
|
||||||
|
return command.script == 'test.py' and 'not found' in command.stderr
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
return 'py.test'
|
||||||
|
|
||||||
|
|
||||||
|
# make it come before the python_command rule
|
||||||
|
priority = 900
|
||||||
14
thefuck/rules/tmux.py
Normal file
14
thefuck/rules/tmux.py
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
def match(command, settings):
|
||||||
|
return ('tmux' in command.script
|
||||||
|
and 'ambiguous command:' in command.stderr
|
||||||
|
and 'could be:' in command.stderr)
|
||||||
|
|
||||||
|
|
||||||
|
def get_new_command(command, settings):
|
||||||
|
cmd = re.match(r"ambiguous command: (.*), could be: ([^, \n]*)",
|
||||||
|
command.stderr)
|
||||||
|
|
||||||
|
return command.script.replace(cmd.group(1), cmd.group(2))
|
||||||
@@ -33,7 +33,7 @@ class Generic(object):
|
|||||||
return command_script
|
return command_script
|
||||||
|
|
||||||
def app_alias(self):
|
def app_alias(self):
|
||||||
return "\nalias fuck='eval $(thefuck $(fc -ln -1))'\n"
|
return "\nalias fuck='TF_ALIAS=fuck eval $(thefuck $(fc -ln -1))'\n"
|
||||||
|
|
||||||
def _get_history_file_name(self):
|
def _get_history_file_name(self):
|
||||||
return ''
|
return ''
|
||||||
@@ -49,12 +49,13 @@ class Generic(object):
|
|||||||
history.write(self._get_history_line(command_script))
|
history.write(self._get_history_line(command_script))
|
||||||
|
|
||||||
def and_(self, *commands):
|
def and_(self, *commands):
|
||||||
return ' && '.join(commands)
|
return u' && '.join(commands)
|
||||||
|
|
||||||
|
|
||||||
class Bash(Generic):
|
class Bash(Generic):
|
||||||
def app_alias(self):
|
def app_alias(self):
|
||||||
return "\nalias fuck='eval $(thefuck $(fc -ln -1)); history -r'\n"
|
return "\nTF_ALIAS=fuck alias fuck='eval $(thefuck $(fc -ln -1));" \
|
||||||
|
" history -r'\n"
|
||||||
|
|
||||||
def _parse_alias(self, alias):
|
def _parse_alias(self, alias):
|
||||||
name, value = alias.replace('alias ', '', 1).split('=', 1)
|
name, value = alias.replace('alias ', '', 1).split('=', 1)
|
||||||
@@ -83,6 +84,7 @@ class Fish(Generic):
|
|||||||
def app_alias(self):
|
def app_alias(self):
|
||||||
return ("function fuck -d 'Correct your previous console command'\n"
|
return ("function fuck -d 'Correct your previous console command'\n"
|
||||||
" set -l exit_code $status\n"
|
" set -l exit_code $status\n"
|
||||||
|
" set -l TF_ALIAS fuck\n"
|
||||||
" set -l eval_script"
|
" set -l eval_script"
|
||||||
" (mktemp 2>/dev/null ; or mktemp -t 'thefuck')\n"
|
" (mktemp 2>/dev/null ; or mktemp -t 'thefuck')\n"
|
||||||
" set -l fucked_up_commandd $history[1]\n"
|
" set -l fucked_up_commandd $history[1]\n"
|
||||||
@@ -105,7 +107,7 @@ class Fish(Generic):
|
|||||||
aliases = self.get_aliases()
|
aliases = self.get_aliases()
|
||||||
binary = command_script.split(' ')[0]
|
binary = command_script.split(' ')[0]
|
||||||
if binary in aliases:
|
if binary in aliases:
|
||||||
return 'fish -ic "{}"'.format(command_script.replace('"', r'\"'))
|
return u'fish -ic "{}"'.format(command_script.replace('"', r'\"'))
|
||||||
else:
|
else:
|
||||||
return command_script
|
return command_script
|
||||||
|
|
||||||
@@ -120,12 +122,14 @@ class Fish(Generic):
|
|||||||
return u'- cmd: {}\n when: {}\n'.format(command_script, int(time()))
|
return u'- cmd: {}\n when: {}\n'.format(command_script, int(time()))
|
||||||
|
|
||||||
def and_(self, *commands):
|
def and_(self, *commands):
|
||||||
return '; and '.join(commands)
|
return u'; and '.join(commands)
|
||||||
|
|
||||||
|
|
||||||
class Zsh(Generic):
|
class Zsh(Generic):
|
||||||
def app_alias(self):
|
def app_alias(self):
|
||||||
return "\nalias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'\n"
|
return "\nTF_ALIAS=fuck" \
|
||||||
|
" alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1));" \
|
||||||
|
" fc -R'\n"
|
||||||
|
|
||||||
def _parse_alias(self, alias):
|
def _parse_alias(self, alias):
|
||||||
name, value = alias.split('=', 1)
|
name, value = alias.split('=', 1)
|
||||||
@@ -152,7 +156,7 @@ class Zsh(Generic):
|
|||||||
|
|
||||||
class Tcsh(Generic):
|
class Tcsh(Generic):
|
||||||
def app_alias(self):
|
def app_alias(self):
|
||||||
return "\nalias fuck 'set fucked_cmd=`history -h 2 | head -n 1` && eval `thefuck ${fucked_cmd}`'\n"
|
return "\nalias fuck 'setenv TF_ALIAS fuck && set fucked_cmd=`history -h 2 | head -n 1` && eval `thefuck ${fucked_cmd}`'\n"
|
||||||
|
|
||||||
def _parse_alias(self, alias):
|
def _parse_alias(self, alias):
|
||||||
name, value = alias.split("\t", 1)
|
name, value = alias.split("\t", 1)
|
||||||
@@ -203,6 +207,10 @@ def app_alias():
|
|||||||
print(_get_shell().app_alias())
|
print(_get_shell().app_alias())
|
||||||
|
|
||||||
|
|
||||||
|
def thefuck_alias():
|
||||||
|
return os.environ.get('TF_ALIAS', 'fuck')
|
||||||
|
|
||||||
|
|
||||||
def put_to_history(command):
|
def put_to_history(command):
|
||||||
return _get_shell().put_to_history(command)
|
return _get_shell().put_to_history(command)
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from difflib import get_close_matches
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
import os
|
import os
|
||||||
import pickle
|
import pickle
|
||||||
@@ -7,6 +8,13 @@ from .types import Command
|
|||||||
|
|
||||||
DEVNULL = open(os.devnull, 'w')
|
DEVNULL = open(os.devnull, 'w')
|
||||||
|
|
||||||
|
if six.PY2:
|
||||||
|
import pipes
|
||||||
|
quote = pipes.quote
|
||||||
|
else:
|
||||||
|
import shlex
|
||||||
|
quote = shlex.quote
|
||||||
|
|
||||||
|
|
||||||
def which(program):
|
def which(program):
|
||||||
"""Returns `program` path or `None`."""
|
"""Returns `program` path or `None`."""
|
||||||
@@ -78,3 +86,12 @@ def memoize(fn):
|
|||||||
return memo[key]
|
return memo[key]
|
||||||
|
|
||||||
return wrapper
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
|
def get_closest(word, possibilities, n=3, cutoff=0.6):
|
||||||
|
"""Returns closest match or just first from possibilities."""
|
||||||
|
possibilities = list(possibilities)
|
||||||
|
try:
|
||||||
|
return get_close_matches(word, possibilities, n, cutoff)[0]
|
||||||
|
except IndexError:
|
||||||
|
return possibilities[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user