Bump to 1.35

Add thefuck-alias for outputting the alias command.

README.md

@@ -1,5 +1,7 @@
 # The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck)
 
+**Aliases changed in 1.34.**
+
 Magnificent app which corrects your previous console command,
 inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320).
@@ -88,8 +90,8 @@ Reading package lists... Done
 
 ## Requirements
 
+- python (2.7+ or 3.3+)
 - pip
-- python
 - python-dev
 
 ## Installation
@@ -100,46 +102,30 @@ Install `The Fuck` with `pip`:
 sudo pip install thefuck
 ```
 
-If it fails try to use `easy_install`:
+[Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
+
+And add to `.bashrc` or `.bash_profile`(for OSX):
 
 ```bash
-sudo easy_install thefuck
-```
-
-Or using an OS package manager (currently supported in OSX via [brew](http://brew.sh)):
-
-```bash
-brew install thefuck
-```
-
-And add to `.bashrc` or `.zshrc` or `.bash_profile`(for OSX):
-
-```bash
-alias fuck='eval $(thefuck $(fc -ln -1))'
+alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
 # You can use whatever you want as an alias, like for Mondays:
 alias FUCK='fuck'
 ```
 
-Or in `config.fish`:
+Or in your `.zshrc`:
 
-```fish
-function fuck
-    eval (thefuck $history[1])
-end
+```bash
+alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
 ```
 
-Or in your Powershell `$PROFILE` on Windows:
+Alternatively, you can redirect the output of `thefuck-alias`:
 
-```powershell
-function fuck {
-    $fuck = $(thefuck (get-history -count 1).commandline)
-    if($fuck.startswith("echo")) {
-        $fuck.substring(5)
-    }
-    else { iex "$fuck" }
-}
+```bash
+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.
 
 
@@ -171,10 +157,14 @@ using matched rule and run it. Rules enabled by default:
 * `rm_dir` – adds `-rf` when you trying to remove directory;
 * `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.
+* `switch_layout` – switches command from your local layout to en;
+* `apt_get` – installs app from apt if it not installed;
+* `brew_install` – fixes formula name for `brew install`;
+* `composer_not_command` – fixes composer command name.
 
 Bundled, but not enabled by default:
 
+* `ls_lah` – adds -lah to ls;
 * `rm_root` – adds `--no-preserve-root` to `rm -rf /` command.
 
 ## Creating your own rules
@@ -183,6 +173,9 @@ For adding your own rule you should create `your-rule-name.py`
 in `~/.thefuck/rules`. Rule should contain two functions:
 `match(command: Command, settings: Settings) -> bool`
 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`
 
 `Command` has three attributes: `script`, `stdout` and `stderr`.
 
@@ -198,6 +191,12 @@ def match(command, settings):
 
 def get_new_command(command, settings):
     return 'sudo {}'.format(command.script)
+    
+# Optional:
+enabled_by_default = True
+
+def side_effect(command, settings):
+    subprocess.call('chmod 777 .', shell=True)
 ```
 
 [More examples of rules](https://github.com/nvbn/thefuck/tree/master/thefuck/rules),
@@ -212,6 +211,15 @@ The Fuck has a few settings parameters, they can be changed in `~/.thefuck/setti
 * `wait_command` – max amount of time in seconds for getting previous command output;
 * `no_colors` – disable colored output.
 
+Example of `settings.py`:
+
+```python
+rules = ['sudo', 'no_command']
+require_confirmation = True
+wait_command = 10
+no_colors = False
+```
+
 Or via environment variables:
 
 * `THEFUCK_RULES` – list of enabled rules, like `DEFAULT_RULES:rm_root` or `sudo:no_command`;
