Bump to 1.47

improve(rules): add mercurial (hg) support

README.md

@@ -132,6 +132,7 @@ thefuck-alias >> ~/.bashrc
 [Or in your shell config (Bash, Zsh, Fish, Powershell).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
 
 Changes will be available only in a new shell session.
+To make them available immediately, run `source ~/.bashrc` (or your shell config file like `.zshrc`).
 
 
 ## Update
@@ -145,24 +146,31 @@ sudo pip install thefuck --upgrade
 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:
 
+* `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_mkdir` – creates directories before cd'ing into them;
 * `cd_parent` – changes `cd..` to `cd ..`;
 * `composer_not_command` – fixes composer command name;
 * `cp_omitting_directory` – adds `-a` when you `cp` directory;
 * `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_merge` – adds `--merge` to inconsistent django south migration;
+* `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_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;
 * `git_no_command` – fixes wrong git commands like `git brnch`;
 * `git_pull` – sets upstream before executing previous `git pull`;
 * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
 * `git_stash` – stashes you local modifications before rebasing or switching branch;
-* `grep_recursive` – adds `-r` when you trying to grep directory; 
+* `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;
+* `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;
@@ -170,13 +178,20 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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;
+* `open` – prepends `http` to address passed to `open`;
 * `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_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;
 * `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;
 * `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.
 
 Enabled by default only on specific platforms:
@@ -184,6 +199,7 @@ Enabled by default only on specific platforms:
 * `apt_get` – installs app from apt if it not installed;
 * `brew_install` – fixes formula name for `brew install`;
 * `brew_unknown_command` – fixes wrong brew commands, for example `brew docto/brew doctor`;
+* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour
 * `pacman` – installs app with `pacman` or `yaourt` if it is not installed.
 
 Bundled, but not enabled by default:
@@ -198,7 +214,7 @@ in `~/.thefuck/rules`. Rule should contain two functions:
 and `get_new_command(command: Command, settings: Settings) -> str`.
 Also the rule can contain optional function
 `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`.
 

setup.py

@@ -1,8 +1,22 @@
+#!/usr/bin/env python
 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.43'
+VERSION = '1.47'
 
+install_requires = ['psutil', 'colorama', 'six']
+
+if sys.version_info < (3, 4):
+    install_requires.append('pathlib')
 
 setup(name='thefuck',
       version=VERSION,
@@ -15,7 +29,7 @@ setup(name='thefuck',
                                       'tests', 'release']),
       include_package_data=True,
       zip_safe=False,
-      install_requires=['pathlib', 'psutil', 'colorama', 'six'],
+      install_requires=install_requires,
       entry_points={'console_scripts': [
           'thefuck = thefuck.main:main',
           'thefuck-alias = thefuck.shells:app_alias']})

tests/rules/test_brew_upgrade.py

@@ -0,0 +1,15 @@
+import pytest
+from thefuck.rules.brew_upgrade import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='brew upgrade')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('brew upgrade'), 'brew upgrade --all')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_cargo_no_command.py

@@ -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

tests/rules/test_git_branch_list.py

@@ -0,0 +1,18 @@
+from thefuck import shells
+from thefuck.rules.git_branch_list import match, get_new_command
+from tests.utils import Command
+
+def test_match():
+    assert match(Command('git branch list'), None)
+
+
+def test_not_match():
+    assert not match(Command(), None)
+    assert not match(Command('git commit'), None)
+    assert not match(Command('git branch'), None)
+    assert not match(Command('git stash list'), None)
+
+
+def test_get_new_command():
+    assert (get_new_command(Command('git branch list'), None) ==
+            shells.and_('git branch --delete list', 'git branch'))

tests/rules/test_git_diff_staged.py

@@ -0,0 +1,27 @@
+import pytest
+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')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git tag'),
+    Command(script='git branch'),
+    Command(script='git log')])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git diff'), 'git diff --staged'),
+    (Command('git df'), 'git df --staged'),
+    (Command('git ds'), 'git ds --staged')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_go_run.py

@@ -0,0 +1,17 @@
+import pytest
+from thefuck.rules.go_run import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='go run foo'), 
+    Command(script='go run bar')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('go run foo'), 'go run foo.go'),
+    (Command('go run bar'), 'go run bar.go')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_java.py

