Bump to 2.9

Some README fixes

.travis.yml

@@ -12,6 +12,8 @@ addons:
       - zsh
       - fish
       - tcsh
+      - pandoc
+      - git
 env:
   - FUNCTIONAL=true BARE=true
 install:

README.md

@@ -1,10 +1,10 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck) 
+# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg?branch=master)](https://travis-ci.org/nvbn/thefuck) 
 
 Magnificent app which corrects your previous console command,
 inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320).
 
-![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
+[![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
 
 Few more examples:
 
@@ -14,7 +14,7 @@ E: Could not open lock file /var/lib/dpkg/lock - open (13: Permission denied)
 E: Unable to lock the administration directory (/var/lib/dpkg/), are you root?
 
 ➜ fuck
-sudo apt-get install vim [enter/ctrl+c]
+sudo apt-get install vim [enter/↑/↓/ctrl+c]
 [sudo] password for nvbn:
 Reading package lists... Done
 ...
@@ -29,7 +29,7 @@ To push the current branch and set the remote as upstream, use
 
 
 ➜ fuck
-git push --set-upstream origin master [enter/ctrl+c]
+git push --set-upstream origin master [enter/↑/↓/ctrl+c]
 Counting objects: 9, done.
 ...
 ```
@@ -42,7 +42,7 @@ No command 'puthon' found, did you mean:
 zsh: command not found: puthon
 
 ➜ fuck
-python [enter/ctrl+c]
+python [enter/↑/↓/ctrl+c]
 Python 3.4.2 (default, Oct  8 2014, 13:08:17)
 ...
 ```
@@ -55,7 +55,7 @@ Did you mean this?
 	branch
 
 ➜ fuck
-git branch [enter/ctrl+c]
+git branch [enter/↑/↓/ctrl+c]
 * master
 ```
 
@@ -67,7 +67,7 @@ Did you mean this?
          repl
 
 ➜ fuck
-lein repl [enter/ctrl+c]
+lein repl [enter/↑/↓/ctrl+c]
 nREPL server started on port 54848 on host 127.0.0.1 - nrepl://127.0.0.1:54848
 REPL-y 0.3.1
 ...
@@ -94,7 +94,15 @@ Reading package lists... Done
 - pip
 - python-dev
 
-## Installation
+## Installation [*experimental*]
+
+On Ubuntu and OS X you can install `The Fuck` with installation script:
+ 
+```bash
+wget -O - https://raw.githubusercontent.com/nvbn/thefuck/master/install.sh | sh - && $0
+```
+
+## Manual installation
 
 Install `The Fuck` with `pip`:
 
@@ -107,9 +115,9 @@ sudo pip install thefuck
 You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
 
 ```bash
-eval "$(thefuck-alias)"
+eval "$(thefuck --alias)"
 # You can use whatever you want as an alias, like for Mondays:
-eval "$(thefuck-alias FUCK)"
+eval "$(thefuck --alias FUCK)"
 ```
 
 [Or in your shell config (Bash, Zsh, Fish, Powershell, tcsh).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
@@ -139,11 +147,14 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `composer_not_command` – fixes composer command name;
 * `cp_omitting_directory` – adds `-a` when you `cp` directory;
 * `cpp11` – adds missing `-std=c++11` to `g++` or `clang++`;
+* `dirty_untar` – fixes `tar x` command that untarred in the current directory;
+* `dirty_unzip` – fixes `unzip` command that unzipped in the current directory;
 * `django_south_ghost` – adds `--delete-ghost-migrations` to failed because ghosts django south migration;
 * `django_south_merge` – adds `--merge` to inconsistent django south migration;
 * `docker_not_command` – fixes wrong docker commands like `docker tags`;
 * `dry` – fixes repetitions like `git git push`;
 * `fix_alt_space` – replaces Alt+Space with Space character;
+* `fix_file` – opens a file with an error in your `$EDITOR`;
 * `git_add` – fixes *"Did you forget to 'git add'?"*;
 * `git_branch_delete` – changes `git branch -d` to `git branch -D`;
 * `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch;
@@ -158,9 +169,9 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_stash` – stashes you local modifications before rebasing or switching branch;
 * `go_run` – appends `.go` extension when compiling/running Go programs
 * `grep_recursive` – adds `-r` when you trying to `grep` directory;
-* `gulp_not_task` – fixes misspelled gulp tasks;
+* `gulp_not_task` – fixes misspelled `gulp` tasks;
 * `has_exists_script` – prepends `./` when script/binary exists;
-* `heroku_no_command` – fixes wrong `heroku` commands like `heroku log`;
+* `heroku_not_command` – fixes wrong `heroku` commands like `heroku log`;
 * `history` – tries to replace command with most similar command from history;
 * `java` – removes `.java` extension when running Java programs;
 * `javac` – appends missing `.java` when compiling Java files;
@@ -170,31 +181,39 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `man_no_space` – fixes man commands without spaces, for example `mandiff`;
 * `mercurial` – fixes wrong `hg` commands;
 * `mkdir_p` – adds `-p` when you trying to create directory without parent;
+* `mvn_no_command` – adds `clean package` to `mvn`;
+* `mvn_unknown_lifecycle_phase` – fixes misspelled lifecycle phases with `mvn`;
 * `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'
+* `quotation_marks` – fixes uneven usage of `'` and `"` when containing args';
 * `rm_dir` – adds `-rf` when you trying to remove directory;
 * `sed_unterminated_s` – adds missing '/' to `sed`'s `s` commands;
 * `sl_ls` – changes `sl` to `ls`;
 * `ssh_known_hosts` – removes host from `known_hosts` on warning;
 * `sudo` – prepends `sudo` to previous command if it failed because of permissions;
-* `switch_layout` – switches command from your local layout to en;
+* `switch_lang` – switches command from your local layout to en;
 * `systemctl` – correctly orders parameters of confusing `systemctl`;
 * `test.py` – runs `py.test` instead of `test.py`;
+* `tsuru_login` – runs `tsuru login` if not authenticated or session expired;
+* `tsuru_not_command` – fixes wrong `tsuru` commands like `tsuru shell`;
 * `tmux` – fixes `tmux` commands;
+* `unknown_command` – fixes hadoop hdfs-style "unknown command", for example adds missing '-' to the command on `hdfs dfs ls`;
+* `vagrant_up` – starts up the vagrant instance;
 * `whois` – fixes `whois` command.
 
 Enabled by default only on specific platforms:
 
-* `apt_get` – installs app from apt if it not installed;
+* `apt_get` – installs app from apt if it not installed (requires `python-commandnotfound` / `python3-commandnotfound`);
+* `apt_get_search` – changes trying to search using `apt-get` with searching using `apt-cache`;
 * `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.
+* `pacman` – installs app with `pacman` if it is not installed (uses `yaourt` if available);
+* `pacman_not_found` – fixes package name with `pacman` or `yaourt`.
 
 Bundled, but not enabled by default:
 
@@ -205,14 +224,18 @@ Bundled, but not enabled by default:
 
 For adding your own rule you should create `your-rule-name.py`
 in `~/.thefuck/rules`. The rule should contain two functions:
+
 ```python
 match(command: Command, settings: Settings) -> bool
-get_new_command(command: Command, settings: Settings) -> str
+get_new_command(command: Command, settings: Settings) -> str | list[str]
 ```
 
 Also the rule can contain an optional function
-`side_effect(command: Command, settings: Settings) -> None` and an
+
-optional boolean `enabled_by_default`.
+```python
+side_effect(old_command: Command, fixed_command: str, settings: Settings) -> None
+```
+and optional `enabled_by_default`, `requires_output` and `priority` variables.
 
 `Command` has three attributes: `script`, `stdout` and `stderr`.
 
@@ -236,6 +259,8 @@ def side_effect(command, settings):
     subprocess.call('chmod 777 .', shell=True)
 
 priority = 1000  # Lower first, default is 1000
+
+requires_output = True
 ```
 
 [More examples of rules](https://github.com/nvbn/thefuck/tree/master/thefuck/rules),
@@ -304,5 +329,12 @@ Run unit and functional tests (requires docker):
 FUNCTIONAL=true py.test
 ```
 
+For sending package to pypi:
+
+```bash
+sudo apt-get install pandoc
+./release.py
+```
+
 ## License MIT
 Project License can be found [here](LICENSE.md).

install.sh

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+should_add_alias () {
+    [ -f $1 ] && ! grep -q thefuck $1
+}
+
+# Install os dependencies:
+if [ -f $(which apt-get) ]; then
+    # Debian/ubuntu:
+    sudo apt-get update -yy
+    sudo apt-get install -yy python-pip python-dev command-not-found
+
+    if [[ -n $(apt-cache search python-commandnotfound) ]]; then
+        # In case of different python versions:
+        sudo apt-get install -yy python-commandnotfound
+    fi
+else
+    if [ -f $(which brew) ]; then
+        # OS X:
+        brew update
+        brew install python
+    else
+        # Genreic way:
+        wget https://bootstrap.pypa.io/get-pip.py
+        sudo python get-pip.py
+        rm get-pip.py
+    fi
+fi
+
+# thefuck requires fresh versions of setuptools and pip:
+sudo pip install -U pip setuptools
+sudo pip install -U thefuck
+
+# Setup aliases:
+if should_add_alias ~/.bashrc; then
+    echo 'eval $(thefuck --alias)' >> ~/.bashrc
+fi
+
+if should_add_alias ~/.bash_profile; then
+    echo 'eval $(thefuck --alias)' >> ~/.bash_profile
+fi
+
+if should_add_alias ~/.zshrc; then
+    echo 'eval $(thefuck --alias)' >> ~/.zshrc
+fi
+
+if should_add_alias ~/.config/fish/config.fish; then
+    thefuck --alias >> ~/.config/fish/config.fish
+fi
+
+if should_add_alias ~/.tcshrc; then
+    echo 'eval `thefuck --alias`' >> ~/.tcshrc
+fi

release.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 from subprocess import call
+import os
 import re
 
 
@@ -28,4 +29,7 @@ call('git commit -am "Bump to {}"'.format(version), shell=True)
 call('git tag {}'.format(version), shell=True)
 call('git push', shell=True)
 call('git push --tags', shell=True)
-call('python setup.py sdist bdist_wheel upload', shell=True)
+
+env = os.environ
+env['CONVERT_README'] = 'true'
+call('python setup.py sdist bdist_wheel upload', shell=True, env=env)

requirements.txt

@@ -4,3 +4,5 @@ pytest-mock
 wheel
 setuptools>=17.1
 pexpect
+pypandoc
+pytest-benchmark

setup.cfg

@@ -1,4 +1,2 @@
 [bdist_wheel]
 universal = 1
-[metadata]
-description-file = README.md

setup.py

@@ -1,24 +1,34 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 import sys
+import os
 
-if sys.version_info < (2, 7):
+if os.environ.get('CONVERT_README'):
+    import pypandoc
+
+    long_description = pypandoc.convert('README.md', 'rst')
+else:
+    long_description = ''
+
+version = sys.version_info[:2]
+if version < (2, 7):
     print('thefuck requires Python version 2.7 or later' +
-          ' ({}.{} detected).'.format(*sys.version_info[:2]))
+          ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
-elif (3, 0) < sys.version_info < (3, 3):
+elif (3, 0) < version < (3, 3):
     print('thefuck requires Python version 3.3 or later' +
-          ' ({}.{} detected).'.format(*sys.version_info[:2]))
+          ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '2.4'
+VERSION = '2.9'
 
-install_requires = ['psutil', 'colorama', 'six']
+install_requires = ['psutil', 'colorama', 'six', 'decorator']
 extras_require = {':python_version<"3.4"': ['pathlib']}
 
 setup(name='thefuck',
       version=VERSION,
       description="Magnificent app which corrects your previous console command",
+      long_description=long_description,
       author='Vladimir Iakovlev',
       author_email='nvbn.rm@gmail.com',
       url='https://github.com/nvbn/thefuck',

tests/conftest.py

@@ -1,6 +1,17 @@
 import pytest
+from mock import Mock
 
 
 @pytest.fixture
 def no_memoize(monkeypatch):
     monkeypatch.setattr('thefuck.utils.memoize.disabled', True)
+
+
+@pytest.fixture
+def settings():
+    return Mock(debug=False, no_colors=True)
+
+
+@pytest.fixture(autouse=True)
+def no_cache(monkeypatch):
+    monkeypatch.setattr('thefuck.utils.cache.disabled', True)

tests/functional/plots.py

@@ -1,42 +1,81 @@
+from pexpect import TIMEOUT
+
+
+def _set_confirmation(proc, require):
+    proc.sendline(u'mkdir -p ~/.thefuck')
+    proc.sendline(
+        u'echo "require_confirmation = {}" > ~/.thefuck/settings.py'.format(
+            require))
+
+
 def with_confirmation(proc):
     """Ensures that command can be fixed when confirmation enabled."""
-    proc.sendline(u'mkdir -p ~/.thefuck')
+    _set_confirmation(proc, True)
-    proc.sendline(u'echo "require_confirmation = True" > ~/.thefuck/settings.py')
 
     proc.sendline(u'ehco test')
 
     proc.sendline(u'fuck')
-    proc.expect(u'echo test')
+    assert proc.expect([TIMEOUT, u'echo test'])
-    proc.expect(u'enter')
+    assert proc.expect([TIMEOUT, u'enter'])
-    proc.expect_exact(u'ctrl+c')
+    assert proc.expect_exact([TIMEOUT, u'ctrl+c'])
     proc.send('\n')
 
-    proc.expect(u'test')
+    assert proc.expect([TIMEOUT, u'test'])
+
+
+def history_changed(proc, to):
+    """Ensures that history changed."""
+    proc.send('\033[A')
+    assert proc.expect([TIMEOUT, to])
+
+
+def history_not_changed(proc):
+    """Ensures that history not changed."""
+    proc.send('\033[A')
+    assert proc.expect([TIMEOUT, u'fuck'])
+
+
+def select_command_with_arrows(proc):
+    """Ensures that command can be selected with arrow keys."""
+    _set_confirmation(proc, True)
+
+    proc.sendline(u'git h')
+    assert proc.expect([TIMEOUT, u"git: 'h' is not a git command."])
+
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'git show'])
+    proc.send('\033[B')
+    assert proc.expect([TIMEOUT, u'git push'])
+    proc.send('\033[B')
+    assert proc.expect([TIMEOUT, u'git help'])
+    proc.send('\033[A')
+    assert proc.expect([TIMEOUT, u'git push'])
+    proc.send('\n')
+
+    assert proc.expect([TIMEOUT, u'Not a git repository'])
 
 
 def refuse_with_confirmation(proc):
     """Ensures that fix can be refused when confirmation enabled."""
-    proc.sendline(u'mkdir -p ~/.thefuck')
+    _set_confirmation(proc, True)
-    proc.sendline(u'echo "require_confirmation = True" > ~/.thefuck/settings.py')
 
     proc.sendline(u'ehco test')
 
     proc.sendline(u'fuck')
-    proc.expect(u'echo test')
+    assert proc.expect([TIMEOUT, u'echo test'])
-    proc.expect(u'enter')
+    assert proc.expect([TIMEOUT, u'enter'])
-    proc.expect_exact(u'ctrl+c')
+    assert proc.expect_exact([TIMEOUT, u'ctrl+c'])
     proc.send('\003')
 
-    proc.expect(u'Aborted')
+    assert proc.expect([TIMEOUT, u'Aborted'])
 
 
 def without_confirmation(proc):
     """Ensures that command can be fixed when confirmation disabled."""
-    proc.sendline(u'mkdir -p ~/.thefuck')
+    _set_confirmation(proc, False)
-    proc.sendline(u'echo "require_confirmation = False" > ~/.thefuck/settings.py')
 
     proc.sendline(u'ehco test')
 
     proc.sendline(u'fuck')
-    proc.expect(u'echo test')
+    assert proc.expect([TIMEOUT, u'echo test'])
-    proc.expect(u'test')
+    assert proc.expect([TIMEOUT, u'test'])

tests/functional/test_bash.py

@@ -1,42 +1,53 @@
 import pytest
 from tests.functional.plots import with_confirmation, without_confirmation, \
-    refuse_with_confirmation
+    refuse_with_confirmation, history_changed, history_not_changed, \
+    select_command_with_arrows
 from tests.functional.utils import spawn, functional, images
 
 containers = images(('ubuntu-python3-bash', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python3 python3-pip python3-dev
+RUN apt-get install -yy python3 python3-pip python3-dev git
 RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
 '''),
                     ('ubuntu-python2-bash', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python python-pip python-dev
+RUN apt-get install -yy python python-pip python-dev git
 RUN pip2 install -U pip setuptools
 '''))
 
 
-@functional
+@pytest.fixture(params=containers)
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def proc(request):
-def test_with_confirmation(tag, dockerfile):
+    tag, dockerfile = request.param
-    with spawn(tag, dockerfile, u'bash') as proc:
+    proc = spawn(request, tag, dockerfile, u'bash')
-        proc.sendline(u'eval $(thefuck-alias)')
+    proc.sendline(u"export PS1='$ '")
-        with_confirmation(proc)
+    proc.sendline(u'eval $(thefuck --alias)')
+    proc.sendline(u'echo > $HISTFILE')
+    return proc
 
 
 @functional
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_with_confirmation(proc):
-def test_refuse_with_confirmation(tag, dockerfile):
+    with_confirmation(proc)
-    with spawn(tag, dockerfile, u'bash') as proc:
+    history_changed(proc, u'echo test')
-        proc.sendline(u'eval $(thefuck-alias)')
-        refuse_with_confirmation(proc)
 
 
 @functional
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_select_command_with_arrows(proc):
-def test_without_confirmation(tag, dockerfile):
+    select_command_with_arrows(proc)
-    with spawn(tag, dockerfile, u'bash') as proc:
+    history_changed(proc, u'git push')
-        proc.sendline(u'eval $(thefuck-alias)')
+
-        without_confirmation(proc)
+
+@functional
+def test_refuse_with_confirmation(proc):
+    refuse_with_confirmation(proc)
+    history_not_changed(proc)
+
+
+@functional
+def test_without_confirmation(proc):
+    without_confirmation(proc)
+    history_changed(proc, u'echo test')

tests/functional/test_fish.py

@@ -1,51 +1,59 @@
 import pytest
 from tests.functional.plots import with_confirmation, without_confirmation, \
-    refuse_with_confirmation
+    refuse_with_confirmation, select_command_with_arrows
 from tests.functional.utils import spawn, functional, images, bare
 
 containers = images(('ubuntu-python3-fish', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python3 python3-pip python3-dev fish
+RUN apt-get install -yy python3 python3-pip python3-dev fish git
 RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
+RUN apt-get install -yy fish
 '''),
                     ('ubuntu-python2-fish', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python python-pip python-dev fish
+RUN apt-get install -yy python python-pip python-dev git
 RUN pip2 install -U pip setuptools
+RUN apt-get install -yy fish
 '''))
 
 
-@functional
+@pytest.fixture(params=containers)
-@pytest.mark.skipif(
+def proc(request):
-    bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
+    tag, dockerfile = request.param
-@pytest.mark.parametrize('tag, dockerfile', containers)
+    proc = spawn(request, tag, dockerfile, u'fish')
-def test_with_confirmation(tag, dockerfile):
+    proc.sendline(u'thefuck --alias > ~/.config/fish/config.fish')
-    with spawn(tag, dockerfile, u'fish') as proc:
+    proc.sendline(u'fish')
-        proc.sendline(u'thefuck-alias > ~/.config/fish/config.fish')
+    return proc
-        proc.sendline(u'fish')
-        with_confirmation(proc)
 
 
 @functional
 @pytest.mark.skipif(
     bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_with_confirmation(proc):
-def test_refuse_with_confirmation(tag, dockerfile):
+    with_confirmation(proc)
-    with spawn(tag, dockerfile, u'fish') as proc:
-        proc.sendline(u'thefuck-alias > ~/.config/fish/config.fish')
-        proc.sendline(u'fish')
-        refuse_with_confirmation(proc)
 
 
 @functional
 @pytest.mark.skipif(
     bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_select_command_with_arrows(proc):
-def test_without_confirmation(tag, dockerfile):
+    select_command_with_arrows(proc)
-    with spawn(tag, dockerfile, u'fish') as proc:
+
-        proc.sendline(u'thefuck-alias > ~/.config/fish/config.fish')
+
-        proc.sendline(u'fish')
+@functional
-        without_confirmation(proc)
+@pytest.mark.skipif(
+    bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
+def test_refuse_with_confirmation(proc):
+    refuse_with_confirmation(proc)
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
+def test_without_confirmation(proc):
+    without_confirmation(proc)
+
+# TODO: ensure that history changes.

tests/functional/test_install.py

@@ -0,0 +1,25 @@
+import pytest
+from pexpect import TIMEOUT
+from tests.functional.utils import spawn, functional, bare
+
+envs = ((u'bash', 'ubuntu-bash', u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy bash
+'''), (u'bash', 'generic-bash', u'''
+FROM fedora:latest
+RUN dnf install -yy python-devel sudo which gcc
+'''))
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason="Can't be tested in bare run")
+@pytest.mark.parametrize('shell, tag, dockerfile', envs)
+def test_installation(request, shell, tag, dockerfile):
+    proc = spawn(request, tag, dockerfile, shell, install=False)
+    proc.sendline(u'cat /src/install.sh | sh - && $0')
+    proc.sendline(u'thefuck --version')
+    assert proc.expect([TIMEOUT, u'The Fuck'], timeout=600)
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'No fucks given'])

tests/functional/test_performance.py

@@ -0,0 +1,56 @@
+from pexpect import TIMEOUT
+import pytest
+import time
+from tests.functional.utils import spawn, functional, bare
+
+dockerfile = u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy python3 python3-pip python3-dev git
+RUN pip3 install -U setuptools
+RUN ln -s /usr/bin/pip3 /usr/bin/pip
+RUN adduser --disabled-password --gecos '' test
+ENV SEED "{seed}"
+COPY thefuck /src
+WORKDIR /src
+RUN pip install .
+USER test
+RUN echo 'eval $(thefuck --alias)' > /home/test/.bashrc
+RUN echo > /home/test/.bash_history
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+'''.format(seed=time.time())
+
+
+@pytest.fixture
+def proc(request):
+    return spawn(request, 'ubuntu-python3-bash-performance',
+                 dockerfile, u'bash', install=False, copy_src=True)
+
+
+def plot(proc):
+    proc.sendline(u'cd /home/test/')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'No fucks given'])
+    proc.sendline(u'git init')
+    proc.sendline(u'git add .')
+    proc.sendline(u'git commit -a -m init')
+    proc.sendline(u'git brnch')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'git branch'])
+    proc.send('\n')
+    assert proc.expect([TIMEOUT, u'master'])
+    proc.sendline(u'echo test')
+    proc.sendline(u'echo tst')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'echo test'])
+    proc.send('\n')
+    assert proc.expect([TIMEOUT, u'test'])
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason='Would lie on a bare run')
+@pytest.mark.benchmark(min_rounds=10)
+def test_performance(proc, benchmark):
+    assert benchmark(plot, proc) is None

tests/functional/test_tcsh.py

@@ -1,45 +1,51 @@
 import pytest
 from tests.functional.utils import spawn, functional, images
 from tests.functional.plots import with_confirmation, without_confirmation, \
-    refuse_with_confirmation
+    refuse_with_confirmation, select_command_with_arrows
 
 containers = images(('ubuntu-python3-tcsh', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python3 python3-pip python3-dev tcsh
+RUN apt-get install -yy python3 python3-pip python3-dev git
 RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
+RUN apt-get install -yy tcsh
 '''),
                     ('ubuntu-python2-tcsh', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python python-pip python-dev tcsh
+RUN apt-get install -yy python python-pip python-dev git
 RUN pip2 install -U pip setuptools
+RUN apt-get install -yy tcsh
 '''))
 
 
-@functional
+@pytest.fixture(params=containers)
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def proc(request):
-def test_with_confirmation(tag, dockerfile):
+    tag, dockerfile = request.param
-    with spawn(tag, dockerfile, u'tcsh') as proc:
+    proc = spawn(request, tag, dockerfile, u'tcsh')
-        proc.sendline(u'tcsh')
+    proc.sendline(u'tcsh')
-        proc.sendline(u'eval `thefuck-alias`')
+    proc.sendline(u'eval `thefuck --alias`')
-        with_confirmation(proc)
+    return proc
 
 
 @functional
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_with_confirmation(proc):
-def test_refuse_with_confirmation(tag, dockerfile):
+    with_confirmation(proc)
-    with spawn(tag, dockerfile, u'tcsh') as proc:
-        proc.sendline(u'tcsh')
-        proc.sendline(u'eval `thefuck-alias`')
-        refuse_with_confirmation(proc)
 
 
 @functional
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_select_command_with_arrows(proc):
-def test_without_confirmation(tag, dockerfile):
+    select_command_with_arrows(proc)
-    with spawn(tag, dockerfile, u'tcsh') as proc:
+
-        proc.sendline(u'tcsh')
+
-        proc.sendline(u'eval `thefuck-alias`')
+@functional
-        without_confirmation(proc)
+def test_refuse_with_confirmation(proc):
+    refuse_with_confirmation(proc)
+
+
+@functional
+def test_without_confirmation(proc):
+    without_confirmation(proc)
+
+# TODO: ensure that history changes.

tests/functional/test_zsh.py

@@ -1,42 +1,57 @@
 import pytest
 from tests.functional.utils import spawn, functional, images
 from tests.functional.plots import with_confirmation, without_confirmation, \
-    refuse_with_confirmation
+    refuse_with_confirmation, history_changed, history_not_changed, select_command_with_arrows
 
 containers = images(('ubuntu-python3-zsh', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python3 python3-pip python3-dev zsh
+RUN apt-get install -yy python3 python3-pip python3-dev git
 RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
+RUN apt-get install -yy zsh
 '''),
                     ('ubuntu-python2-zsh', u'''
 FROM ubuntu:latest
 RUN apt-get update
-RUN apt-get install -yy python python-pip python-dev zsh
+RUN apt-get install -yy python python-pip python-dev git
 RUN pip2 install -U pip setuptools
+RUN apt-get install -yy zsh
 '''))
 
 
-@functional
+@pytest.fixture(params=containers)
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def proc(request):
-def test_with_confirmation(tag, dockerfile):
+    tag, dockerfile = request.param
-    with spawn(tag, dockerfile, u'zsh') as proc:
+    proc = spawn(request, tag, dockerfile, u'zsh')
-        proc.sendline(u'eval $(thefuck-alias)')
+    proc.sendline(u'eval $(thefuck --alias)')
-        with_confirmation(proc)
+    proc.sendline(u'export HISTFILE=~/.zsh_history')
+    proc.sendline(u'echo > $HISTFILE')
+    proc.sendline(u'export SAVEHIST=100')
+    proc.sendline(u'export HISTSIZE=100')
+    proc.sendline(u'setopt INC_APPEND_HISTORY')
+    return proc
 
 
 @functional
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_with_confirmation(proc):
-def test_refuse_with_confirmation(tag, dockerfile):
+    with_confirmation(proc)
-    with spawn(tag, dockerfile, u'zsh') as proc:
+    history_changed(proc, u'echo test')
-        proc.sendline(u'eval $(thefuck-alias)')
-        refuse_with_confirmation(proc)
 
 
 @functional
-@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_select_command_with_arrows(proc):
-def test_without_confirmation(tag, dockerfile):
+    select_command_with_arrows(proc)
-    with spawn(tag, dockerfile, u'zsh') as proc:
+    history_changed(proc, u'git push')
-        proc.sendline(u'eval $(thefuck-alias)')
+
-        without_confirmation(proc)
+
+@functional
+def test_refuse_with_confirmation(proc):
+    refuse_with_confirmation(proc)
+    history_not_changed(proc)
+
+
+@functional
+def test_without_confirmation(proc):
+    without_confirmation(proc)
+    history_changed(proc, u'echo test')

tests/functional/utils.py

@@ -1,45 +1,56 @@
+import pytest
 import os
-from contextlib import contextmanager
 import subprocess
 import shutil
 from tempfile import mkdtemp
 from pathlib import Path
 import sys
 import pexpect
-import pytest
+from tests.utils import root
+
 
-root = str(Path(__file__).parent.parent.parent.resolve())
 bare = os.environ.get('BARE')
 enabled = os.environ.get('FUNCTIONAL')
 
 
-def build_container(tag, dockerfile):
+def build_container(tag, dockerfile, copy_src=False):
     tmpdir = mkdtemp()
-    with Path(tmpdir).joinpath('Dockerfile').open('w') as file:
+    try:
-        file.write(dockerfile)
+        if copy_src:
-    if subprocess.call(['docker', 'build', '--tag={}'.format(tag), tmpdir],
+            subprocess.call(['cp', '-a', str(root), tmpdir])
-                       cwd=root) != 0:
+        dockerfile_path = Path(tmpdir).joinpath('Dockerfile')
-        raise Exception("Can't build a container")
+        with dockerfile_path.open('w') as file:
-    shutil.rmtree(tmpdir)
+            file.write(dockerfile)
+        if subprocess.call(['docker', 'build', '--tag={}'.format(tag), tmpdir]) != 0:
+            raise Exception("Can't build a container")
+    finally:
+        shutil.rmtree(tmpdir)
 
 
-@contextmanager
+def spawn(request, tag, dockerfile, cmd, install=True, copy_src=False):
-def spawn(tag, dockerfile, cmd):
     if bare:
         proc = pexpect.spawnu(cmd)
     else:
         tag = 'thefuck/{}'.format(tag)
-        build_container(tag, dockerfile)
+        build_container(tag, dockerfile, copy_src)
-        proc = pexpect.spawnu('docker run --volume {}:/src --tty=true '
+        proc = pexpect.spawnu('docker run --rm=true --volume {}:/src --tty=true '
                               '--interactive=true {} {}'.format(root, tag, cmd))
-        proc.sendline('pip install /src')
+        if install:
+            proc.sendline('pip install /src')
+
+    proc.sendline('cd /')
 
     proc.logfile = sys.stdout
 
-    try:
+    def _finalizer():
-        yield proc
+        proc.terminate()
-    finally:
+        if not bare:
-        proc.terminate(force=bare)
+            container_id = subprocess.check_output(['docker', 'ps']) \
+                                     .decode('utf-8').split('\n')[-2].split()[0]
+            subprocess.check_call(['docker', 'kill', container_id])
+
+    request.addfinalizer(_finalizer)
+    return proc
 
 
 def images(*items):

tests/rules/test_apt_get.py

@@ -16,6 +16,8 @@ def test_match(command):
 
 @pytest.mark.parametrize('command, return_value', [
     (Command(script='vim', stderr='vim: command not found'),
+     [('vim', 'main'), ('vim-tiny', 'main')]),
+    (Command(script='sudo vim', stderr='vim: command not found'),
      [('vim', 'main'), ('vim-tiny', 'main')])])
 @patch('thefuck.rules.apt_get.CommandNotFound', create=True)
 @patch.multiple(apt_get, create=True, apt_get='apt_get')
@@ -38,7 +40,9 @@ def test_not_match(command):
                     reason='Skip if python-commandnotfound is not available')
 @pytest.mark.parametrize('command, new_command', [
     (Command('vim'), 'sudo apt-get install vim && vim'),
-    (Command('convert'), 'sudo apt-get install imagemagick && convert')])
+    (Command('convert'), 'sudo apt-get install imagemagick && convert'),
+    (Command('sudo vim'), 'sudo apt-get install vim && sudo vim'),
+    (Command('sudo convert'), 'sudo apt-get install imagemagick && sudo convert')])
 def test_get_new_command(command, new_command):
     assert get_new_command(command, None) == new_command
 
@@ -47,6 +51,11 @@ def test_get_new_command(command, new_command):
     (Command('vim'), 'sudo apt-get install vim && vim',
      [('vim', 'main'), ('vim-tiny', 'main')]),
     (Command('convert'), 'sudo apt-get install imagemagick && convert',
+     [('imagemagick', 'main'),
+      ('graphicsmagick-imagemagick-compat', 'universe')]),
+    (Command('sudo vim'), 'sudo apt-get install vim && sudo vim',
+     [('vim', 'main'), ('vim-tiny', 'main')]),
+    (Command('sudo convert'), 'sudo apt-get install imagemagick && sudo convert',
      [('imagemagick', 'main'),
       ('graphicsmagick-imagemagick-compat', 'universe')])])
 @patch('thefuck.rules.apt_get.CommandNotFound', create=True)
@@ -55,5 +64,3 @@ def test_get_new_command_mocked(cmdnf_mock, command, new_command, return_value):
     get_packages = Mock(return_value=return_value)
     cmdnf_mock.CommandNotFound.return_value = Mock(getPackages=get_packages)
     assert get_new_command(command, None) == new_command
-    assert cmdnf_mock.CommandNotFound.called
-    assert get_packages.called

tests/rules/test_apt_get_search.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.apt_get_search import get_new_command, match
+from tests.utils import Command
+
+
+def test_match():
+    assert match(Command('apt-get search foo'), None)
+
+
+@pytest.mark.parametrize('command', [
+    Command('apt-cache search foo'),
+    Command('aptitude search foo'),
+    Command('apt search foo'),
+    Command('apt-get install foo'),
+    Command('apt-get source foo'),
+    Command('apt-get clean'),
+    Command('apt-get remove'),
+    Command('apt-get update')
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+def test_get_new_command():
+    assert get_new_command(Command('apt-get search foo'), None) == 'apt-cache search foo'

tests/rules/test_brew_install.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.brew_install import match, get_new_command
-from thefuck.rules.brew_install import brew_formulas
+from thefuck.rules.brew_install import _get_formulas
 from tests.utils import Command
 
 
@@ -20,9 +20,7 @@ def brew_already_installed():
 
 
 def _is_not_okay_to_test():
-    if 'elasticsearch' not in brew_formulas:
+    return 'elasticsearch' not in _get_formulas()
-        return True
-    return False
 
 
 @pytest.mark.skipif(_is_not_okay_to_test(),

tests/rules/test_brew_unknown_command.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.brew_unknown_command import match, get_new_command
-from thefuck.rules.brew_unknown_command import brew_commands
+from thefuck.rules.brew_unknown_command import _brew_commands
 from tests.utils import Command
 
 
@@ -16,13 +16,14 @@ def brew_unknown_cmd2():
 
 def test_match(brew_unknown_cmd):
     assert match(Command('brew inst', stderr=brew_unknown_cmd), None)
-    for command in brew_commands:
+    for command in _brew_commands():
         assert not match(Command('brew ' + command), None)
 
 
 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'
+                           None) == ['brew list', 'brew install', 'brew uninstall']
 
-    assert get_new_command(Command('brew instaa', stderr=brew_unknown_cmd2),
+    cmds = get_new_command(Command('brew instaa', stderr=brew_unknown_cmd2), None)
-                           None) == 'brew install'
+    assert 'brew install' in cmds
+    assert 'brew uninstall' in cmds

tests/rules/test_composer_not_command.py

@@ -5,34 +5,38 @@ from tests.utils import Command
 
 @pytest.fixture
 def composer_not_command():
-    return """
+    # that weird spacing is part of the actual command output
-
+    return (
-                                    
+        '\n'
-  [InvalidArgumentException]        
+        '\n'
-  Command "udpate" is not defined.  
+        '                                    \n'
-  Did you mean this?                
+        '  [InvalidArgumentException]        \n'
-      update
+        '  Command "udpate" is not defined.  \n'
-
+        '  Did you mean this?                \n'
-
+        '      update                        \n'
-"""
+        '                                    \n'
+        '\n'
+        '\n'
+    )
 
 
 @pytest.fixture
 def composer_not_command_one_of_this():
-    return """
+    # that weird spacing is part of the actual command output
-                            
+    return (
-
+        '\n'
-
+        '\n'
-  [InvalidArgumentException]       
+        '                                   \n'
-  Command "pdate" is not defined.  
+        '  [InvalidArgumentException]       \n'
-  Did you mean one of these?       
+        '  Command "pdate" is not defined.  \n'
-      selfupdate                   
+        '  Did you mean one of these?       \n'
-      self-update                  
+        '      selfupdate                   \n'
-      update                       
+        '      self-update                  \n'
-
+        '      update                       \n'
-
+        '                                   \n'
-
+        '\n'
-"""
+        '\n'
+    )
 
 
 def test_match(composer_not_command, composer_not_command_one_of_this):

tests/rules/test_dirty_untar.py

@@ -0,0 +1,63 @@
+import os
+import pytest
+import tarfile
+from thefuck.rules.dirty_untar import match, get_new_command, side_effect
+from tests.utils import Command
+
+
+@pytest.fixture
+def tar_error(tmpdir):
+    def fixture(filename):
+        path = os.path.join(str(tmpdir), filename)
+
+        def reset(path):
+            with tarfile.TarFile(path, 'w') as archive:
+                for file in ('a', 'b', 'c'):
+                    with open(file, 'w') as f:
+                        f.write('*')
+
+                    archive.add(file)
+
+                    os.remove(file)
+
+            with tarfile.TarFile(path, 'r') as archive:
+                archive.extractall()
+
+        os.chdir(str(tmpdir))
+        reset(path)
+
+        assert(set(os.listdir('.')) == {filename, 'a', 'b', 'c'})
+
+    return fixture
+
+parametrize_filename = pytest.mark.parametrize('filename', [
+    'foo.tar',
+    'foo.tar.gz',
+    'foo.tgz'])
+
+parametrize_script = pytest.mark.parametrize('script, fixed', [
+    ('tar xvf {}', 'mkdir -p foo && tar xvf {} -C foo'),
+    ('tar -xvf {}', 'mkdir -p foo && tar -xvf {} -C foo'),
+    ('tar --extract -f {}', 'mkdir -p foo && tar --extract -f {} -C foo')])
+
+
+@parametrize_filename
+@parametrize_script
+def test_match(tar_error, filename, script, fixed):
+    tar_error(filename)
+    assert match(Command(script=script.format(filename)), None)
+
+
+@parametrize_filename
+@parametrize_script
+def test_side_effect(tar_error, filename, script, fixed):
+    tar_error(filename)
+    side_effect(Command(script=script.format(filename)), None, None)
+    assert(os.listdir('.') == [filename])
+
+
+@parametrize_filename
+@parametrize_script
+def test_get_new_command(tar_error, filename, script, fixed):
+    tar_error(filename)
+    assert get_new_command(Command(script=script.format(filename)), None) == fixed.format(filename)

tests/rules/test_dirty_unzip.py

@@ -0,0 +1,45 @@
+import os
+import pytest
+import zipfile
+from thefuck.rules.dirty_unzip import match, get_new_command, side_effect
+from tests.utils import Command
+
+
+@pytest.fixture
+def zip_error(tmpdir):
+    path = os.path.join(str(tmpdir), 'foo.zip')
+
+    def reset(path):
+        with zipfile.ZipFile(path, 'w') as archive:
+            archive.writestr('a', '1')
+            archive.writestr('b', '2')
+            archive.writestr('c', '3')
+
+            archive.extractall()
+
+    os.chdir(str(tmpdir))
+    reset(path)
+
+    assert(set(os.listdir('.')) == {'foo.zip', 'a', 'b', 'c'})
+
+
+@pytest.mark.parametrize('script', [
+    'unzip foo',
+    'unzip foo.zip'])
+def test_match(zip_error, script):
+    assert match(Command(script=script), None)
+
+
+@pytest.mark.parametrize('script', [
+    'unzip foo',
+    'unzip foo.zip'])
+def test_side_effect(zip_error, script):
+    side_effect(Command(script=script), None, None)
+    assert(os.listdir('.') == ['foo.zip'])
+
+
+@pytest.mark.parametrize('script,fixed', [
+    ('unzip foo', 'unzip foo -d foo'),
+    ('unzip foo.zip', 'unzip foo.zip -d foo')])
+def test_get_new_command(zip_error, script, fixed):
+    assert get_new_command(Command(script=script), None) == fixed

tests/rules/test_docker_not_command.py

@@ -122,8 +122,8 @@ def test_not_match(script, stderr):
 
 @pytest.mark.usefixtures('docker_help')
 @pytest.mark.parametrize('wrong, fixed', [
-    ('pes', 'ps'),
+    ('pes', ['ps', 'push', 'pause']),
-    ('tags', 'tag')])
+    ('tags', ['tag', 'stats', 'images'])])
 def test_get_new_command(wrong, fixed):
     command = Command('docker {}'.format(wrong), stderr=stderr(wrong))
-    assert get_new_command(command, None) == 'docker {}'.format(fixed)
+    assert get_new_command(command, None) == ['docker {}'.format(x) for x in fixed]

tests/rules/test_fix_file.py

@@ -0,0 +1,234 @@
+import pytest
+import os
+from thefuck.rules.fix_file import match, get_new_command
+from tests.utils import Command
+from thefuck.types import Settings
+
+
+# (script, file, line, col (or None), stdout, stderr)
+tests = (
+('gcc a.c', 'a.c', 3, 1, '',
+"""
+a.c: In function 'main':
+a.c:3:1: error: expected expression before '}' token
+ }
+  ^
+"""),
+
+('clang a.c', 'a.c', 3, 1, '',
+"""
+a.c:3:1: error: expected expression
+}
+^
+"""),
+
+('perl a.pl', 'a.pl', 3, None, '',
+"""
+syntax error at a.pl line 3, at EOF
+Execution of a.pl aborted due to compilation errors.
+"""),
+
+('perl a.pl', 'a.pl', 2, None, '',
+"""
+Search pattern not terminated at a.pl line 2.
+"""),
+
+('sh a.sh', 'a.sh', 2, None, '',
+"""
+a.sh: line 2: foo: command not found
+"""),
+
+('zsh a.sh', 'a.sh', 2, None, '',
+"""
+a.sh:2: command not found: foo
+"""),
+
+('bash a.sh', 'a.sh', 2, None, '',
+"""
+a.sh: line 2: foo: command not found
+"""),
+
+('rustc a.rs', 'a.rs', 2, 5, '',
+"""
+a.rs:2:5: 2:6 error: unexpected token: `+`
+a.rs:2     +
+           ^
+"""),
+
+('cargo build', 'src/lib.rs', 3, 5, '',
+"""
+   Compiling test v0.1.0 (file:///tmp/fix-error/test)
+   src/lib.rs:3:5: 3:6 error: unexpected token: `+`
+   src/lib.rs:3     +
+                    ^
+Could not compile `test`.
+
+To learn more, run the command again with --verbose.
+"""),
+
+('python a.py', 'a.py', 2, None, '',
+"""
+  File "a.py", line 2
+      +
+          ^
+SyntaxError: invalid syntax
+"""),
+
+('python a.py', 'a.py', 8, None, '',
+"""
+Traceback (most recent call last):
+  File "a.py", line 8, in <module>
+    match("foo")
+  File "a.py", line 5, in match
+    m = re.search(None, command)
+  File "/usr/lib/python3.4/re.py", line 170, in search
+    return _compile(pattern, flags).search(string)
+  File "/usr/lib/python3.4/re.py", line 293, in _compile
+    raise TypeError("first argument must be string or compiled pattern")
+TypeError: first argument must be string or compiled pattern
+"""),
+
+('ruby a.rb', 'a.rb', 3, None, '',
+"""
+a.rb:3: syntax error, unexpected keyword_end
+"""),
+
+('lua a.lua', 'a.lua', 2, None, '',
+"""
+lua: a.lua:2: unexpected symbol near '+'
+"""),
+
+('fish a.sh', '/tmp/fix-error/a.sh', 2, None, '',
+"""
+fish: Unknown command 'foo'
+/tmp/fix-error/a.sh (line 2): foo
+                              ^
+"""),
+
+('./a', './a', 2, None, '',
+"""
+awk: ./a:2: BEGIN { print "Hello, world!" + }
+awk: ./a:2:                                 ^ syntax error
+"""),
+
+('llc a.ll', 'a.ll', 1, 2, '',
+"""
+llc: a.ll:1:2: error: expected top-level entity
++
+^
+"""),
+
+('go build a.go', 'a.go', 1, 2, '',
+"""
+can't load package:
+a.go:1:2: expected 'package', found '+'
+"""),
+
+('make', 'Makefile', 2, None, '',
+"""
+bidule
+make: bidule: Command not found
+Makefile:2: recipe for target 'target' failed
+make: *** [target] Error 127
+"""),
+
+('git st', '/home/martin/.config/git/config', 1, None, '',
+"""
+fatal: bad config file line 1 in /home/martin/.config/git/config
+"""),
+
+('node fuck.js asdf qwer', '/Users/pablo/Workspace/barebones/fuck.js', '2', 5, '',
+"""
+/Users/pablo/Workspace/barebones/fuck.js:2
+conole.log(arg);  // this should read console.log(arg);
+^
+ReferenceError: conole is not defined
+    at /Users/pablo/Workspace/barebones/fuck.js:2:5
+    at Array.forEach (native)
+    at Object.<anonymous> (/Users/pablo/Workspace/barebones/fuck.js:1:85)
+    at Module._compile (module.js:460:26)
+    at Object.Module._extensions..js (module.js:478:10)
+    at Module.load (module.js:355:32)
+    at Function.Module._load (module.js:310:12)
+    at Function.Module.runMain (module.js:501:10)
+    at startup (node.js:129:16)
+    at node.js:814:3
+"""),
+
+('pep8', './tests/rules/test_systemctl.py', 17, 80,
+"""
+./tests/rules/test_systemctl.py:17:80: E501 line too long (93 > 79 characters)
+./tests/rules/test_systemctl.py:18:80: E501 line too long (103 > 79 characters)
+./tests/rules/test_whois.py:20:80: E501 line too long (89 > 79 characters)
+./tests/rules/test_whois.py:22:80: E501 line too long (83 > 79 characters)
+""", ''),
+
+('py.test', '/home/thefuck/tests/rules/test_fix_file.py', 218, None,
+"""
+monkeypatch = <_pytest.monkeypatch.monkeypatch object at 0x7fdb76a25b38>
+test = ('fish a.sh', '/tmp/fix-error/a.sh', 2, None, '', "\\nfish: Unknown command 'foo'\\n/tmp/fix-error/a.sh (line 2): foo\\n                              ^\\n")
+
+    @pytest.mark.parametrize('test', tests)
+    @pytest.mark.usefixtures('no_memoize')
+    def test_get_new_command(monkeypatch, test):
+>       mocker.patch('os.path.isfile', return_value=True)
+E       NameError: name 'mocker' is not defined
+
+/home/thefuck/tests/rules/test_fix_file.py:218: NameError
+""", ''),
+)
+
+
+@pytest.mark.parametrize('test', tests)
+@pytest.mark.usefixtures('no_memoize')
+def test_match(mocker, monkeypatch, test):
+    mocker.patch('os.path.isfile', return_value=True)
+    monkeypatch.setenv('EDITOR', 'dummy_editor')
+    assert match(Command(stdout=test[4], stderr=test[5]), None)
+
+
+@pytest.mark.parametrize('test', tests)
+@pytest.mark.usefixtures('no_memoize')
+def test_no_editor(mocker, monkeypatch, test):
+    mocker.patch('os.path.isfile', return_value=True)
+    if 'EDITOR' in os.environ:
+        monkeypatch.delenv('EDITOR')
+
+    assert not match(Command(stdout=test[4], stderr=test[5]), None)
+
+
+@pytest.mark.parametrize('test', tests)
+@pytest.mark.usefixtures('no_memoize')
+def test_not_file(mocker, monkeypatch, test):
+    mocker.patch('os.path.isfile', return_value=False)
+    monkeypatch.setenv('EDITOR', 'dummy_editor')
+
+    assert not match(Command(stdout=test[4], stderr=test[5]), None)
+
+
+@pytest.mark.parametrize('test', tests)
+@pytest.mark.usefixtures('no_memoize')
+def test_get_new_command(mocker, monkeypatch, test):
+    mocker.patch('os.path.isfile', return_value=True)
+    monkeypatch.setenv('EDITOR', 'dummy_editor')
+
+    cmd = Command(script=test[0], stdout=test[4], stderr=test[5])
+    #assert (get_new_command(cmd, Settings({})) ==
+    #    'dummy_editor {} +{} && {}'.format(test[1], test[2], test[0]))
+
+
+@pytest.mark.parametrize('test', tests)
+@pytest.mark.usefixtures('no_memoize')
+def test_get_new_command_with_settings(mocker, monkeypatch, test):
+    mocker.patch('os.path.isfile', return_value=True)
+    monkeypatch.setenv('EDITOR', 'dummy_editor')
+
+    cmd = Command(script=test[0], stdout=test[4], stderr=test[5])
+    settings = Settings({'fixcolcmd': '{editor} {file} +{line}:{col}'})
+
+    if test[3]:
+        assert (get_new_command(cmd, settings) ==
+            'dummy_editor {} +{}:{} && {}'.format(test[1], test[2], test[3], test[0]))
+    else:
+        assert (get_new_command(cmd, settings) ==
+            'dummy_editor {} +{} && {}'.format(test[1], test[2], test[0]))

tests/rules/test_git_branch_list.py

@@ -2,6 +2,7 @@ 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)
 

tests/rules/test_git_fix_stash.py

@@ -10,7 +10,7 @@ usage: git stash list [<options>]
    or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
    or: git stash branch <branchname> [<stash>]
    or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
-		       [-u|--include-untracked] [-a|--all] [<message>]]
+\t\t       [-u|--include-untracked] [-a|--all] [<message>]]
    or: git stash clear
 '''
 

tests/rules/test_git_not_command.py

@@ -30,8 +30,8 @@ def git_not_command_closest():
     return '''git: 'tags' is not a git command. See 'git --help'.
 
 Did you mean one of these?
-	stage
+\tstage
-	tag
+\ttag
 '''
 
 
@@ -50,8 +50,8 @@ def test_match(git_not_command, git_command, git_not_command_one_of_this):
 def test_get_new_command(git_not_command, git_not_command_one_of_this,
                          git_not_command_closest):
     assert get_new_command(Command('git brnch', stderr=git_not_command), None) \
-           == 'git branch'
+           == ['git branch']
     assert get_new_command(Command('git st', stderr=git_not_command_one_of_this),
-                           None) == 'git status'
+                           None) == ['git stats', 'git stash', 'git stage']
     assert get_new_command(Command('git tags', stderr=git_not_command_closest),
-                           None) == 'git tag'
+                           None) == ['git tag', 'git stage']

tests/rules/test_go_run.py

@@ -4,7 +4,7 @@ from tests.utils import Command
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='go run foo'), 
+    Command(script='go run foo'),
     Command(script='go run bar')])
 def test_match(command):
     assert match(command, None)

tests/rules/test_gulp_not_task.py

@@ -25,4 +25,4 @@ def test_get_new_command(mocker):
     mocker.patch('thefuck.rules.gulp_not_task.get_gulp_tasks', return_value=[
         'serve', 'build', 'default'])
     command = Command('gulp srve', stdout('srve'))
-    assert get_new_command(command, None) == 'gulp serve'
+    assert get_new_command(command, None) == ['gulp serve', 'gulp default']

tests/rules/test_heroku_not_command.py

@@ -27,8 +27,8 @@ def test_not_match(script, stderr):
 
 
 @pytest.mark.parametrize('cmd, result', [
-    ('log', 'heroku logs'),
+    ('log', ['heroku logs', 'heroku pg']),
-    ('pge', 'heroku pg')])
+    ('pge', ['heroku pg', 'heroku logs'])])
 def test_get_new_command(cmd, result):
     command = Command('heroku {}'.format(cmd), stderr=suggest_stderr(cmd))
     assert get_new_command(command, None) == result

tests/rules/test_lein_not_task.py

@@ -1,6 +1,6 @@
 import pytest
-from mock import Mock
 from thefuck.rules.lein_not_task import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -9,14 +9,15 @@ def is_not_task():
 
 Did you mean this?
          repl
+         jar
 '''
 
 
 def test_match(is_not_task):
-    assert match(Mock(script='lein rpl', stderr=is_not_task), None)
+    assert match(Command(script='lein rpl', stderr=is_not_task), None)
-    assert not match(Mock(script='ls', stderr=is_not_task), None)
+    assert not match(Command(script='ls', stderr=is_not_task), None)
 
 
 def test_get_new_command(is_not_task):
-    assert get_new_command(Mock(script='lein rpl --help', stderr=is_not_task),
+    assert get_new_command(Command(script='lein rpl --help', stderr=is_not_task),
-                           None) == 'lein repl --help'
+                           None) == ['lein repl --help', 'lein jar --help']

tests/rules/test_ls_lah.py

@@ -1,16 +1,16 @@
-from mock import patch, Mock
 from thefuck.rules.ls_lah import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Mock(script='ls'), None)
+    assert match(Command(script='ls'), None)
-    assert match(Mock(script='ls file.py'), None)
+    assert match(Command(script='ls file.py'), None)
-    assert match(Mock(script='ls /opt'), None)
+    assert match(Command(script='ls /opt'), None)
-    assert not match(Mock(script='ls -lah /opt'), None)
+    assert not match(Command(script='ls -lah /opt'), None)
-    assert not match(Mock(script='pacman -S binutils'), None)
+    assert not match(Command(script='pacman -S binutils'), None)
-    assert not match(Mock(script='lsof'), None)
+    assert not match(Command(script='lsof'), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Mock(script='ls file.py'), None) == 'ls -lah file.py'
+    assert get_new_command(Command(script='ls file.py'), None) == 'ls -lah file.py'
-    assert get_new_command(Mock(script='ls'), None) == 'ls -lah'
+    assert get_new_command(Command(script='ls'), None) == 'ls -lah'

tests/rules/test_man.py

@@ -23,7 +23,7 @@ def test_not_match(command):
 
 
 @pytest.mark.parametrize('command, new_command', [
-    (Command('man read'), 'man 3 read'),
+    (Command('man read'), ['man 3 read', 'man 2 read']),
     (Command('man 2 read'), 'man 3 read'),
     (Command('man 3 read'), 'man 2 read'),
     (Command('man -s2 read'), 'man -s3 read'),

tests/rules/test_mercurial.py

@@ -2,7 +2,7 @@ import pytest
 
 from tests.utils import Command
 from thefuck.rules.mercurial import (
-    extract_possisiblities, match, get_new_command
+    extract_possibilities, match, get_new_command
 )
 
 
@@ -96,8 +96,8 @@ def test_not_match(command):
         '\n    rebase recover remove rename resolve revert'
     )), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']),
 ])
-def test_extract_possisiblities(command, possibilities):
+def test_extract_possibilities(command, possibilities):
-    assert extract_possisiblities(command) == possibilities
+    assert extract_possibilities(command) == possibilities
 
 
 @pytest.mark.parametrize('command, new_command', [

tests/rules/test_mkdir_p.py

@@ -3,20 +3,29 @@ from thefuck.rules.mkdir_p import match, get_new_command
 from tests.utils import Command
 
 
-def test_match():
+@pytest.mark.parametrize('command', [
-    assert match(Command('mkdir foo/bar/baz',
+    Command('mkdir foo/bar/baz', stderr='mkdir: foo/bar: No such file or directory'),
-                         stderr='mkdir: foo/bar: No such file or directory'),
+    Command('./bin/hdfs dfs -mkdir foo/bar/baz', stderr='mkdir: `foo/bar/baz\': No such file or directory'),
-                 None)
+    Command('hdfs dfs -mkdir foo/bar/baz', stderr='mkdir: `foo/bar/baz\': No such file or directory')
+    ])
+def test_match(command):
+    assert match(command, None)
 
 
 @pytest.mark.parametrize('command', [
     Command('mkdir foo/bar/baz'),
     Command('mkdir foo/bar/baz', stderr='foo bar baz'),
+    Command('hdfs dfs -mkdir foo/bar/baz'),
+    Command('./bin/hdfs dfs -mkdir foo/bar/baz'),
     Command()])
 def test_not_match(command):
     assert not match(command, None)
 
 
