Bump to 2.8

Fix slowness problems

.travis.yml

@@ -3,7 +3,25 @@ python:
   - "3.4"
   - "3.3"
   - "2.7"
+addons:
+  apt:
+    sources:
+      - fish-shell/release-2
+    packages:
+      - bash
+      - zsh
+      - fish
+      - tcsh
+      - pandoc
+      - git
+env:
+  - FUNCTIONAL=true BARE=true
 install:
+  - pip install coveralls
   - pip install -r requirements.txt
   - python setup.py develop
-script: py.test -v
+  - rm -rf build
+script:
+  - export COVERAGE_PYTHON_VERSION=python-${TRAVIS_PYTHON_VERSION:0:1}
+  - coverage run --source=thefuck,tests -m py.test -v --capture=sys
+after_success: coveralls

README.md

@@ -1,12 +1,12 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck)
-
-**Aliases changed in 1.34.**
+# 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).
 
-Few examples:
+[![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
+
+Few more examples:
 
 ```bash
 ➜ apt-get install vim
@@ -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
+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
+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
+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
+git branch [enter/↑/↓/ctrl+c]
 * master
 ```
 
@@ -67,13 +67,13 @@ Did you mean this?
          repl
 
 ➜ fuck
-lein repl
+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
 ...
 ```
 
-If you are scared to blindly run the changed command, there is a `require_confirmation`
+If you are not scared to blindly run the changed command, there is a `require_confirmation`
 [settings](#settings) option:
 
 ```bash
@@ -82,7 +82,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
 [sudo] password for nvbn:
 Reading package lists... Done
 ...
@@ -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 -
+```
+
+## Manual installation
 
 Install `The Fuck` with `pip`:
 
@@ -104,32 +112,15 @@ sudo pip install thefuck
 
 [Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
 
-And add to the `.bashrc` or `.bash_profile`(for OSX):
+You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
 
 ```bash
-alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
+eval "$(thefuck --alias)"
 # You can use whatever you want as an alias, like for Mondays:
-alias FUCK='fuck'
+eval "$(thefuck --alias FUCK)"
 ```
 
-Or in your `.zshrc`:
-
-```bash
-alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
-```
-
-If you are using `tcsh`:
-```tcsh
-alias fuck 'set fucked_cmd=`history -h 2 | head -n 1` && eval `thefuck ${fucked_cmd}`'
-```
-
-Alternatively, you can redirect the output of `thefuck-alias`:
-
-```bash
-thefuck-alias >> ~/.bashrc
-```
-
-[Or in your shell config (Bash, Zsh, Fish, Powershell).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
+[Or in your shell config (Bash, Zsh, Fish, Powershell, tcsh).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
 
 Changes will be available only in a new shell session.
 To make them available immediately, run `source ~/.bashrc` (or your shell config file like `.zshrc`).
@@ -141,6 +132,8 @@ To make them available immediately, run `source ~/.bashrc` (or your shell config
 sudo pip install thefuck --upgrade
 ```
 
+**Aliases changed in 1.34.**
+
 ## How it works
 
 The Fuck tries to match a rule for the previous command, creates a new command
@@ -153,35 +146,45 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `cd_parent` – changes `cd..` to `cd ..`;
 * `composer_not_command` – fixes composer command name;
 * `cp_omitting_directory` – adds `-a` when you `cp` directory;
-* `cpp11` – add missing `-std=c++11` to `g++` or `clang++`;
+* `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;
-* `dry` – fix repetitions like "git git push";
+* `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;
-* `git_add` – fix *"Did you forget to 'git add'?"*;
+* `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;
-* `git_checkout` – creates the branch before checking-out;
+* `git_checkout` – fixes branch name or creates new branch;
 * `git_diff_staged` – adds `--staged` to previous `git diff` with unexpected output;
-* `git_no_command` – fixes wrong git commands like `git brnch`;
+* `git_fix_stash` – fixes `git stash` commands (misspelled subcommand and missing `save`);
+* `git_not_command` – fixes wrong git commands like `git brnch`;
 * `git_pull` – sets upstream before executing previous `git pull`;
+* `git_pull_clone` – clones instead of pulling when the repo does not exist;
 * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
+* `git_push_pull` – runs `git pull` when `push` was rejected;
 * `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;
+* `grep_recursive` – adds `-r` when you trying to `grep` directory;
+* `gulp_not_task` – fixes misspelled gulp tasks;
 * `has_exists_script` – prepends `./` when script/binary exists;
+* `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;
 * `lein_not_task` – fixes wrong `lein` tasks like `lein rpl`;
-* `ls_lah` – adds -lah to ls;
-* `man` – change manual section;
+* `ls_lah` – adds `-lah` to `ls`;
+* `man` – changes manual section;
 * `man_no_space` – fixes man commands without spaces, for example `mandiff`;
 * `mercurial` – fixes wrong `hg` commands;
 * `mkdir_p` – adds `-p` when you trying to create directory without parent;
 * `no_command` – fixes wrong console commands, for example `vom/vim`;
 * `no_such_file` – creates missing directories with `mv` and `cp` commands;
 * `open` – prepends `http` to address passed to `open`;
-* `pip_unknown_command` – fixes wrong pip commands, for example `pip instatl/pip install`;
+* `pip_unknown_command` – fixes wrong `pip` commands, for example `pip instatl/pip install`;
 * `python_command` – prepends `python` when you trying to run not executable/without `./` python script;
 * `python_execute` – appends missing `.py` when executing Python files;
 * `quotation_marks` – fixes uneven usage of `'` and `"` when containing args'
@@ -190,10 +193,14 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `sl_ls` – changes `sl` to `ls`;
 * `ssh_known_hosts` – removes host from `known_hosts` on warning;
 * `sudo` – prepends `sudo` to previous command if it failed because of permissions;
-* `switch_layout` – switches command from your local layout to en;
-* `systemctl` – correctly orders parameters of confusing systemctl;
+* `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`;
-* `tmux` – fixes tmux commands;
+* `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:
@@ -201,26 +208,35 @@ Enabled by default only on specific platforms:
 * `apt_get` – installs app from apt if it not installed;
 * `brew_install` – fixes formula name for `brew install`;
 * `brew_unknown_command` – fixes wrong brew commands, for example `brew docto/brew doctor`;
-* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour
-* `pacman` – installs app with `pacman` or `yaourt` if it is not installed.
+* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
+* `pacman` – installs app with `pacman` if it is not installed (uses `yaourt` if available).
+* `pacman_not_found` – fix package name with `pacman` or `yaourt`;
 
 Bundled, but not enabled by default:
 
+* `git_push_force` – adds `--force` to a `git push` (may conflict with `git_push_pull`);
 * `rm_root` – adds `--no-preserve-root` to `rm -rf /` command.
 
 ## Creating your own rules
 
 For adding your own rule you should create `your-rule-name.py`
-in `~/.thefuck/rules`. Rule should contain two functions:
-`match(command: Command, settings: Settings) -> bool`
-and `get_new_command(command: Command, settings: Settings) -> str`.
-Also the rule can contain optional function
-`side_effect(command: Command, settings: Settings) -> None` and
-optional boolean `enabled_by_default`.
+in `~/.thefuck/rules`. The rule should contain two functions:
+
+```python
+match(command: Command, settings: Settings) -> bool
+get_new_command(command: Command, settings: Settings) -> str | list[str]
+```
+
+Also the rule can contain an optional function
+
+```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`.
 
-`Settings` is a special object filled with `~/.thefuck/settings.py` and values from env, [more](#settings).
+`Settings` is a special object filled with `~/.thefuck/settings.py` and values from env ([see more below](#settings)).
 
 Simple example of the rule for running script with `sudo`:
 
@@ -239,7 +255,9 @@ enabled_by_default = True
 def side_effect(command, settings):
     subprocess.call('chmod 777 .', shell=True)
 
-priority = 1000  # Lower first
+priority = 1000  # Lower first, default is 1000
+
+requires_output = True
 ```
 
 [More examples of rules](https://github.com/nvbn/thefuck/tree/master/thefuck/rules),
@@ -250,11 +268,11 @@ priority = 1000  # Lower first
 The Fuck has a few settings parameters which can be changed in `~/.thefuck/settings.py`:
 
 * `rules` – list of enabled rules, by default `thefuck.conf.DEFAULT_RULES`;
-* `require_confirmation` – requires confirmation before running new command, by default `False`;
+* `require_confirmation` – requires confirmation before running new command, by default `True`;
 * `wait_command` – max amount of time in seconds for getting previous command output;
 * `no_colors` – disable colored output;
 * `priority` – dict with rules priorities, rule with lower `priority` will be matched first;
-* `debug` – enabled debug output, by default `False`;
+* `debug` – enables debug output, by default `False`.
 
 Example of `settings.py`:
 
@@ -296,11 +314,24 @@ pip install -r requirements.txt
 python setup.py develop
 ```
 
-Run tests:
+Run unit tests:
 
 ```bash
 py.test
 ```
 
+Run unit and functional tests (requires docker):
+
+```bash
+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,35 @@
+#!/bin/sh
+
+# Install os dependencies:
+if [ -f $(which apt-get) ]; then
+    sudo apt-get install python-pip
+else
+    if [ -f $(which brew) ]; then
+        brew install python
+    fi
+fi
+
+# thefuck requires fresh versions of setuptools and pip:
+sudo pip install -U pip setuptools
+sudo pip install -U thefuck
+
+# Setup aliases:
+if [ -f ~/.bashrc ]; then
+    echo 'eval $(thefuck --alias)' >> ~/.bashrc
+fi
+
+if [ -f ~/.bash_profile ]; then
+    echo 'eval $(thefuck --alias)' >> ~/.bash_profile
+fi
+
+if [ -f ~/.zshrc ]; then
+    echo 'eval $(thefuck --alias)' >> ~/.zshrc
+fi
+
+if [ -f ~/.config/fish/config.fish ]; then
+    thefuck --alias >> ~/.config/fish/config.fish
+fi
+
+if [ -f ~/.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

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

setup.py

@@ -1,17 +1,26 @@
 #!/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 = '1.49.1'
+VERSION = '2.8'
 
 install_requires = ['psutil', 'colorama', 'six']
 extras_require = {':python_version<"3.4"': ['pathlib']}
@@ -19,6 +28,7 @@ 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',
@@ -31,4 +41,4 @@ setup(name='thefuck',
       extras_require=extras_require,
       entry_points={'console_scripts': [
           'thefuck = thefuck.main:main',
-          'thefuck-alias = thefuck.shells:app_alias']})
+          'thefuck-alias = thefuck.main:print_alias']})

tests/functional/plots.py

@@ -0,0 +1,82 @@
+from time import sleep
+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."""
+    _set_confirmation(proc, True)
+
+    proc.sendline(u'ehco test')
+
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'echo test'])
+    assert proc.expect([TIMEOUT, u'enter'])
+    assert proc.expect_exact([TIMEOUT, u'ctrl+c'])
+    proc.send('\n')
+
+    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."""
+    _set_confirmation(proc, True)
+
+    proc.sendline(u'ehco test')
+
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'echo test'])
+    assert proc.expect([TIMEOUT, u'enter'])
+    assert proc.expect_exact([TIMEOUT, u'ctrl+c'])
+    proc.send('\003')
+
+    assert proc.expect([TIMEOUT, u'Aborted'])
+
+
+def without_confirmation(proc):
+    """Ensures that command can be fixed when confirmation disabled."""
+    _set_confirmation(proc, False)
+
+    proc.sendline(u'ehco test')
+
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'echo test'])
+    assert proc.expect([TIMEOUT, u'test'])