@@ -219,6 +227,15 @@ 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`.
 
+For example:
+
+```bash
+export THEFUCK_RULES='sudo:no_command'
+export THEFUCK_REQUIRE_CONFIRMATION='true'
+export THEFUCK_WAIT_COMMAND=10
+export THEFUCK_NO_COLORS='false'
+```
+
 ## Developing
 
 Install `The Fuck` for development:

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '1.30'
+VERSION = '1.35'
 
 
 setup(name='thefuck',
@@ -17,4 +17,4 @@ setup(name='thefuck',
       zip_safe=False,
       install_requires=['pathlib', 'psutil', 'colorama', 'six'],
       entry_points={'console_scripts': [
-          'thefuck = thefuck.main:main']})
+          'thefuck = thefuck.main:main', 'thefuck-alias = thefuck.main:alias']})

tests/rules/test_brew_install.py

@@ -1,7 +1,7 @@
 import pytest
-from thefuck.types import Command
 from thefuck.rules.brew_install import match, get_new_command
 from thefuck.rules.brew_install import brew_formulas
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -29,21 +29,21 @@ def _is_not_okay_to_test():
                     reason='No need to run if there\'s no formula')
 def test_match(brew_no_available_formula, brew_already_installed,
                brew_install_no_argument):
-    assert match(Command('brew install elsticsearch', '',
-                         brew_no_available_formula), None)
-    assert not match(Command('brew install git', '',
-                             brew_already_installed), None)
-    assert not match(Command('brew install', '', brew_install_no_argument),
+    assert match(Command('brew install elsticsearch',
+                         stderr=brew_no_available_formula), None)
+    assert not match(Command('brew install git',
+                             stderr=brew_already_installed), None)
+    assert not match(Command('brew install', stderr=brew_install_no_argument),
                      None)
 
 
 @pytest.mark.skipif(_is_not_okay_to_test(),
                     reason='No need to run if there\'s no formula')
 def test_get_new_command(brew_no_available_formula):
-    assert get_new_command(Command('brew install elsticsearch', '',
-                                   brew_no_available_formula), None)\
+    assert get_new_command(Command('brew install elsticsearch',
+                                   stderr=brew_no_available_formula), None)\
         == 'brew install elasticsearch'
 
-    assert get_new_command(Command('brew install aa', '',
-                                   brew_no_available_formula),
+    assert get_new_command(Command('brew install aa',
+                                   stderr=brew_no_available_formula),
                            None) != 'brew install aha'

tests/rules/test_brew_unknown_command.py

@@ -1,7 +1,7 @@
 import pytest
-from thefuck.types import Command
 from thefuck.rules.brew_unknown_command import match, get_new_command
 from thefuck.rules.brew_unknown_command import brew_commands
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -10,19 +10,19 @@ def brew_unknown_cmd():
 
 
 @pytest.fixture
-def brew_unknown_cmd_instaa():
+def brew_unknown_cmd2():
     return '''Error: Unknown command: instaa'''
 
 
 def test_match(brew_unknown_cmd):
-    assert match(Command('brew inst', '', brew_unknown_cmd), None)
+    assert match(Command('brew inst', stderr=brew_unknown_cmd), None)
     for command in brew_commands:
-        assert not match(Command('brew ' + command, '', ''), None)
+        assert not match(Command('brew ' + command), None)
 
 
-def test_get_new_command(brew_unknown_cmd, brew_unknown_cmd_instaa):
-    assert get_new_command(Command('brew inst', '', brew_unknown_cmd), None)\
-        == 'brew list'
+def test_get_new_command(brew_unknown_cmd, brew_unknown_cmd2):
+    assert get_new_command(Command('brew inst', stderr=brew_unknown_cmd),
+                           None) == 'brew list'
 
-    assert get_new_command(Command('brew instaa', '', brew_unknown_cmd_instaa),
+    assert get_new_command(Command('brew instaa', stderr=brew_unknown_cmd2),
                            None) == 'brew install'

tests/rules/test_cd_mkdir.py

@@ -1,19 +1,25 @@
-from mock import Mock
+import pytest
 from thefuck.rules.cd_mkdir import match, get_new_command
+from tests.utils import Command
 
 
-def test_match():
-    assert match(Mock(script='cd foo', stderr='cd: foo: No such file or directory'),
-                 None)
-    assert match(Mock(script='cd foo/bar/baz', stderr='cd: foo: No such file or directory'),
-                 None)
-    assert match(Mock(script='cd foo/bar/baz', stderr='cd: can\'t cd to foo/bar/baz'),
-                 None)
-    assert not match(Mock(script='cd foo',
-                          stderr=''), None)
-    assert not match(Mock(script='', stderr=''), None)
+@pytest.mark.parametrize('command', [
+    Command(script='cd foo', stderr='cd: foo: No such file or directory'),
+    Command(script='cd foo/bar/baz',
+            stderr='cd: foo: No such file or directory'),
+    Command(script='cd foo/bar/baz', stderr='cd: can\'t cd to foo/bar/baz')])
+def test_match(command):
+    assert match(command, None)
 
 
-def test_get_new_command():
-    assert get_new_command(Mock(script='cd foo'), None) == 'mkdir -p foo && cd foo'
-    assert get_new_command(Mock(script='cd foo/bar/baz'), None) == 'mkdir -p foo/bar/baz && cd foo/bar/baz'
+@pytest.mark.parametrize('command', [
+    Command(script='cd foo', stderr=''), Command()])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('cd foo'), 'mkdir -p foo && cd foo'),
+    (Command('cd foo/bar/baz'), 'mkdir -p foo/bar/baz && cd foo/bar/baz')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_cd_parent.py

@@ -1,12 +1,12 @@
-from thefuck.types import Command
 from thefuck.rules.cd_parent import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Command('cd..', '', 'cd..: command not found'), None)
-    assert not match(Command('', '', ''), None)
+    assert match(Command('cd..', stderr='cd..: command not found'), None)
+    assert not match(Command(), None)
 
 
 def test_get_new_command():
     assert get_new_command(
-        Command('cd..', '', ''), None) == 'cd ..'
+        Command('cd..'), None) == 'cd ..'

tests/rules/test_composer_not_command.py

@@ -1,6 +1,6 @@
 import pytest
-from thefuck.types import Command
 from thefuck.rules.composer_not_command import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -36,13 +36,18 @@ def composer_not_command_one_of_this():
 
 
 def test_match(composer_not_command, composer_not_command_one_of_this):
-    assert match(Command('composer udpate', '', composer_not_command), None)
-    assert match(Command('composer pdate', '', composer_not_command_one_of_this), None)
-    assert not match(Command('ls update', '', composer_not_command), None)
+    assert match(Command('composer udpate',
+                         stderr=composer_not_command), None)
+    assert match(Command('composer pdate',
+                         stderr=composer_not_command_one_of_this), None)
+    assert not match(Command('ls update', stderr=composer_not_command),
+                     None)
 
 
 def test_get_new_command(composer_not_command, composer_not_command_one_of_this):
-    assert get_new_command(Command('composer udpate', '', composer_not_command), None) \
+    assert get_new_command(Command('composer udpate',
+                                   stderr=composer_not_command), None) \
            == 'composer update'
     assert get_new_command(
-        Command('composer pdate', '', composer_not_command_one_of_this), None) == 'composer selfupdate'
+        Command('composer pdate', stderr=composer_not_command_one_of_this),
+        None) == 'composer selfupdate'

tests/rules/test_fix_alt_space.py

@@ -1,18 +1,22 @@
 # -*- encoding: utf-8 -*-
 
-
-from thefuck.types import Command
 from thefuck.rules.fix_alt_space import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    """ The character before 'grep' is Alt+Space, which happens frequently on the Mac when typing
-        the pipe character (Alt+7), and holding the Alt key pressed for longer than necessary. """
-    assert match(Command(u'ps -ef | grep foo', '', u'-bash:  grep: command not found'), None)
-    assert not match(Command('ps -ef | grep foo', '', ''), None)
-    assert not match(Command('', '', ''), None)
+    """The character before 'grep' is Alt+Space, which happens frequently
+    on the Mac when typing the pipe character (Alt+7), and holding the Alt
+    key pressed for longer than necessary.
+
+    """
+    assert match(Command(u'ps -ef | grep foo',
+                         stderr=u'-bash:  grep: command not found'), None)
+    assert not match(Command('ps -ef | grep foo'), None)
+    assert not match(Command(), None)
 
 
 def test_get_new_command():
     """ Replace the Alt+Space character by a simple space """
-    assert get_new_command(Command(u'ps -ef | grep foo', '', ''), None) == 'ps -ef | grep foo'
+    assert get_new_command(Command(u'ps -ef | grep foo'), None)\
+           == 'ps -ef | grep foo'

tests/rules/test_git_not_command.py

@@ -1,6 +1,6 @@
 import pytest
-from thefuck.types import Command
 from thefuck.rules.git_not_command import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -31,14 +31,14 @@ def git_command():
 
 
 def test_match(git_not_command, git_command, git_not_command_one_of_this):
-    assert match(Command('git brnch', '', git_not_command), None)
-    assert match(Command('git st', '', git_not_command_one_of_this), None)
-    assert not match(Command('ls brnch', '', git_not_command), None)
-    assert not match(Command('git branch', '', git_command), None)
+    assert match(Command('git brnch', stderr=git_not_command), None)
+    assert match(Command('git st', stderr=git_not_command_one_of_this), None)
+    assert not match(Command('ls brnch', stderr=git_not_command), None)
+    assert not match(Command('git branch', stderr=git_command), None)
 
 
 def test_get_new_command(git_not_command, git_not_command_one_of_this):
-    assert get_new_command(Command('git brnch', '', git_not_command), None)\
+    assert get_new_command(Command('git brnch', stderr=git_not_command), None)\
         == 'git branch'
-    assert get_new_command(
-        Command('git st', '', git_not_command_one_of_this), None) == 'git status'
+    assert get_new_command(Command('git st', stderr=git_not_command_one_of_this),
+                           None) == 'git status'

tests/rules/test_git_push.py

@@ -1,6 +1,6 @@
 import pytest
-from thefuck.types import Command
 from thefuck.rules.git_push import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -14,11 +14,11 @@ To push the current branch and set the remote as upstream, use
 
 
 def test_match(stderr):
-    assert match(Command('git push master', '', stderr), None)
-    assert not match(Command('git push master', '', ''), None)
-    assert not match(Command('ls', '', stderr), None)
+    assert match(Command('git push master', stderr=stderr), None)
+    assert not match(Command('git push master'), None)
+    assert not match(Command('ls', stderr=stderr), None)
 
 
 def test_get_new_command(stderr):
-    assert get_new_command(Command('', '', stderr), None)\
+    assert get_new_command(Command(stderr=stderr), None)\
         == "git push --set-upstream origin master"

tests/rules/test_ls_lah.py

@@ -0,0 +1,13 @@
+from mock import patch, Mock
+from thefuck.rules.ls_lah import match, get_new_command
+
+
+def test_match():
+    assert match(Mock(script='ls file.py'), None)
+    assert match(Mock(script='ls /opt'), None)
+    assert not match(Mock(script='ls -lah /opt'), None)
+
+
+def test_get_new_command():
+    assert get_new_command(Mock(script='ls file.py'), None) == 'ls -lah file.py'
+    assert get_new_command(Mock(script='ls'), None) == 'ls -lah'

tests/rules/test_mkdir_p.py

@@ -1,13 +1,22 @@
-from thefuck.types import Command
+import pytest
 from thefuck.rules.mkdir_p import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Command('mkdir foo/bar/baz', '', 'mkdir: foo/bar: No such file or directory'), None)
-    assert not match(Command('mkdir foo/bar/baz', '', ''), None)
-    assert not match(Command('mkdir foo/bar/baz', '', 'foo bar baz'), None)
-    assert not match(Command('', '', ''), None)
+    assert match(Command('mkdir foo/bar/baz',
+                         stderr='mkdir: foo/bar: No such file or directory'),
+                 None)
+
+
+@pytest.mark.parametrize('command', [
+    Command('mkdir foo/bar/baz'),
+    Command('mkdir foo/bar/baz', stderr='foo bar baz'),
+    Command()])
+def test_not_match(command):
+    assert not match(command, None)
 
 
 def test_get_new_command():
-    assert get_new_command(Command('mkdir foo/bar/baz', '', ''), None) == 'mkdir -p foo/bar/baz'
+    assert get_new_command(Command('mkdir foo/bar/baz'), None)\
+           == 'mkdir -p foo/bar/baz'

tests/rules/test_pip_unknown_command.py

@@ -1,6 +1,6 @@
 import pytest
-from thefuck.types import Command
 from thefuck.rules.pip_unknown_command import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -14,11 +14,12 @@ def pip_unknown_cmd_without_recommend():
 
 
 def test_match(pip_unknown_cmd, pip_unknown_cmd_without_recommend):
-    assert match(Command('pip instatl', '', pip_unknown_cmd), None)
-    assert not match(Command('pip i', '', pip_unknown_cmd_without_recommend),
+    assert match(Command('pip instatl', stderr=pip_unknown_cmd), None)
+    assert not match(Command('pip i',
+                             stderr=pip_unknown_cmd_without_recommend),
                      None)
 
 
 def test_get_new_command(pip_unknown_cmd):
-    assert get_new_command(Command('pip instatl', '', pip_unknown_cmd), None)\
-        == 'pip install'
+    assert get_new_command(Command('pip instatl', stderr=pip_unknown_cmd),
+                           None) == 'pip install'

tests/rules/test_python_command.py

@@ -1,11 +1,12 @@
-from thefuck.types import Command
 from thefuck.rules.python_command import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Command('temp.py', '', 'Permission denied'), None)
-    assert not match(Command('', '', ''), None)
+    assert match(Command('temp.py', stderr='Permission denied'), None)
+    assert not match(Command(), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Command('./test_sudo.py', '', ''), None) == 'python ./test_sudo.py'
+    assert get_new_command(Command('./test_sudo.py'), None)\
+           == 'python ./test_sudo.py'

tests/rules/test_rm_dir.py

@@ -1,13 +1,20 @@
-from thefuck.types import Command
+import pytest
 from thefuck.rules.rm_dir import match, get_new_command
+from tests.utils import Command
 
 
-def test_match():
-    assert match(Command('rm foo', '', 'rm: foo: is a directory'), None)
-    assert match(Command('rm foo', '', 'rm: foo: Is a directory'), None)
-    assert not match(Command('rm foo', '', ''), None)
-    assert not match(Command('rm foo', '', 'foo bar baz'), None)
-    assert not match(Command('', '', ''), None)
+@pytest.mark.parametrize('command', [
+    Command('rm foo', stderr='rm: foo: is a directory'),
+    Command('rm foo', stderr='rm: foo: Is a directory')])
+def test_match(command):
+    assert match(command, None)
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command('rm foo'), Command('rm foo'), Command()])
+def test_not_match(command):
+    assert not match(command, None)
 
 
 def test_get_new_command():

tests/rules/test_rm_root.py

@@ -1,18 +1,21 @@
-from mock import Mock
+import pytest
 from thefuck.rules.rm_root import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Mock(script='rm -rf /',
-                      stderr='add --no-preserve-root'), None)
-    assert not match(Mock(script='ls',
-                          stderr='add --no-preserve-root'), None)
-    assert not match(Mock(script='rm --no-preserve-root /',
-                          stderr='add --no-preserve-root'), None)
-    assert not match(Mock(script='rm -rf /',
-                          stderr=''), None)
+    assert match(Command(script='rm -rf /',
+                         stderr='add --no-preserve-root'), None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='ls', stderr='add --no-preserve-root'),
+    Command(script='rm --no-preserve-root /', stderr='add --no-preserve-root'),
+    Command(script='rm -rf /', stderr='')])
+def test_not_match(command):
+    assert not match(command, None)
 
 
 def test_get_new_command():
-    assert get_new_command(Mock(script='rm -rf /'), None) \
-        == 'rm -rf / --no-preserve-root'
+    assert get_new_command(Command(script='rm -rf /'), None) \
+           == 'rm -rf / --no-preserve-root'

tests/rules/test_sl_ls.py

@@ -1,12 +1,12 @@
 
-from thefuck.types import Command
 from thefuck.rules.sl_ls import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Command('sl', '', ''), None)
-    assert not match(Command('ls', '', ''), None)
+    assert match(Command('sl'), None)
+    assert not match(Command('ls'), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Command('sl', '', ''), None) == 'ls'
+    assert get_new_command(Command('sl'), None) == 'ls'

tests/rules/test_ssh_known_host.py

@@ -1,8 +1,9 @@
 import os
 import pytest
 from mock import Mock
-from thefuck.types import Command
-from thefuck.rules.ssh_known_hosts import match, get_new_command, remove_offending_keys
+from thefuck.rules.ssh_known_hosts import match, get_new_command,\
+    side_effect
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -43,27 +44,23 @@ Host key verification failed.""".format(path, '98.765.432.321')
 
 def test_match(ssh_error):
     errormsg, _, _, _ = ssh_error
-    assert match(Command('ssh', '', errormsg), None)
-    assert match(Command('ssh', '', errormsg), None)
-    assert match(Command('scp something something', '', errormsg), None)
-    assert match(Command('scp something something', '', errormsg), None)
-    assert not match(Command('', '', errormsg), None)
-    assert not match(Command('notssh', '', errormsg), None)
-    assert not match(Command('ssh', '', ''), None)
+    assert match(Command('ssh', stderr=errormsg), None)
+    assert match(Command('ssh', stderr=errormsg), None)
+    assert match(Command('scp something something', stderr=errormsg), None)
+    assert match(Command('scp something something', stderr=errormsg), None)
+    assert not match(Command(stderr=errormsg), None)
+    assert not match(Command('notssh', stderr=errormsg), None)
+    assert not match(Command('ssh'), None)
 
 
-def test_remove_offending_keys(ssh_error):
+def test_side_effect(ssh_error):
     errormsg, path, reset, known_hosts = ssh_error
-    command = Command('ssh user@host', '', errormsg)
-    remove_offending_keys(command, None)
+    command = Command('ssh user@host', stderr=errormsg)
+    side_effect(command, None)
     expected = ['123.234.567.890 asdjkasjdakjsd\n', '111.222.333.444 qwepoiwqepoiss\n']
     assert known_hosts(path) == expected
 
 
 def test_get_new_command(ssh_error, monkeypatch):
     errormsg, _, _, _ = ssh_error
-
-    method = Mock()
-    monkeypatch.setattr('thefuck.rules.ssh_known_hosts.remove_offending_keys', method)
-    assert get_new_command(Command('ssh user@host', '', errormsg), None) == 'ssh user@host'
-    assert method.call_count
+    assert get_new_command(Command('ssh user@host', stderr=errormsg), None) == 'ssh user@host'

tests/rules/test_sudo.py

@@ -1,13 +1,21 @@
-from thefuck.types import Command
+import pytest
 from thefuck.rules.sudo import match, get_new_command
+from tests.utils import Command
 
 
-def test_match():
-    assert match(Command('', '', 'Permission denied'), None)
-    assert match(Command('', '', 'permission denied'), None)
-    assert match(Command('', '', "npm ERR! Error: EACCES, unlink"), None)
-    assert not match(Command('', '', ''), None)
+@pytest.mark.parametrize('stderr, stdout', [
+    ('Permission denied', ''),
+    ('permission denied', ''),
+    ("npm ERR! Error: EACCES, unlink", ''),
+    ('requested operation requires superuser privilege', ''),
+    ('', "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)
+
+
+def test_not_match():
+    assert not match(Command(), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Command('ls', '', ''), None) == 'sudo ls'
+    assert get_new_command(Command('ls'), None) == 'sudo ls'

tests/rules/test_switch_lang.py

@@ -1,25 +1,27 @@
 # -*- encoding: utf-8 -*-
 
-from mock import Mock
+import pytest
 from thefuck.rules import switch_lang
+from tests.utils import Command
 
 
-def test_match():
-    assert switch_lang.match(Mock(stderr='command not found: фзе-пуе',
-                                  script=u'фзе-пуе'), None)
-    assert switch_lang.match(Mock(stderr='command not found: λσ',
-                                  script=u'λσ'), None)
-
-    assert not switch_lang.match(Mock(stderr='command not found: pat-get',
-                                      script=u'pat-get'), None)
-    assert not switch_lang.match(Mock(stderr='command not found: ls',
-                                      script=u'ls'), None)
-    assert not switch_lang.match(Mock(stderr='some info',
-                                      script=u'фзе-пуе'), None)
+@pytest.mark.parametrize('command', [
+    Command(stderr='command not found: фзе-пуе', script=u'фзе-пуе'),
+    Command(stderr='command not found: λσ', script=u'λσ')])
+def test_match(command):
+    assert switch_lang.match(command, None)
 
 
-def test_get_new_command():
-    assert switch_lang.get_new_command(
-        Mock(script=u'фзе-пуе штыефдд мшь'), None) == 'apt-get install vim'
-    assert switch_lang.get_new_command(
-        Mock(script=u'λσ -λα'), None) == 'ls -la'
+@pytest.mark.parametrize('command', [
+    Command(stderr='command not found: pat-get', script=u'pat-get'),
+    Command(stderr='command not found: ls', script=u'ls'),
+    Command(stderr='some info', script=u'фзе-пуе')])
+def test_not_match(command):
+    assert not switch_lang.match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(u'фзе-пуе штыефдд мшь'), 'apt-get install vim'),
+    (Command(u'λσ -λα'), 'ls -la')])
+def test_get_new_command(command, new_command):
+    assert switch_lang.get_new_command(command, None) == new_command

tests/test_conf.py

@@ -1,89 +1,100 @@
+import pytest
 import six
-from mock import patch, Mock
-from thefuck.types import Rule
+from mock import Mock
 from thefuck import conf
+from tests.utils import Rule
 
 
-def test_default():
-    assert Rule('test', None, None, True) in conf.DEFAULT_RULES
-    assert Rule('test', None, None, False) not in conf.DEFAULT_RULES
-    assert Rule('test', None, None, False) in (conf.DEFAULT_RULES + ['test'])
+@pytest.mark.parametrize('enabled, rules, result', [
+    (True, conf.DEFAULT_RULES, True),
+    (False, conf.DEFAULT_RULES, False),
+    (False, conf.DEFAULT_RULES + ['test'], True)])
+def test_default(enabled, rules, result):
+    assert (Rule('test', enabled_by_default=enabled) in rules) == result
 
 
-def test_settings_defaults():
-    with patch('thefuck.conf.load_source', return_value=object()), \
-         patch('thefuck.conf.os.environ', new_callable=lambda: {}):
-        for key, val in conf.DEFAULT_SETTINGS.items():
-            assert getattr(conf.get_settings(Mock()), key) == val
+@pytest.fixture
+def load_source(monkeypatch):
+    mock = Mock()
+    monkeypatch.setattr('thefuck.conf.load_source', mock)
+    return mock
 
 
-def test_settings_from_file():
-    with patch('thefuck.conf.load_source', return_value=Mock(rules=['test'],
-                                                             wait_command=10,
-                                                             require_confirmation=True,
-                                                             no_colors=True)), \
-         patch('thefuck.conf.os.environ', new_callable=lambda: {}):
+@pytest.fixture
+def environ(monkeypatch):
+    data = {}
+    monkeypatch.setattr('thefuck.conf.os.environ', data)
+    return data
+
+
+@pytest.mark.usefixture('environ')
+def test_settings_defaults(load_source):
+    load_source.return_value = object()
+    for key, val in conf.DEFAULT_SETTINGS.items():
+        assert getattr(conf.get_settings(Mock()), key) == val
+
+
+@pytest.mark.usefixture('environ')
+class TestSettingsFromFile(object):
+    def test_from_file(self, load_source):
+        load_source.return_value = Mock(rules=['test'],
+                                        wait_command=10,
+                                        require_confirmation=True,
+                                        no_colors=True)
         settings = conf.get_settings(Mock())
         assert settings.rules == ['test']
         assert settings.wait_command == 10
         assert settings.require_confirmation is True
         assert settings.no_colors is True
 
-
-def test_settings_from_file_with_DEFAULT():
-    with patch('thefuck.conf.load_source', return_value=Mock(rules=conf.DEFAULT_RULES + ['test'],
-                                                             wait_command=10,
-                                                             require_confirmation=True,
-                                                             no_colors=True)), \
-         patch('thefuck.conf.os.environ', new_callable=lambda: {}):
+    def test_from_file_with_DEFAULT(self, load_source):
+        load_source.return_value = Mock(rules=conf.DEFAULT_RULES + ['test'],
+                                        wait_command=10,
+                                        require_confirmation=True,
+                                        no_colors=True)
         settings = conf.get_settings(Mock())
         assert settings.rules == conf.DEFAULT_RULES + ['test']
 
 
-def test_settings_from_env():
-    with patch('thefuck.conf.load_source', return_value=Mock(rules=['test'],
-                                                             wait_command=10)), \
-         patch('thefuck.conf.os.environ',
-               new_callable=lambda: {'THEFUCK_RULES': 'bash:lisp',
-                                     'THEFUCK_WAIT_COMMAND': '55',
-                                     'THEFUCK_REQUIRE_CONFIRMATION': 'true',
-                                     'THEFUCK_NO_COLORS': 'false'}):
+@pytest.mark.usefixture('load_source')
+class TestSettingsFromEnv(object):
+    def test_from_env(self, environ):
+        environ.update({'THEFUCK_RULES': 'bash:lisp',
+                        'THEFUCK_WAIT_COMMAND': '55',
+                        'THEFUCK_REQUIRE_CONFIRMATION': 'true',
+                        'THEFUCK_NO_COLORS': 'false'})
         settings = conf.get_settings(Mock())
         assert settings.rules == ['bash', 'lisp']
         assert settings.wait_command == 55
         assert settings.require_confirmation is True
         assert settings.no_colors is False
 
-
-def test_settings_from_env_with_DEFAULT():
-    with patch('thefuck.conf.load_source', return_value=Mock()), \
-         patch('thefuck.conf.os.environ', new_callable=lambda: {'THEFUCK_RULES': 'DEFAULT_RULES:bash:lisp'}):
+    def test_from_env_with_DEFAULT(self, environ):
+        environ.update({'THEFUCK_RULES': 'DEFAULT_RULES:bash:lisp'})
         settings = conf.get_settings(Mock())
         assert settings.rules == conf.DEFAULT_RULES + ['bash', 'lisp']
 
 
-def test_initialize_settings_file_ignore_if_exists():
-    settings_path_mock = Mock(is_file=Mock(return_value=True), open=Mock())
-    user_dir_mock = Mock(joinpath=Mock(return_value=settings_path_mock))
-    conf.initialize_settings_file(user_dir_mock)
-    assert settings_path_mock.is_file.call_count == 1
-    assert not settings_path_mock.open.called
+class TestInitializeSettingsFile(object):
+    def test_ignore_if_exists(self):
+        settings_path_mock = Mock(is_file=Mock(return_value=True), open=Mock())
+        user_dir_mock = Mock(joinpath=Mock(return_value=settings_path_mock))
+        conf.initialize_settings_file(user_dir_mock)
+        assert settings_path_mock.is_file.call_count == 1
+        assert not settings_path_mock.open.called
 
-
-def test_initialize_settings_file_create_if_exists_not():
-    settings_file = six.StringIO()
-    settings_path_mock = Mock(
-        is_file=Mock(return_value=False),
-        open=Mock(return_value=Mock(
-            __exit__=lambda *args: None, __enter__=lambda *args: settings_file
-        )),
-    )
-    user_dir_mock = Mock(joinpath=Mock(return_value=settings_path_mock))
-    conf.initialize_settings_file(user_dir_mock)
-    settings_file_contents = settings_file.getvalue()
-    assert settings_path_mock.is_file.call_count == 1
-    assert settings_path_mock.open.call_count == 1
-    assert conf.SETTINGS_HEADER in settings_file_contents
-    for setting in conf.DEFAULT_SETTINGS.items():
-        assert '# {} = {}\n'.format(*setting) in settings_file_contents
-    settings_file.close()
+    def test_create_if_doesnt_exists(self):
+        settings_file = six.StringIO()
+        settings_path_mock = Mock(
+            is_file=Mock(return_value=False),
+            open=Mock(return_value=Mock(
+                __exit__=lambda *args: None, __enter__=lambda *args: settings_file)))
+        user_dir_mock = Mock(joinpath=Mock(return_value=settings_path_mock))
+        conf.initialize_settings_file(user_dir_mock)
+        settings_file_contents = settings_file.getvalue()
+        assert settings_path_mock.is_file.call_count == 1
+        assert settings_path_mock.open.call_count == 1
+        assert conf.SETTINGS_HEADER in settings_file_contents
+        for setting in conf.DEFAULT_SETTINGS.items():
+            assert '# {} = {}\n'.format(*setting) in settings_file_contents
+        settings_file.close()

tests/test_main.py

@@ -1,95 +1,155 @@
+import pytest
 from subprocess import PIPE
 from pathlib import PosixPath, Path
-from mock import patch, Mock
+from mock import Mock
 from thefuck import main, conf, types
+from tests.utils import Rule, Command
 
 
-def test_load_rule():
+def test_load_rule(monkeypatch):
     match = object()
     get_new_command = object()
-    with patch('thefuck.main.load_source',
-               return_value=Mock(
-                   match=match,
-                   get_new_command=get_new_command,
-                   enabled_by_default=True)) as load_source:
-        assert main.load_rule(Path('/rules/bash.py')) \
-               == types.Rule('bash', match, get_new_command, True)
-        load_source.assert_called_once_with('bash', '/rules/bash.py')
+    load_source = Mock()
+    load_source.return_value = Mock(match=match,
+                                    get_new_command=get_new_command,
+                                    enabled_by_default=True)
+    monkeypatch.setattr('thefuck.main.load_source', load_source)
+    assert main.load_rule(Path('/rules/bash.py')) \
+           == Rule('bash', match, get_new_command)
+    load_source.assert_called_once_with('bash', '/rules/bash.py')
 
 
-def test_get_rules():
-    with patch('thefuck.main.Path.glob') as glob, \
-            patch('thefuck.main.load_source',
-                  lambda x, _: Mock(match=x, get_new_command=x,
-                                    enabled_by_default=True)):
-        glob.return_value = [PosixPath('bash.py'), PosixPath('lisp.py')]
-        assert list(main.get_rules(
-            Path('~'),
-            Mock(rules=conf.DEFAULT_RULES))) \
-               == [types.Rule('bash', 'bash', 'bash', True),
-                   types.Rule('lisp', 'lisp', 'lisp', True),
-                   types.Rule('bash', 'bash', 'bash', True),
-                   types.Rule('lisp', 'lisp', 'lisp', True)]
-        assert list(main.get_rules(
-            Path('~'),
-            Mock(rules=types.RulesNamesList(['bash'])))) \
-               == [types.Rule('bash', 'bash', 'bash', True),
-                   types.Rule('bash', 'bash', 'bash', True)]
+@pytest.mark.parametrize('conf_rules, rules', [
+    (conf.DEFAULT_RULES, [Rule('bash', 'bash', 'bash'),
+                          Rule('lisp', 'lisp', 'lisp'),
+                          Rule('bash', 'bash', 'bash'),
+                          Rule('lisp', 'lisp', 'lisp')]),
+    (types.RulesNamesList(['bash']), [Rule('bash', 'bash', 'bash'),
+                                      Rule('bash', 'bash', 'bash')])])
+def test_get_rules(monkeypatch, conf_rules, rules):
+    monkeypatch.setattr(
+        'thefuck.main.Path.glob',
+        lambda *_: [PosixPath('bash.py'), PosixPath('lisp.py')])
+    monkeypatch.setattr('thefuck.main.load_source',
+                        lambda x, _: Mock(match=x, get_new_command=x,
+                                          enabled_by_default=True))
+    assert list(main.get_rules(Path('~'), Mock(rules=conf_rules))) == rules
 
 
-def test_get_command():
-    with patch('thefuck.main.Popen') as Popen, \
-            patch('thefuck.main.os.environ',
-                  new_callable=lambda: {}), \
-            patch('thefuck.main.wait_output',
-                  return_value=True):
+class TestGetCommand(object):
+    @pytest.fixture(autouse=True)
+    def Popen(self, monkeypatch):
+        Popen = Mock()
         Popen.return_value.stdout.read.return_value = b'stdout'
         Popen.return_value.stderr.read.return_value = b'stderr'
-        assert main.get_command(Mock(), ['thefuck', 'apt-get',
-                                         'search', 'vim']) \
-               == types.Command('apt-get search vim', 'stdout', 'stderr')
+        monkeypatch.setattr('thefuck.main.Popen', Popen)
+        return Popen
+
+    @pytest.fixture(autouse=True)
+    def prepare(self, monkeypatch):
+        monkeypatch.setattr('thefuck.main.os.environ', {})
+        monkeypatch.setattr('thefuck.main.wait_output', lambda *_: True)
+
+    @pytest.fixture(autouse=True)
+    def generic_shell(self, monkeypatch):
+        monkeypatch.setattr('thefuck.shells.from_shell', lambda x: x)
+        monkeypatch.setattr('thefuck.shells.to_shell', lambda x: x)
+
+    def test_get_command_calls(self, Popen):
+        assert main.get_command(Mock(),
+            ['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'})
-        assert main.get_command(Mock(), ['']) is None
+    @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
+        else:
+            assert main.get_command(Mock(), args) is None
 
 
-def test_get_matched_rule(capsys):
-    rules = [types.Rule('', lambda x, _: x.script == 'cd ..', None, True),
-             types.Rule('', lambda *_: False, None, True),
-             types.Rule('rule', Mock(side_effect=OSError('Denied')), None, True)]
-    assert main.get_matched_rule(types.Command('ls', '', ''),
-                                 rules, Mock(no_colors=True)) is None
-    assert main.get_matched_rule(types.Command('cd ..', '', ''),
-                                 rules, Mock(no_colors=True)) == rules[0]
-    assert capsys.readouterr()[1].split('\n')[0] \
-           == '[WARN] Rule rule:'
+class TestGetMatchedRule(object):
+    def test_no_match(self):
+        assert main.get_matched_rule(
+            Command('ls'), [Rule('', lambda *_: False)],
+            Mock(no_colors=True)) is None
+
+    def test_match(self):
+        rule = Rule('', lambda x, _: x.script == 'cd ..')
+        assert main.get_matched_rule(
+            Command('cd ..'), [rule], Mock(no_colors=True)) == rule
+
+    def test_when_rule_failed(self, capsys):
+        main.get_matched_rule(
+            Command('ls'), [Rule('test', Mock(side_effect=OSError('Denied')))],
+            Mock(no_colors=True))
+        assert capsys.readouterr()[1].split('\n')[0] == '[WARN] Rule test:'
 
 
-def test_run_rule(capsys):
-    with patch('thefuck.main.confirm', return_value=True):
-        main.run_rule(types.Rule('', None, lambda *_: 'new-command', True),
-                      None, None)
+class TestRunRule(object):
+    @pytest.fixture(autouse=True)
+    def confirm(self, monkeypatch):
+        mock = Mock(return_value=True)
+        monkeypatch.setattr('thefuck.main.confirm', mock)
+        return mock
+
+    def test_run_rule(self, capsys):
+        main.run_rule(Rule(get_new_command=lambda *_: 'new-command'),
+                      Command(), None)
         assert capsys.readouterr() == ('new-command\n', '')
-    with patch('thefuck.main.confirm', return_value=False):
-        main.run_rule(types.Rule('', None, lambda *_: 'new-command', True),
-                      None, None)
+
+    def test_run_rule_with_side_effect(self, capsys):
+        side_effect = Mock()
+        settings = Mock()
+        command = Command()
+        main.run_rule(Rule(get_new_command=lambda *_: 'new-command',
+                           side_effect=side_effect),
+                      command, settings)
+        assert capsys.readouterr() == ('new-command\n', '')
+        side_effect.assert_called_once_with(command, settings)
+
+    def test_when_not_comfirmed(self, capsys, confirm):
+        confirm.return_value = False
+        main.run_rule(Rule(get_new_command=lambda *_: 'new-command'),
+                      Command(), None)
         assert capsys.readouterr() == ('', '')
 
 
-def test_confirm(capsys):
-    # When confirmation not required:
-    assert main.confirm('command', Mock(require_confirmation=False))
-    assert capsys.readouterr() == ('', 'command\n')
-    # When confirmation required and confirmed:
-    with patch('thefuck.main.sys.stdin.read', return_value='\n'):
-        assert main.confirm('command', Mock(require_confirmation=True,
-                                            no_colors=True))
+class TestConfirm(object):
+    @pytest.fixture
+    def stdin(self, monkeypatch):
+        mock = Mock(return_value='\n')
+        monkeypatch.setattr('sys.stdin.read', mock)
+        return mock
+
+    def test_when_not_required(self, capsys):
+        assert main.confirm('command', None, Mock(require_confirmation=False))
+        assert capsys.readouterr() == ('', 'command\n')
+
+    def test_with_side_effect_and_without_confirmation(self, capsys):
+        assert main.confirm('command', Mock(), Mock(require_confirmation=False))
+        assert capsys.readouterr() == ('', 'command*\n')
+
+    # `stdin` fixture should be applied after `capsys`
+    def test_when_confirmation_required_and_confirmed(self, capsys, stdin):
+        assert main.confirm('command', None, Mock(require_confirmation=True,
+                                                  no_colors=True))
         assert capsys.readouterr() == ('', 'command [enter/ctrl+c]')
-    # When confirmation required and ctrl+c:
-    with patch('thefuck.main.sys.stdin.read', side_effect=KeyboardInterrupt):
-        assert not main.confirm('command', Mock(require_confirmation=True,
-                                                no_colors=True))
+
+    # `stdin` fixture should be applied after `capsys`
+    def test_when_confirmation_required_and_confirmed_with_side_effect(self, capsys, stdin):
+        assert main.confirm('command', Mock(), Mock(require_confirmation=True,
+                                                    no_colors=True))
+        assert capsys.readouterr() == ('', 'command* [enter/ctrl+c]')
+
+    def test_when_confirmation_required_and_aborted(self, capsys, stdin):
+        stdin.side_effect = KeyboardInterrupt
+        assert not main.confirm('command', None, Mock(require_confirmation=True,
+                                                      no_colors=True))
         assert capsys.readouterr() == ('', 'command [enter/ctrl+c]Aborted\n')

tests/test_shells.py

@@ -0,0 +1,85 @@
+import pytest
+from mock import Mock, MagicMock
+from thefuck import shells
+
+
+@pytest.fixture
+def builtins_open(monkeypatch):
+    mock = MagicMock()
+    monkeypatch.setattr('six.moves.builtins.open', mock)
+    return mock
+
+
+@pytest.fixture
+def isfile(monkeypatch):
+    mock = Mock(return_value=True)
+    monkeypatch.setattr('os.path.isfile', mock)
+    return mock
+
+
+class TestGeneric(object):
+    def test_from_shell(self):
+        assert shells.Generic().from_shell('pwd') == 'pwd'
+
+    def test_to_shell(self):
+        assert shells.Generic().to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open):
+        assert shells.Generic().put_to_history('ls') is None
+        assert builtins_open.call_count == 0
+
+
+@pytest.mark.usefixtures('isfile')
+class TestBash(object):
+    @pytest.fixture(autouse=True)
+    def Popen(self, monkeypatch):
+        mock = Mock()
+        monkeypatch.setattr('thefuck.shells.Popen', mock)
+        mock.return_value.stdout.read.return_value = (
+            b'alias l=\'ls -CF\'\n'
+            b'alias la=\'ls -A\'\n'
+            b'alias ll=\'ls -alF\'')
+        return mock
+
+    @pytest.mark.parametrize('before, after', [
+        ('pwd', 'pwd'),
+        ('ll', 'ls -alF')])
+    def test_from_shell(self, before, after):
+        assert shells.Bash().from_shell(before) == after
+
+    def test_to_shell(self):
+        assert shells.Bash().to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open):
+        shells.Bash().put_to_history('ls')
+        builtins_open.return_value.__enter__.return_value.\
+            write.assert_called_once_with('ls\n')
+
+
+@pytest.mark.usefixtures('isfile')
+class TestZsh(object):
+    @pytest.fixture(autouse=True)
+    def Popen(self, monkeypatch):
+        mock = Mock()
+        monkeypatch.setattr('thefuck.shells.Popen', mock)
+        mock.return_value.stdout.read.return_value = (
+            b'l=\'ls -CF\'\n'
+            b'la=\'ls -A\'\n'
+            b'll=\'ls -alF\'')
+        return mock
+
+    @pytest.mark.parametrize('before, after', [
+        ('pwd', 'pwd'),
+        ('ll', 'ls -alF')])
+    def test_from_shell(self, before, after):
+        assert shells.Zsh().from_shell(before) == after
+
+    def test_to_shell(self):
+        assert shells.Zsh().to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open, monkeypatch):
+        monkeypatch.setattr('thefuck.shells.time',
+                            lambda: 1430707243.3517463)
+        shells.Zsh().put_to_history('ls')
+        builtins_open.return_value.__enter__.return_value. \
+            write.assert_called_once_with(': 1430707243:0;ls\n')

tests/test_types.py

@@ -1,11 +1,12 @@
-from thefuck.types import Rule, RulesNamesList, Settings
+from thefuck.types import RulesNamesList, Settings
+from tests.utils import Rule
 
 
 def test_rules_names_list():
     assert RulesNamesList(['bash', 'lisp']) == ['bash', 'lisp']
     assert RulesNamesList(['bash', 'lisp']) == RulesNamesList(['bash', 'lisp'])
-    assert Rule('lisp', None, None, False) in RulesNamesList(['lisp'])
-    assert Rule('bash', None, None, False) not in RulesNamesList(['lisp'])
+    assert Rule('lisp') in RulesNamesList(['lisp'])
+    assert Rule('bash') not in RulesNamesList(['lisp'])
 
 
 def test_update_settings():

tests/test_utils.py

@@ -1,25 +1,26 @@
+import pytest
 from mock import Mock
 from thefuck.utils import sudo_support, wrap_settings
-from thefuck.types import Command, Settings
+from thefuck.types import Settings
+from tests.utils import Command
 
 
-def test_wrap_settings():
+@pytest.mark.parametrize('override, old, new', [
+    ({'key': 'val'}, {}, {'key': 'val'}),
+    ({'key': 'new-val'}, {'key': 'val'}, {'key': 'new-val'})])
+def test_wrap_settings(override, old, new):
     fn = lambda _, settings: settings
-    assert wrap_settings({'key': 'val'})(fn)(None, Settings({})) \
-           == {'key': 'val'}
-    assert wrap_settings({'key': 'new-val'})(fn)(
-        None, Settings({'key': 'val'})) == {'key': 'new-val'}
+    assert wrap_settings(override)(fn)(None, Settings(old)) == new
 
 
-def test_sudo_support():
-    fn = Mock(return_value=True, __name__='')
-    assert sudo_support(fn)(Command('sudo ls', 'out', 'err'), None)
-    fn.assert_called_once_with(Command('ls', 'out', 'err'), None)
-
-    fn.return_value = False
-    assert not sudo_support(fn)(Command('sudo ls', 'out', 'err'), None)
-
-    fn.return_value = 'pwd'
-    assert sudo_support(fn)(Command('sudo ls', 'out', 'err'), None) == 'sudo pwd'
-
-    assert sudo_support(fn)(Command('ls', 'out', 'err'), None) == 'pwd'
+@pytest.mark.parametrize('return_value, command, called, result', [
+    ('ls -lah', 'sudo ls', 'ls', 'sudo ls -lah'),
+    ('ls -lah', 'ls', 'ls', 'ls -lah'),
+    (True, 'sudo ls', 'ls', True),
+    (True, 'ls', 'ls', True),
+    (False, 'sudo ls', 'ls', False),
+    (False, 'ls', 'ls', False)])
+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)

tests/utils.py

@@ -0,0 +1,13 @@
+from thefuck import types
+
+
+def Command(script='', stdout='', stderr=''):
+    return types.Command(script, stdout, stderr)
+
+
+def Rule(name='', match=lambda *_: True,
+         get_new_command=lambda *_: '',
+         enabled_by_default=True,
+         side_effect=None):
+    return types.Rule(name, match, get_new_command,
+                      enabled_by_default, side_effect)

thefuck/logs.py

@@ -26,17 +26,20 @@ def rule_failed(rule, exc_info, settings):
     exception('Rule {}'.format(rule.name), exc_info, settings)
 
 
-def show_command(new_command, settings):
-    sys.stderr.write('{bold}{command}{reset}\n'.format(
+def show_command(new_command, side_effect, settings):
+    sys.stderr.write('{bold}{command}{side_effect}{reset}\n'.format(
         command=new_command,
+        side_effect='*' if side_effect else '',
         bold=color(colorama.Style.BRIGHT, settings),
         reset=color(colorama.Style.RESET_ALL, settings)))
 
 
-def confirm_command(new_command, settings):
+def confirm_command(new_command, side_effect, settings):
     sys.stderr.write(
-        '{bold}{command}{reset} [{green}enter{reset}/{red}ctrl+c{reset}]'.format(
+        '{bold}{command}{side_effect}{reset} '
+        '[{green}enter{reset}/{red}ctrl+c{reset}]'.format(
             command=new_command,
+            side_effect='*' if side_effect else '',
             bold=color(colorama.Style.BRIGHT, settings),
             green=color(colorama.Fore.GREEN, settings),
             red=color(colorama.Fore.RED, settings),

thefuck/main.py

@@ -6,7 +6,8 @@ import os
 import sys
 from psutil import Process, TimeoutExpired
 import colorama
-from . import logs, conf, types
+import six
+from . import logs, conf, types, shells
 
 
 def setup_user_dir():
@@ -24,7 +25,8 @@ def load_rule(rule):
     rule_module = load_source(rule.name[:-3], str(rule))
     return types.Rule(rule.name[:-3], rule_module.match,
                       rule_module.get_new_command,
-                      getattr(rule_module, 'enabled_by_default', True))
+                      getattr(rule_module, 'enabled_by_default', True),
+                      getattr(rule_module, 'side_effect', None))
 
 
 def get_rules(user_dir, settings):
@@ -60,7 +62,7 @@ def wait_output(settings, popen):
 
 def get_command(settings, args):
     """Creates command from `args` and executes it."""
-    if sys.version_info[0] < 3:
+    if six.PY2:
         script = ' '.join(arg.decode('utf-8') for arg in args[1:])
     else:
         script = ' '.join(args[1:])
@@ -68,6 +70,7 @@ def get_command(settings, args):
     if not script:
         return
 
+    script = shells.from_shell(script)
     result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
                    env=dict(os.environ, LANG='C'))
     if wait_output(settings, result):
@@ -85,13 +88,13 @@ def get_matched_rule(command, rules, settings):
             logs.rule_failed(rule, sys.exc_info(), settings)
 
 
-def confirm(new_command, settings):
+def confirm(new_command, side_effect, settings):
     """Returns `True` when running of new command confirmed."""
     if not settings.require_confirmation:
-        logs.show_command(new_command, settings)
+        logs.show_command(new_command, side_effect, settings)
         return True
 
-    logs.confirm_command(new_command, settings)
+    logs.confirm_command(new_command, side_effect, settings)
     try:
         sys.stdin.read(1)
         return True
@@ -102,14 +105,16 @@ def confirm(new_command, settings):
 
 def run_rule(rule, command, settings):
     """Runs command from rule for passed command."""
-    new_command = rule.get_new_command(command, settings)
-    if confirm(new_command, settings):
+    new_command = shells.to_shell(rule.get_new_command(command, settings))
+    if confirm(new_command, rule.side_effect, settings):
+        if rule.side_effect:
+            rule.side_effect(command, settings)
+        shells.put_to_history(new_command)
         print(new_command)
 
 
-def is_second_run(command):
-    """Is it the second run of `fuck`?"""
-    return command.script.startswith('fuck')
+def alias():
+    print(shells.app_alias())
 
 
 def main():
@@ -119,10 +124,6 @@ def main():
 
     command = get_command(settings, sys.argv)
     if command:
-        if is_second_run(command):
-            logs.failed("Can't fuck twice", settings)
-            return
-
         rules = get_rules(user_dir, settings)
         matched_rule = get_matched_rule(command, rules, settings)
         if matched_rule:

thefuck/rules/brew_unknown_command.py

@@ -1,11 +1,80 @@
 import difflib
+import os
 import re
-import thefuck.logs
+import subprocess
 
-# This commands are based on Homebrew 0.9.5
-brew_commands = ['info', 'home', 'options', 'install', 'uninstall', 'search',
-                 'list', 'update', 'upgrade', 'pin', 'unpin', 'doctor',
-                 'create', 'edit']
+
+BREW_CMD_PATH = '/Library/Homebrew/cmd'
+TAP_PATH = '/Library/Taps'
+TAP_CMD_PATH = '/%s/%s/cmd'
+
+
+def _get_brew_path_prefix():
+    """To get brew path"""
+    try:
+        return subprocess.check_output(['brew', '--prefix']).strip()
+    except:
+        return None
+
+
+def _get_brew_commands(brew_path_prefix):
+    """To get brew default commands on local environment"""
+    brew_cmd_path = brew_path_prefix + BREW_CMD_PATH
+
+    commands = [name.replace('.rb', '') for name in os.listdir(brew_cmd_path)
+                if name.endswith('.rb')]
+
+    return commands
+
+
+def _get_brew_tap_specific_commands(brew_path_prefix):
+    """To get tap's specific commands
+    https://github.com/Homebrew/homebrew/blob/master/Library/brew.rb#L115"""
+    commands = []
+    brew_taps_path = brew_path_prefix + TAP_PATH
+
+    for user in _get_directory_names_only(brew_taps_path):
+        taps = _get_directory_names_only(brew_taps_path + '/%s' % user)
+
+        # Brew Taps's naming rule
+        # https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/brew-tap.md#naming-conventions-and-limitations
+        taps = (tap for tap in taps if tap.startswith('homebrew-'))
+        for tap in taps:
+            tap_cmd_path = brew_taps_path + TAP_CMD_PATH % (user, tap)
+
+            if os.path.isdir(tap_cmd_path):
+                commands += (name.replace('brew-', '').replace('.rb', '')
+                             for name in os.listdir(tap_cmd_path)
+                             if _is_brew_tap_cmd_naming(name))
+
+    return commands
+
+
+def _is_brew_tap_cmd_naming(name):
+    if name.startswith('brew-') and name.endswith('.rb'):
+        return True
+
+    return False
+
+
+def _get_directory_names_only(path):
+    return [d for d in os.listdir(path)
+            if os.path.isdir(os.path.join(path, d))]
+
+
+brew_path_prefix = _get_brew_path_prefix()
+
+# Failback commands for testing (Based on Homebrew 0.9.5)
+brew_commands = ['info', 'home', 'options', 'install', 'uninstall',
+                 'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
+                 'doctor', 'create', 'edit']
+
+if brew_path_prefix:
+    try:
+        brew_commands = _get_brew_commands(brew_path_prefix) \
+                        + _get_brew_tap_specific_commands(brew_path_prefix)
+    except OSError:
+        pass
 
 
 def _get_similar_commands(command):

thefuck/rules/ls_lah.py

@@ -0,0 +1,11 @@
+enabled_by_default = False
+
+
+def match(command, settings):
+    return 'ls' in command.script and not ('ls -' in command.script)
+
+
+def get_new_command(command, settings):
+    command = command.script.split(' ')
+    command[0] = 'ls -lah'
+    return ' '.join(command)

thefuck/rules/ssh_known_hosts.py

@@ -22,7 +22,11 @@ def match(command, settings):
     return True
 
 
-def remove_offending_keys(command, settings):
+def get_new_command(command, settings):
+    return command.script
+
+
+def side_effect(command, settings):
     offending = offending_pattern.findall(command.stderr)
     for filepath, lineno in offending:
         with open(filepath, 'r') as fh:
@@ -30,8 +34,3 @@ def remove_offending_keys(command, settings):
             del lines[int(lineno) - 1]
         with open(filepath, 'w') as fh:
             fh.writelines(lines)
-
-
-def get_new_command(command, settings):
-    remove_offending_keys(command, settings)
-    return command.script

thefuck/rules/sudo.py

@@ -7,12 +7,17 @@ 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.']
+            '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']
 
 
 def match(command, settings):
     for pattern in patterns:
-        if pattern.lower() in command.stderr.lower():
+        if pattern.lower() in command.stderr.lower()\
+                or pattern.lower() in command.stdout.lower():
             return True
     return False
 

thefuck/shells.py

@@ -0,0 +1,120 @@
+"""Module with shell specific actions, each shell class should
+implement `from_shell`, `to_shell`, `app_alias` and `put_to_history`
+methods.
+
+"""
+from collections import defaultdict
+from subprocess import Popen, PIPE
+from time import time
+import os
+from psutil import Process
+
+
+FNULL = open(os.devnull, 'w')
+
+
+class Generic(object):
+    def _get_aliases(self):
+        return {}
+
+    def _expand_aliases(self, command_script):
+        aliases = self._get_aliases()
+        binary = command_script.split(' ')[0]
+        if binary in aliases:
+            return command_script.replace(binary, aliases[binary], 1)
+        else:
+            return command_script
+
+    def from_shell(self, command_script):
+        """Prepares command before running in app."""
+        return self._expand_aliases(command_script)
+
+    def to_shell(self, command_script):
+        """Prepares command for running in shell."""
+        return command_script
+
+    def app_alias(self):
+        return "\nalias fuck='eval $(thefuck $(fc -ln -1))'\n"
+
+    def _get_history_file_name(self):
+        return ''
+
+    def _get_history_line(self, command_script):
+        return ''
+
+    def put_to_history(self, command_script):
+        """Puts command script to shell history."""
+        history_file_name = self._get_history_file_name()
+        if os.path.isfile(history_file_name):
+            with open(history_file_name, 'a') as history:
+                history.write(self._get_history_line(command_script))
+
+
+class Bash(Generic):
+    def _parse_alias(self, alias):
+        name, value = alias.replace('alias ', '', 1).split('=', 1)
+        if value[0] == value[-1] == '"' or value[0] == value[-1] == "'":
+            value = value[1:-1]
+        return name, value
+
+    def _get_aliases(self):
+        proc = Popen('bash -ic alias', stdout=PIPE, stderr=FNULL, shell=True)
+        return dict(
+            self._parse_alias(alias)
+            for alias in proc.stdout.read().decode('utf-8').split('\n')
+            if alias)
+
+    def _get_history_file_name(self):
+        return os.environ.get("HISTFILE",
+                              os.path.expanduser('~/.bash_history'))
+
+    def _get_history_line(self, command_script):
+        return u'{}\n'.format(command_script)
+
+
+class Zsh(Generic):
+    def _parse_alias(self, alias):
+        name, value = alias.split('=', 1)
+        if value[0] == value[-1] == '"' or value[0] == value[-1] == "'":
+            value = value[1:-1]
+        return name, value
+
+    def _get_aliases(self):
+        proc = Popen('zsh -ic alias', stdout=PIPE, stderr=FNULL, shell=True)
+        return dict(
+            self._parse_alias(alias)
+            for alias in proc.stdout.read().decode('utf-8').split('\n')
+            if alias)
+
+    def _get_history_file_name(self):
+        return os.environ.get("HISTFILE",
+                              os.path.expanduser('~/.zsh_history'))
+
+    def _get_history_line(self, command_script):
+        return u': {}:0;{}\n'.format(int(time()), command_script)
+
+
+shells = defaultdict(lambda: Generic(), {
+    'bash': Bash(),
+    'zsh': Zsh()})
+
+
+def _get_shell():
+    shell = Process(os.getpid()).parent().cmdline()[0]
+    return shells[shell]
+
+
+def from_shell(command):
+    return _get_shell().from_shell(command)
+
+
+def to_shell(command):
+    return _get_shell().to_shell(command)
+
+
+def app_alias():
+    return _get_shell().app_alias()
+
+
+def put_to_history(command):
+    return _get_shell().put_to_history(command)

thefuck/types.py

@@ -4,11 +4,11 @@ from collections import namedtuple
 Command = namedtuple('Command', ('script', 'stdout', 'stderr'))
 
 Rule = namedtuple('Rule', ('name', 'match', 'get_new_command',
-                           'enabled_by_default'))
+                           'enabled_by_default', 'side_effect'))
 
 
 class RulesNamesList(list):
-    """Wrapper a top of list for string rules names."""
+    """Wrapper a top of list for storing rules names."""
 
     def __contains__(self, item):
         return super(RulesNamesList, self).__contains__(item.name)