@@ -0,0 +1,17 @@
+import pytest
+from thefuck.rules.java import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='java foo.java'),
+    Command(script='java bar.java')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('java foo.java'), 'java foo'),
+    (Command('java bar.java'), 'java bar')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_javac.py

@@ -0,0 +1,17 @@
+import pytest
+from thefuck.rules.javac import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='javac foo'),
+    Command(script='javac bar')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('javac foo'), 'javac foo.java'),
+    (Command('javac bar'), 'javac bar.java')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_ls_lah.py

@@ -3,9 +3,12 @@ from thefuck.rules.ls_lah import match, get_new_command
 
 
 def test_match():
+    assert match(Mock(script='ls'), None)
     assert match(Mock(script='ls file.py'), None)
     assert match(Mock(script='ls /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():

tests/rules/test_man.py

@@ -2,6 +2,7 @@ import pytest
 from thefuck.rules.man import match, get_new_command
 from tests.utils import Command
 
+
 @pytest.mark.parametrize('command', [
     Command('man read'),
     Command('man 2 read'),
@@ -14,6 +15,13 @@ def test_match(command):
     assert match(command, None)
 
 
+@pytest.mark.parametrize('command', [
+    Command('man'),
+    Command('man ')])
+def test_not_match(command):
+    assert not match(command, None)
+
+
 @pytest.mark.parametrize('command, new_command', [
     (Command('man read'), 'man 3 read'),
     (Command('man 2 read'), 'man 3 read'),

tests/rules/test_mercurial.py

@@ -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

tests/rules/test_no_command.py

@@ -1,19 +1,36 @@
 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():
-    with patch('thefuck.rules.no_command._get_all_callables',
-               return_value=['vim', 'apt-get']):
-        assert match(Mock(stderr='vom: not found', script='vom file.py'), None)
-        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_all_callables(*args):
+    all_callables = _get_all_callables()
+    assert 'vim' in all_callables
+    assert 'fsck' in all_callables
+    assert 'fuck' not in all_callables
 
 
-def test_get_new_command():
-    with patch('thefuck.rules.no_command._get_all_callables',
-               return_value=['vim', 'apt-get']):
-        assert get_new_command(
-            Mock(stderr='vom: not found',
-                 script='vom file.py'),
-            None) == 'vim file.py'
+@patch('thefuck.rules.no_command._safe', return_value=[])
+@patch('thefuck.rules.no_command.get_aliases',
+       return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+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)
+
+
+@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'

tests/rules/test_open.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.open import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='open foo.com'),
+    Command(script='open foo.ly'),
+    Command(script='open foo.org'),
+    Command(script='open foo.net'),
+    Command(script='open foo.se'),
+    Command(script='open foo.io')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('open foo.com'), 'open http://foo.com'),
+    (Command('open foo.ly'), 'open http://foo.ly'),
+    (Command('open foo.org'), 'open http://foo.org'),
+    (Command('open foo.net'), 'open http://foo.net'),
+    (Command('open foo.se'), 'open http://foo.se'),
+    (Command('open foo.io'), 'open http://foo.io')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_pacman.py

@@ -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),
                     reason='Skip if pacman is not available')
 @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):
     assert match(command, None)
 
 
 @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.multiple(pacman, create=True, pacman=pacman_cmd)
 def test_match_mocked(subp_mock, command, return_value):
     subp_mock.check_output.return_value = return_value
     assert match(command, None)
-    assert subp_mock.check_output.called
 
 
 @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):
     assert not match(command, None)
 
@@ -48,19 +50,20 @@ def test_not_match(command):
                     reason='Skip if pacman is not available')
 @pytest.mark.parametrize('command, new_command', [
     (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):
     assert get_new_command(command, None) == new_command
 
 
 @pytest.mark.parametrize('command, new_command, return_value', [
-    (Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd),
-        PKGFILE_OUTPUT_VIM),
-    (Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd),
-        PKGFILE_OUTPUT_CONVERT)])
+    (Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd), 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), PKGFILE_OUTPUT_CONVERT),
+    (Command('sudo convert'), '{} -S extra/imagemagick && sudo convert'.format(pacman_cmd), PKGFILE_OUTPUT_CONVERT)])
 @patch('thefuck.rules.pacman.subprocess')
 @patch.multiple(pacman, create=True, pacman=pacman_cmd)
 def test_get_new_command_mocked(subp_mock, command, new_command, return_value):
     subp_mock.check_output.return_value = return_value
     assert get_new_command(command, None) == new_command