tests/functional/test_bash.py

@@ -0,0 +1,53 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_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 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 git
+RUN pip2 install -U pip setuptools
+'''))
+
+
+@pytest.fixture(params=containers)
+def proc(request):
+    tag, dockerfile = request.param
+    proc = spawn(request, tag, dockerfile, u'bash')
+    proc.sendline(u"export PS1='$ '")
+    proc.sendline(u'eval $(thefuck-alias)')
+    proc.sendline(u'echo > $HISTFILE')
+    return proc
+
+
+@functional
+def test_with_confirmation(proc):
+    with_confirmation(proc)
+    history_changed(proc, u'echo test')
+
+
+@functional
+def test_select_command_with_arrows(proc):
+    select_command_with_arrows(proc)
+    history_changed(proc, u'git push')
+
+
+@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

@@ -0,0 +1,59 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_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 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 git
+RUN pip2 install -U pip setuptools
+RUN apt-get install -yy fish
+'''))
+
+
+@pytest.fixture(params=containers)
+def proc(request):
+    tag, dockerfile = request.param
+    proc = spawn(request, tag, dockerfile, u'fish')
+    proc.sendline(u'thefuck-alias > ~/.config/fish/config.fish')
+    proc.sendline(u'fish')
+    return proc
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
+def test_with_confirmation(proc):
+    with_confirmation(proc)
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason='https://github.com/travis-ci/apt-source-whitelist/issues/71')
+def test_select_command_with_arrows(proc):
+    select_command_with_arrows(proc)
+
+
+@functional
+@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_tcsh.py

@@ -0,0 +1,51 @@
+import pytest
+from tests.functional.utils import spawn, functional, images
+from tests.functional.plots import with_confirmation, without_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 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 git
+RUN pip2 install -U pip setuptools
+RUN apt-get install -yy tcsh
+'''))
+
+
+@pytest.fixture(params=containers)
+def proc(request):
+    tag, dockerfile = request.param
+    proc = spawn(request, tag, dockerfile, u'tcsh')
+    proc.sendline(u'tcsh')
+    proc.sendline(u'eval `thefuck-alias`')
+    return proc
+
+
+@functional
+def test_with_confirmation(proc):
+    with_confirmation(proc)
+
+
+@functional
+def test_select_command_with_arrows(proc):
+    select_command_with_arrows(proc)
+
+
+@functional
+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

@@ -0,0 +1,57 @@
+import pytest
+from tests.functional.utils import spawn, functional, images
+from tests.functional.plots import with_confirmation, without_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 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 git
+RUN pip2 install -U pip setuptools
+RUN apt-get install -yy zsh
+'''))
+
+
+@pytest.fixture(params=containers)
+def proc(request):
+    tag, dockerfile = request.param
+    proc = spawn(request, tag, dockerfile, u'zsh')
+    proc.sendline(u'eval $(thefuck-alias)')
+    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
+def test_with_confirmation(proc):
+    with_confirmation(proc)
+    history_changed(proc, u'echo test')
+
+
+@functional
+def test_select_command_with_arrows(proc):
+    select_command_with_arrows(proc)
+    history_changed(proc, u'git push')
+
+
+@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

@@ -0,0 +1,53 @@
+import os
+import subprocess
+import shutil
+from tempfile import mkdtemp
+from pathlib import Path
+import sys
+import pexpect
+import pytest
+
+root = str(Path(__file__).parent.parent.parent.resolve())
+bare = os.environ.get('BARE')
+enabled = os.environ.get('FUNCTIONAL')
+
+
+def build_container(tag, dockerfile):
+    tmpdir = mkdtemp()
+    try:
+        with Path(tmpdir).joinpath('Dockerfile').open('w') as file:
+            file.write(dockerfile)
+        if subprocess.call(['docker', 'build', '--tag={}'.format(tag), tmpdir],
+                           cwd=root) != 0:
+            raise Exception("Can't build a container")
+    finally:
+        shutil.rmtree(tmpdir)
+
+
+def spawn(request, tag, dockerfile, cmd):
+    if bare:
+        proc = pexpect.spawnu(cmd)
+    else:
+        tag = 'thefuck/{}'.format(tag)
+        build_container(tag, dockerfile)
+        proc = pexpect.spawnu('docker run --volume {}:/src --tty=true '
+                              '--interactive=true {} {}'.format(root, tag, cmd))
+        proc.sendline('pip install /src')
+    proc.sendline('cd /')
+
+    proc.logfile = sys.stdout
+
+    request.addfinalizer(proc.terminate)
+    return proc
+
+
+def images(*items):
+    if bare:
+        return [items[0]]
+    else:
+        return items
+
+
+functional = pytest.mark.skipif(
+    not enabled,
+    reason='Functional tests are disabled by default.')

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_brew_unknown_command.py