-def test_get_new_command():
+@pytest.mark.parametrize('command, new_command', [
-    assert get_new_command(Command('mkdir foo/bar/baz'), None)\
+    (Command('mkdir foo/bar/baz'), 'mkdir -p foo/bar/baz'),
-           == 'mkdir -p foo/bar/baz'
+    (Command('hdfs dfs -mkdir foo/bar/baz'), 'hdfs dfs -mkdir -p foo/bar/baz'),
+    (Command('./bin/hdfs dfs -mkdir foo/bar/baz'), './bin/hdfs dfs -mkdir -p foo/bar/baz')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_mvn_no_command.py

@@ -0,0 +1,40 @@
+import pytest
+from thefuck.rules.mvn_no_command import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn clean', stdout="""
+[INFO] Scanning for projects...[INFO]                                                                         
+[INFO] ------------------------------------------------------------------------
+[INFO] Building test 0.2
+[INFO] ------------------------------------------------------------------------
+[INFO] 
+[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ test ---
+[INFO] Deleting /home/mlk/code/test/target
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 0.477s
+[INFO] Finished at: Wed Aug 26 13:05:47 BST 2015
+[INFO] Final Memory: 6M/240M
+[INFO] ------------------------------------------------------------------------
+"""),
+    Command(script='mvn --help'),
+    Command(script='mvn -v')
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(script='mvn', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean package', 'mvn clean install']),
+    (Command(script='mvn -N', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn -N clean package', 'mvn -N clean install'])])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_mvn_unknown_lifecycle_phase.py

@@ -0,0 +1,40 @@
+import pytest
+from thefuck.rules.mvn_unknown_lifecycle_phase import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn cle', stdout='[ERROR] Unknown lifecycle phase "cle". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn clean', stdout="""
+[INFO] Scanning for projects...[INFO]                                                                         
+[INFO] ------------------------------------------------------------------------
+[INFO] Building test 0.2
+[INFO] ------------------------------------------------------------------------
+[INFO] 
+[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ test ---
+[INFO] Deleting /home/mlk/code/test/target
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 0.477s
+[INFO] Finished at: Wed Aug 26 13:05:47 BST 2015
+[INFO] Final Memory: 6M/240M
+[INFO] ------------------------------------------------------------------------
+"""),
+    Command(script='mvn --help'),
+    Command(script='mvn -v')
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(script='mvn cle', stdout='[ERROR] Unknown lifecycle phase "cle". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean', 'mvn compile']),
+    (Command(script='mvn claen package', stdout='[ERROR] Unknown lifecycle phase "claen". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean package'])])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_no_command.py

@@ -22,8 +22,8 @@ def test_get_new_command():
     assert get_new_command(
         Command(stderr='vom: not found',
                 script='vom file.py'),
-        None) == 'vim file.py'
+        None) == ['vim file.py']
     assert get_new_command(
         Command(stderr='fucck: not found',
                 script='fucck'),
-        Command) == 'fsck'
+        Command) == ['fsck']

tests/rules/test_no_such_file.py

@@ -11,6 +11,14 @@ def test_match(command):
     assert match(command, None)
 
 
+@pytest.mark.parametrize('command', [
+    Command(script='mv foo bar/', stderr=""),
+    Command(script='mv foo bar/foo', stderr="mv: permission denied"),
+    ])
+def test_not_match(command):
+    assert not match(command, None)
+
+
 @pytest.mark.parametrize('command, new_command', [
     (Command(script='mv foo bar/foo', stderr="mv: cannot move 'foo' to 'bar/foo': No such file or directory"), 'mkdir -p bar && mv foo bar/foo'),
     (Command(script='mv foo bar/', stderr="mv: cannot move 'foo' to 'bar/': No such file or directory"), 'mkdir -p bar && mv foo bar/'),

tests/rules/test_open.py

@@ -9,7 +9,10 @@ from tests.utils import Command
     Command(script='open foo.org'),
     Command(script='open foo.net'),
     Command(script='open foo.se'),
-    Command(script='open foo.io')])
+    Command(script='open foo.io'),
+    Command(script='xdg-open foo.com'),
+    Command(script='gnome-open foo.com'),
+    Command(script='kde-open foo.com')])
 def test_match(command):
     assert match(command, None)
 
@@ -20,6 +23,9 @@ def test_match(command):
     (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')])
+    (Command('open foo.io'), 'open http://foo.io'),
+    (Command('xdg-open foo.io'), 'xdg-open http://foo.io'),
+    (Command('gnome-open foo.io'), 'gnome-open http://foo.io'),
+    (Command('kde-open foo.io'), 'kde-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

@@ -7,17 +7,14 @@ from tests.utils import Command
 
 pacman_cmd = getattr(pacman, 'pacman', 'pacman')
 
-PKGFILE_OUTPUT_CONVERT = '''
+PKGFILE_OUTPUT_SUDO = 'core/sudo 1.8.13-13/usr/bin/sudo'
-extra/imagemagick 6.9.1.0-1\t/usr/bin/convert
+PKGFILE_OUTPUT_CONVERT = 'extra/imagemagick 6.9.1.0-1\t/usr/bin/convert'
-'''
 
-PKGFILE_OUTPUT_VIM = '''
+PKGFILE_OUTPUT_VIM = '''extra/gvim 7.4.712-1        \t/usr/bin/vim
-extra/gvim 7.4.712-1        \t/usr/bin/vim
 extra/gvim-python3 7.4.712-1\t/usr/bin/vim
 extra/vim 7.4.712-1         \t/usr/bin/vim
 extra/vim-minimal 7.4.712-1 \t/usr/bin/vim
-extra/vim-python3 7.4.712-1 \t/usr/bin/vim
+extra/vim-python3 7.4.712-1 \t/usr/bin/vim'''
-'''
 
 
 @pytest.mark.skipif(not getattr(pacman, 'enabled_by_default', True),
@@ -32,7 +29,7 @@ def test_match(command):
 @pytest.mark.parametrize('command, return_value', [
     (Command(script='vim', stderr='vim: command not found'), PKGFILE_OUTPUT_VIM),
     (Command(script='sudo vim', stderr='sudo: vim: command not found'), PKGFILE_OUTPUT_VIM)])
-@patch('thefuck.rules.pacman.subprocess')
+@patch('thefuck.specific.archlinux.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
@@ -46,23 +43,39 @@ def test_not_match(command):
     assert not match(command, None)
 
 
+sudo_vim_possibilities = ['{} -S extra/gvim && sudo vim',
+                          '{} -S extra/gvim-python3 && sudo vim',
+                          '{} -S extra/vim && sudo vim',
+                          '{} -S extra/vim-minimal && sudo vim',
+                          '{} -S extra/vim-python3 && sudo vim']
+sudo_vim_possibilities = [s.format(pacman_cmd) for s in sudo_vim_possibilities]
+
+vim_possibilities = ['{} -S extra/gvim && vim',
+                     '{} -S extra/gvim-python3 && vim',
+                     '{} -S extra/vim && vim',
+                     '{} -S extra/vim-minimal && vim',
+                     '{} -S extra/vim-python3 && vim']
+vim_possibilities = [s.format(pacman_cmd) for s in vim_possibilities]
+
+
 @pytest.mark.skipif(not getattr(pacman, 'enabled_by_default', True),
                     reason='Skip if pacman is not available')
 @pytest.mark.parametrize('command, new_command', [
-    (Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd)),
+    (Command('vim'), vim_possibilities),
-    (Command('sudo vim'), '{} -S extra/gvim && sudo vim'.format(pacman_cmd)),
+    (Command('sudo vim'), sudo_vim_possibilities),
-    (Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd)),
+    (Command('convert'), ['{} -S extra/imagemagick && convert'.format(pacman_cmd)]),
-    (Command('sudo convert'), '{} -S extra/imagemagick && sudo 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('vim'), vim_possibilities, PKGFILE_OUTPUT_VIM),
-    (Command('sudo vim'), '{} -S extra/gvim && sudo vim'.format(pacman_cmd), PKGFILE_OUTPUT_VIM),
+    (Command('sudo vim'), sudo_vim_possibilities, PKGFILE_OUTPUT_VIM),
-    (Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd), PKGFILE_OUTPUT_CONVERT),
+    (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)])
+    (Command('sudo'), ['{} -S core/sudo && sudo'.format(pacman_cmd)], PKGFILE_OUTPUT_SUDO),
-@patch('thefuck.rules.pacman.subprocess')
+    (Command('sudo convert'), ['{} -S extra/imagemagick && sudo convert'.format(pacman_cmd)], PKGFILE_OUTPUT_CONVERT)])
+@patch('thefuck.specific.archlinux.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

tests/rules/test_pacman_not_found.py

@@ -0,0 +1,48 @@
+import pytest
+from mock import patch
+from thefuck.rules import pacman_not_found
+from thefuck.rules.pacman_not_found import match, get_new_command
+from tests.utils import Command
+
+PKGFILE_OUTPUT_LLC = '''extra/llvm 3.6.0-5      /usr/bin/llc
+extra/llvm35 3.5.2-13/usr/bin/llc'''
+
+
+@pytest.mark.skipif(not getattr(pacman_not_found, 'enabled_by_default', True),
+                    reason='Skip if pacman is not available')
+@pytest.mark.parametrize('command', [
+    Command(script='yaourt -S llc', stderr='error: target not found: llc'),
+    Command(script='pacman llc', stderr='error: target not found: llc'),
+    Command(script='sudo pacman llc', stderr='error: target not found: llc')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='yaourt -S llc', stderr='error: target not found: llc'),
+    Command(script='pacman llc', stderr='error: target not found: llc'),
+    Command(script='sudo pacman llc', stderr='error: target not found: llc')])
+@patch('thefuck.specific.archlinux.subprocess')
+def test_match_mocked(subp_mock, command):
+    subp_mock.check_output.return_value = PKGFILE_OUTPUT_LLC
+    assert match(command, None)
+
+
+@pytest.mark.skipif(not getattr(pacman_not_found, 'enabled_by_default', True),
+                    reason='Skip if pacman is not available')
+@pytest.mark.parametrize('command, fixed', [
+    (Command(script='yaourt -S llc', stderr='error: target not found: llc'), ['yaourt -S extra/llvm', 'yaourt -S extra/llvm35']),
+    (Command(script='pacman -S llc', stderr='error: target not found: llc'), ['pacman -S extra/llvm', 'pacman -S extra/llvm35']),
+    (Command(script='sudo pacman -S llc', stderr='error: target not found: llc'), ['sudo pacman -S extra/llvm', 'sudo pacman -S extra/llvm35'])])
+def test_get_new_command(command, fixed):
+    assert get_new_command(command, None) == fixed
+
+
+@pytest.mark.parametrize('command, fixed', [
+    (Command(script='yaourt -S llc', stderr='error: target not found: llc'), ['yaourt -S extra/llvm', 'yaourt -S extra/llvm35']),
+    (Command(script='pacman -S llc', stderr='error: target not found: llc'), ['pacman -S extra/llvm', 'pacman -S extra/llvm35']),
+    (Command(script='sudo pacman -S llc', stderr='error: target not found: llc'), ['sudo pacman -S extra/llvm', 'sudo pacman -S extra/llvm35'])])
+@patch('thefuck.specific.archlinux.subprocess')
+def test_get_new_command_mocked(subp_mock, command, fixed):
+    subp_mock.check_output.return_value = PKGFILE_OUTPUT_LLC
+    assert get_new_command(command, None) == fixed

tests/rules/test_rm_dir.py

@@ -5,17 +5,27 @@ from tests.utils import Command
 
 @pytest.mark.parametrize('command', [
     Command('rm foo', stderr='rm: foo: is a directory'),
-    Command('rm foo', stderr='rm: foo: Is a directory')])
+    Command('rm foo', stderr='rm: foo: Is a directory'),
+    Command('hdfs dfs -rm foo', stderr='rm: `foo`: Is a directory'),
+    Command('./bin/hdfs dfs -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()])
+    Command('rm foo'), 
+    Command('hdfs dfs -rm foo'),
+    Command('./bin/hdfs dfs -rm foo'),  
+    Command()])
 def test_not_match(command):
     assert not match(command, None)
 
 
-def test_get_new_command():
+@pytest.mark.parametrize('command, new_command', [
-    assert get_new_command(Command('rm foo', '', ''), None) == 'rm -rf foo'
+    (Command('rm foo'), 'rm -rf foo'),
+    (Command('hdfs dfs -rm foo'), 'hdfs dfs -rm -r foo')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+
+

tests/rules/test_ssh_known_host.py

@@ -56,7 +56,7 @@ def test_match(ssh_error):
 def test_side_effect(ssh_error):
     errormsg, path, reset, known_hosts = ssh_error
     command = Command('ssh user@host', stderr=errormsg)
-    side_effect(command, None)
+    side_effect(command, None, None)
     expected = ['123.234.567.890 asdjkasjdakjsd\n', '111.222.333.444 qwepoiwqepoiss\n']
     assert known_hosts(path) == expected
 

tests/rules/test_sudo.py

@@ -21,5 +21,9 @@ def test_not_match():
     assert not match(Command(), None)
 
 
-def test_get_new_command():
+@pytest.mark.parametrize('before, after', [
-    assert get_new_command(Command('ls'), None) == 'sudo ls'
+    ('ls', 'sudo ls'),
+    ('echo a > b', 'sudo sh -c "echo a > b"'),
+    ('echo "a" >> b', 'sudo sh -c "echo \\"a\\" >> b"')])
+def test_get_new_command(before, after):
+    assert get_new_command(Command(before), None) == after

tests/rules/test_systemctl.py

@@ -3,7 +3,6 @@ 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)
@@ -13,6 +12,7 @@ def test_match():
     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

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

tests/rules/test_tsuru_login.py

@@ -0,0 +1,37 @@
+import pytest
+from thefuck.rules.tsuru_login import match, get_new_command
+from tests.utils import Command
+
+
+error_msg = (
+    "Error: you're not authenticated or your session has expired.",
+    ("You're not authenticated or your session has expired. "
+     "Please use \"login\" command for authentication."),
+)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='tsuru app-shell', stderr=error_msg[0]),
+    Command(script='tsuru app-log -f', stderr=error_msg[1]),
+])
+def test_match(command):
+    assert match(command, {})
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='tsuru'),
+    Command(script='tsuru app-restart', stderr=('Error: unauthorized')),
+    Command(script='tsuru app-log -f', stderr=('Error: unparseable data')),
+])
+def test_not_match(command):
+    assert not match(command, {})
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('tsuru app-shell', stderr=error_msg[0]),
+     'tsuru login && tsuru app-shell'),
+    (Command('tsuru app-log -f', stderr=error_msg[1]),
+     'tsuru login && tsuru app-log -f'),
+])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, {}) == new_command

tests/rules/test_tsuru_not_command.py

@@ -0,0 +1,90 @@
+import pytest
+
+from tests.utils import Command
+from thefuck.rules.tsuru_not_command import match, get_new_command
+
+
+@pytest.mark.parametrize('command', [
+    Command('tsuru log', stderr=(
+        'tsuru: "tchururu" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\tapp-log\n'
+        '\tlogin\n'
+        '\tlogout\n'
+    )),
+    Command('tsuru app-l', stderr=(
+        'tsuru: "tchururu" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\tapp-list\n'
+        '\tapp-log\n'
+    )),
+    Command('tsuru user-list', stderr=(
+        'tsuru: "tchururu" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\tteam-user-list\n'
+    )),
+    Command('tsuru targetlist', stderr=(
+        'tsuru: "tchururu" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\ttarget-list\n'
+    )),
+])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command('tsuru tchururu', stderr=(
+        'tsuru: "tchururu" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+    )),
+    Command('tsuru version', stderr='tsuru version 0.16.0.'),
+    Command('tsuru help', stderr=(
+        'tsuru version 0.16.0.\n'
+        '\nUsage: tsuru command [args]\n'
+    )),
+    Command('tsuru platform-list', stderr=(
+        '- java\n'
+        '- logstashgiro\n'
+        '- newnode\n'
+        '- nodejs\n'
+        '- php\n'
+        '- python\n'
+        '- python3\n'
+        '- ruby\n'
+        '- ruby20\n'
+        '- static\n'
+    )),
+    Command('tsuru env-get', stderr='Error: App thefuck not found.'),
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_commands', [
+    (Command('tsuru log', stderr=(
+        'tsuru: "log" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\tapp-log\n'
+        '\tlogin\n'
+        '\tlogout\n'
+    )), ['tsuru login', 'tsuru logout', 'tsuru app-log']),
+    (Command('tsuru app-l', stderr=(
+        'tsuru: "app-l" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\tapp-list\n'
+        '\tapp-log\n'
+    )), ['tsuru app-log', 'tsuru app-list']),
+    (Command('tsuru user-list', stderr=(
+        'tsuru: "user-list" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\tteam-user-list\n'
+    )), ['tsuru team-user-list']),
+    (Command('tsuru targetlist', stderr=(
+        'tsuru: "targetlist" is not a tsuru command. See "tsuru help".\n'
+        '\nDid you mean?\n'
+        '\ttarget-list\n'
+    )), ['tsuru target-list']),
+])
+def test_get_new_command(command, new_commands):
+    assert get_new_command(command, None) == new_commands

tests/rules/test_unknown_command.py

@@ -0,0 +1,35 @@
+import pytest
+from thefuck.rules.unknown_command import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='./bin/hdfs dfs ls', stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.'),
+    Command(script='hdfs dfs ls',
+            stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.'),
+    Command(script='hdfs dfs ls /foo/bar', stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='./bin/hdfs dfs -ls', stderr=''),
+    Command(script='./bin/hdfs dfs -ls /foo/bar', stderr=''),  
+    Command(script='hdfs dfs -ls -R /foo/bar', stderr=''),  
+    Command()])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('hdfs dfs ls',
+        stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.'), ['hdfs dfs -ls']),
+    (Command('hdfs dfs rm /foo/bar',
+        stderr='rm: Unknown command\nDid you mean -rm?  This command begins with a dash.'), ['hdfs dfs -rm /foo/bar']),
+    (Command('./bin/hdfs dfs ls -R /foo/bar',
+        stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.'), ['./bin/hdfs dfs -ls -R /foo/bar']),
+    (Command('./bin/hdfs dfs -Dtest=fred ls -R /foo/bar',
+        stderr='ls: Unknown command\nDid you mean -ls?  This command begins with a dash.'), ['./bin/hdfs dfs -Dtest=fred -ls -R /foo/bar'])])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_vagrant_up.py

@@ -0,0 +1,35 @@
+import pytest
+from thefuck.rules.vagrant_up import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='vagrant ssh', stderr='VM must be running to open SSH connection. Run `vagrant up`\nto start the virtual machine.'),
+    Command(script='vagrant ssh devbox', stderr='VM must be running to open SSH connection. Run `vagrant up`\nto start the virtual machine.'),
+    Command(script='vagrant rdp',
+            stderr='VM must be created before running this command. Run `vagrant up` first.'),
+    Command(script='vagrant rdp devbox',
+            stderr='VM must be created before running this command. Run `vagrant up` first.')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='vagrant ssh', stderr=''),
+    Command(script='vagrant ssh jeff', stderr='The machine with the name \'jeff\' was not found configured for this Vagrant environment.'),  
+    Command(script='vagrant ssh', stderr='A Vagrant environment or target machine is required to run this command. Run `vagrant init` to create a new Vagrant environment. Or, get an ID of a target machine from `vagrant global-status` to run this command on. A final option is to change to a directory with a Vagrantfile and to try again.'),  
+    Command()])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(script='vagrant ssh', stderr='VM must be running to open SSH connection. Run `vagrant up`\nto start the virtual machine.'), 'vagrant up && vagrant ssh'),
+    (Command(script='vagrant ssh devbox', stderr='VM must be running to open SSH connection. Run `vagrant up`\nto start the virtual machine.'), ['vagrant up devbox && vagrant ssh devbox', 'vagrant up && vagrant ssh devbox']),
+    (Command(script='vagrant rdp',
+            stderr='VM must be created before running this command. Run `vagrant up` first.'), 'vagrant up && vagrant rdp'),
+    (Command(script='vagrant rdp devbox',
+            stderr='VM must be created before running this command. Run `vagrant up` first.'), ['vagrant up devbox && vagrant rdp devbox', 'vagrant up && vagrant rdp devbox'])])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_whois.py

@@ -6,7 +6,7 @@ from tests.utils import Command
 @pytest.mark.parametrize('command', [
     Command(script='whois https://en.wikipedia.org/wiki/Main_Page'),
     Command(script='whois https://en.wikipedia.org/'),
-    Command(script='whois en.wikipedia.org')])
+    Command(script='whois meta.unix.stackexchange.com')])
 def test_match(command):
     assert match(command, None)
 
@@ -15,9 +15,12 @@ def test_not_match():
     assert not match(Command(script='whois'), None)
 
 
+# `whois com` actually makes sense
 @pytest.mark.parametrize('command, new_command', [
     (Command('whois https://en.wikipedia.org/wiki/Main_Page'), 'whois en.wikipedia.org'),
     (Command('whois https://en.wikipedia.org/'), 'whois en.wikipedia.org'),
-    (Command('whois en.wikipedia.org'), 'whois wikipedia.org')])
+    (Command('whois meta.unix.stackexchange.com'), ['whois unix.stackexchange.com',
+                                                    'whois stackexchange.com',
+                                                    'whois com'])])
 def test_get_new_command(command, new_command):
     assert get_new_command(command, None) == new_command

tests/specific/test_git.py

@@ -0,0 +1,29 @@
+import pytest
+from thefuck.specific.git import git_support
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('called, command, stderr', [
+    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
+    ('git com file', 'git commit --verbose file',
+     "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
+def test_git_support(called, command, stderr):
+    @git_support
+    def fn(command, settings): return command.script
+
+    assert fn(Command(script=called, stderr=stderr), None) == command
+
+
+@pytest.mark.parametrize('command, is_git', [
+    ('git pull', True),
+    ('hub pull', True),
+    ('git push --set-upstream origin foo', True),
+    ('hub push --set-upstream origin foo', True),
+    ('ls', False),
+    ('cat git', False),
+    ('cat hub', False)])
+def test_git_support_match(command, is_git):
+    @git_support
+    def fn(command, settings): return True
+
+    assert fn(Command(script=command), None) == is_git

tests/specific/test_sudo.py

@@ -0,0 +1,20 @@
+import pytest
+from mock import Mock
+from thefuck.specific.sudo import sudo_support
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('return_value, command, called, result', [
+    ('ls -lah', 'sudo ls', 'ls', 'sudo ls -lah'),
+    ('ls -lah', 'ls', 'ls', 'ls -lah'),
+    (['ls -lah'], 'sudo ls', 'ls', ['sudo 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):
+    def fn(command, settings):
+        assert command == Command(called)
+        return return_value
+
+    assert sudo_support(fn)(Command(command), None) == result

tests/test_corrector.py

@@ -0,0 +1,85 @@
+import pytest
+from pathlib import PosixPath, Path
+from mock import Mock
+from thefuck import corrector, conf, types
+from tests.utils import Rule, Command, CorrectedCommand
+from thefuck.corrector import make_corrected_commands, get_corrected_commands
+
+
+def test_load_rule(mocker):
+    match = object()
+    get_new_command = object()
+    load_source = mocker.patch(
+        'thefuck.corrector.load_source',
+        return_value=Mock(match=match,
+                          get_new_command=get_new_command,
+                          enabled_by_default=True,
+                          priority=900,
+                          requires_output=True))
+    assert corrector.load_rule(Path('/rules/bash.py'), settings=Mock(priority={})) \
+           == Rule('bash', match, get_new_command, priority=900)
+    load_source.assert_called_once_with('bash', '/rules/bash.py')
+
+
+class TestGetRules(object):
+    @pytest.fixture(autouse=True)
+    def glob(self, mocker):
+        return mocker.patch('thefuck.corrector.Path.glob', return_value=[])
+
+    def _compare_names(self, rules, names):
+        return [r.name for r in rules] == names
+
+    @pytest.mark.parametrize('conf_rules, rules', [
+        (conf.DEFAULT_RULES, ['bash', 'lisp', 'bash', 'lisp']),
+        (types.RulesNamesList(['bash']), ['bash', 'bash'])])
+    def test_get(self, monkeypatch, glob, conf_rules, rules):
+        glob.return_value = [PosixPath('bash.py'), PosixPath('lisp.py')]
+        monkeypatch.setattr('thefuck.corrector.load_source',
+                            lambda x, _: Rule(x))
+        assert self._compare_names(
+            corrector.get_rules(Path('~'), Mock(rules=conf_rules, priority={})),
+            rules)
+
+
+class TestIsRuleMatch(object):
+    def test_no_match(self, settings):
+        assert not corrector.is_rule_match(
+            Command('ls'), Rule('', lambda *_: False), settings)
+
+    def test_match(self, settings):
+        rule = Rule('', lambda x, _: x.script == 'cd ..')
+        assert corrector.is_rule_match(Command('cd ..'), rule, settings)
+
+    def test_when_rule_failed(self, capsys, settings):
+        rule = Rule('test', Mock(side_effect=OSError('Denied')),
+                    requires_output=False)
+        assert not corrector.is_rule_match(
+            Command('ls'), rule, settings)
+        assert capsys.readouterr()[1].split('\n')[0] == '[WARN] Rule test:'
+
+
+class TestMakeCorrectedCommands(object):
+    def test_with_rule_returns_list(self):
+        rule = Rule(get_new_command=lambda x, _: [x.script + '!', x.script + '@'],
+                    priority=100)
+        assert list(make_corrected_commands(Command(script='test'), rule, None)) \
+               == [CorrectedCommand(script='test!', priority=100),
+                   CorrectedCommand(script='test@', priority=200)]
+
+    def test_with_rule_returns_command(self):
+        rule = Rule(get_new_command=lambda x, _: x.script + '!',
+                    priority=100)
+        assert list(make_corrected_commands(Command(script='test'), rule, None)) \
+               == [CorrectedCommand(script='test!', priority=100)]
+
+def test_get_corrected_commands(mocker):
+    command = Command('test', 'test', 'test')
+    rules = [Rule(match=lambda *_: False),
+             Rule(match=lambda *_: True,
+                  get_new_command=lambda x, _: x.script + '!', priority=100),
+             Rule(match=lambda *_: True,
+                  get_new_command=lambda x, _: [x.script + '@', x.script + ';'],
+                  priority=60)]
+    mocker.patch('thefuck.corrector.get_rules', return_value=rules)
+    assert [cmd.script for cmd in get_corrected_commands(command, None, Mock(debug=False))] \
+           == ['test!', 'test@', 'test;']

tests/test_main.py

@@ -1,60 +1,8 @@
 import pytest
 from subprocess import PIPE
-from pathlib import PosixPath, Path
 from mock import Mock
-from thefuck import main, conf, types
+from thefuck import main
-from tests.utils import Rule, Command
+from tests.utils import Command
-
-
-def test_load_rule(mocker):
-    match = object()
-    get_new_command = object()
-    load_source = mocker.patch(
-        'thefuck.main.load_source',
-        return_value=Mock(match=match,
-                          get_new_command=get_new_command,
-                          enabled_by_default=True,
-                          priority=900))
-    assert main.load_rule(Path('/rules/bash.py')) \
-           == Rule('bash', match, get_new_command, priority=900)
-    load_source.assert_called_once_with('bash', '/rules/bash.py')
-
-
-class TestGetRules(object):
-    @pytest.fixture(autouse=True)
-    def glob(self, mocker):
-        return mocker.patch('thefuck.main.Path.glob', return_value=[])
-
-    def _compare_names(self, rules, names):
-        return [r.name for r in rules] == names
-
-    @pytest.mark.parametrize('conf_rules, rules', [
-        (conf.DEFAULT_RULES, ['bash', 'lisp', 'bash', 'lisp']),
-        (types.RulesNamesList(['bash']), ['bash', 'bash'])])
-    def test_get(self, monkeypatch, glob, conf_rules, rules):
-        glob.return_value = [PosixPath('bash.py'), PosixPath('lisp.py')]
-        monkeypatch.setattr('thefuck.main.load_source',
-                            lambda x, _: Rule(x))
-        assert self._compare_names(
-            main.get_rules(Path('~'), Mock(rules=conf_rules, priority={})),
-            rules)
-
-    @pytest.mark.parametrize('priority, unordered, ordered', [
-        ({},
-         [Rule('bash', priority=100), Rule('python', priority=5)],
-         ['python', 'bash']),
-        ({},
-         [Rule('lisp', priority=9999), Rule('c', priority=conf.DEFAULT_PRIORITY)],
-         ['c', 'lisp']),
-        ({'python': 9999},
-         [Rule('bash', priority=100), Rule('python', priority=5)],
-         ['bash', 'python'])])
-    def test_ordered_by_priority(self, monkeypatch, priority, unordered, ordered):
-        monkeypatch.setattr('thefuck.main._get_loaded_rules',
-                            lambda *_: unordered)
-        assert self._compare_names(
-            main.get_rules(Path('~'), Mock(priority=priority)),
-            ordered)
 
 
 class TestGetCommand(object):
@@ -78,7 +26,7 @@ class TestGetCommand(object):
 
     def test_get_command_calls(self, Popen):
         assert main.get_command(Mock(env={}),
-            ['thefuck', 'apt-get', 'search', 'vim']) \
+                                ['thefuck', 'apt-get', 'search', 'vim']) \
                == Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,
@@ -87,6 +35,8 @@ class TestGetCommand(object):
                                       env={})
 
     @pytest.mark.parametrize('args, result', [
+        (['thefuck', ''], None),
+        (['thefuck', '', ''], None),
         (['thefuck', 'ls', '-la'], 'ls -la'),
         (['thefuck', 'ls'], 'ls')])
     def test_get_command_script(self, args, result):
@@ -94,80 +44,3 @@ class TestGetCommand(object):
             assert main.get_command(Mock(env={}), args).script == result
         else:
             assert main.get_command(Mock(env={}), args) is None
-
-
-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, debug=False))
-        assert capsys.readouterr()[1].split('\n')[0] == '[WARN] Rule test:'
-
-
-class TestRunRule(object):
-    @pytest.fixture(autouse=True)
-    def confirm(self, mocker):
-        return mocker.patch('thefuck.main.confirm', return_value=True)
-
-    def test_run_rule(self, capsys):
-        main.run_rule(Rule(get_new_command=lambda *_: 'new-command'),
-                      Command(), None)
-        assert capsys.readouterr() == ('new-command\n', '')
-
-    def test_run_rule_with_side_effect(self, capsys):
-        side_effect = Mock()
-        settings = Mock(debug=False)
-        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() == ('', '')
-
-
-class TestConfirm(object):
-    @pytest.fixture
-    def stdin(self, mocker):
-        return mocker.patch('sys.stdin.read', return_value='\n')
-
-    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]')
-
-    # `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_readme.py

@@ -0,0 +1,16 @@
+from tests.utils import root
+
+
+def test_readme():
+    with root.joinpath('README.md').open() as f:
+        readme = f.read()
+
+        bundled = root \
+            .joinpath('thefuck') \
+            .joinpath('rules') \
+            .glob('*.py')
+
+        for rule in bundled:
+            if rule.stem != '__init__':
+                assert rule.stem in readme,\
+                    'Missing rule "{}" in README.md'.format(rule.stem)

tests/test_types.py

@@ -1,5 +1,6 @@
-from thefuck.types import RulesNamesList, Settings
+from thefuck.types import RulesNamesList, Settings, \
-from tests.utils import Rule
+    SortedCorrectedCommandsSequence
+from tests.utils import Rule, CorrectedCommand
 
 
 def test_rules_names_list():
@@ -11,6 +12,47 @@ def test_rules_names_list():
 
 def test_update_settings():
     settings = Settings({'key': 'val'})
-    new_settings = settings.update(key='new-val')
+    new_settings = settings.update(key='new-val', unset='unset-value')
-    assert new_settings.key == 'new-val'
+    assert new_settings.key == 'val'
+    assert new_settings.unset == 'unset-value'
     assert settings.key == 'val'
+
+
+class TestSortedCorrectedCommandsSequence(object):
+    def test_realises_generator_only_on_demand(self, settings):
+        should_realise = False
+
+        def gen():
+            yield CorrectedCommand('git commit')
+            yield CorrectedCommand('git branch', priority=200)
+            assert should_realise
+            yield CorrectedCommand('git checkout', priority=100)
+
+        commands = SortedCorrectedCommandsSequence(gen(), settings)
+        assert commands[0] == CorrectedCommand('git commit')
+        should_realise = True
+        assert commands[1] == CorrectedCommand('git checkout', priority=100)
+        assert commands[2] == CorrectedCommand('git branch', priority=200)
+
+    def test_remove_duplicates(self, settings):
+        side_effect = lambda *_: None
+        seq = SortedCorrectedCommandsSequence(
+            iter([CorrectedCommand('ls', priority=100),
+                  CorrectedCommand('ls', priority=200),
+                  CorrectedCommand('ls', side_effect, 300)]),
+            settings)
+        assert set(seq) == {CorrectedCommand('ls', priority=100),
+                            CorrectedCommand('ls', side_effect, 300)}
+
+
+class TestCorrectedCommand(object):
+
+    def test_equality(self):
+        assert CorrectedCommand('ls', None, 100) == \
+               CorrectedCommand('ls', None, 200)
+        assert CorrectedCommand('ls', None, 100) != \
+               CorrectedCommand('ls', lambda *_: _, 100)
+
+    def test_hashable(self):
+        assert {CorrectedCommand('ls', None, 100),
+                CorrectedCommand('ls', None, 200)} == {CorrectedCommand('ls')}

tests/test_ui.py

@@ -0,0 +1,121 @@
+# -*- encoding: utf-8 -*-
+
+from mock import Mock
+import pytest
+from itertools import islice
+from thefuck import ui
+from thefuck.types import CorrectedCommand, SortedCorrectedCommandsSequence
+
+
+@pytest.fixture
+def patch_getch(monkeypatch):
+    def patch(vals):
+        def getch():
+            for val in vals:
+                if val == KeyboardInterrupt:
+                    raise val
+                else:
+                    yield val
+
+        getch_gen = getch()
+        monkeypatch.setattr('thefuck.ui.getch', lambda: next(getch_gen))
+
+    return patch
+
+
+def test_read_actions(patch_getch):
+    patch_getch([  # Enter:
+                   '\n',
+                   # Enter:
+                   '\r',
+                   # Ignored:
+                   'x', 'y',
+                   # Up:
+                   '\x1b', '[', 'A',
+                   # Down:
+                   '\x1b', '[', 'B',
+                   # Ctrl+C:
+                   KeyboardInterrupt], )
+    assert list(islice(ui.read_actions(), 5)) \
+           == [ui.SELECT, ui.SELECT, ui.PREVIOUS, ui.NEXT, ui.ABORT]
+
+
+def test_command_selector():
+    selector = ui.CommandSelector([1, 2, 3])
+    assert selector.value == 1
+    changes = []
+    selector.on_change(changes.append)
+    selector.next()
+    assert selector.value == 2
+    selector.next()
+    assert selector.value == 3
+    selector.next()
+    assert selector.value == 1
+    selector.previous()
+    assert selector.value == 3
+    assert changes == [1, 2, 3, 1, 3]
+
+
+class TestSelectCommand(object):
+    @pytest.fixture
+    def commands_with_side_effect(self, settings):
+        return SortedCorrectedCommandsSequence(
+            iter([CorrectedCommand('ls', lambda *_: None, 100),
+                  CorrectedCommand('cd', lambda *_: None, 100)]),
+            settings)
+
+    @pytest.fixture
+    def commands(self, settings):
+        return SortedCorrectedCommandsSequence(
+            iter([CorrectedCommand('ls', None, 100),
+                  CorrectedCommand('cd', None, 100)]),
+            settings)
+
+    def test_without_commands(self, capsys):
+        assert ui.select_command([], Mock(debug=False, no_color=True)) is None
+        assert capsys.readouterr() == ('', 'No fucks given\n')
+
+    def test_without_confirmation(self, capsys, commands):
+        assert ui.select_command(commands,
+                                 Mock(debug=False, no_color=True,
+                                      require_confirmation=False)) == commands[0]
+        assert capsys.readouterr() == ('', 'ls\n')
+
+    def test_without_confirmation_with_side_effects(self, capsys,
+                                                    commands_with_side_effect):
+        assert ui.select_command(commands_with_side_effect,
+                                 Mock(debug=False, no_color=True,
+                                      require_confirmation=False)) \
+               == commands_with_side_effect[0]
+        assert capsys.readouterr() == ('', 'ls (+side effect)\n')
+
+    def test_with_confirmation(self, capsys, patch_getch, commands):
+        patch_getch(['\n'])
+        assert ui.select_command(commands,
+                                 Mock(debug=False, no_color=True,
+                                      require_confirmation=True)) == commands[0]
+        assert capsys.readouterr() == ('', u'\x1b[1K\rls [enter/↑/↓/ctrl+c]\n')
+
+    def test_with_confirmation_abort(self, capsys, patch_getch, commands):
+        patch_getch([KeyboardInterrupt])
+        assert ui.select_command(commands,
+                                 Mock(debug=False, no_color=True,
+                                      require_confirmation=True)) is None
+        assert capsys.readouterr() == ('', u'\x1b[1K\rls [enter/↑/↓/ctrl+c]\nAborted\n')
+
+    def test_with_confirmation_with_side_effct(self, capsys, patch_getch,
+                                               commands_with_side_effect):
+        patch_getch(['\n'])
+        assert ui.select_command(commands_with_side_effect,
+                                 Mock(debug=False, no_color=True,
+                                      require_confirmation=True))\
+               == commands_with_side_effect[0]
+        assert capsys.readouterr() == ('', u'\x1b[1K\rls (+side effect) [enter/↑/↓/ctrl+c]\n')
+
+    def test_with_confirmation_select_second(self, capsys, patch_getch, commands):
+        patch_getch(['\x1b', '[', 'B', '\n'])
+        assert ui.select_command(commands,
+                                 Mock(debug=False, no_color=True,
+                                      require_confirmation=True)) == commands[1]
+        assert capsys.readouterr() == (
+            '', u'\x1b[1K\rls [enter/↑/↓/ctrl+c]\x1b[1K\rcd [enter/↑/↓/ctrl+c]\n')

tests/test_utils.py

@@ -1,55 +1,22 @@
 import pytest
 from mock import Mock
-from thefuck.utils import git_support, sudo_support, wrap_settings,\
+import six
-    memoize, get_closest, get_all_executables, replace_argument
+from thefuck.utils import wrap_settings, \
+    memoize, get_closest, get_all_executables, replace_argument, \
+    get_all_matched_commands, is_app, for_app, cache
 from thefuck.types import Settings
 from tests.utils import Command
 
 
 @pytest.mark.parametrize('override, old, new', [
     ({'key': 'val'}, {}, {'key': 'val'}),
-    ({'key': 'new-val'}, {'key': 'val'}, {'key': 'new-val'})])
+    ({'key': 'new-val'}, {'key': 'val'}, {'key': 'val'}),
+    ({'key': 'new-val', 'unset': 'unset'}, {'key': 'val'}, {'key': 'val', 'unset': 'unset'})])
 def test_wrap_settings(override, old, new):
     fn = lambda _, settings: settings
     assert wrap_settings(override)(fn)(None, Settings(old)) == new
 
 
-@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)
-
-
-@pytest.mark.parametrize('called, command, stderr', [
-    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
-    ('git com file', 'git commit --verbose file', "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
-def test_git_support(called, command, stderr):
-    @git_support
-    def fn(command, settings): return command.script
-    assert fn(Command(script=called, stderr=stderr), None) == command
-
-
-@pytest.mark.parametrize('command, is_git', [
-    ('git pull', True),
-    ('hub pull', True),
-    ('git push --set-upstream origin foo', True),
-    ('hub push --set-upstream origin foo', True),
-    ('ls', False),
-    ('cat git', False),
-    ('cat hub', False)])
-def test_git_support_match(command, is_git):
-    @git_support
-    def fn(command, settings): return True
-    assert fn(Command(script=command), None) == is_git
-
-
 def test_memoize():
     fn = Mock(__name__='fn')
     memoized = memoize(fn)
@@ -68,7 +35,6 @@ def test_no_memoize():
 
 
 class TestGetClosest(object):
-
     def test_when_can_match(self):
         assert 'branch' == get_closest('brnch', ['branch', 'status'])
 
@@ -99,3 +65,118 @@ def test_get_all_callables():
     (('git brnch', 'brnch', 'branch'), 'git branch')])
 def test_replace_argument(args, result):
     assert replace_argument(*args) == result
+
+
+@pytest.mark.parametrize('stderr, result', [
+    (("git: 'cone' is not a git command. See 'git --help'.\n"
+      '\n'
+      'Did you mean one of these?\n'
+      '\tclone'), ['clone']),
+    (("git: 're' is not a git command. See 'git --help'.\n"
+      '\n'
+      'Did you mean one of these?\n'
+      '\trebase\n'
+      '\treset\n'
+      '\tgrep\n'
+      '\trm'), ['rebase', 'reset', 'grep', 'rm']),
+    (('tsuru: "target" is not a tsuru command. See "tsuru help".\n'
+      '\n'
+      'Did you mean one of these?\n'
+      '\tservice-add\n'
+      '\tservice-bind\n'
+      '\tservice-doc\n'
+      '\tservice-info\n'
+      '\tservice-list\n'
+      '\tservice-remove\n'
+      '\tservice-status\n'
+      '\tservice-unbind'), ['service-add', 'service-bind', 'service-doc',
+                            'service-info', 'service-list', 'service-remove',
+                            'service-status', 'service-unbind'])])
+def test_get_all_matched_commands(stderr, result):
+    assert list(get_all_matched_commands(stderr)) == result
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, names, result', [
+    ('git diff', ['git', 'hub'], True),
+    ('hub diff', ['git', 'hub'], True),
+    ('hg diff', ['git', 'hub'], False)])
+def test_is_app(script, names, result):
+    assert is_app(Command(script), *names) == result
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, names, result', [
+    ('git diff', ['git', 'hub'], True),
+    ('hub diff', ['git', 'hub'], True),
+    ('hg diff', ['git', 'hub'], False)])
+def test_for_app(script, names, result):
+    @for_app(*names)
+    def match(command, settings):
+        return True
+
+    assert match(Command(script), None) == result
+
+
+class TestCache(object):
+    @pytest.fixture(autouse=True)
+    def enable_cache(self, monkeypatch):
+        monkeypatch.setattr('thefuck.utils.cache.disabled', False)
+
+    @pytest.fixture
+    def shelve(self, mocker):
+        value = {}
+
+        class _Shelve(object):
+            def __init__(self, path):
+                pass
+
+            def __setitem__(self, k, v):
+                value[k] = v
+
+            def __getitem__(self, k):
+                return value[k]
+
+            def get(self, k, v=None):
+                return value.get(k, v)
+
+            def close(self):
+                return
+
+        mocker.patch('thefuck.utils.shelve.open', new_callable=lambda: _Shelve)
+        return value
+
+    @pytest.fixture(autouse=True)
+    def mtime(self, mocker):
+        mocker.patch('thefuck.utils.os.path.getmtime', return_value=0)
+
+    @pytest.fixture
+    def fn(self):
+        @cache('~/.bashrc')
+        def fn():
+            return 'test'
+
+        return fn
+
+    @pytest.fixture
+    def key(self):
+        if six.PY3:
+            return 'tests.test_utils.<function TestCache.fn.<locals>.fn '
+        else:
+            return 'tests.test_utils.<function fn '
+
+    def test_with_blank_cache(self, shelve, fn, key):
+        assert shelve == {}
+        assert fn() == 'test'
+        assert shelve == {key: {'etag': '0', 'value': 'test'}}
+
+    def test_with_filled_cache(self, shelve, fn, key):
+        cache_value = {key: {'etag': '0', 'value': 'new-value'}}
+        shelve.update(cache_value)
+        assert fn() == 'new-value'
+        assert shelve == cache_value
+
+    def test_when_etag_changed(self, shelve, fn, key):
+        shelve.update({key: {'etag': '-1', 'value': 'old-value'}})
+        assert fn() == 'test'
+        assert shelve == {key: {'etag': '0', 'value': 'test'}}

tests/utils.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from thefuck import types
 from thefuck.conf import DEFAULT_PRIORITY
 
@@ -10,7 +11,15 @@ def Rule(name='', match=lambda *_: True,
          get_new_command=lambda *_: '',
          enabled_by_default=True,
          side_effect=None,
-         priority=DEFAULT_PRIORITY):
+         priority=DEFAULT_PRIORITY,
+         requires_output=True):
     return types.Rule(name, match, get_new_command,
                       enabled_by_default, side_effect,
-                      priority)
+                      priority, requires_output)
+
+
+def CorrectedCommand(script='', side_effect=None, priority=DEFAULT_PRIORITY):
+    return types.CorrectedCommand(script, side_effect, priority)
+
+
+root = Path(__file__).parent.parent.resolve()

thefuck/corrector.py

@@ -0,0 +1,71 @@
+import sys
+from imp import load_source
+from pathlib import Path
+from . import conf, types, logs
+
+
+def load_rule(rule, settings):
+    """Imports rule module and returns it."""
+    name = rule.name[:-3]
+    with logs.debug_time(u'Importing rule: {};'.format(name), settings):
+        rule_module = load_source(name, str(rule))
+        priority = getattr(rule_module, 'priority', conf.DEFAULT_PRIORITY)
+    return types.Rule(name, rule_module.match,
+                      rule_module.get_new_command,
+                      getattr(rule_module, 'enabled_by_default', True),
+                      getattr(rule_module, 'side_effect', None),
+                      settings.priority.get(name, priority),
+                      getattr(rule_module, 'requires_output', True))
+
+
+def get_loaded_rules(rules, settings):
+    """Yields all available rules."""
+    for rule in rules:
+        if rule.name != '__init__.py':
+            loaded_rule = load_rule(rule, settings)
+            if loaded_rule in settings.rules:
+                yield loaded_rule
+
+
+def get_rules(user_dir, settings):
+    """Returns all enabled rules."""
+    bundled = Path(__file__).parent \
+        .joinpath('rules') \
+        .glob('*.py')
+    user = user_dir.joinpath('rules').glob('*.py')
+    return sorted(get_loaded_rules(sorted(bundled) + sorted(user), settings),
+                  key=lambda rule: rule.priority)
+
+
+def is_rule_match(command, rule, settings):
+    """Returns first matched rule for command."""
+    script_only = command.stdout is None and command.stderr is None
+
+    if script_only and rule.requires_output:
+        return False
+
+    try:
+        with logs.debug_time(u'Trying rule: {};'.format(rule.name),
+                             settings):
+            if rule.match(command, settings):
+                return True
+    except Exception:
+        logs.rule_failed(rule, sys.exc_info(), settings)
+
+
+def make_corrected_commands(command, rule, settings):
+    new_commands = rule.get_new_command(command, settings)
+    if not isinstance(new_commands, list):
+        new_commands = (new_commands,)
+    for n, new_command in enumerate(new_commands):
+        yield types.CorrectedCommand(script=new_command,
+                                     side_effect=rule.side_effect,
+                                     priority=(n + 1) * rule.priority)
+
+
+def get_corrected_commands(command, user_dir, settings):
+    corrected_commands = (
+        corrected for rule in get_rules(user_dir, settings)
+        if is_rule_match(command, rule, settings)
+        for corrected in make_corrected_commands(command, rule, settings))
+    return types.SortedCorrectedCommandsSequence(corrected_commands, settings)

thefuck/logs.py

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 from contextlib import contextmanager
 from datetime import datetime
 import sys
@@ -28,27 +30,6 @@ def rule_failed(rule, exc_info, settings):
     exception('Rule {}'.format(rule.name), exc_info, settings)
 
 
-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, side_effect, settings):
-    sys.stderr.write(
-        '{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),
-            reset=color(colorama.Style.RESET_ALL, settings)))
-    sys.stderr.flush()
-
-
 def failed(msg, settings):
     sys.stderr.write('{red}{msg}{reset}\n'.format(
         msg=msg,
@@ -56,6 +37,29 @@ def failed(msg, settings):
         reset=color(colorama.Style.RESET_ALL, settings)))
 
 
+def show_corrected_command(corrected_command, settings):
+    sys.stderr.write('{bold}{script}{reset}{side_effect}\n'.format(
+        script=corrected_command.script,
+        side_effect=' (+side effect)' if corrected_command.side_effect else '',
+        bold=color(colorama.Style.BRIGHT, settings),
+        reset=color(colorama.Style.RESET_ALL, settings)))
+
+
+def confirm_text(corrected_command, settings):
+    sys.stderr.write(
+        ('{clear}{bold}{script}{reset}{side_effect} '
+         '[{green}enter{reset}/{blue}↑{reset}/{blue}↓{reset}'
+         '/{red}ctrl+c{reset}]').format(
+            script=corrected_command.script,
+            side_effect=' (+side effect)' if corrected_command.side_effect else '',
+            clear='\033[1K\r',
+            bold=color(colorama.Style.BRIGHT, settings),
+            green=color(colorama.Fore.GREEN, settings),
+            red=color(colorama.Fore.RED, settings),
+            reset=color(colorama.Style.RESET_ALL, settings),
+            blue=color(colorama.Fore.BLUE, settings)))
+
+
 def debug(msg, settings):
     if settings.debug:
         sys.stderr.write(u'{blue}{bold}DEBUG:{reset} {msg}\n'.format(
@@ -71,4 +75,4 @@ def debug_time(msg, settings):
     try:
         yield
     finally:
-        debug('{} took: {}'.format(msg, datetime.now() - started), settings)
+        debug(u'{} took: {}'.format(msg, datetime.now() - started), settings)

thefuck/main.py

@@ -1,7 +1,9 @@
-from imp import load_source
+from argparse import ArgumentParser
+from warnings import warn
 from pathlib import Path
 from os.path import expanduser
 from pprint import pformat
+import pkg_resources
 from subprocess import Popen, PIPE
 import os
 import sys
@@ -9,6 +11,8 @@ from psutil import Process, TimeoutExpired
 import colorama
 import six
 from . import logs, conf, types, shells
+from .corrector import get_corrected_commands
+from .ui import select_command
 
 
 def setup_user_dir():
@@ -21,39 +25,9 @@ def setup_user_dir():
     return user_dir
 
 
-def load_rule(rule):
-    """Imports rule module and returns it."""
-    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, 'side_effect', None),
-                      getattr(rule_module, 'priority', conf.DEFAULT_PRIORITY))
-
-
-def _get_loaded_rules(rules, settings):
-    """Yields all available rules."""
-    for rule in rules:
-        if rule.name != '__init__.py':
-            loaded_rule = load_rule(rule)
-            if loaded_rule in settings.rules:
-                yield loaded_rule
-
-
-def get_rules(user_dir, settings):
-    """Returns all enabled rules."""
-    bundled = Path(__file__).parent \
-        .joinpath('rules') \
-        .glob('*.py')
-    user = user_dir.joinpath('rules').glob('*.py')
-    rules = _get_loaded_rules(sorted(bundled) + sorted(user), settings)
-    return sorted(rules, key=lambda rule: settings.priority.get(
-        rule.name, rule.priority))
-
-
 def wait_output(settings, popen):
     """Returns `True` if we can get output of the command in the
-    `wait_command` time.
+    `settings.wait_command` time.
 
     Command will be killed if it wasn't finished in the time.
 
@@ -76,6 +50,7 @@ def get_command(settings, args):
     else:
         script = ' '.join(args[1:])
 
+    script = script.strip()
     if not script:
         return
 
@@ -87,50 +62,29 @@ def get_command(settings, args):
                          settings):
         result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env)
         if wait_output(settings, result):
-            return types.Command(script, result.stdout.read().decode('utf-8'),
+            stdout = result.stdout.read().decode('utf-8')
-                                 result.stderr.read().decode('utf-8'))
+            stderr = result.stderr.read().decode('utf-8')
+
+            logs.debug(u'Received stdout: {}'.format(stdout), settings)
+            logs.debug(u'Received stderr: {}'.format(stderr), settings)
+
+            return types.Command(script, stdout, stderr)
+        else:
+            logs.debug(u'Execution timed out!', settings)
+            return types.Command(script, None, None)
 
 
-def get_matched_rule(command, rules, settings):
+def run_command(old_cmd, command, settings):
-    """Returns first matched rule for command."""
-    for rule in rules:
-        try:
-            with logs.debug_time(u'Trying rule: {};'.format(rule.name),
-                                 settings):
-                if rule.match(command, settings):
-                    return rule
-        except Exception:
-            logs.rule_failed(rule, sys.exc_info(), 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, side_effect, settings)
-        return True
-
-    logs.confirm_command(new_command, side_effect, settings)
-    try:
-        sys.stdin.read(1)
-        return True
-    except KeyboardInterrupt:
-        logs.failed('Aborted', settings)
-        return False
-
-
-def run_rule(rule, command, settings):
     """Runs command from rule for passed command."""
-    new_command = shells.to_shell(rule.get_new_command(command, settings))
+    if command.side_effect:
-    if confirm(new_command, rule.side_effect, settings):
+        command.side_effect(old_cmd, command.script, settings)
-        if rule.side_effect:
+    shells.put_to_history(command.script)
-            rule.side_effect(command, settings)
+    print(command.script)
-        shells.put_to_history(new_command)
-        print(new_command)
 
 
 # Entry points:
 
-def main():
+def fix_command():
     colorama.init()
     user_dir = setup_user_dir()
     settings = conf.get_settings(user_dir)
@@ -138,26 +92,46 @@ def main():
         logs.debug(u'Run with settings: {}'.format(pformat(settings)), settings)
 
         command = get_command(settings, sys.argv)
-        if command:
-            logs.debug(u'Received stdout: {}'.format(command.stdout), settings)
-            logs.debug(u'Received stderr: {}'.format(command.stderr), settings)
 
-            rules = get_rules(user_dir, settings)
+        if not command:
-            logs.debug(
+            logs.debug('Empty command, nothing to do', settings)
-                u'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
+            return
-                settings)
 
-            matched_rule = get_matched_rule(command, rules, settings)
+        corrected_commands = get_corrected_commands(command, user_dir, settings)
-            if matched_rule:
+        selected_command = select_command(corrected_commands, settings)
-                logs.debug(u'Matched rule: {}'.format(matched_rule.name), settings)
+        if selected_command:
-                run_rule(matched_rule, command, settings)
+            run_command(command, selected_command, settings)
-                return
-
-        logs.failed('No fuck given', settings)
 
 
-def print_alias():
+def print_alias(entry_point=True):
+    if entry_point:
+        warn('`thefuck-alias` is deprecated, use `thefuck --alias` instead.')
+        position = 1
+    else:
+        position = 2
+
     alias = shells.thefuck_alias()
-    if len(sys.argv) > 1:
+    if len(sys.argv) > position:
-        alias = sys.argv[1]
+        alias = sys.argv[position]
     print(shells.app_alias(alias))
+
+
+def main():
+    parser = ArgumentParser(prog='thefuck')
+    parser.add_argument('-v', '--version',
+                        action='version',
+                        version='%(prog)s {}'.format(
+                            pkg_resources.require('thefuck')[0].version))
+    parser.add_argument('-a', '--alias',
+                        action='store_true',
+                        help='[custom-alias-name] prints alias for current shell')
+    parser.add_argument('command',
+                        nargs='*',
+                        help='command that should be fixed')
+    known_args = parser.parse_args(sys.argv[1:2])
+    if known_args.alias:
+        print_alias(False)
+    elif known_args.command:
+        fix_command()
+    else:
+        parser.print_usage()

thefuck/rules/apt_get.py

@@ -1,27 +1,30 @@
 from thefuck import shells
-from thefuck.utils import sudo_support
+from thefuck.utils import memoize
 
 try:
     import CommandNotFound
 except ImportError:
     enabled_by_default = False
 
-@sudo_support
-def match(command, settings):
-    if 'not found' in command.stderr:
-        try:
-            c = CommandNotFound.CommandNotFound()
-            pkgs = c.getPackages(command.script.split(" ")[0])
-            name, _ = pkgs[0]
-            return True
-        except IndexError:
-            # IndexError is thrown when no matching package is found
-            return False
 
-@sudo_support
+@memoize
+def get_package(command):
+    try:
+        c = CommandNotFound.CommandNotFound()
+        cmd = command.split(' ')
+        pkgs = c.getPackages(cmd[0] if cmd[0] != 'sudo' else cmd[1])
+        name, _ = pkgs[0]
+        return name
+    except IndexError:
+        # IndexError is thrown when no matching package is found
+        return None
+
+
+def match(command, settings):
+    return 'not found' in command.stderr and get_package(command.script)
+
+
 def get_new_command(command, settings):
-    c = CommandNotFound.CommandNotFound()
+    name = get_package(command.script)
-    pkgs = c.getPackages(command.script.split(" ")[0])
-    name, _ = pkgs[0]
     formatme = shells.and_('sudo apt-get install {}', '{}')
     return formatme.format(name, command.script)

thefuck/rules/apt_get_search.py

@@ -0,0 +1,11 @@
+import re
+from thefuck.utils import for_app
+
+
+@for_app('apt-get')
+def match(command, settings):
+    return command.script.startswith('apt-get search')
+
+
+def get_new_command(command, settings):
+    return re.sub(r'^apt-get', 'apt-cache', command.script)

thefuck/rules/brew_install.py

@@ -1,38 +1,38 @@
 import os
 import re
-from subprocess import check_output
+from thefuck.utils import get_closest, replace_argument, which
-from thefuck.utils import get_closest, replace_argument
+from thefuck.specific.brew import get_brew_path_prefix
 
-# Formulars are base on each local system's status
 
-brew_formulas = []
+enabled_by_default = bool(which('brew'))
-try:
-    brew_path_prefix = check_output(['brew', '--prefix'],
-                                    universal_newlines=True).strip()
-    brew_formula_path = brew_path_prefix + '/Library/Formula'
 
-    for file_name in os.listdir(brew_formula_path):
+
-        if file_name.endswith('.rb'):
+def _get_formulas():
-            brew_formulas.append(file_name.replace('.rb', ''))
+    # Formulas are based on each local system's status
-except:
+    try:
-    pass
+        brew_path_prefix = get_brew_path_prefix()
+        brew_formula_path = brew_path_prefix + '/Library/Formula'
+
+        for file_name in os.listdir(brew_formula_path):
+            if file_name.endswith('.rb'):
+                yield file_name[:-3]
+    except:
+        pass
 
 
 def _get_similar_formula(formula_name):
-    return get_closest(formula_name, brew_formulas, 1, 0.85)
+    return get_closest(formula_name, _get_formulas(), 1, 0.85)
 
 
 def match(command, settings):
     is_proper_command = ('brew install' in command.script and
                          'No available formula' in command.stderr)
 
-    has_possible_formulas = False
     if is_proper_command:
         formula = re.findall(r'Error: No available formula for ([a-z]+)',
                              command.stderr)[0]
-        has_possible_formulas = bool(_get_similar_formula(formula))
+        return bool(_get_similar_formula(formula))
-
+    return False
-    return has_possible_formulas
 
 
 def get_new_command(command, settings):

thefuck/rules/brew_unknown_command.py

@@ -1,30 +1,19 @@
 import os
 import re
-import subprocess
+from thefuck.utils import get_closest, replace_command
-from thefuck.utils import get_closest, replace_argument
+from thefuck.specific.brew import get_brew_path_prefix
 
 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'],
-                                       universal_newlines=True).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)
+    return [name[:-3] for name in os.listdir(brew_cmd_path)
-                if name.endswith('.rb')]
+            if name.endswith('.rb')]
-
-    return commands
 
 
 def _get_brew_tap_specific_commands(brew_path_prefix):