-    assert subp_mock.check_output.called

tests/rules/test_python_execute.py

@@ -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

tests/rules/test_quotation_marks.py

@@ -0,0 +1,19 @@
+import pytest
+from thefuck.rules.quotation_marks import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script="git commit -m \'My Message\""),
+    Command(script="git commit -am \"Mismatched Quotation Marks\'"),
+    Command(script="echo \"hello\'")])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (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("echo \"hello\'"), "echo \"hello\"")])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_sed_unterminated_s.py

@@ -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/"

tests/rules/test_sudo.py

@@ -8,6 +8,9 @@ from tests.utils import Command
     ('permission denied', ''),
     ("npm ERR! Error: EACCES, unlink", ''),
     ('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'")])
 def test_match(stderr, stdout):
     assert match(Command(stderr=stderr, stdout=stdout), None)

tests/rules/test_systemctl.py

@@ -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"

tests/rules/test_tmux.py

@@ -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'

tests/test_shells.py

@@ -33,6 +33,11 @@ class TestGeneric(object):
     def test_get_aliases(self, shell):
         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')
 class TestBash(object):
@@ -44,6 +49,7 @@ class TestBash(object):
     def Popen(self, mocker):
         mock = mocker.patch('thefuck.shells.Popen')
         mock.return_value.stdout.read.return_value = (
+            b'alias fuck=\'eval $(thefuck $(fc -ln -1))\'\n'
             b'alias l=\'ls -CF\'\n'
             b'alias la=\'ls -A\'\n'
             b'alias ll=\'ls -alF\'')
@@ -51,6 +57,8 @@ class TestBash(object):
 
     @pytest.mark.parametrize('before, after', [
         ('pwd', 'pwd'),
+        ('fuck', 'eval $(thefuck $(fc -ln -1))'),
+        ('awk', 'awk'),
         ('ll', 'ls -alF')])
     def test_from_shell(self, before, after, shell):
         assert shell.from_shell(before) == after
@@ -67,10 +75,16 @@ class TestBash(object):
         assert shell.and_('ls', 'cd') == 'ls && cd'
 
     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',
                                        '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')
 class TestFish(object):
@@ -78,9 +92,22 @@ class TestFish(object):
     def shell(self):
         return shells.Fish()
 
+    @pytest.fixture(autouse=True)
+    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')
+        return mock
+
     @pytest.mark.parametrize('before, after', [
         ('pwd', 'pwd'),
-        ('ll', 'll')])  # Fish has no aliases but functions
+        ('fuck', 'fish -ic "fuck"'),
+        ('find', 'find'),
+        ('funced', 'fish -ic "funced"'),
+        ('awk', 'awk'),
+        ('math "2 + 2"', r'fish -ic "math \"2 + 2\""'),
+        ('vim', 'vim'),
+        ('ll', 'fish -ic "ll"')])  # Fish has no aliases but functions
     def test_from_shell(self, before, after, shell):
         assert shell.from_shell(before) == after
 
@@ -98,7 +125,19 @@ class TestFish(object):
         assert shell.and_('foo', 'bar') == 'foo; and bar'
 
     def test_get_aliases(self, shell):
-        assert shell.get_aliases() == {}
+        assert shell.get_aliases() == {'fish_config': 'fish_config',
+                                       'fuck': 'fuck',
+                                       'funced': 'funced',
+                                       'funcsave': 'funcsave',
+                                       'grep': 'grep',
+                                       'history': 'history',
+                                       'll': 'll',
+                                       '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')
@@ -111,12 +150,14 @@ class TestZsh(object):
     def Popen(self, mocker):
         mock = mocker.patch('thefuck.shells.Popen')
         mock.return_value.stdout.read.return_value = (
+            b'fuck=\'eval $(thefuck $(fc -ln -1 | tail -n 1))\'\n'
             b'l=\'ls -CF\'\n'
             b'la=\'ls -A\'\n'
             b'll=\'ls -alF\'')
         return mock
 
     @pytest.mark.parametrize('before, after', [
+        ('fuck', 'eval $(thefuck $(fc -ln -1 | tail -n 1))'),
         ('pwd', 'pwd'),
         ('ll', 'ls -alF')])
     def test_from_shell(self, before, after, shell):