@@ -22,7 +22,7 @@ def test_match(brew_unknown_cmd):
 
 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),
-                           None) == 'brew install'
+                           None) == ['brew install', 'brew uninstall', 'brew list']

tests/rules/test_composer_not_command.py

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

@@ -0,0 +1,129 @@
+import pytest
+from io import BytesIO
+from tests.utils import Command
+from thefuck.rules.docker_not_command import get_new_command, match
+
+
+@pytest.fixture
+def docker_help(mocker):
+    help = b'''Usage: docker [OPTIONS] COMMAND [arg...]
+
+A self-sufficient runtime for linux containers.
+
+Options:
+
+  --api-cors-header=                   Set CORS headers in the remote API
+  -b, --bridge=                        Attach containers to a network bridge
+  --bip=                               Specify network bridge IP
+  -D, --debug=false                    Enable debug mode
+  -d, --daemon=false                   Enable daemon mode
+  --default-gateway=                   Container default gateway IPv4 address
+  --default-gateway-v6=                Container default gateway IPv6 address
+  --default-ulimit=[]                  Set default ulimits for containers
+  --dns=[]                             DNS server to use
+  --dns-search=[]                      DNS search domains to use
+  -e, --exec-driver=native             Exec driver to use
+  --exec-opt=[]                        Set exec driver options
+  --exec-root=/var/run/docker          Root of the Docker execdriver
+  --fixed-cidr=                        IPv4 subnet for fixed IPs
+  --fixed-cidr-v6=                     IPv6 subnet for fixed IPs
+  -G, --group=docker                   Group for the unix socket
+  -g, --graph=/var/lib/docker          Root of the Docker runtime
+  -H, --host=[]                        Daemon socket(s) to connect to
+  -h, --help=false                     Print usage
+  --icc=true                           Enable inter-container communication
+  --insecure-registry=[]               Enable insecure registry communication
+  --ip=0.0.0.0                         Default IP when binding container ports
+  --ip-forward=true                    Enable net.ipv4.ip_forward
+  --ip-masq=true                       Enable IP masquerading
+  --iptables=true                      Enable addition of iptables rules
+  --ipv6=false                         Enable IPv6 networking
+  -l, --log-level=info                 Set the logging level
+  --label=[]                           Set key=value labels to the daemon
+  --log-driver=json-file               Default driver for container logs
+  --log-opt=map[]                      Set log driver options
+  --mtu=0                              Set the containers network MTU
+  -p, --pidfile=/var/run/docker.pid    Path to use for daemon PID file
+  --registry-mirror=[]                 Preferred Docker registry mirror
+  -s, --storage-driver=                Storage driver to use
+  --selinux-enabled=false              Enable selinux support
+  --storage-opt=[]                     Set storage driver options
+  --tls=false                          Use TLS; implied by --tlsverify
+  --tlscacert=~/.docker/ca.pem         Trust certs signed only by this CA
+  --tlscert=~/.docker/cert.pem         Path to TLS certificate file
+  --tlskey=~/.docker/key.pem           Path to TLS key file
+  --tlsverify=false                    Use TLS and verify the remote
+  --userland-proxy=true                Use userland proxy for loopback traffic
+  -v, --version=false                  Print version information and quit
+
+Commands:
+    attach    Attach to a running container
+    build     Build an image from a Dockerfile
+    commit    Create a new image from a container's changes
+    cp        Copy files/folders from a container's filesystem to the host path
+    create    Create a new container
+    diff      Inspect changes on a container's filesystem
+    events    Get real time events from the server
+    exec      Run a command in a running container
+    export    Stream the contents of a container as a tar archive
+    history   Show the history of an image
+    images    List images
+    import    Create a new filesystem image from the contents of a tarball
+    info      Display system-wide information
+    inspect   Return low-level information on a container or image
+    kill      Kill a running container
+    load      Load an image from a tar archive
+    login     Register or log in to a Docker registry server
+    logout    Log out from a Docker registry server
+    logs      Fetch the logs of a container
+    pause     Pause all processes within a container
+    port      Lookup the public-facing port that is NAT-ed to PRIVATE_PORT
+    ps        List containers
+    pull      Pull an image or a repository from a Docker registry server
+    push      Push an image or a repository to a Docker registry server
+    rename    Rename an existing container
+    restart   Restart a running container
+    rm        Remove one or more containers
+    rmi       Remove one or more images
+    run       Run a command in a new container
+    save      Save an image to a tar archive
+    search    Search for an image on the Docker Hub
+    start     Start a stopped container
+    stats     Display a stream of a containers' resource usage statistics
+    stop      Stop a running container
+    tag       Tag an image into a repository
+    top       Lookup the running processes of a container
+    unpause   Unpause a paused container
+    version   Show the Docker version information
+    wait      Block until a container stops, then print its exit code
+
+Run 'docker COMMAND --help' for more information on a command.
+'''
+    mock = mocker.patch('subprocess.Popen')
+    mock.return_value.stdout = BytesIO(help)
+    return mock
+
+
+def stderr(cmd):
+    return "docker: '{}' is not a docker command.\n" \
+           "See 'docker --help'.".format(cmd)
+
+
+def test_match():
+    assert match(Command('docker pes', stderr=stderr('pes')), None)
+
+
+@pytest.mark.parametrize('script, stderr', [
+    ('docker ps', ''),
+    ('cat pes', stderr('pes'))])
+def test_not_match(script, stderr):
+    assert not match(Command(script, stderr=stderr), None)
+
+
+@pytest.mark.usefixtures('docker_help')
+@pytest.mark.parametrize('wrong, fixed', [
+    ('pes', ['ps', 'push', 'pause']),
+    ('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(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_delete.py

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

tests/rules/test_git_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_checkout.py

@@ -12,6 +12,11 @@ def did_not_match(target, did_you_forget=False):
     return error
 
 
+@pytest.fixture
+def get_branches(mocker):
+    return mocker.patch('thefuck.rules.git_checkout.get_branches')
+
+
 @pytest.mark.parametrize('command', [
     Command(script='git checkout unknown', stderr=did_not_match('unknown')),
     Command(script='git commit unknown', stderr=did_not_match('unknown'))])
@@ -28,10 +33,21 @@ def test_not_match(command):
     assert not match(command, None)
 
 
-@pytest.mark.parametrize('command, new_command', [
-    (Command(script='git checkout unknown', stderr=did_not_match('unknown')),
+@pytest.mark.parametrize('branches, command, new_command', [
+    ([],
+     Command(script='git checkout unknown', stderr=did_not_match('unknown')),
      'git branch unknown && git checkout unknown'),
-    (Command('git commit unknown', stderr=did_not_match('unknown')),
-     'git branch unknown && git commit unknown')])
-def test_get_new_command(command, new_command):
+    ([],
+     Command('git commit unknown', stderr=did_not_match('unknown')),
+     'git branch unknown && git commit unknown'),
+    (['test-random-branch-123'],
+     Command(script='git checkout tst-rdm-brnch-123',
+             stderr=did_not_match('tst-rdm-brnch-123')),
+     'git checkout test-random-branch-123'),
+    (['test-random-branch-123'],
+     Command(script='git commit tst-rdm-brnch-123',
+             stderr=did_not_match('tst-rdm-brnch-123')),
+     'git commit test-random-branch-123')])
+def test_get_new_command(branches, command, new_command, get_branches):
+    get_branches.return_value = branches
     assert get_new_command(command, None) == new_command

tests/rules/test_git_diff_staged.py

@@ -4,14 +4,14 @@ from tests.utils import Command
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git diff'),
-    Command(script='git df'),
-    Command(script='git ds')])
+    Command(script='git diff foo'),
+    Command(script='git diff')])
 def test_match(command):
     assert match(command, None)
 
 
 @pytest.mark.parametrize('command', [
+    Command(script='git diff --staged'),
     Command(script='git tag'),
     Command(script='git branch'),
     Command(script='git log')])