@@ -51,10 +40,7 @@ def _get_brew_tap_specific_commands(brew_path_prefix):
 
 
 def _is_brew_tap_cmd_naming(name):
-    if name.startswith('brew-') and name.endswith('.rb'):
+    return name.startswith('brew-') and name.endswith('.rb')
-        return True
-
-    return False
 
 
 def _get_directory_names_only(path):
@@ -62,41 +48,33 @@ def _get_directory_names_only(path):
             if os.path.isdir(os.path.join(path, d))]
 
 
-brew_path_prefix = _get_brew_path_prefix()
+def _brew_commands():
+    brew_path_prefix = get_brew_path_prefix()
+    if brew_path_prefix:
+        try:
+            return _get_brew_commands(brew_path_prefix) \
+                 + _get_brew_tap_specific_commands(brew_path_prefix)
+        except OSError:
+            pass
 
-# Failback commands for testing (Based on Homebrew 0.9.5)
+    # Failback commands for testing (Based on Homebrew 0.9.5)
-brew_commands = ['info', 'home', 'options', 'install', 'uninstall',
+    return ['info', 'home', 'options', 'install', 'uninstall',
-                 'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
+            'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
-                 'doctor', 'create', 'edit']
+            '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_command(command):
-    return get_closest(command, brew_commands)
 
 
 def match(command, settings):
     is_proper_command = ('brew' in command.script and
                          'Unknown command' in command.stderr)
 
-    has_possible_commands = False
     if is_proper_command:
         broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                                 command.stderr)[0]