@@ -136,6 +177,13 @@ class TestZsh(object):
         assert shell.and_('ls', 'cd') == 'ls && cd'
 
     def test_get_aliases(self, shell):
-        assert shell.get_aliases() == {'l': 'ls -CF',
-                                       'la': 'ls -A',
-                                       'll': 'ls -alF'}
+        assert shell.get_aliases() == {
+            'fuck': 'eval $(thefuck $(fc -ln -1 | tail -n 1))',
+            '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()

tests/test_utils.py

@@ -1,6 +1,6 @@
 import pytest
 from mock import Mock
-from thefuck.utils import sudo_support, wrap_settings
+from thefuck.utils import sudo_support, wrap_settings, memoize
 from thefuck.types import Settings
 from tests.utils import Command
 
@@ -24,3 +24,11 @@ def test_sudo_support(return_value, command, called, result):
     fn = Mock(return_value=return_value, __name__='')
     assert sudo_support(fn)(Command(command), None) == result
     fn.assert_called_once_with(Command(called), None)
+
+
+def test_memoize():
+    fn = Mock(__name__='fn')
+    memoized = memoize(fn)
+    memoized()
+    memoized()
+    fn.assert_called_once_with()

thefuck/main.py

@@ -62,7 +62,7 @@ def wait_output(settings, popen):
         proc.wait(settings.wait_command)
         return True
     except TimeoutExpired:
-        for child in proc.get_children(recursive=True):
+        for child in proc.children(recursive=True):
             child.kill()
         proc.kill()
         return False

thefuck/rules/apt_get.py

@@ -1,11 +1,12 @@
 from thefuck import shells
+from thefuck.utils import sudo_support
 
 try:
     import CommandNotFound
 except ImportError:
     enabled_by_default = False
 
-
+@sudo_support
 def match(command, settings):
     if 'not found' in command.stderr:
         try:
@@ -17,7 +18,7 @@ def match(command, settings):
             # IndexError is thrown when no matching package is found
             return False
 
-
+@sudo_support
 def get_new_command(command, settings):
     c = CommandNotFound.CommandNotFound()
     pkgs = c.getPackages(command.script.split(" ")[0])

thefuck/rules/brew_upgrade.py

@@ -0,0 +1,14 @@
+# Appends --all to the brew upgrade command
+# 
+# Example:
+# > brew upgrade
+# Warning: brew upgrade with no arguments will change behaviour soon!
+# It currently upgrades all formula but this will soon change to require '--all'.
+#
+# 
+
+def match(command, settings):
+    return (command.script == 'brew upgrade')
+
+def get_new_command(command, settings):
+    return command.script + ' --all'

thefuck/rules/cargo.py

@@ -0,0 +1,6 @@
+def match(command, settings):
+    return command.script == 'cargo'
+
+
+def get_new_command(command, settings):
+    return 'cargo build'

thefuck/rules/cargo_no_command.py

@@ -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)

thefuck/rules/cd_correction.py

@@ -47,7 +47,7 @@ def get_new_command(command, settings):
             cwd = os.path.join(cwd, best_matches[0])
         else:
             return cd_mkdir.get_new_command(command, settings)
-    return "cd {0}".format(cwd)
+    return 'cd "{0}"'.format(cwd)
 
 
 enabled_by_default = True

thefuck/rules/git_branch_list.py

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

thefuck/rules/git_diff_staged.py

@@ -0,0 +1,6 @@
+def match(command, settings):
+    return command.script.startswith('git d')
+
+
+def get_new_command(command, settings):
+    return '{} --staged'.format(command.script)

thefuck/rules/git_pull.py