@@ -21,7 +21,6 @@ def test_not_match(command):
 
 @pytest.mark.parametrize('command, new_command', [
     (Command('git diff'), 'git diff --staged'),
-    (Command('git df'), 'git df --staged'),
-    (Command('git ds'), 'git ds --staged')])
+    (Command('git diff foo'), 'git diff --staged foo')])
 def test_get_new_command(command, new_command):
     assert get_new_command(command, None) == new_command

tests/rules/test_git_fix_stash.py

@@ -0,0 +1,31 @@
+import pytest
+from thefuck.rules.git_fix_stash import match, get_new_command
+from tests.utils import Command
+
+
+git_stash_err = '''
+usage: git stash list [<options>]
+   or: git stash show [<stash>]
+   or: git stash drop [-q|--quiet] [<stash>]
+   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]
+\t\t       [-u|--include-untracked] [-a|--all] [<message>]]
+   or: git stash clear
+'''
+
+
+@pytest.mark.parametrize('wrong', [
+    'git stash opp',
+    'git stash Some message',
+    'git stash saev Some message'])
+def test_match(wrong):
+    assert match(Command(wrong, stderr=git_stash_err), None)
+
+
+@pytest.mark.parametrize('wrong,fixed', [
+    ('git stash opp', 'git stash pop'),
+    ('git stash Some message', 'git stash save Some message'),
+    ('git stash saev Some message', 'git stash save Some message')])
+def test_get_new_command(wrong, fixed):
+    assert get_new_command(Command(wrong, stderr=git_stash_err), None) == fixed

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
-	tag
+\tstage
+\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_git_pull_clone.py