-        has_possible_commands = bool(_get_similar_command(broken_cmd))
+        return bool(get_closest(broken_cmd, _brew_commands()))
-
+    return False
-    return has_possible_commands
 
 
 def get_new_command(command, settings):
     broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                             command.stderr)[0]
-    new_cmd = _get_similar_command(broken_cmd)
+    return replace_command(command, broken_cmd, _brew_commands())
-
-    return replace_argument(command.script, broken_cmd, new_cmd)

thefuck/rules/brew_upgrade.py

@@ -1,14 +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')
+    return command.script == 'brew upgrade'
+
 
 def get_new_command(command, settings):
     return command.script + ' --all'

thefuck/rules/cargo_no_command.py

@@ -1,10 +1,10 @@
 import re
-from thefuck.utils import replace_argument
+from thefuck.utils import replace_argument, for_app
 
 
+@for_app('cargo')
 def match(command, settings):
-    return ('cargo' in command.script
+    return ('No such subcommand' in command.stderr
-            and 'No such subcommand' in command.stderr
             and 'Did you mean' in command.stderr)
 
 

thefuck/rules/cd_correction.py

@@ -1,12 +1,12 @@
-#!/usr/bin/env python
-__author__ = "mmussomele"
-
 """Attempts to spellcheck and correct failed cd commands"""
 
 import os
 from difflib import get_close_matches
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 from thefuck.rules import cd_mkdir
+from thefuck.utils import for_app
+
+__author__ = "mmussomele"
 
 MAX_ALLOWED_DIFF = 0.6
 
@@ -17,6 +17,7 @@ def _get_sub_dirs(parent):
 
 
 @sudo_support
+@for_app('cd')
 def match(command, settings):
     """Match function copied from cd_mkdir.py"""
     return (command.script.startswith('cd ')
@@ -28,8 +29,8 @@ def match(command, settings):
 def get_new_command(command, settings):
     """
     Attempt to rebuild the path string by spellchecking the directories.
-    If it fails (i.e. no directories are a close enough match), then it 
+    If it fails (i.e. no directories are a close enough match), then it
-    defaults to the rules of cd_mkdir. 
+    defaults to the rules of cd_mkdir.
     Change sensitivity by changing MAX_ALLOWED_DIFF. Default value is 0.6
     """
     dest = command.script.split()[1].split(os.sep)

thefuck/rules/cd_mkdir.py

@@ -1,13 +1,14 @@
 import re
 from thefuck import shells
-from thefuck.utils import sudo_support
+from thefuck.utils import for_app
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
+@for_app('cd')
 def match(command, settings):
-    return (command.script.startswith('cd ')
+    return (('no such file or directory' in command.stderr.lower()
-        and ('no such file or directory' in command.stderr.lower()
+             or 'cd: can\'t cd to' in command.stderr.lower()))
-            or 'cd: can\'t cd to' in command.stderr.lower()))
 
 
 @sudo_support

thefuck/rules/cd_parent.py

@@ -7,8 +7,10 @@
 # > cd..
 # cd..: command not found
 
+
 def match(command, settings):
     return command.script == 'cd..'
 
+
 def get_new_command(command, settings):
     return 'cd ..'

thefuck/rules/composer_not_command.py

@@ -1,11 +1,11 @@
 import re
-from thefuck.utils import replace_argument
+from thefuck.utils import replace_argument, for_app
 
 
+@for_app('composer')
 def match(command, settings):
-    return ('composer' in command.script
+    return (('did you mean this?' in command.stderr.lower()
-            and ('did you mean this?' in command.stderr.lower()
+             or 'did you mean one of these?' in command.stderr.lower()))
-                 or 'did you mean one of these?' in command.stderr.lower()))
 
 
 def get_new_command(command, settings):

thefuck/rules/cp_omitting_directory.py

@@ -1,12 +1,13 @@
 import re
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
+from thefuck.utils import for_app
 
 
 @sudo_support
+@for_app('cp')
 def match(command, settings):
     stderr = command.stderr.lower()
-    return command.script.startswith('cp ') \
+    return 'omitting directory' in stderr or 'is a directory' in stderr
-        and ('omitting directory' in stderr or 'is a directory' in stderr)
 
 
 @sudo_support

thefuck/rules/cpp11.py

@@ -1,8 +1,11 @@
+from thefuck.utils import for_app
+
+
+@for_app(['g++', 'clang++'])
 def match(command, settings):
-    return (('g++' in command.script or 'clang++' in command.script) and
+    return ('This file requires compiler and library support for the '
-            ('This file requires compiler and library support for the '
+            'ISO C++ 2011 standard.' in command.stderr or
-             'ISO C++ 2011 standard.' in command.stderr or
+            '-Wc++11-extensions' in command.stderr)
-             '-Wc++11-extensions' in command.stderr))
 
 
 def get_new_command(command, settings):

thefuck/rules/dirty_untar.py

@@ -0,0 +1,42 @@
+import os
+import tarfile
+from thefuck import shells
+from thefuck.utils import for_app
+
+
+def _is_tar_extract(cmd):
+    if '--extract' in cmd:
+        return True
+
+    cmd = cmd.split()
+
+    return len(cmd) > 1 and 'x' in cmd[1]
+
+
+def _tar_file(cmd):
+    tar_extensions = ('.tar', '.tar.Z', '.tar.bz2', '.tar.gz', '.tar.lz',
+                      '.tar.lzma', '.tar.xz', '.taz', '.tb2', '.tbz', '.tbz2',
+                      '.tgz', '.tlz', '.txz', '.tz')
+
+    for c in cmd.split():
+        for ext in tar_extensions:
+            if c.endswith(ext):
+                return (c, c[0:len(c) - len(ext)])
+
+
+@for_app('tar')
+def match(command, settings):
+    return ('-C' not in command.script
+            and _is_tar_extract(command.script)
+            and _tar_file(command.script) is not None)
+
+
+def get_new_command(command, settings):
+    return shells.and_('mkdir -p {dir}', '{cmd} -C {dir}') \
+        .format(dir=_tar_file(command.script)[1], cmd=command.script)
+
+
+def side_effect(old_cmd, command, settings):
+    with tarfile.TarFile(_tar_file(old_cmd.script)[0]) as archive:
+        for file in archive.getnames():
+            os.remove(file)

thefuck/rules/dirty_unzip.py

@@ -0,0 +1,40 @@
+import os
+import zipfile
+from thefuck.utils import for_app
+
+
+def _is_bad_zip(file):
+    with zipfile.ZipFile(file, 'r') as archive:
+        return len(archive.namelist()) > 1
+
+
+def _zip_file(command):
+    # unzip works that way:
+    # unzip [-flags] file[.zip] [file(s) ...] [-x file(s) ...]
+    #                ^          ^ files to unzip from the archive
+    #                archive to unzip
+    for c in command.script.split()[1:]:
+        if not c.startswith('-'):
+            if c.endswith('.zip'):
+                return c
+            else:
+                return '{}.zip'.format(c)
+
+
+@for_app('unzip')
+def match(command, settings):
+    return ('-d' not in command.script
+            and _is_bad_zip(_zip_file(command)))
+
+
+def get_new_command(command, settings):
+    return '{} -d {}'.format(command.script, _zip_file(command)[:-4])
+
+
+def side_effect(old_cmd, command, settings):
+    with zipfile.ZipFile(_zip_file(old_cmd), 'r') as archive:
+        for file in archive.namelist():
+            os.remove(file)
+
+
+requires_output = False

thefuck/rules/docker_not_command.py

@@ -1,13 +1,14 @@
 from itertools import dropwhile, takewhile, islice
 import re
 import subprocess
-from thefuck.utils import get_closest, sudo_support, replace_argument
+from thefuck.utils import replace_command, for_app
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
+@for_app('docker')
 def match(command, settings):
-    return command.script.startswith('docker') \
+    return 'is not a docker command' in command.stderr
-           and 'is not a docker command' in command.stderr
 
 
 def get_docker_commands():
@@ -23,5 +24,4 @@ def get_docker_commands():
 def get_new_command(command, settings):
     wrong_command = re.findall(
         r"docker: '(\w+)' is not a docker command.", command.stderr)[0]
-    fixed_command = get_closest(wrong_command, get_docker_commands())
+    return replace_command(command, wrong_command, get_docker_commands())
-    return replace_argument(command.script, wrong_command, fixed_command)

thefuck/rules/fix_alt_space.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 import re
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support

thefuck/rules/fix_file.py

@@ -0,0 +1,77 @@
+import re
+import os
+from thefuck.utils import memoize, wrap_settings
+from thefuck import shells
+
+
+# order is important: only the first match is considered
+patterns = (
+        # js, node:
+        '^    at {file}:{line}:{col}',
+        # cargo:
+        '^   {file}:{line}:{col}',
+        # python, thefuck:
+        '^  File "{file}", line {line}',
+        # awk:
+        '^awk: {file}:{line}:',
+        # git
+        '^fatal: bad config file line {line} in {file}',
+        # llc:
+        '^llc: {file}:{line}:{col}:',
+        # lua:
+        '^lua: {file}:{line}:',
+        # fish:
+        '^{file} \\(line {line}\\):',
+        # bash, sh, ssh:
+        '^{file}: line {line}: ',
+        # cargo, clang, gcc, go, pep8, rustc:
+        '^{file}:{line}:{col}',
+        # ghc, make, ruby, zsh:
+        '^{file}:{line}:',
+        # perl:
+        'at {file} line {line}',
+    )
+
+
+# for the sake of readability do not use named groups above
+def _make_pattern(pattern):
+    pattern = pattern.replace('{file}', '(?P<file>[^:\n]+)') \
+                     .replace('{line}', '(?P<line>[0-9]+)') \
+                     .replace('{col}',  '(?P<col>[0-9]+)')
+    return re.compile(pattern, re.MULTILINE)
+patterns = [_make_pattern(p).search for p in patterns]
+
+
+@memoize
+def _search(stderr):
+    for pattern in patterns:
+        m = pattern(stderr)
+        if m and os.path.isfile(m.group('file')):
+            return m
+
+
+def match(command, settings):
+    if 'EDITOR' not in os.environ:
+        return False
+
+    return _search(command.stderr) or _search(command.stdout)
+
+
+@wrap_settings({'fixlinecmd': '{editor} {file} +{line}',
+                'fixcolcmd': None})
+def get_new_command(command, settings):
+    m = _search(command.stderr) or _search(command.stdout)
+
+    # Note: there does not seem to be a standard for columns, so they are just
+    # ignored by default
+    if settings.fixcolcmd and 'col' in m.groupdict():
+        editor_call = settings.fixcolcmd.format(editor=os.environ['EDITOR'],
+                                                file=m.group('file'),
+                                                line=m.group('line'),
+                                                col=m.group('col'))
+    else:
+        editor_call = settings.fixlinecmd.format(editor=os.environ['EDITOR'],
+                                                 file=m.group('file'),
+                                                 line=m.group('line'))
+
+    return shells.and_(editor_call, command.script)

thefuck/rules/git_add.py

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

thefuck/rules/git_branch_delete.py

@@ -1,13 +1,13 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('branch -d' in command.script
             and 'If you are sure you want to delete it' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, '-d', '-D')

thefuck/rules/git_branch_list.py

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

thefuck/rules/git_checkout.py

@@ -2,9 +2,10 @@ import re
 import subprocess
 from thefuck import shells, utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
@@ -23,11 +24,11 @@ def get_branches():
         yield line.strip()
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
         r"error: pathspec '([^']*)' "
-        "did not match any file\(s\) known to git.", command.stderr)[0]
+        r"did not match any file\(s\) known to git.", command.stderr)[0]
     closest_branch = utils.get_closest(missing_file, get_branches(),
                                        fallback_to_first=False)
     if closest_branch:

thefuck/rules/git_diff_staged.py

@@ -1,13 +1,13 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('diff' in command.script and
             '--staged' not in command.script)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, 'diff', 'diff --staged')

thefuck/rules/git_fix_stash.py

@@ -1,8 +1,9 @@
 from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return (command.script.split()[1] == 'stash'
             and 'usage:' in command.stderr)
@@ -19,7 +20,7 @@ stash_commands = (
     'show')
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     stash_cmd = command.script.split()[2]
     fixed = utils.get_closest(stash_cmd, stash_commands, fallback_to_first=False)

thefuck/rules/git_not_command.py

@@ -1,5 +1,6 @@
 import re
-from thefuck.utils import get_closest, git_support, replace_argument
+from thefuck.utils import get_all_matched_commands, replace_command
+from thefuck.specific.git import git_support
 
 
 @git_support
@@ -8,20 +9,9 @@ def match(command, settings):
             and 'Did you mean' in command.stderr)
 
 
-def _get_all_git_matched_commands(stderr):
-    should_yield = False
-    for line in stderr.split('\n'):
-        if 'Did you mean' in line:
-            should_yield = True
-        elif should_yield and line:
-            yield line.strip()
-
-
 @git_support
 def get_new_command(command, settings):
     broken_cmd = re.findall(r"git: '([^']*)' is not a git command",
                             command.stderr)[0]