@@ -1,3 +1,6 @@
+from thefuck import shells
+
+
 def match(command, settings):
     return ('git' in command.script
             and 'pull' in command.script
@@ -9,4 +12,4 @@ def get_new_command(command, settings):
     branch = line.split(' ')[-1]
     set_upstream = line.replace('<remote>', 'origin')\
                        .replace('<branch>', branch)
-    return u'{} && {}'.format(set_upstream, command.script)
+    return shells.and_(set_upstream, command.script)

thefuck/rules/go_run.py

@@ -0,0 +1,14 @@
+# Appends .go when compiling go files
+# 
+# Example:
+# > go run foo
+# error: go run: no go files listed
+#
+# 
+
+def match(command, settings):
+    return (command.script.startswith ('go run ')
+            and not command.script.endswith('.go'))
+
+def get_new_command(command, settings):
+    return command.script + '.go'

thefuck/rules/java.py

@@ -0,0 +1,14 @@
+# Fixes common java command mistake
+#
+# Example:
+# > java foo.java
+# Error: Could not find or load main class foo.java
+
+
+def match(command, settings):
+    return (command.script.startswith('java ')
+            and command.script.endswith('.java'))
+
+
+def get_new_command(command, settings):
+    return command.script[:-5]

thefuck/rules/javac.py

@@ -0,0 +1,15 @@
+# Appends .java when compiling java files
+#
+# Example:
+# > javac foo
+# error: Class names, 'foo', are only accepted if annotation
+# processing is explicitly requested
+ 
+
+def match(command, settings):
+    return (command.script.startswith('javac ')
+            and not command.script.endswith('.java'))
+
+
+def get_new_command(command, settings):
+    return command.script + '.java'

thefuck/rules/ls_lah.py

@@ -1,5 +1,7 @@
 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):

thefuck/rules/man.py

@@ -1,5 +1,5 @@
 def match(command, settings):
-    return command.script.startswith('man')
+    return command.script.strip().startswith('man ')
 
 
 def get_new_command(command, settings):

thefuck/rules/mercurial.py

@@ -0,0 +1,34 @@
+import re
+
+from difflib import get_close_matches
+
+
+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)
+    matches = get_close_matches(script[1], possisiblities)
+    if matches:
+        script[1] = matches[0]
+    else:
+        script[1] = possisiblities[0]
+    return ' '.join(script)

thefuck/rules/no_command.py

@@ -2,7 +2,7 @@ from difflib import get_close_matches
 import os
 from pathlib import Path
 from thefuck.utils import sudo_support
-from thefuck.shells import get_aliases
+from thefuck.shells import thefuck_alias, get_aliases
 
 
 def _safe(fn, fallback):
@@ -13,10 +13,12 @@ def _safe(fn, fallback):
 
 
 def _get_all_callables():
+    tf_alias = thefuck_alias()
     return [exe.name
             for path in os.environ.get('PATH', '').split(':')
             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

thefuck/rules/open.py

@@ -0,0 +1,26 @@
+# Opens URL's in the default web browser
+#
+# Example:
+# > open github.com
+# The file ~/github.com does not exist.
+# Perhaps you meant 'http://github.com'?
+#
+
+
+def match(command, settings):
+    return (command.script.startswith(('open', 'xdg-open', 'gnome-open', 'kde-open'))
+            and (
+                '.com' in command.script
+                or '.net' in command.script
+                or '.org' in command.script
+                or '.ly' in command.script
+                or '.io' in command.script
+                or '.se' in command.script
+                or '.edu' in command.script
+                or '.info' in command.script
+                or '.me' in command.script
+                or 'www.' in command.script))
+
+
+def get_new_command(command, settings):
+    return 'open http://' + command.script[5:]

thefuck/rules/pacman.py

@@ -1,12 +1,21 @@
 import subprocess
 from thefuck.utils import DEVNULL, which
 from thefuck import shells
+from thefuck.utils import memoize
 
 
+@memoize
 def __get_pkgfile(command):
     try:
+        command = command.script
+
+        if command.startswith('sudo'):
+            command = command[5:]
+
+        command = command.split(" ")[0]
+
         return subprocess.check_output(
-            ['pkgfile', '-b', '-v', command.script.split(" ")[0]],
+            ['pkgfile', '-b', '-v', command],
             universal_newlines=True, stderr=DEVNULL
         ).split()
     except subprocess.CalledProcessError:

thefuck/rules/python_execute.py

@@ -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'

thefuck/rules/quotation_marks.py

@@ -0,0 +1,14 @@
+# Fixes careless " and ' usage
+# 
+# Example:
+# > git commit -m 'My Message"
+# 
+#
+# 
+
+def match(command, settings):
+    return ('\'' in command.script
+            and '\"' in command.script)
+
+def get_new_command(command, settings):
+    return command.script.replace ('\'', '\"')

thefuck/rules/sed_unterminated_s.py

@@ -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))