@@ -0,0 +1,21 @@
+import pytest
+from thefuck.rules.git_pull_clone import match, get_new_command
+from tests.utils import Command
+
+
+git_err = '''
+fatal: Not a git repository (or any parent up to mount point /home)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git pull git@github.com:mcarton/thefuck.git', stderr=git_err)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git pull git@github.com:mcarton/thefuck.git', stderr=git_err), 'git clone git@github.com:mcarton/thefuck.git')])
+def test_get_new_command(command, output):
+    assert get_new_command(command, None) == output

tests/rules/test_git_push.py

@@ -20,5 +20,5 @@ def test_match(stderr):
 
 
 def test_get_new_command(stderr):
-    assert get_new_command(Command(stderr=stderr), None)\
+    assert get_new_command(Command('git push', stderr=stderr), None)\
         == "git push --set-upstream origin master"

tests/rules/test_git_push_force.py

@@ -0,0 +1,52 @@
+import pytest
+from thefuck.rules.git_push_force import match, get_new_command
+from tests.utils import Command
+
+
+git_err = '''
+To /tmp/foo
+ ! [rejected]        master -> master (non-fast-forward)
+ error: failed to push some refs to '/tmp/bar'
+ hint: Updates were rejected because the tip of your current branch is behind
+ hint: its remote counterpart. Integrate the remote changes (e.g.
+ hint: 'git pull ...') before pushing again.
+ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+'''
+
+git_uptodate = 'Everything up-to-date'
+git_ok = '''
+Counting objects: 3, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 282 bytes | 0 bytes/s, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To /tmp/bar
+   514eed3..f269c79  master -> master
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_err),
+    Command(script='git push nvbn', stderr=git_err),
+    Command(script='git push nvbn master', stderr=git_err)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_ok),
+    Command(script='git push', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate)])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git push', stderr=git_err), 'git push --force'),
+    (Command(script='git push nvbn', stderr=git_err), 'git push --force nvbn'),
+    (Command(script='git push nvbn master', stderr=git_err), 'git push --force nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command, None) == output

tests/rules/test_git_push_pull.py

@@ -0,0 +1,54 @@
+import pytest
+from thefuck.rules.git_push_pull import match, get_new_command
+from tests.utils import Command
+
+
+git_err = '''
+To /tmp/foo
+ ! [rejected]        master -> master (non-fast-forward)
+ error: failed to push some refs to '/tmp/bar'
+ hint: Updates were rejected because the tip of your current branch is behind
+ hint: its remote counterpart. Integrate the remote changes (e.g.
+ hint: 'git pull ...') before pushing again.
+ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+'''
+
+git_uptodate = 'Everything up-to-date'
+git_ok = '''
+Counting objects: 3, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 282 bytes | 0 bytes/s, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To /tmp/bar
+   514eed3..f269c79  master -> master
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_err),
+    Command(script='git push nvbn', stderr=git_err),
+    Command(script='git push nvbn master', stderr=git_err)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_ok),
+    Command(script='git push', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate)])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git push', stderr=git_err), 'git pull && git push'),
+    (Command(script='git push nvbn', stderr=git_err),
+     'git pull nvbn && git push nvbn'),
+    (Command(script='git push nvbn master', stderr=git_err),
+     'git pull nvbn master && git push nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command, None) == output

tests/rules/test_git_stash.py

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

tests/rules/test_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

@@ -0,0 +1,28 @@
+import pytest
+from tests.utils import Command
+from thefuck.rules.gulp_not_task import match, get_new_command
+
+
+def stdout(task):
+    return '''[00:41:11] Using gulpfile gulpfile.js
+[00:41:11] Task '{}' is not in your gulpfile
+[00:41:11] Please check the documentation for proper gulpfile formatting
+'''.format(task)
+
+
+def test_match():
+    assert match(Command('gulp srve', stdout('srve')), None)
+
+
+@pytest.mark.parametrize('script, stdout', [
+    ('gulp serve', ''),
+    ('cat srve', stdout('srve'))])
+def test_not_march(script, stdout):
+    assert not match(Command(script, stdout), None)
+
+
+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', 'gulp default']

tests/rules/test_heroku_not_command.py

@@ -0,0 +1,34 @@
+import pytest
+from tests.utils import Command
+from thefuck.rules.heroku_not_command import match, get_new_command
+
+
+def suggest_stderr(cmd):
+    return ''' !    `{}` is not a heroku command.
+     !    Perhaps you meant `logs`, `pg`.
+     !    See `heroku help` for a list of available commands.'''.format(cmd)
+
+
+no_suggest_stderr = ''' !    `aaaaa` is not a heroku command.
+ !    See `heroku help` for a list of available commands.'''
+
+
+@pytest.mark.parametrize('cmd', ['log', 'pge'])
+def test_match(cmd):
+    assert match(
+        Command('heroku {}'.format(cmd), stderr=suggest_stderr(cmd)), None)
+
+
+@pytest.mark.parametrize('script, stderr', [
+    ('cat log', suggest_stderr('log')),
+    ('heroku aaa', no_suggest_stderr)])
+def test_not_match(script, stderr):
+    assert not match(Command(script, stderr=stderr), None)
+
+
+@pytest.mark.parametrize('cmd, result', [
+    ('log', ['heroku logs', '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_history.py

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

tests/rules/test_lein_not_task.py

@@ -9,6 +9,7 @@ def is_not_task():
 
 Did you mean this?
          repl
+         jar
 '''
 
 
@@ -19,4 +20,4 @@ def test_match(is_not_task):
 
 def test_get_new_command(is_not_task):
     assert get_new_command(Mock(script='lein rpl --help', stderr=is_not_task),
-                           None) == 'lein repl --help'
+                           None) == ['lein repl --help', 'lein jar --help']

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):
-    assert extract_possisiblities(command) == possibilities
+def test_extract_possibilities(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():
-    assert match(Command('mkdir foo/bar/baz',
-                         stderr='mkdir: foo/bar: No such file or directory'),
-                 None)
+@pytest.mark.parametrize('command', [
+    Command('mkdir foo/bar/baz', 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'),
+    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():
-    assert get_new_command(Command('mkdir foo/bar/baz'), None)\
-           == 'mkdir -p foo/bar/baz'
+@pytest.mark.parametrize('command, new_command', [
+    (Command('mkdir 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_no_command.py

@@ -1,29 +1,16 @@
 import pytest
-from thefuck.rules.no_command import match, get_new_command, get_all_callables
+from thefuck.rules.no_command import match, get_new_command
 from tests.utils import Command
 
 
 @pytest.fixture(autouse=True)
-def _safe(mocker):
-    mocker.patch('thefuck.rules.no_command._safe', return_value=[])
-
-
-@pytest.fixture(autouse=True)
-def get_aliases(mocker):
-    mocker.patch('thefuck.rules.no_command.get_aliases',
-                 return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+def get_all_executables(mocker):
+    mocker.patch('thefuck.rules.no_command.get_all_executables',
+                 return_value=['vim', 'apt-get', 'fsck'])
 
 
 @pytest.mark.usefixtures('no_memoize')
-def test_get_all_callables(*args):
-    all_callables = get_all_callables()
-    assert 'vim' in all_callables
-    assert 'fsck' in all_callables
-    assert 'fuck' not in all_callables
-
-
-@pytest.mark.usefixtures('no_memoize')
-def test_match(*args):
+def test_match():
     assert match(Command(stderr='vom: not found', script='vom file.py'), None)
     assert match(Command(stderr='fucck: not found', script='fucck'), None)
     assert not match(Command(stderr='qweqwe: not found', script='qweqwe'), None)
@@ -31,12 +18,12 @@ def test_match(*args):
 
 
 @pytest.mark.usefixtures('no_memoize')
-def test_get_new_command(*args):
+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 = '''
-extra/imagemagick 6.9.1.0-1\t/usr/bin/convert
-'''
+PKGFILE_OUTPUT_SUDO = 'core/sudo 1.8.13-13/usr/bin/sudo'
+PKGFILE_OUTPUT_CONVERT = 'extra/imagemagick 6.9.1.0-1\t/usr/bin/convert'
 
-PKGFILE_OUTPUT_VIM = '''
-extra/gvim 7.4.712-1        \t/usr/bin/vim
+PKGFILE_OUTPUT_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.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('sudo vim'), '{} -S extra/gvim && sudo vim'.format(pacman_cmd)),
-    (Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd)),
-    (Command('sudo convert'), '{} -S extra/imagemagick && sudo convert'.format(pacman_cmd))])
+    (Command('vim'), vim_possibilities),
+    (Command('sudo vim'), sudo_vim_possibilities),
+    (Command('convert'), ['{} -S extra/imagemagick && convert'.format(pacman_cmd)]),
+    (Command('sudo convert'), ['{} -S extra/imagemagick && sudo convert'.format(pacman_cmd)])])
 def test_get_new_command(command, new_command, mocker):
     assert get_new_command(command, None) == new_command
 
 
 @pytest.mark.parametrize('command, new_command, return_value', [
-    (Command('vim'), '{} -S extra/gvim && vim'.format(pacman_cmd), PKGFILE_OUTPUT_VIM),
-    (Command('sudo vim'), '{} -S extra/gvim && sudo vim'.format(pacman_cmd), PKGFILE_OUTPUT_VIM),
-    (Command('convert'), '{} -S extra/imagemagick && convert'.format(pacman_cmd), PKGFILE_OUTPUT_CONVERT),
-    (Command('sudo convert'), '{} -S extra/imagemagick && sudo convert'.format(pacman_cmd), PKGFILE_OUTPUT_CONVERT)])
-@patch('thefuck.rules.pacman.subprocess')
+    (Command('vim'), vim_possibilities, 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('sudo'), ['{} -S core/sudo && sudo'.format(pacman_cmd)], PKGFILE_OUTPUT_SUDO),
+    (Command('sudo convert'), ['{} -S extra/imagemagick && sudo convert'.format(pacman_cmd)], PKGFILE_OUTPUT_CONVERT)])
+@patch('thefuck.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.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.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():
-    assert get_new_command(Command('rm foo', '', ''), None) == 'rm -rf foo'
+@pytest.mark.parametrize('command, new_command', [
+    (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

@@ -11,6 +11,7 @@ from tests.utils import Command
     ('need to be root', ''),
     ('need root', ''),
     ('must be root', ''),
+    ('You don\'t have access to the history DB.', ''),
     ('', "error: [Errno 13] Permission denied: '/usr/local/lib/python2.7/dist-packages/ipaddr.py'")])
 def test_match(stderr, stdout):
     assert match(Command(stderr=stderr, stdout=stdout), None)
@@ -20,5 +21,9 @@ def test_not_match():
     assert not match(Command(), None)
 
 
-def test_get_new_command():
-    assert get_new_command(Command('ls'), None) == 'sudo ls'
+@pytest.mark.parametrize('before, after', [
+    ('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_switch_lang.py

@@ -15,6 +15,7 @@ def test_match(command):
 @pytest.mark.parametrize('command', [
     Command(stderr='command not found: pat-get', script=u'pat-get'),
     Command(stderr='command not found: ls', script=u'ls'),
+    Command(stderr='command not found: агсл', script=u'агсл'),
     Command(stderr='some info', script=u'фзе-пуе')])
 def test_not_match(command):
     assert not switch_lang.match(command, None)

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/test_corrector.py

@@ -0,0 +1,97 @@
+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, remove_duplicates
+
+
+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 TestGetMatchedRules(object):
+    def test_no_match(self):
+        assert list(corrector.get_matched_rules(
+            Command('ls'), [Rule('', lambda *_: False)],
+            Mock(no_colors=True))) == []
+
+    def test_match(self):
+        rule = Rule('', lambda x, _: x.script == 'cd ..')
+        assert list(corrector.get_matched_rules(
+            Command('cd ..'), [rule], Mock(no_colors=True))) == [rule]
+
+    def test_when_rule_failed(self, capsys):
+        all(corrector.get_matched_rules(
+            Command('ls'), [Rule('test', Mock(side_effect=OSError('Denied')),
+                                 requires_output=False)],
+            Mock(no_colors=True, debug=False)))
+        assert capsys.readouterr()[1].split('\n')[0] == '[WARN] Rule test:'
+
+
+class TestGetCorrectedCommands(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_remove_duplicates():
+    side_effect = lambda *_: None
+    assert set(remove_duplicates([CorrectedCommand('ls', priority=100),
+                                  CorrectedCommand('ls', priority=200),
+                                  CorrectedCommand('ls', side_effect, 300)])) \
+           == {CorrectedCommand('ls', priority=100),
+               CorrectedCommand('ls', side_effect, 300)}
+
+
+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 tests.utils import Rule, 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)
+from thefuck import main
+from tests.utils import Command
 
 
 class TestGetCommand(object):
@@ -77,97 +25,22 @@ class TestGetCommand(object):
         monkeypatch.setattr('thefuck.shells.to_shell', lambda x: x)
 
     def test_get_command_calls(self, Popen):
-        assert main.get_command(Mock(),
-            ['thefuck', 'apt-get', 'search', 'vim']) \
+        assert main.get_command(Mock(env={}),
+                                ['thefuck', 'apt-get', 'search', 'vim']) \
                == Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,
                                       stdout=PIPE,
                                       stderr=PIPE,
-                                      env={'LANG': 'C'})
+                                      env={})
 
     @pytest.mark.parametrize('args, result', [
+        (['thefuck', ''], None),
+        (['thefuck', '', ''], None),
         (['thefuck', 'ls', '-la'], 'ls -la'),
         (['thefuck', 'ls'], 'ls')])
     def test_get_command_script(self, args, result):
         if result:
-            assert main.get_command(Mock(), args).script == result
+            assert main.get_command(Mock(env={}), args).script == result
         else:
-            assert main.get_command(Mock(), args) is None
-
-
-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')
+            assert main.get_command(Mock(env={}), args) is None

tests/test_readme.py

@@ -0,0 +1,17 @@
+from pathlib import Path
+
+
+def test_readme():
+    project_root = Path(__file__).parent.parent
+    with project_root.joinpath('README.md').open() as f:
+        readme = f.read()
+
+        bundled = project_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_shells.py

@@ -44,9 +44,10 @@ class TestGeneric(object):
         assert shell.get_aliases() == {}
 
     def test_app_alias(self, shell):
-        assert 'alias fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'alias fuck' in shell.app_alias('fuck')
+        assert 'alias FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
     def test_get_history(self, history_lines, shell):
         history_lines(['ls', 'rm'])
@@ -97,9 +98,10 @@ class TestBash(object):
                                        'll': 'ls -alF'}
 
     def test_app_alias(self, shell):
-        assert 'alias fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'alias fuck' in shell.app_alias('fuck')
+        assert 'alias FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
     def test_get_history(self, history_lines, shell):
         history_lines(['ls', 'rm'])
@@ -173,9 +175,10 @@ class TestFish(object):
                                        'ruby': 'ruby'}
 
     def test_app_alias(self, shell):
-        assert 'function fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'function fuck' in shell.app_alias('fuck')
+        assert 'function FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
 
 @pytest.mark.usefixtures('isfile')
@@ -222,9 +225,10 @@ class TestZsh(object):
             'll': 'ls -alF'}
 
     def test_app_alias(self, shell):
-        assert 'alias fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'alias fuck' in shell.app_alias('fuck')
+        assert 'alias FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
     def test_get_history(self, history_lines, shell):
         history_lines([': 1432613911:0;ls', ': 1432613916:0;rm'])

tests/test_types.py

@@ -11,6 +11,7 @@ def test_rules_names_list():
 
 def test_update_settings():
     settings = Settings({'key': 'val'})
-    new_settings = settings.update(key='new-val')
-    assert new_settings.key == 'new-val'
+    new_settings = settings.update(key='new-val', unset='unset-value')
+    assert new_settings.key == 'val'
+    assert new_settings.unset == 'unset-value'
     assert settings.key == 'val'

tests/test_ui.py

@@ -0,0 +1,124 @@
+# -*- encoding: utf-8 -*-
+
+from mock import Mock
+import pytest
+from itertools import islice
+from thefuck import ui
+from thefuck.types import CorrectedCommand
+
+
+@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):
+        return [CorrectedCommand('ls', lambda *_: None, 100),
+                CorrectedCommand('cd', lambda *_: None, 100)]
+
+    @pytest.fixture
+    def commands(self):
+        return [CorrectedCommand('ls', None, 100),
+                CorrectedCommand('cd', None, 100)]
+
+    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_one_match(self, capsys, patch_getch, commands):
+        patch_getch(['\n'])
+        assert ui.select_command((commands[0],),
+                                 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,13 +1,16 @@
 import pytest
 from mock import Mock
-from thefuck.utils import sudo_support, wrap_settings, memoize, get_closest
+from thefuck.utils import git_support, sudo_support, wrap_settings,\
+    memoize, get_closest, get_all_executables, replace_argument, \
+    get_all_matched_commands
 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
@@ -16,6 +19,7 @@ def test_wrap_settings(override, old, new):
 @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),
@@ -26,6 +30,29 @@ def test_sudo_support(return_value, command, called, result):
     fn.assert_called_once_with(Command(called), None)
 
 
+@pytest.mark.parametrize('called, command, stderr', [
+    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
+    ('git com file', 'git commit --verbose file', "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
+def test_git_support(called, command, stderr):
+    @git_support
+    def fn(command, settings): return command.script
+    assert fn(Command(script=called, stderr=stderr), None) == command
+
+
+@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)
@@ -50,3 +77,57 @@ class TestGetClosest(object):
 
     def test_when_cant_match(self):
         assert 'status' == get_closest('st', ['status', 'reset'])
+
+    def test_without_fallback(self):
+        assert get_closest('st', ['status', 'reset'],
+                           fallback_to_first=False) is None
+
+
+@pytest.fixture
+def get_aliases(mocker):
+    mocker.patch('thefuck.shells.get_aliases',
+                 return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+
+
+@pytest.mark.usefixtures('no_memoize', 'get_aliases')
+def test_get_all_callables():
+    all_callables = get_all_executables()
+    assert 'vim' in all_callables
+    assert 'fsck' in all_callables
+    assert 'fuck' not in all_callables
+
+
+@pytest.mark.parametrize('args, result', [
+    (('apt-get instol vim', 'instol', 'install'), 'apt-get install vim'),
+    (('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

tests/utils.py

@@ -10,7 +10,12 @@ 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)

thefuck/archlinux.py

@@ -0,0 +1,41 @@
+""" This file provide some utility functions for Arch Linux specific rules."""
+import thefuck.utils
+import subprocess
+
+
+@thefuck.utils.memoize
+def get_pkgfile(command):
+    """ Gets the packages that provide the given command using `pkgfile`.
+
+    If the command is of the form `sudo foo`, searches for the `foo` command
+    instead.
+    """
+    try:
+        command = command.strip()
+
+        if command.startswith('sudo '):
+            command = command[5:]
+
+        command = command.split(" ")[0]
+
+        packages = subprocess.check_output(
+            ['pkgfile', '-b', '-v', command],
+            universal_newlines=True, stderr=thefuck.utils.DEVNULL
+        ).splitlines()
+
+        return [package.split()[0] for package in packages]
+    except subprocess.CalledProcessError:
+        return None
+
+
+def archlinux_env():
+    if thefuck.utils.which('yaourt'):
+        pacman = 'yaourt'
+    elif thefuck.utils.which('pacman'):
+        pacman = 'sudo pacman'
+    else:
+        return False, None
+
+    enabled_by_default = thefuck.utils.which('pkgfile')
+
+    return enabled_by_default, pacman

thefuck/conf.py

@@ -27,10 +27,11 @@ DEFAULT_PRIORITY = 1000
 
 DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                     'wait_command': 3,
-                    'require_confirmation': False,
+                    'require_confirmation': True,
                     'no_colors': False,
                     'debug': False,
-                    'priority': {}}
+                    'priority': {},
+                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_WAIT_COMMAND': 'wait_command',

thefuck/corrector.py

@@ -0,0 +1,87 @@
+import sys
+from imp import load_source
+from pathlib import Path
+from . import conf, types, logs
+from .utils import eager
+
+
+def load_rule(rule, settings):
+    """Imports rule module and returns it."""
+    name = rule.name[:-3]
+    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
+
+
+@eager
+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 get_loaded_rules(sorted(bundled) + sorted(user), settings)
+
+
+@eager
+def get_matched_rules(command, rules, settings):
+    """Returns first matched rule for command."""
+    script_only = command.stdout is None and command.stderr is None
+
+    for rule in rules:
+        if script_only and rule.requires_output:
+            continue
+
+        try:
+            with logs.debug_time(u'Trying rule: {};'.format(rule.name),
+                                 settings):
+                if rule.match(command, settings):
+                    yield rule
+        except Exception:
+            logs.rule_failed(rule, sys.exc_info(), settings)
+
+
+def make_corrected_commands(command, rules, settings):
+    for rule in rules:
+        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 remove_duplicates(corrected_commands):
+    commands = {(command.script, command.side_effect): command
+                for command in sorted(corrected_commands,
+                                      key=lambda command: -command.priority)}
+    return commands.values()
+
+
+def get_corrected_commands(command, user_dir, settings):
+    rules = get_rules(user_dir, settings)
+    logs.debug(
+        u'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
+        settings)
+    matched = get_matched_rules(command, rules, settings)
+    logs.debug(
+        u'Matched rules: {}'.format(', '.join(rule.name for rule in matched)),
+        settings)
+    corrected_commands = make_corrected_commands(command, matched, settings)
+    return sorted(remove_duplicates(corrected_commands),
+                  key=lambda corrected_command: corrected_command.priority)

thefuck/logs.py

@@ -1,4 +1,7 @@
-from pprint import pformat
+# -*- encoding: utf-8 -*-
+
+from contextlib import contextmanager
+from datetime import datetime
 import sys
 from traceback import format_exception
 import colorama
@@ -27,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,
@@ -55,6 +37,33 @@ 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, multiple_cmds, settings):
+    if multiple_cmds:
+        arrows = '{blue}↑{reset}/{blue}↓{reset}/'
+    else:
+        arrows = ''
+
+    sys.stderr.write(
+        ('{clear}{bold}{script}{reset}{side_effect} '
+         '[{green}enter{reset}/' + arrows + '{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(
@@ -62,3 +71,12 @@ def debug(msg, settings):
             reset=color(colorama.Style.RESET_ALL, settings),
             blue=color(colorama.Fore.BLUE, settings),
             bold=color(colorama.Style.BRIGHT, settings)))
+
+
+@contextmanager
+def debug_time(msg, settings):
+    started = datetime.now()
+    try:
+        yield
+    finally:
+        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,74 +50,88 @@ def get_command(settings, args):
     else:
         script = ' '.join(args[1:])
 
+    script = script.strip()
     if not script:
         return
 
     script = shells.from_shell(script)
-    logs.debug('Call: {}'.format(script), settings)
-    result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
-                   env=dict(os.environ, LANG='C'))
-    if wait_output(settings, result):
-        return types.Command(script, result.stdout.read().decode('utf-8'),
-                             result.stderr.read().decode('utf-8'))
+    env = dict(os.environ)
+    env.update(settings.env)
+
+    with logs.debug_time(u'Call: {}; with env: {};'.format(script, env),
+                         settings):
+        result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env)
+        if wait_output(settings, result):
+            stdout = result.stdout.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):
-    """Returns first matched rule for command."""
-    for rule in rules:
-        try:
-            logs.debug(u'Trying rule: {}'.format(rule.name), settings)
-            if rule.match(command, settings):
-                return rule
-        except Exception:
-            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):
+def run_command(old_cmd, command, settings):
     """Runs command from rule for passed command."""
-    new_command = shells.to_shell(rule.get_new_command(command, settings))
-    if confirm(new_command, rule.side_effect, settings):
-        if rule.side_effect:
-            rule.side_effect(command, settings)
-        shells.put_to_history(new_command)
-        print(new_command)
+    if command.side_effect:
+        command.side_effect(old_cmd, command.script, settings)
+    shells.put_to_history(command.script)
+    print(command.script)
 
 
-def main():
+# Entry points:
+
+def fix_command():
     colorama.init()
     user_dir = setup_user_dir()
     settings = conf.get_settings(user_dir)
-    logs.debug('Run with settings: {}'.format(pformat(settings)), settings)
+    with logs.debug_time('Total', settings):
+        logs.debug(u'Run with settings: {}'.format(pformat(settings)), settings)
 
-    command = get_command(settings, sys.argv)
-    if command:
-        logs.debug('Received stdout: {}'.format(command.stdout), settings)
-        logs.debug('Received stderr: {}'.format(command.stderr), settings)
+        command = get_command(settings, sys.argv)
 
-        rules = get_rules(user_dir, settings)
-        logs.debug(
-            'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
-            settings)
-
-        matched_rule = get_matched_rule(command, rules, settings)
-        if matched_rule:
-            logs.debug('Matched rule: {}'.format(matched_rule.name), settings)
-            run_rule(matched_rule, command, settings)
+        if not command:
+            logs.debug('Empty command, nothing to do', settings)
             return
 
-    logs.failed('No fuck given', settings)
+        corrected_commands = get_corrected_commands(command, user_dir, settings)
+        selected_command = select_command(corrected_commands, settings)
+        if selected_command:
+            run_command(command, selected_command, settings)
+
+
+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) > position:
+        alias = sys.argv[position]
+    print(shells.app_alias(alias))
+
+
+def main():
+    parser = ArgumentParser(prog='The Fuck')
+    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()
-    pkgs = c.getPackages(command.script.split(" ")[0])
-    name, _ = pkgs[0]
+    name = get_package(command.script)
     formatme = shells.and_('sudo apt-get install {}', '{}')
     return formatme.format(name, command.script)

thefuck/rules/brew_install.py

@@ -1,7 +1,7 @@
 import os
 import re
 from subprocess import check_output
-from thefuck.utils import get_closest
+from thefuck.utils import get_closest, replace_argument
 
 # Formulars are base on each local system's status
 
@@ -40,4 +40,4 @@ def get_new_command(command, settings):
                                    command.stderr)[0]
     exist_formula = _get_similar_formula(not_exist_formula)
 
-    return command.script.replace(not_exist_formula, exist_formula, 1)
+    return replace_argument(command.script, not_exist_formula, exist_formula)

thefuck/rules/brew_unknown_command.py

@@ -1,7 +1,7 @@
 import os
 import re
 import subprocess
-from thefuck.utils import get_closest
+from thefuck.utils import get_closest, replace_command
 
 BREW_CMD_PATH = '/Library/Homebrew/cmd'
 TAP_PATH = '/Library/Taps'
@@ -77,10 +77,6 @@ if brew_path_prefix:
         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)
@@ -89,7 +85,7 @@ def match(command, settings):
     if is_proper_command:
         broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                                 command.stderr)[0]
-        has_possible_commands = bool(_get_similar_command(broken_cmd))
+        has_possible_commands = bool(get_closest(broken_cmd, brew_commands))
 
     return has_possible_commands
 
@@ -97,6 +93,4 @@ def match(command, settings):
 def get_new_command(command, settings):
     broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                             command.stderr)[0]
-    new_cmd = _get_similar_command(broken_cmd)
-
-    return command.script.replace(broken_cmd, new_cmd, 1)
+    return replace_command(command, broken_cmd, brew_commands)

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,4 +1,5 @@
 import re
+from thefuck.utils import replace_argument
 
 
 def match(command, settings):
@@ -11,4 +12,4 @@ def get_new_command(command, settings):
     broken = command.script.split()[1]
     fix = re.findall(r'Did you mean `([^`]*)`', command.stderr)[0]
 
-    return command.script.replace(broken, fix, 1)
+    return replace_argument(command.script, broken, fix)

thefuck/rules/cd_correction.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-__author__ = "mmussomele"
-
 """Attempts to spellcheck and correct failed cd commands"""
 
 import os
@@ -8,6 +5,8 @@ from difflib import get_close_matches
 from thefuck.utils import sudo_support
 from thefuck.rules import cd_mkdir
 
+__author__ = "mmussomele"
+
 MAX_ALLOWED_DIFF = 0.6
 
 
@@ -28,8 +27,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 
-    defaults to the rules of cd_mkdir. 
+    If it fails (i.e. no directories are a close enough match), then it
+    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_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,4 +1,5 @@
 import re
+from thefuck.utils import replace_argument
 
 
 def match(command, settings):
@@ -12,4 +13,4 @@ def get_new_command(command, settings):
     new_cmd = re.findall(r'Did you mean this\?[^\n]*\n\s*([^\n]*)', command.stderr)
     if not new_cmd:
         new_cmd = re.findall(r'Did you mean one of these\?[^\n]*\n\s*([^\n]*)', command.stderr)
-    return command.script.replace(broken_cmd, new_cmd[0].strip(), 1)
+    return replace_argument(command.script, broken_cmd, new_cmd[0].strip())

thefuck/rules/dirty_untar.py

@@ -0,0 +1,41 @@
+from thefuck import shells
+import os
+import tarfile
+
+
+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)])
+
+
+def match(command, settings):
+    return (command.script.startswith('tar')
+            and '-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,39 @@
+import os
+import zipfile
+
+
+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)
+
+
+def match(command, settings):
+    return (command.script.startswith('unzip')
+            and '-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

@@ -0,0 +1,26 @@
+from itertools import dropwhile, takewhile, islice
+import re
+import subprocess
+from thefuck.utils import sudo_support, replace_command
+
+
+@sudo_support
+def match(command, settings):
+    return command.script.startswith('docker') \
+           and 'is not a docker command' in command.stderr
+
+
+def get_docker_commands():
+    proc = subprocess.Popen('docker', stdout=subprocess.PIPE)
+    lines = [line.decode('utf-8') for line in proc.stdout.readlines()]
+    lines = dropwhile(lambda line: not line.startswith('Commands:'), lines)
+    lines = islice(lines, 1, None)
+    lines = list(takewhile(lambda line: line != '\n', lines))
+    return [line.strip().split(' ')[0] for line in lines]
+
+
+@sudo_support
+def get_new_command(command, settings):
+    wrong_command = re.findall(
+        r"docker: '(\w+)' is not a docker command.", command.stderr)[0]
+    return replace_command(command, wrong_command, get_docker_commands())

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]+)')
+    pattern = pattern.replace('{line}', '(?P<line>[0-9]+)')
+    pattern = pattern.replace('{col}',  '(?P<col>[0-9]+)')
+    return re.compile(pattern, re.MULTILINE)
+patterns = [_make_pattern(p) for p in patterns]
+
+
+@memoize
+def _search(stderr):
+    for pattern in patterns:
+        m = re.search(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,17 +1,18 @@
 import re
-from thefuck import shells
+from thefuck import utils, shells
 
 
+@utils.git_support
 def match(command, settings):
-    return ('git' in command.script
-            and 'did not match any file(s) known to git.' in command.stderr
+    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
 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

@@ -0,0 +1,13 @@
+from thefuck import utils
+from thefuck.utils import replace_argument
+
+
+@utils.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
+def get_new_command(command, settings):
+    return replace_argument(command.script, '-d', '-D')

thefuck/rules/git_branch_list.py

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

thefuck/rules/git_checkout.py

@@ -1,17 +1,37 @@
 import re
-from thefuck import shells
+import subprocess
+from thefuck import shells, utils
+from thefuck.utils import replace_argument
 
 
+@utils.git_support
 def match(command, settings):
-    return ('git' in command.script
-            and 'did not match any file(s) known to git.' in command.stderr
+    return ('did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
 
 
+def get_branches():
+    proc = subprocess.Popen(
+        ['git', 'branch', '-a', '--no-color', '--no-column'],
+        stdout=subprocess.PIPE)
+    for line in proc.stdout.readlines():
+        line = line.decode('utf-8')
+        if line.startswith('*'):
+            line = line.split(' ')[1]
+        if '/' in line:
+            line = line.split('/')[-1]
+        yield line.strip()
+
+
+@utils.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]
-
-    formatme = shells.and_('git branch {}', '{}')
-    return formatme.format(missing_file, command.script)
+        r"error: pathspec '([^']*)' "
+        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:
+        return replace_argument(command.script, missing_file, closest_branch)
+    else:
+        return shells.and_('git branch {}', '{}').format(
+            missing_file, command.script)

thefuck/rules/git_diff_staged.py

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

thefuck/rules/git_fix_stash.py

@@ -0,0 +1,32 @@
+from thefuck import utils
+from thefuck.utils import replace_argument
+
+
+@utils.git_support
+def match(command, settings):
+    return (command.script.split()[1] == 'stash'
+            and 'usage:' in command.stderr)
+
+# git's output here is too complicated to be parsed (see the test file)
+stash_commands = (
+    'apply',
+    'branch',
+    'clear',
+    'drop',
+    'list',
+    'pop',
+    'save',
+    'show')
+
+
+@utils.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)
+
+    if fixed is not None:
+        return replace_argument(command.script, stash_cmd, fixed)
+    else:
+        cmd = command.script.split()
+        cmd.insert(2, 'save')
+        return ' '.join(cmd)

thefuck/rules/git_not_command.py

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

thefuck/rules/git_pull.py

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

thefuck/rules/git_pull_clone.py

@@ -0,0 +1,13 @@
+from thefuck import utils
+from thefuck.utils import replace_argument
+
+
+@utils.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
+def get_new_command(command, settings):
+    return replace_argument(command.script, 'pull', 'clone')

thefuck/rules/git_push.py

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

thefuck/rules/git_push_force.py

@@ -0,0 +1,18 @@
+from thefuck import utils
+from thefuck.utils import replace_argument
+
+
+@utils.git_support
+def match(command, settings):
+    return ('push' in command.script
+            and '! [rejected]' in command.stderr
+            and 'failed to push some refs to' in command.stderr
+            and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
+
+
+@utils.git_support
+def get_new_command(command, settings):
+    return replace_argument(command.script, 'push', 'push --force')
+
+
+enabled_by_default = False

thefuck/rules/git_push_pull.py

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

thefuck/rules/git_stash.py

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

thefuck/rules/go_run.py

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

thefuck/rules/gulp_not_task.py

@@ -0,0 +1,21 @@
+import re
+import subprocess
+from thefuck.utils import replace_command
+
+
+def match(command, script):
+    return command.script.startswith('gulp')\
+        and 'is not in your gulpfile' in command.stdout
+
+
+def get_gulp_tasks():
+    proc = subprocess.Popen(['gulp', '--tasks-simple'],
+                            stdout=subprocess.PIPE)
+    return [line.decode('utf-8')[:-1]
+            for line in proc.stdout.readlines()]
+
+
+def get_new_command(command, script):
+    wrong_task = re.findall(r"Task '(\w+)' is not in your gulpfile",
+                            command.stdout)[0]
+    return replace_command(command, wrong_task, get_gulp_tasks())

thefuck/rules/has_exists_script.py

@@ -11,4 +11,3 @@ def match(command, settings):
 @sudo_support
 def get_new_command(command, settings):
     return u'./{}'.format(command.script)
-

thefuck/rules/heroku_not_command.py

@@ -0,0 +1,19 @@
+import re
+from thefuck.utils import replace_command
+
+
+def match(command, settings):
+    return command.script.startswith('heroku') and \
+           'is not a heroku command' in command.stderr and \
+           'Perhaps you meant' in command.stderr
+
+
+def _get_suggests(stderr):
+    for line in stderr.split('\n'):
+        if 'Perhaps you meant' in line:
+            return re.findall(r'`([^`]+)`', line)
+
+
+def get_new_command(command, settings):
+    wrong = re.findall(r'`(\w+)` is not a heroku command', command.stderr)[0]
+    return replace_command(command, wrong, _get_suggests(command.stderr))

thefuck/rules/history.py

@@ -1,15 +1,27 @@
 from difflib import get_close_matches
-from thefuck.shells import get_history
-from thefuck.utils import get_closest, memoize
-from thefuck.rules.no_command import get_all_callables
+from thefuck.shells import get_history, thefuck_alias
+from thefuck.utils import get_closest, memoize, get_all_executables
+
+
+def _not_corrected(history, tf_alias):
+    """Returns all lines from history except that comes before `fuck`."""
+    previous = None
+    for line in history:
+        if previous is not None and line != tf_alias:
+            yield previous
+        previous = line
+    if history:
+        yield history[-1]
 
 
 @memoize
 def _history_of_exists_without_current(command):
-    callables = get_all_callables()
-    return [line for line in get_history()
-            if line != command.script
-            and line.split(' ')[0] in callables]
+    history = get_history()
+    tf_alias = thefuck_alias()
+    executables = get_all_executables()
+    return [line for line in _not_corrected(history, tf_alias)
+            if not line.startswith(tf_alias) and not line == command.script
+            and line.split(' ')[0] in executables]
 
 
 def match(command, settings):
@@ -21,4 +33,5 @@ def get_new_command(command, settings):
     return get_closest(command.script,
                        _history_of_exists_without_current(command))
 
+
 priority = 9999

thefuck/rules/javac.py

@@ -4,7 +4,7 @@
 # > javac foo
 # error: Class names, 'foo', are only accepted if annotation
 # processing is explicitly requested
- 
+
 
 def match(command, settings):
     return (command.script.startswith('javac ')