-    new_cmd = get_closest(broken_cmd,
+    matched = get_all_matched_commands(command.stderr)
-                          _get_all_git_matched_commands(command.stderr))
+    return replace_command(command, broken_cmd, matched)
-    return replace_argument(command.script, broken_cmd, new_cmd)
-

thefuck/rules/git_pull.py

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

thefuck/rules/git_pull_clone.py

@@ -1,13 +1,13 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('fatal: Not a git repository' in command.stderr
             and "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, 'pull', 'clone')

thefuck/rules/git_push.py

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

thefuck/rules/git_push_force.py

@@ -1,8 +1,8 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('push' in command.script
             and '! [rejected]' in command.stderr
@@ -10,7 +10,7 @@ def match(command, settings):
             and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, 'push', 'push --force')
 

thefuck/rules/git_push_pull.py

@@ -1,9 +1,9 @@
-from thefuck import utils
+from thefuck import shells
-from thefuck.shells import and_
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('push' in command.script
             and '! [rejected]' in command.stderr
@@ -11,7 +11,7 @@ def match(command, settings):
             and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
-    return and_(replace_argument(command.script, 'push', 'pull'),
+    return shells.and_(replace_argument(command.script, 'push', 'pull'),
-                command.script)
+                       command.script)

thefuck/rules/git_stash.py

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

thefuck/rules/go_run.py

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

thefuck/rules/grep_recursive.py

@@ -1,6 +1,9 @@
+from thefuck.utils import for_app
+
+
+@for_app('grep')
 def match(command, settings):
-    return (command.script.startswith('grep')
+    return 'is a directory' in command.stderr.lower()
-            and 'is a directory' in command.stderr.lower())
 
 
 def get_new_command(command, settings):

thefuck/rules/gulp_not_task.py

@@ -1,11 +1,11 @@
 import re
 import subprocess
-from thefuck.utils import get_closest, replace_argument
+from thefuck.utils import replace_command, for_app
 
 
+@for_app('gulp')
 def match(command, script):
-    return command.script.startswith('gulp')\
+    return 'is not in your gulpfile' in command.stdout
-        and 'is not in your gulpfile' in command.stdout
 
 
 def get_gulp_tasks():
@@ -18,5 +18,4 @@ def get_gulp_tasks():
 def get_new_command(command, script):
     wrong_task = re.findall(r"Task '(\w+)' is not in your gulpfile",
                             command.stdout)[0]
-    fixed_task = get_closest(wrong_task, get_gulp_tasks())
+    return replace_command(command, wrong_task, get_gulp_tasks())
-    return replace_argument(command.script, wrong_task, fixed_task)

thefuck/rules/has_exists_script.py

@@ -1,5 +1,5 @@
 import os
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
@@ -11,4 +11,3 @@ def match(command, settings):
 @sudo_support
 def get_new_command(command, settings):
     return u'./{}'.format(command.script)
-