Bump to 2.0

Add git_branch_delete rule

.travis.yml

@@ -4,6 +4,10 @@ python:
   - "3.3"
   - "2.7"
 install:
-  - python setup.py develop
   - pip install -r requirements.txt
-script: py.test -v
+  - python setup.py develop
+  - pip install coveralls
+script:
+  - export COVERAGE_PYTHON_VERSION=python-${TRAVIS_PYTHON_VERSION:0:1}
+  - coverage run --source=thefuck,tests -m py.test -v
+after_success: coveralls

README.md

@@ -1,4 +1,4 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck)
+# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck) [![Coverage Status](https://coveralls.io/repos/nvbn/thefuck/badge.svg?branch=master&service=github)](https://coveralls.io/github/nvbn/thefuck?branch=master)
 
 **Aliases changed in 1.34.**
 
@@ -6,7 +6,9 @@ Magnificent app which corrects your previous console command,
 inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320).
 
-Few examples:
+![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
+
+Few more examples:
 
 ```bash
 ➜ apt-get install vim
@@ -159,6 +161,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `dry` – fix repetitions like "git git push";
 * `fix_alt_space` – replaces Alt+Space with Space character;
 * `git_add` – fix *"Did you forget to 'git add'?"*;
+* `git_branch_delete` – changes `git branch -d` to `git branch -D`;
 * `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_diff_staged` – adds `--staged` to previous `git diff` with unexpected output;
@@ -169,12 +172,14 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `go_run` – appends `.go` extension when compiling/running Go programs
 * `grep_recursive` – adds `-r` when you trying to grep directory;
 * `has_exists_script` – prepends `./` when script/binary exists;
+* `history` – tries to replace command with most similar command from history;
 * `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`;
 * `ls_lah` – adds -lah to ls;
 * `man` – change manual section;
 * `man_no_space` – fixes man commands without spaces, for example `mandiff`;
+* `mercurial` – fixes wrong `hg` commands;
 * `mkdir_p` – adds `-p` when you trying to create directory without parent;
 * `no_command` – fixes wrong console commands, for example `vom/vim`;
 * `no_such_file` – creates missing directories with `mv` and `cp` commands;
@@ -184,7 +189,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `python_execute` – appends missing `.py` when executing Python files;
 * `quotation_marks` – fixes uneven usage of `'` and `"` when containing args'
 * `rm_dir` – adds `-rf` when you trying to remove directory;
-* `sed` – adds missing '/' to `sed`'s `s` commands;
+* `sed_unterminated_s` – adds missing '/' to `sed`'s `s` commands;
 * `sl_ls` – changes `sl` to `ls`;
 * `ssh_known_hosts` – removes host from `known_hosts` on warning;
 * `sudo` – prepends `sudo` to previous command if it failed because of permissions;
@@ -248,10 +253,11 @@ priority = 1000  # Lower first
 The Fuck has a few settings parameters which can be changed in `~/.thefuck/settings.py`:
 
 * `rules` – list of enabled rules, by default `thefuck.conf.DEFAULT_RULES`;
-* `require_confirmation` – requires confirmation before running new command, by default `False`;
+* `require_confirmation` – requires confirmation before running new command, by default `True`;
 * `wait_command` – max amount of time in seconds for getting previous command output;
 * `no_colors` – disable colored output;
-* `priority` – dict with rules priorities, rule with lower `priority` will be matched first.
+* `priority` – dict with rules priorities, rule with lower `priority` will be matched first;
+* `debug` – enabled debug output, by default `False`;
 
 Example of `settings.py`:
 
@@ -261,6 +267,7 @@ require_confirmation = True
 wait_command = 10
 no_colors = False
 priority = {'sudo': 100, 'no_command': 9999}
+debug = False
 ```
 
 Or via environment variables:
@@ -270,7 +277,8 @@ Or via environment variables:
 * `THEFUCK_WAIT_COMMAND` – max amount of time in seconds for getting previous command output;
 * `THEFUCK_NO_COLORS` – disable colored output, `true/false`;
 * `THEFUCK_PRIORITY` – priority of the rules, like `no_command=9999:apt_get=100`,
-rule with lower `priority` will be matched first.
+rule with lower `priority` will be matched first;
+* `THEFUCK_DEBUG` – enables debug output, `true/false`.
 
 For example:
 

requirements.txt

@@ -2,3 +2,4 @@ pytest
 mock
 pytest-mock
 wheel
+setuptools>=17.1

setup.py

@@ -11,12 +11,10 @@ elif (3, 0) < sys.version_info < (3, 3):
           ' ({}.{} detected).'.format(*sys.version_info[:2]))
     sys.exit(-1)
 
-VERSION = '1.47'
+VERSION = '2.0'
 
 install_requires = ['psutil', 'colorama', 'six']
-
-if sys.version_info < (3, 4):
-    install_requires.append('pathlib')
+extras_require = {':python_version<"3.4"': ['pathlib']}
 
 setup(name='thefuck',
       version=VERSION,
@@ -30,6 +28,7 @@ setup(name='thefuck',
       include_package_data=True,
       zip_safe=False,
       install_requires=install_requires,
+      extras_require=extras_require,
       entry_points={'console_scripts': [
           'thefuck = thefuck.main:main',
           'thefuck-alias = thefuck.shells:app_alias']})

tests/conftest.py

@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture
+def no_memoize(monkeypatch):
+    monkeypatch.setattr('thefuck.utils.memoize.disabled', True)

tests/rules/test_cp_omitting_directory.py

@@ -1,14 +1,22 @@
-from mock import Mock
+import pytest
 from thefuck.rules.cp_omitting_directory import match, get_new_command
+from tests.utils import Command
 
 
-def test_match():
-    assert match(Mock(script='cp dir', stderr="cp: omitting directory 'dir'"),
-                 None)
-    assert not match(Mock(script='some dir',
-                          stderr="cp: omitting directory 'dir'"), None)
-    assert not match(Mock(script='cp dir', stderr=""), None)
+@pytest.mark.parametrize('script, stderr', [
+    ('cp dir', 'cp: dor: is a directory'),
+    ('cp dir', "cp: omitting directory 'dir'")])
+def test_match(script, stderr):
+    assert match(Command(script, stderr=stderr), None)
+
+
+@pytest.mark.parametrize('script, stderr', [
+    ('some dir', 'cp: dor: is a directory'),
+    ('some dir', "cp: omitting directory 'dir'"),
+    ('cp dir', '')])
+def test_not_match(script, stderr):
+    assert not match(Command(script, stderr=stderr), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Mock(script='cp dir'), None) == 'cp -a dir'
+    assert get_new_command(Command(script='cp dir'), None) == 'cp -a dir'

tests/rules/test_git_branch_delete.py

@@ -0,0 +1,22 @@
+import pytest
+from thefuck.rules.git_branch_delete import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def stderr():
+    return '''error: The branch 'branch' is not fully merged.
+If you are sure you want to delete it, run 'git branch -D branch'.
+
+'''
+
+
+def test_match(stderr):
+    assert match(Command('git branch -d branch', stderr=stderr), None)
+    assert not match(Command('git branch -d branch'), None)
+    assert not match(Command('ls', stderr=stderr), None)
+
+
+def test_get_new_command(stderr):
+    assert get_new_command(Command('git branch -d branch', stderr=stderr), None)\
+        == "git branch -D branch"

tests/rules/test_git_diff_staged.py

@@ -3,15 +3,13 @@ from thefuck.rules.git_diff_staged import match, get_new_command
 from tests.utils import Command
 
 
-@pytest.mark.parametrize('command', [
-    Command(script='git diff'),
-    Command(script='git df'),
-    Command(script='git ds')])
+@pytest.mark.parametrize('command', [Command(script='git diff')])
 def test_match(command):
     assert match(command, None)
 
 
 @pytest.mark.parametrize('command', [
+    Command(script='git diff --staged'),
     Command(script='git tag'),
     Command(script='git branch'),
     Command(script='git log')])
@@ -20,8 +18,6 @@ def test_not_match(command):
 
 
 @pytest.mark.parametrize('command, new_command', [
-    (Command('git diff'), 'git diff --staged'),
-    (Command('git df'), 'git df --staged'),
-    (Command('git ds'), 'git ds --staged')])
+    (Command('git diff'), 'git diff --staged')])
 def test_get_new_command(command, new_command):
     assert get_new_command(command, None) == new_command

tests/rules/test_git_not_command.py

@@ -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
 def git_command():
     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)
 
 
-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 branch'
+def test_get_new_command(git_not_command, git_not_command_one_of_this,
+                         git_not_command_closest):
+    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),
                            None) == 'git status'
+    assert get_new_command(Command('git tags', stderr=git_not_command_closest),
+                           None) == 'git tag'

tests/rules/test_git_stash.py

@@ -3,22 +3,20 @@ from thefuck.rules.git_stash import match, get_new_command
 from tests.utils import Command
 
 
-@pytest.fixture
-def cherry_pick_error():
-    return ('error: Your local changes would be overwritten by cherry-pick.\n'
-            'hint: Commit your changes or stash them to proceed.\n'
-            'fatal: cherry-pick failed')
+cherry_pick_error = (
+        'error: Your local changes would be overwritten by cherry-pick.\n'
+        'hint: Commit your changes or stash them to proceed.\n'
+        'fatal: cherry-pick failed')
 
 
-@pytest.fixture
-def rebase_error():
-    return ('Cannot rebase: Your index contains uncommitted changes.\n'
-            'Please commit or stash them.')
+rebase_error = (
+        'Cannot rebase: Your index contains uncommitted changes.\n'
+        'Please commit or stash them.')
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git cherry-pick a1b2c3d', stderr=cherry_pick_error()),
-    Command(script='git rebase -i HEAD~7', stderr=rebase_error())])
+    Command(script='git cherry-pick a1b2c3d', stderr=cherry_pick_error),
+    Command(script='git rebase -i HEAD~7', stderr=rebase_error)])
 def test_match(command):
     assert match(command, None)
 

tests/rules/test_history.py

@@ -0,0 +1,35 @@
+import pytest
+from thefuck.rules.history import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def history(mocker):
+    return mocker.patch('thefuck.rules.history.get_history',
+                        return_value=['ls cat', 'diff x', 'nocommand x'])
+
+
+@pytest.fixture
+def callables(mocker):
+    return mocker.patch('thefuck.rules.history.get_all_callables',
+                        return_value=['diff', 'ls'])
+
+
+@pytest.mark.usefixtures('history', 'callables', 'no_memoize')
+@pytest.mark.parametrize('script', ['ls cet', 'daff x'])
+def test_match(script):
+    assert match(Command(script=script), None)
+
+
+@pytest.mark.usefixtures('history', 'callables', 'no_memoize')
+@pytest.mark.parametrize('script', ['apt-get', 'nocommand y'])
+def test_not_match(script):
+    assert not match(Command(script=script), None)
+
+
+@pytest.mark.usefixtures('history', 'callables', 'no_memoize')
+@pytest.mark.parametrize('script, result', [
+    ('ls cet', 'ls cat'),
+    ('daff x', 'diff x')])
+def test_get_new_command(script, result):
+    assert get_new_command(Command(script), None) == result

tests/rules/test_no_command.py

@@ -1,36 +1,42 @@
-from mock import patch, Mock
-from thefuck.rules.no_command import match, get_new_command, _get_all_callables
+import pytest
+from thefuck.rules.no_command import match, get_new_command, get_all_callables
+from tests.utils import Command
 
 
-@patch('thefuck.rules.no_command._safe', return_value=[])
-@patch('thefuck.rules.no_command.get_aliases',
-       return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+@pytest.fixture(autouse=True)
+def _safe(mocker):
+    mocker.patch('thefuck.rules.no_command._safe', return_value=[])
+
+
+@pytest.fixture(autouse=True)
+def get_aliases(mocker):
+    mocker.patch('thefuck.rules.no_command.get_aliases',
+                 return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+
+
+@pytest.mark.usefixtures('no_memoize')
 def test_get_all_callables(*args):
-    all_callables = _get_all_callables()
+    all_callables = get_all_callables()
     assert 'vim' in all_callables
     assert 'fsck' in all_callables
     assert 'fuck' not in all_callables
 
 
-@patch('thefuck.rules.no_command._safe', return_value=[])
-@patch('thefuck.rules.no_command.get_aliases',
-       return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+@pytest.mark.usefixtures('no_memoize')
 def test_match(*args):
-    assert match(Mock(stderr='vom: not found', script='vom file.py'), None)
-    assert match(Mock(stderr='fucck: not found', script='fucck'), None)
-    assert not match(Mock(stderr='qweqwe: not found', script='qweqwe'), None)
-    assert not match(Mock(stderr='some text', script='vom file.py'), None)
+    assert match(Command(stderr='vom: not found', script='vom file.py'), None)
+    assert match(Command(stderr='fucck: not found', script='fucck'), None)
+    assert not match(Command(stderr='qweqwe: not found', script='qweqwe'), None)
+    assert not match(Command(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'])
+@pytest.mark.usefixtures('no_memoize')
 def test_get_new_command(*args):
     assert get_new_command(
-        Mock(stderr='vom: not found',
-             script='vom file.py'),
+        Command(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'
+        Command(stderr='fucck: not found',
+                script='fucck'),
+        Command) == 'fsck'

tests/rules/test_tmux.py

@@ -16,4 +16,4 @@ def test_match(tmux_ambiguous):
 
 def test_get_new_command(tmux_ambiguous):
     assert get_new_command(Command('tmux list', stderr=tmux_ambiguous), None)\
-        == 'tmux list-buffers'
+        == 'tmux list-keys'

tests/test_logs.py

@@ -5,3 +5,10 @@ from thefuck import logs
 def test_color():
     assert logs.color('red', Mock(no_colors=False)) == 'red'
     assert logs.color('red', Mock(no_colors=True)) == ''
+
+
+def test_debug(capsys):
+    logs.debug('test', Mock(no_colors=True, debug=True))
+    assert capsys.readouterr() == ('', 'DEBUG: test\n')
+    logs.debug('test', Mock(no_colors=True, debug=False))
+    assert capsys.readouterr() == ('', '')

tests/test_main.py

@@ -77,23 +77,23 @@ class TestGetCommand(object):
         monkeypatch.setattr('thefuck.shells.to_shell', lambda x: x)
 
     def test_get_command_calls(self, Popen):
-        assert main.get_command(Mock(),
+        assert main.get_command(Mock(env={}),
             ['thefuck', 'apt-get', 'search', 'vim']) \
                == Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,
                                       stdout=PIPE,
                                       stderr=PIPE,
-                                      env={'LANG': 'C'})
+                                      env={})
 
     @pytest.mark.parametrize('args, result', [
         (['thefuck', 'ls', '-la'], 'ls -la'),
         (['thefuck', 'ls'], 'ls')])
     def test_get_command_script(self, args, result):
         if result:
-            assert main.get_command(Mock(), args).script == result
+            assert main.get_command(Mock(env={}), args).script == result
         else:
-            assert main.get_command(Mock(), args) is None
+            assert main.get_command(Mock(env={}), args) is None
 
 
 class TestGetMatchedRule(object):
@@ -110,7 +110,7 @@ class TestGetMatchedRule(object):
     def test_when_rule_failed(self, capsys):
         main.get_matched_rule(
             Command('ls'), [Rule('test', Mock(side_effect=OSError('Denied')))],
-            Mock(no_colors=True))
+            Mock(no_colors=True, debug=False))
         assert capsys.readouterr()[1].split('\n')[0] == '[WARN] Rule test:'
 
 
@@ -126,7 +126,7 @@ class TestRunRule(object):
 
     def test_run_rule_with_side_effect(self, capsys):
         side_effect = Mock()
-        settings = Mock()
+        settings = Mock(debug=False)
         command = Command()
         main.run_rule(Rule(get_new_command=lambda *_: 'new-command',
                            side_effect=side_effect),

tests/test_shells.py

@@ -12,6 +12,16 @@ def isfile(mocker):
     return mocker.patch('os.path.isfile', return_value=True)
 
 
+@pytest.fixture
+@pytest.mark.usefixtures('isfile')
+def history_lines(mocker):
+    def aux(lines):
+        mock = mocker.patch('io.open')
+        mock.return_value.__enter__\
+            .return_value.__iter__.return_value = lines
+    return aux
+
+
 class TestGeneric(object):
     @pytest.fixture
     def shell(self):
@@ -38,6 +48,12 @@ class TestGeneric(object):
         assert 'thefuck' in shell.app_alias()
         assert 'TF_ALIAS' in shell.app_alias()
 
+    def test_get_history(self, history_lines, shell):
+        history_lines(['ls', 'rm'])
+        # We don't know what to do in generic shell with history lines,
+        # so just ignore them:
+        assert list(shell.get_history()) == []
+
 
 @pytest.mark.usefixtures('isfile')
 class TestBash(object):
@@ -85,6 +101,10 @@ class TestBash(object):
         assert 'thefuck' in shell.app_alias()
         assert 'TF_ALIAS' in shell.app_alias()
 
+    def test_get_history(self, history_lines, shell):
+        history_lines(['ls', 'rm'])
+        assert list(shell.get_history()) == ['ls', 'rm']
+
 
 @pytest.mark.usefixtures('isfile')
 class TestFish(object):
@@ -96,18 +116,34 @@ class TestFish(object):
     def Popen(self, mocker):
         mock = mocker.patch('thefuck.shells.Popen')
         mock.return_value.stdout.read.return_value = (
-            b'fish_config\nfuck\nfunced\nfuncsave\ngrep\nhistory\nll\nmath')
+            b'cd\nfish_config\nfuck\nfunced\nfuncsave\ngrep\nhistory\nll\nls\n'
+            b'man\nmath\npopd\npushd\nruby')
         return mock
 
+    @pytest.fixture
+    def environ(self, monkeypatch):
+        data = {'TF_OVERRIDDEN_ALIASES': 'cd, ls, man, open'}
+        monkeypatch.setattr('thefuck.shells.os.environ', data)
+        return data
+
+    @pytest.mark.usefixture('environ')
+    def test_get_overridden_aliases(self, shell, environ):
+        assert shell._get_overridden_aliases() == ['cd', 'ls', 'man', 'open']
+
     @pytest.mark.parametrize('before, after', [
+        ('cd', 'cd'),
         ('pwd', 'pwd'),
         ('fuck', 'fish -ic "fuck"'),
         ('find', 'find'),
         ('funced', 'fish -ic "funced"'),
+        ('grep', 'grep'),
         ('awk', 'awk'),
         ('math "2 + 2"', r'fish -ic "math \"2 + 2\""'),
+        ('man', 'man'),
+        ('open', 'open'),
         ('vim', 'vim'),
-        ('ll', 'fish -ic "ll"')])  # Fish has no aliases but functions
+        ('ll', 'fish -ic "ll"'),
+        ('ls', 'ls')])  # Fish has no aliases but functions
     def test_from_shell(self, before, after, shell):
         assert shell.from_shell(before) == after
 
@@ -129,10 +165,12 @@ class TestFish(object):
                                        'fuck': 'fuck',
                                        'funced': 'funced',
                                        'funcsave': 'funcsave',
-                                       'grep': 'grep',
                                        'history': 'history',
                                        'll': 'll',
-                                       'math': 'math'}
+                                       'math': 'math',
+                                       'popd': 'popd',
+                                       'pushd': 'pushd',
+                                       'ruby': 'ruby'}
 
     def test_app_alias(self, shell):
         assert 'function fuck' in shell.app_alias()
@@ -187,3 +225,7 @@ class TestZsh(object):
         assert 'alias fuck' in shell.app_alias()
         assert 'thefuck' in shell.app_alias()
         assert 'TF_ALIAS' in shell.app_alias()
+
+    def test_get_history(self, history_lines, shell):
+        history_lines([': 1432613911:0;ls', ': 1432613916:0;rm'])
+        assert list(shell.get_history()) == ['ls', 'rm']

tests/test_utils.py

@@ -1,6 +1,6 @@
 import pytest
 from mock import Mock
-from thefuck.utils import sudo_support, wrap_settings, memoize
+from thefuck.utils import git_support, sudo_support, wrap_settings, memoize, get_closest
 from thefuck.types import Settings
 from tests.utils import Command
 
@@ -26,9 +26,36 @@ def test_sudo_support(return_value, command, called, result):
     fn.assert_called_once_with(Command(called), None)
 
 
+@pytest.mark.parametrize('called, command, stderr', [
+    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
+    ('git com file', 'git commit --verbose file', "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
+def test_git_support(called, command, stderr):
+    @git_support
+    def fn(command, settings): return command.script
+    assert fn(Command(script=called, stderr=stderr), None) == command
+
+
 def test_memoize():
     fn = Mock(__name__='fn')
     memoized = memoize(fn)
     memoized()
     memoized()
     fn.assert_called_once_with()
+
+
+@pytest.mark.usefixtures('no_memoize')
+def test_no_memoize():
+    fn = Mock(__name__='fn')
+    memoized = memoize(fn)
+    memoized()
+    memoized()
+    assert fn.call_count == 2
+
+
+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'])

thefuck/conf.py

@@ -27,15 +27,18 @@ DEFAULT_PRIORITY = 1000
 
 DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                     'wait_command': 3,
-                    'require_confirmation': False,
+                    'require_confirmation': True,
                     'no_colors': False,
-                    'priority': {}}
+                    'debug': False,
+                    'priority': {},
+                    'env': {'LANG': 'C', 'GIT_TRACE': '1'}}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_WAIT_COMMAND': 'wait_command',
                'THEFUCK_REQUIRE_CONFIRMATION': 'require_confirmation',
                'THEFUCK_NO_COLORS': 'no_colors',
-               'THEFUCK_PRIORITY': 'priority'}
+               'THEFUCK_PRIORITY': 'priority',
+               'THEFUCK_DEBUG': 'debug'}
 
 
 SETTINGS_HEADER = u"""# ~/.thefuck/settings.py: The Fuck settings file
@@ -87,7 +90,7 @@ def _val_from_env(env, attr):
         return dict(_priority_from_env(val))
     elif attr == 'wait_command':
         return int(val)
-    elif attr in ('require_confirmation', 'no_colors'):
+    elif attr in ('require_confirmation', 'no_colors', 'debug'):
         return val.lower() == 'true'
     else:
         return val

thefuck/logs.py

@@ -1,3 +1,4 @@
+from pprint import pformat
 import sys
 from traceback import format_exception
 import colorama
@@ -52,3 +53,12 @@ def failed(msg, settings):
         msg=msg,
         red=color(colorama.Fore.RED, settings),
         reset=color(colorama.Style.RESET_ALL, settings)))
+
+
+def debug(msg, settings):
+    if settings.debug:
+        sys.stderr.write(u'{blue}{bold}DEBUG:{reset} {msg}\n'.format(
+            msg=msg,
+            reset=color(colorama.Style.RESET_ALL, settings),
+            blue=color(colorama.Fore.BLUE, settings),
+            bold=color(colorama.Style.BRIGHT, settings)))

thefuck/main.py

@@ -1,6 +1,7 @@
 from imp import load_source
 from pathlib import Path
 from os.path import expanduser
+from pprint import pformat
 from subprocess import Popen, PIPE
 import os
 import sys
@@ -79,8 +80,13 @@ def get_command(settings, args):
         return
 
     script = shells.from_shell(script)
-    result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
-                   env=dict(os.environ, LANG='C'))
+    logs.debug('Call: {}'.format(script), settings)
+
+    env = dict(os.environ)
+    env.update(settings.env)
+    logs.debug('Executing with env: {}'.format(env), settings)
+
+    result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env)
     if wait_output(settings, result):
         return types.Command(script, result.stdout.read().decode('utf-8'),
                              result.stderr.read().decode('utf-8'))
@@ -90,6 +96,7 @@ def get_matched_rule(command, rules, settings):
     """Returns first matched rule for command."""
     for rule in rules:
         try:
+            logs.debug(u'Trying rule: {}'.format(rule.name), settings)
             if rule.match(command, settings):
                 return rule
         except Exception:
@@ -125,12 +132,21 @@ def main():
     colorama.init()
     user_dir = setup_user_dir()
     settings = conf.get_settings(user_dir)
+    logs.debug('Run with settings: {}'.format(pformat(settings)), settings)
 
     command = get_command(settings, sys.argv)
     if command:
+        logs.debug('Received stdout: {}'.format(command.stdout), settings)
+        logs.debug('Received stderr: {}'.format(command.stderr), settings)
+
         rules = get_rules(user_dir, settings)
+        logs.debug(
+            'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
+            settings)
+
         matched_rule = get_matched_rule(command, rules, settings)
         if matched_rule:
+            logs.debug('Matched rule: {}'.format(matched_rule.name), settings)
             run_rule(matched_rule, command, settings)
             return
 

thefuck/rules/brew_install.py

@@ -1,9 +1,10 @@
-import difflib
 import os
 import re
 from subprocess import check_output
+from thefuck.utils import get_closest
 
 # Formulars are base on each local system's status
+
 brew_formulas = []
 try:
     brew_path_prefix = check_output(['brew', '--prefix'],
@@ -17,8 +18,8 @@ except:
     pass
 
 
-def _get_similar_formulars(formula_name):
-    return difflib.get_close_matches(formula_name, brew_formulas, 1, 0.85)
+def _get_similar_formula(formula_name):
+    return get_closest(formula_name, brew_formulas, 1, 0.85)
 
 
 def match(command, settings):
@@ -29,7 +30,7 @@ def match(command, settings):
     if is_proper_command:
         formula = re.findall(r'Error: No available formula for ([a-z]+)',
                              command.stderr)[0]
-        has_possible_formulas = len(_get_similar_formulars(formula)) > 0
+        has_possible_formulas = bool(_get_similar_formula(formula))
 
     return has_possible_formulas
 
@@ -37,6 +38,6 @@ def match(command, settings):
 def get_new_command(command, settings):
     not_exist_formula = re.findall(r'Error: No available formula for ([a-z]+)',
                                    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)

thefuck/rules/brew_unknown_command.py

@@ -1,8 +1,7 @@
-import difflib
 import os
 import re
 import subprocess
-
+from thefuck.utils import get_closest
 
 BREW_CMD_PATH = '/Library/Homebrew/cmd'
 TAP_PATH = '/Library/Taps'
@@ -78,8 +77,8 @@ if brew_path_prefix:
         pass
 
 
-def _get_similar_commands(command):
-    return difflib.get_close_matches(command, brew_commands)
+def _get_similar_command(command):
+    return get_closest(command, brew_commands)
 
 
 def match(command, settings):
@@ -90,7 +89,7 @@ def match(command, settings):
     if is_proper_command:
         broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                                 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
 
@@ -98,6 +97,6 @@ def match(command, settings):
 def get_new_command(command, settings):
     broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                             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)

thefuck/rules/cp_omitting_directory.py

@@ -4,8 +4,9 @@ from thefuck.utils import sudo_support
 
 @sudo_support
 def match(command, settings):
+    stderr = command.stderr.lower()
     return command.script.startswith('cp ') \
-        and 'cp: omitting directory' in command.stderr.lower()
+        and ('omitting directory' in stderr or 'is a directory' in stderr)
 
 
 @sudo_support

thefuck/rules/git_add.py

@@ -1,13 +1,15 @@
 import re
-from thefuck import shells
+from thefuck import utils, shells
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
             r"error: pathspec '([^']*)' "

thefuck/rules/git_branch_delete.py

@@ -0,0 +1,7 @@
+def match(command, settings):
+    return ('git branch -d' in command.script
+            and 'If you are sure you want to delete it' in command.stderr)
+
+
+def get_new_command(command, settings):
+    return command.script.replace('-d', '-D')

thefuck/rules/git_branch_list.py

@@ -1,10 +1,12 @@
-from thefuck import shells
+from thefuck import utils, shells
 
 
+@utils.git_support
 def match(command, settings):
     # catches "git branch list" in place of "git branch"
     return command.script.split() == 'git branch list'.split()
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return shells.and_('git branch --delete list', 'git branch')

thefuck/rules/git_checkout.py

@@ -1,13 +1,15 @@
 import re
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
             r"error: pathspec '([^']*)' "

thefuck/rules/git_diff_staged.py

@@ -1,6 +1,13 @@
+from thefuck import utils
+
+
+@utils.git_support
 def match(command, settings):
-    return command.script.startswith('git d')
+    return ('git' in command.script and
+            'diff' in command.script and
+            '--staged' not in command.script)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return '{} --staged'.format(command.script)

thefuck/rules/git_not_command.py

@@ -1,16 +1,28 @@
 import re
+from thefuck.utils import get_closest, git_support
 
 
+@git_support
 def match(command, settings):
     return ('git' in command.script
             and " is not a git command. See 'git --help'." 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()
+
+
+@git_support
 def get_new_command(command, settings):
     broken_cmd = re.findall(r"git: '([^']*)' is not a git command",
                             command.stderr)[0]
-    new_cmd = re.findall(r'Did you mean[^\n]*\n\s*([^\n]*)',
-                         command.stderr)[0]
+    new_cmd = get_closest(broken_cmd,
+                          _get_all_git_matched_commands(command.stderr))
     return command.script.replace(broken_cmd, new_cmd, 1)
 

thefuck/rules/git_pull.py

@@ -1,12 +1,14 @@
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'pull' in command.script
             and 'set-upstream' in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     line = command.stderr.split('\n')[-3].strip()
     branch = line.split(' ')[-1]

thefuck/rules/git_push.py

@@ -1,8 +1,13 @@
+from thefuck import utils
+
+
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'push' in command.script
             and 'set-upstream' in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return command.stderr.split('\n')[-3].strip()

thefuck/rules/git_stash.py

@@ -1,12 +1,14 @@
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     # catches "Please commit or stash them" and "Please, commit your changes or
     # stash them before you can switch branches."
     return 'git' in command.script and 'or stash them' in command.stderr
 
 
+@utils.git_support
 def get_new_command(command, settings):
     formatme = shells.and_('git stash', '{}')
     return formatme.format(command.script)

thefuck/rules/history.py

@@ -0,0 +1,24 @@
+from difflib import get_close_matches
+from thefuck.shells import get_history
+from thefuck.utils import get_closest, memoize
+from thefuck.rules.no_command import get_all_callables
+
+
+@memoize
+def _history_of_exists_without_current(command):
+    callables = get_all_callables()
+    return [line for line in get_history()
+            if line != command.script
+            and line.split(' ')[0] in callables]
+
+
+def match(command, settings):
+    return len(get_close_matches(command.script,
+                                 _history_of_exists_without_current(command)))
+
+
+def get_new_command(command, settings):
+    return get_closest(command.script,
+                       _history_of_exists_without_current(command))
+
+priority = 9999

thefuck/rules/mercurial.py

@@ -1,6 +1,5 @@
 import re
-
-from difflib import get_close_matches
+from thefuck.utils import get_closest
 
 
 def extract_possisiblities(command):
@@ -26,9 +25,5 @@ def match(command, settings):
 def get_new_command(command, settings):
     script = command.script.split(' ')
     possisiblities = extract_possisiblities(command)
-    matches = get_close_matches(script[1], possisiblities)
-    if matches:
-        script[1] = matches[0]
-    else:
-        script[1] = possisiblities[0]
+    script[1] = get_closest(script[1], possisiblities)
     return ' '.join(script)

thefuck/rules/no_command.py

@@ -1,7 +1,7 @@
 from difflib import get_close_matches
 import os
 from pathlib import Path
-from thefuck.utils import sudo_support
+from thefuck.utils import sudo_support, memoize
 from thefuck.shells import thefuck_alias, get_aliases
 
 
@@ -12,7 +12,8 @@ def _safe(fn, fallback):
         return fallback
 
 
-def _get_all_callables():
+@memoize
+def get_all_callables():
     tf_alias = thefuck_alias()
     return [exe.name
             for path in os.environ.get('PATH', '').split(':')
@@ -25,14 +26,14 @@ def _get_all_callables():
 def match(command, settings):
     return 'not found' in command.stderr and \
            bool(get_close_matches(command.script.split(' ')[0],
-                                  _get_all_callables()))
+                                  get_all_callables()))
 
 
 @sudo_support
 def get_new_command(command, settings):
     old_command = command.script.split(' ')[0]
     new_command = get_close_matches(old_command,
-                                    _get_all_callables())[0]
+                                    get_all_callables())[0]
     return ' '.join([new_command] + command.script.split(' ')[1:])
 
 

thefuck/rules/sudo.py

@@ -13,7 +13,8 @@ patterns = ['permission denied',
             'must be root',
             'need to be root',
             'need root',
-            'only root can do that']
+            'only root can do that',
+            'authentication is required']
 
 
 def match(command, settings):

thefuck/rules/tmux.py

@@ -1,3 +1,4 @@
+from thefuck.utils import get_closest
 import re
 
 
@@ -8,7 +9,12 @@ def match(command, settings):
 
 
 def get_new_command(command, settings):
-    cmd = re.match(r"ambiguous command: (.*), could be: ([^, \n]*)",
+    cmd = re.match(r"ambiguous command: (.*), could be: (.*)",
                    command.stderr)
 
-    return command.script.replace(cmd.group(1), cmd.group(2))
+    old_cmd = cmd.group(1)
+    suggestions = [cmd.strip() for cmd in cmd.group(2).split(',')]
+
+    new_cmd = get_closest(old_cmd, suggestions)
+
+    return command.script.replace(old_cmd, new_cmd)

thefuck/shells.py

@@ -7,6 +7,7 @@ from collections import defaultdict
 from subprocess import Popen, PIPE
 from time import time
 import os
+import io
 from psutil import Process
 from .utils import DEVNULL, memoize
 
@@ -48,6 +49,26 @@ class Generic(object):
             with open(history_file_name, 'a') as history:
                 history.write(self._get_history_line(command_script))
 
+    def _script_from_history(self, line):
+        """Returns prepared history line.
+
+        Should return a blank line if history line is corrupted or empty.
+
+        """
+        return ''
+
+    def get_history(self):
+        """Returns list of history entries."""
+        history_file_name = self._get_history_file_name()
+        if os.path.isfile(history_file_name):
+            with io.open(history_file_name, 'r',
+                         encoding='utf-8', errors='ignore') as history:
+                for line in history:
+                    prepared = self._script_from_history(line)\
+                                   .strip()
+                    if prepared:
+                        yield prepared
+
     def and_(self, *commands):
         return u' && '.join(commands)
 
@@ -63,7 +84,6 @@ class Bash(Generic):
             value = value[1:-1]
         return name, value
 
-    @memoize
     def get_aliases(self):
         proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL,
                      shell=True)
@@ -79,12 +99,24 @@ class Bash(Generic):
     def _get_history_line(self, command_script):
         return u'{}\n'.format(command_script)
 
+    def _script_from_history(self, line):
+        print(line)
+        return line
+
 
 class Fish(Generic):
+
+    def _get_overridden_aliases(self):
+        overridden_aliases = os.environ.get('TF_OVERRIDDEN_ALIASES', '').strip()
+        if overridden_aliases:
+            return [alias.strip() for alias in overridden_aliases.split(',')]
+        else:
+            return ['cd', 'grep', 'ls', 'man', 'open']
+
     def app_alias(self):
-        return ("function fuck -d 'Correct your previous console command'\n"
+        return ("set TF_ALIAS fuck\n"
+                "function fuck -d 'Correct your previous console command'\n"
                 "    set -l exit_code $status\n"
-                "    set -l TF_ALIAS fuck\n"
                 "    set -l eval_script"
                 " (mktemp 2>/dev/null ; or mktemp -t 'thefuck')\n"
                 "    set -l fucked_up_commandd $history[1]\n"
@@ -96,12 +128,12 @@ class Fish(Generic):
                 "    end\n"
                 "end")
 
-    @memoize
     def get_aliases(self):
+        overridden = self._get_overridden_aliases()
         proc = Popen('fish -ic functions', stdout=PIPE, stderr=DEVNULL,
                      shell=True)
         functions = proc.stdout.read().decode('utf-8').strip().split('\n')
-        return {function: function for function in functions}
+        return {func: func for func in functions if func not in overridden}
 
     def _expand_aliases(self, command_script):
         aliases = self.get_aliases()
@@ -137,7 +169,6 @@ class Zsh(Generic):
             value = value[1:-1]
         return name, value
 
-    @memoize
     def get_aliases(self):
         proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL,
                      shell=True)
@@ -153,6 +184,12 @@ class Zsh(Generic):
     def _get_history_line(self, command_script):
         return u': {}:0;{}\n'.format(int(time()), command_script)
 
+    def _script_from_history(self, line):
+        if ';' in line:
+            return line.split(';', 1)[1]
+        else:
+            return ''
+
 
 class Tcsh(Generic):
     def app_alias(self):
@@ -162,7 +199,6 @@ class Tcsh(Generic):
         name, value = alias.split("\t", 1)
         return name, value
 
-    @memoize
     def get_aliases(self):
         proc = Popen('tcsh -ic alias', stdout=PIPE, stderr=DEVNULL,
                      shell=True)
@@ -219,5 +255,11 @@ def and_(*commands):
     return _get_shell().and_(*commands)
 
 
+@memoize
 def get_aliases():
     return list(_get_shell().get_aliases().keys())
+
+
+@memoize
+def get_history():
+    return list(_get_shell().get_history())

thefuck/utils.py

@@ -1,6 +1,9 @@
+from difflib import get_close_matches
 from functools import wraps
+from shlex import split
 import os
 import pickle
+import re
 import six
 from .types import Command
 
@@ -8,11 +11,9 @@ from .types import Command
 DEVNULL = open(os.devnull, 'w')
 
 if six.PY2:
-    import pipes
-    quote = pipes.quote
+    from pipes import quote
 else:
-    import shlex
-    quote = shlex.quote
+    from shlex import quote
 
 
 def which(program):
@@ -72,6 +73,30 @@ def sudo_support(fn):
     return wrapper
 
 
+def git_support(fn):
+    """Resolve git aliases."""
+    @wraps(fn)
+    def wrapper(command, settings):
+        if (command.script.startswith('git') and
+                'trace: alias expansion:' in command.stderr):
+
+            search = re.search("trace: alias expansion: ([^ ]*) => ([^\n]*)",
+                               command.stderr)
+            alias = search.group(1)
+
+            # by default git quotes everything, for example:
+            #     'commit' '--amend'
+            # which is surprising and does not allow to easily test for
+            # eg. 'git commit'
+            expansion = ' '.join(map(quote, split(search.group(2))))
+            new_script = command.script.replace(alias, expansion)
+
+            command = Command._replace(command, script=new_script)
+        return fn(command, settings)
+
+    return wrapper
+
+
 def memoize(fn):
     """Caches previous calls to the function."""
     memo = {}
@@ -79,9 +104,19 @@ def memoize(fn):
     @wraps(fn)
     def wrapper(*args, **kwargs):
         key = pickle.dumps((args, kwargs))
-        if key not in memo:
+        if key not in memo or memoize.disabled:
             memo[key] = fn(*args, **kwargs)
 
         return memo[key]
 
     return wrapper
+memoize.disabled = False
+
+
+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]