thefuck/rules/sudo.py

@@ -7,11 +7,13 @@ patterns = ['permission denied',
             'root privilege',
             'This command has to be run under the root user.',
             'This operation requires root.',
-            'You need to be root to perform this command.',
             'requested operation requires superuser privilege',
             'must be run as root',
             'must be superuser',
-            'Need to be root']
+            'must be root',
+            'need to be root',
+            'need root',
+            'only root can do that']
 
 
 def match(command, settings):

thefuck/rules/systemctl.py

@@ -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)

thefuck/rules/test.py.py

@@ -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

thefuck/rules/tmux.py

@@ -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))

thefuck/shells.py

@@ -8,10 +8,11 @@ from subprocess import Popen, PIPE
 from time import time
 import os
 from psutil import Process
-from .utils import DEVNULL
+from .utils import DEVNULL, memoize
 
 
 class Generic(object):
+
     def get_aliases(self):
         return {}
 
@@ -32,7 +33,7 @@ class Generic(object):
         return command_script
 
     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):
         return ''
@@ -48,12 +49,13 @@ class Generic(object):
                 history.write(self._get_history_line(command_script))
 
     def and_(self, *commands):
-        return ' && '.join(commands)
+        return u' && '.join(commands)
 
 
 class Bash(Generic):
     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):
         name, value = alias.replace('alias ', '', 1).split('=', 1)
@@ -61,8 +63,10 @@ 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)
+        proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL,
+                     shell=True)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -80,6 +84,7 @@ class Fish(Generic):
     def app_alias(self):
         return ("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"
@@ -91,6 +96,25 @@ class Fish(Generic):
                 "    end\n"
                 "end")
 
+    @memoize
+    def get_aliases(self):
+        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}
+
+    def _expand_aliases(self, command_script):
+        aliases = self.get_aliases()
+        binary = command_script.split(' ')[0]
+        if binary in aliases:
+            return u'fish -ic "{}"'.format(command_script.replace('"', r'\"'))
+        else:
+            return command_script
+
+    def from_shell(self, command_script):
+        """Prepares command before running in app."""
+        return self._expand_aliases(command_script)
+
     def _get_history_file_name(self):
         return os.path.expanduser('~/.config/fish/fish_history')
 
@@ -98,12 +122,14 @@ class Fish(Generic):
         return u'- cmd: {}\n   when: {}\n'.format(command_script, int(time()))
 
     def and_(self, *commands):
-        return '; and '.join(commands)
+        return u'; and '.join(commands)
 
 
 class Zsh(Generic):
     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):
         name, value = alias.split('=', 1)
@@ -111,8 +137,10 @@ 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)
+        proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL,
+                     shell=True)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -128,14 +156,16 @@ class Zsh(Generic):
 
 class Tcsh(Generic):
     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):
         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)
+        proc = Popen('tcsh -ic alias', stdout=PIPE, stderr=DEVNULL,
+                     shell=True)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -177,6 +207,10 @@ def app_alias():
     print(_get_shell().app_alias())
 
 
+def thefuck_alias():
+    return os.environ.get('TF_ALIAS', 'fuck')
+
+
 def put_to_history(command):
     return _get_shell().put_to_history(command)
 

thefuck/utils.py

@@ -1,11 +1,19 @@
 from functools import wraps
 import os
+import pickle
 import six
 from .types import Command
 
 
 DEVNULL = open(os.devnull, 'w')
 
+if six.PY2:
+    import pipes
+    quote = pipes.quote
+else:
+    import shlex
+    quote = shlex.quote
+
 
 def which(program):
     """Returns `program` path or `None`."""
@@ -62,3 +70,18 @@ def sudo_support(fn):
         else:
             return result
     return wrapper
+
+
+def memoize(fn):
+    """Caches previous calls to the function."""
+    memo = {}
+
+    @wraps(fn)
+    def wrapper(*args, **kwargs):
+        key = pickle.dumps((args, kwargs))
+        if key not in memo:
+            memo[key] = fn(*args, **kwargs)
+
+        return memo[key]
+
+    return wrapper