#311 Manually convert md to rst

fix setup.py version checking

.travis.yml

@@ -3,7 +3,23 @@ python:
   - "3.4"
   - "3.3"
   - "2.7"
+addons:
+  apt:
+    sources:
+      - fish-shell/release-2
+    packages:
+      - bash
+      - zsh
+      - fish
+      - tcsh
+env:
+  - FUNCTIONAL=true BARE=true
 install:
-  - python setup.py develop
+  - pip install coveralls
   - pip install -r requirements.txt
-script: py.test
+  - python setup.py develop
+  - 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,10 +1,12 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck)
+# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck) 
 
 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
@@ -12,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
 ...
@@ -27,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.
 ...
 ```
@@ -40,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)
 ...
 ```
@@ -53,7 +55,7 @@ Did you mean this?
 	branch
 
 ➜ fuck
-git branch
+git branch [enter/ctrl+c]
 * master
 ```
 
@@ -65,14 +67,14 @@ 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 scary to blindly run changed command, there's `require_confirmation`
+If you are not scared to blindly run the changed command, there is a `require_confirmation`
-[settings](#Settings) option:
+[settings](#settings) option:
 
 ```bash
 ➜ apt-get install vim
@@ -80,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
 ...
@@ -88,8 +90,8 @@ Reading package lists... Done
 
 ## Requirements
 
+- python (2.7+ or 3.3+)
 - pip
-- python
 - python-dev
 
 ## Installation
@@ -100,41 +102,20 @@ Install `The Fuck` with `pip`:
 sudo pip install thefuck
 ```
 
-If it fails try to use `easy_install`:
+[Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
+
+You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
 
 ```bash
-sudo easy_install thefuck
+eval "$(thefuck-alias)"
+# You can use whatever you want as an alias, like for Mondays:
+eval "$(thefuck-alias FUCK)"
 ```
 
-And add to `.bashrc` or `.zshrc` or `.bash_profile`(for OSX):
+[Or in your shell config (Bash, Zsh, Fish, Powershell, tcsh).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
-
-```bash
-alias fuck='$(thefuck $(fc -ln -1))'
-# You can use whatever you want as an alias, like for mondays:
-alias FUCK='fuck'
-```
-
-Or in `config.fish`:
-
-```fish
-function fuck
-    eval (thefuck $history[1])
-end
-```
-
-Or in your Powershell `$PROFILE` on Windows:
-
-```powershell
-function fuck { 
-    $fuck = $(thefuck (get-history -count 1).commandline)
-    if($fuck.startswith("echo")) { 
-        $fuck.substring(5) 
-    } 
-    else { iex "$fuck" } 
-}
-```
 
 Changes will be available only in a new shell session.
+To make them available immediately, run `source ~/.bashrc` (or your shell config file like `.zshrc`).
 
 
 ## Update
@@ -143,33 +124,102 @@ Changes will be available only in a new shell session.
 sudo pip install thefuck --upgrade
 ```
 
+**Aliases changed in 1.34.**
+
 ## How it works
 
-The Fuck tries to match rule for the previous command, create new command
+The Fuck tries to match a rule for the previous command, creates a new command
-using matched rule and run it. Rules enabled by default:
+using the matched rule and runs it. Rules enabled by default are as follows:
 
+* `cargo` – runs `cargo build` instead of `cargo`;
+* `cargo_no_command` – fixes wrongs commands like `cargo buid`;
+* `cd_correction` – spellchecks and correct failed cd commands;
+* `cd_mkdir` – creates directories before cd'ing into them;
 * `cd_parent` – changes `cd..` to `cd ..`;
+* `composer_not_command` – fixes composer command name;
 * `cp_omitting_directory` – adds `-a` when you `cp` directory;
-* `git_no_command` – fixes wrong git commands like `git brnch`;
+* `cpp11` – adds missing `-std=c++11` to `g++` or `clang++`;
+* `dirty_untar` – fixes `tar x` command that untarred in the current directory;
+* `dirty_unzip` – fixes `unzip` command that unzipped in the current directory;
+* `django_south_ghost` – adds `--delete-ghost-migrations` to failed because ghosts django south migration;
+* `django_south_merge` – adds `--merge` to inconsistent django south migration;
+* `docker_not_command` – fixes wrong docker commands like `docker tags`;
+* `dry` – fixes repetitions like `git git push`;
+* `fix_alt_space` – replaces Alt+Space with Space character;
+* `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` – fixes branch name or creates new branch;
+* `git_diff_staged` – adds `--staged` to previous `git diff` with unexpected output;
+* `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;
+* `gulp_not_task` – fixes misspelled gulp tasks;
 * `has_exists_script` – prepends `./` when script/binary exists;
+* `heroku_no_command` – fixes wrong `heroku` commands like `heroku log`;
+* `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` – 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`;
 * `python_command` – prepends `python` when you trying to run not executable/without `./` python script;
+* `python_execute` – appends missing `.py` when executing Python files;
+* `quotation_marks` – fixes uneven usage of `'` and `"` when containing args'
 * `rm_dir` – adds `-rf` when you trying to remove directory;
-* `sudo` – prepends `sudo` to previous command if it failed because of permissions.
+* `sed_unterminated_s` – adds missing '/' to `sed`'s `s` commands;
+* `sl_ls` – changes `sl` to `ls`;
+* `ssh_known_hosts` – removes host from `known_hosts` on warning;
+* `sudo` – prepends `sudo` to previous command if it failed because of permissions;
+* `switch_layout` – switches command from your local layout to en;
+* `systemctl` – correctly orders parameters of confusing `systemctl`;
+* `test.py` – runs `py.test` instead of `test.py`;
+* `tsuru_login` – runs `tsuru login` if not authenticated or session expired;
+* `tmux` – fixes `tmux` commands;
+* `whois` – fixes `whois` command.
+
+Enabled by default only on specific platforms:
+
+* `apt_get` – installs app from apt if it not installed;
+* `brew_install` – fixes formula name for `brew install`;
+* `brew_unknown_command` – fixes wrong brew commands, for example `brew docto/brew doctor`;
+* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
+* `pacman` – installs app with `pacman` or `yaourt` if it is not installed.
+
+Bundled, but not enabled by default:
+
+* `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:
+in `~/.thefuck/rules`. The rule should contain two functions:
-`match(command: Command, settings: Settings) -> bool`
+
-and `get_new_command(command: Command, settings: Settings) -> str`.
+```python
+match(command: Command, settings: Settings) -> bool
+get_new_command(command: Command, settings: Settings) -> str
+```
+
+Also the rule can contain an optional function `side_effect(command: Command, settings: Settings) -> None`
+and optional `enabled_by_default`, `requires_output` and `priority` variables.
 
 `Command` has three attributes: `script`, `stdout` and `stderr`.
 
-`Settings` is `~/.thefuck/settings.py`.
+`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`:
 
@@ -181,6 +231,16 @@ def match(command, settings):
 
 def get_new_command(command, settings):
     return 'sudo {}'.format(command.script)
+
+# Optional:
+enabled_by_default = True
+
+def side_effect(command, settings):
+    subprocess.call('chmod 777 .', shell=True)
+
+priority = 1000  # Lower first, default is 1000
+
+requires_output = True
 ```
 
 [More examples of rules](https://github.com/nvbn/thefuck/tree/master/thefuck/rules),
@@ -188,13 +248,45 @@ def get_new_command(command, settings):
 
 ## Settings
 
-The Fuck has a few settings parameters, they can be changed in `~/.thefuck/settings.py`:
+The Fuck has a few settings parameters which can be changed in `~/.thefuck/settings.py`:
 
-* `rules` – list of enabled rules, by default all;
+* `rules` – list of enabled rules, by default `thefuck.conf.DEFAULT_RULES`;
-* `require_confirmation` – require 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;
-* `command_not_found` – path to `command_not_found` binary,
+* `no_colors` – disable colored output;
-by default `/usr/lib/command-not-found`.
+* `priority` – dict with rules priorities, rule with lower `priority` will be matched first;
+* `debug` – enables debug output, by default `False`.
+
+Example of `settings.py`:
+
+```python
+rules = ['sudo', 'no_command']
+require_confirmation = True
+wait_command = 10
+no_colors = False
+priority = {'sudo': 100, 'no_command': 9999}
+debug = False
+```
+
+Or via environment variables:
+
+* `THEFUCK_RULES` – list of enabled rules, like `DEFAULT_RULES:rm_root` or `sudo:no_command`;
+* `THEFUCK_REQUIRE_CONFIRMATION` – require confirmation before running new command, `true/false`;
+* `THEFUCK_WAIT_COMMAND` – max amount of time in seconds for getting previous command output;
+* `THEFUCK_NO_COLORS` – disable colored output, `true/false`;
+* `THEFUCK_PRIORITY` – priority of the rules, like `no_command=9999:apt_get=100`,
+rule with lower `priority` will be matched first;
+* `THEFUCK_DEBUG` – enables debug output, `true/false`.
+
+For example:
+
+```bash
+export THEFUCK_RULES='sudo:no_command'
+export THEFUCK_REQUIRE_CONFIRMATION='true'
+export THEFUCK_WAIT_COMMAND=10
+export THEFUCK_NO_COLORS='false'
+export THEFUCK_PRIORITY='no_command=9999:apt_get=100'
+```
 
 ## Developing
 
@@ -205,11 +297,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).

release.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+from subprocess import call
+import re
+
+
+version = None
+
+
+def get_new_setup_py_lines():
+    global version
+    with open('setup.py', 'r') as sf:
+        current_setup = sf.readlines()
+    for line in current_setup:
+        if line.startswith('VERSION = '):
+            major, minor = re.findall(r"VERSION = '(\d+)\.(\d+)'", line)[0]
+            version = "{}.{}".format(major, int(minor) + 1)
+            yield "VERSION = '{}'\n".format(version)
+        else:
+            yield line
+
+
+lines = list(get_new_setup_py_lines())
+with open('setup.py', 'w') as sf:
+    sf.writelines(lines)
+
+call('git pull', shell=True)
+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)

requirements.txt

@@ -1,2 +1,7 @@
 pytest
 mock
+pytest-mock
+wheel
+setuptools>=17.1
+pexpect
+pypandoc

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

setup.py

@@ -1,16 +1,43 @@
+#!/usr/bin/env python
 from setuptools import setup, find_packages
+import sys
 
+try:
+    import pypandoc
+
+    long_description = pypandoc.convert('README.md', 'rst')
+except:
+    long_description = open('README.md').read()
+
+version = sys.version_info[:2]
+if version < (2, 7):
+    print('thefuck requires Python version 2.7 or later' +
+          ' ({}.{} detected).'.format(*version))
+    sys.exit(-1)
+elif (3, 0) < version < (3, 3):
+    print('thefuck requires Python version 3.3 or later' +
+          ' ({}.{} detected).'.format(*version))
+    sys.exit(-1)
+
+VERSION = '2.5.4'
+
+install_requires = ['psutil', 'colorama', 'six']
+extras_require = {':python_version<"3.4"': ['pathlib']}
 
 setup(name='thefuck',
-      version=1.15,
+      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',
       license='MIT',
-      packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+      packages=find_packages(exclude=['ez_setup', 'examples',
+                                      'tests', 'release']),
       include_package_data=True,
       zip_safe=False,
-      install_requires=['pathlib', 'psutil'],
+      install_requires=install_requires,
+      extras_require=extras_require,
       entry_points={'console_scripts': [
-          'thefuck = thefuck.main:main']})
+          'thefuck = thefuck.main:main',
+          'thefuck-alias = thefuck.main:print_alias']})

tests/conftest.py

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

tests/functional/plots.py

@@ -0,0 +1,57 @@
+from pexpect import TIMEOUT
+
+
+def with_confirmation(proc):
+    """Ensures that command can be fixed when confirmation enabled."""
+    proc.sendline(u'mkdir -p ~/.thefuck')
+    proc.sendline(u'echo "require_confirmation = True" > ~/.thefuck/settings.py')
+
+    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):
+    """Ensures that history changed."""
+    proc.send('\033[A')
+    assert proc.expect([TIMEOUT, u'echo test'])
+
+
+def history_not_changed(proc):
+    """Ensures that history not changed."""
+    proc.send('\033[A')
+    assert proc.expect([TIMEOUT, u'fuck'])
+
+
+def refuse_with_confirmation(proc):
+    """Ensures that fix can be refused when confirmation enabled."""
+    proc.sendline(u'mkdir -p ~/.thefuck')
+    proc.sendline(u'echo "require_confirmation = True" > ~/.thefuck/settings.py')
+
+    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."""
+    proc.sendline(u'mkdir -p ~/.thefuck')
+    proc.sendline(u'echo "require_confirmation = False" > ~/.thefuck/settings.py')
+
+    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,51 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_confirmation, \
+    refuse_with_confirmation, history_changed, history_not_changed
+from tests.functional.utils import spawn, functional, images
+
+containers = images(('ubuntu-python3-bash', u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy python3 python3-pip python3-dev
+RUN pip3 install -U setuptools
+RUN ln -s /usr/bin/pip3 /usr/bin/pip
+'''),
+                    ('ubuntu-python2-bash', u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy python python-pip python-dev
+RUN pip2 install -U pip setuptools
+'''))
+
+
+@functional
+@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_with_confirmation(tag, dockerfile):
+    with spawn(tag, dockerfile, u'bash') as proc:
+        proc.sendline(u"export PS1='$ '")
+        proc.sendline(u'eval $(thefuck-alias)')
+        proc.sendline(u'touch $HISTFILE')
+        with_confirmation(proc)
+        history_changed(proc)
+
+
+@functional
+@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_refuse_with_confirmation(tag, dockerfile):
+    with spawn(tag, dockerfile, u'bash') as proc:
+        proc.sendline(u"export PS1='$ '")
+        proc.sendline(u'eval $(thefuck-alias)')
+        proc.sendline(u'touch $HISTFILE')
+        refuse_with_confirmation(proc)
+        history_not_changed(proc)
+
+
+@functional
+@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_without_confirmation(tag, dockerfile):
+    with spawn(tag, dockerfile, u'bash') as proc:
+        proc.sendline(u"export PS1='$ '")
+        proc.sendline(u'eval $(thefuck-alias)')
+        proc.sendline(u'touch $HISTFILE')
+        without_confirmation(proc)
+        history_changed(proc)

tests/functional/test_fish.py

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

tests/functional/test_tcsh.py

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

tests/functional/test_zsh.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, history_changed, history_not_changed
+
+containers = images(('ubuntu-python3-zsh', u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy python3 python3-pip python3-dev zsh
+RUN pip3 install -U setuptools
+RUN ln -s /usr/bin/pip3 /usr/bin/pip
+'''),
+                    ('ubuntu-python2-zsh', u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy python python-pip python-dev zsh
+RUN pip2 install -U pip setuptools
+'''))
+
+
+@functional
+@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_with_confirmation(tag, dockerfile):
+    with spawn(tag, dockerfile, u'zsh') as proc:
+        proc.sendline(u'eval $(thefuck-alias)')
+        proc.sendline(u'export HISTFILE=~/.zsh_history')
+        proc.sendline(u'touch $HISTFILE')
+        with_confirmation(proc)
+        history_changed(proc)
+
+
+@functional
+@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_refuse_with_confirmation(tag, dockerfile):
+    with spawn(tag, dockerfile, u'zsh') as proc:
+        proc.sendline(u'eval $(thefuck-alias)')
+        proc.sendline(u'export HISTFILE=~/.zsh_history')
+        proc.sendline(u'touch $HISTFILE')
+        refuse_with_confirmation(proc)
+        history_not_changed(proc)
+
+
+@functional
+@pytest.mark.parametrize('tag, dockerfile', containers)
+def test_without_confirmation(tag, dockerfile):
+    with spawn(tag, dockerfile, u'zsh') as proc:
+        proc.sendline(u'eval $(thefuck-alias)')
+        proc.sendline(u'export HISTFILE=~/.zsh_history')
+        proc.sendline(u'touch $HISTFILE')
+        without_confirmation(proc)
+        history_changed(proc)

tests/functional/utils.py

@@ -0,0 +1,54 @@
+import os
+from contextlib import contextmanager
+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()
+    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")
+    shutil.rmtree(tmpdir)
+
+
+@contextmanager
+def spawn(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.logfile = sys.stdout
+
+    try:
+        yield proc
+    finally:
+        proc.terminate(force=bare)
+
+
+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/conftest.py

@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def generic_shell(monkeypatch):
+    monkeypatch.setattr('thefuck.shells.and_', lambda *x: ' && '.join(x))

tests/rules/test_apt_get.py

@@ -0,0 +1,59 @@
+import pytest
+from mock import Mock, patch
+from thefuck.rules import apt_get
+from thefuck.rules.apt_get import match, get_new_command
+from tests.utils import Command
+
+
+# python-commandnotfound is available in ubuntu 14.04+
+@pytest.mark.skipif(not getattr(apt_get, 'enabled_by_default', True),
+                    reason='Skip if python-commandnotfound is not available')
+@pytest.mark.parametrize('command', [
+    Command(script='vim', stderr='vim: command not found')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, return_value', [
+    (Command(script='vim', stderr='vim: command not found'),
+     [('vim', 'main'), ('vim-tiny', 'main')])])
+@patch('thefuck.rules.apt_get.CommandNotFound', create=True)
+@patch.multiple(apt_get, create=True, apt_get='apt_get')
+def test_match_mocked(cmdnf_mock, command, return_value):
+    get_packages = Mock(return_value=return_value)
+    cmdnf_mock.CommandNotFound.return_value = Mock(getPackages=get_packages)
+    assert match(command, None)
+    assert cmdnf_mock.CommandNotFound.called
+    assert get_packages.called
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='vim', stderr=''), Command()])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+# python-commandnotfound is available in ubuntu 14.04+
+@pytest.mark.skipif(not getattr(apt_get, 'enabled_by_default', True),
+                    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')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+
+
+@pytest.mark.parametrize('command, new_command, return_value', [
+    (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')])])
+@patch('thefuck.rules.apt_get.CommandNotFound', create=True)
+@patch.multiple(apt_get, create=True, apt_get='apt_get')
+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_install.py

@@ -0,0 +1,49 @@
+import pytest
+from thefuck.rules.brew_install import match, get_new_command
+from thefuck.rules.brew_install import brew_formulas
+from tests.utils import Command
+
+
+@pytest.fixture
+def brew_no_available_formula():
+    return '''Error: No available formula for elsticsearch '''
+
+
+@pytest.fixture
+def brew_install_no_argument():
+    return '''This command requires a formula argument'''
+
+
+@pytest.fixture
+def brew_already_installed():
+    return '''Warning: git-2.3.5 already installed'''
+
+
+def _is_not_okay_to_test():
+    if 'elasticsearch' not in brew_formulas:
+        return True
+    return False
+
+
+@pytest.mark.skipif(_is_not_okay_to_test(),
+                    reason='No need to run if there\'s no formula')
+def test_match(brew_no_available_formula, brew_already_installed,
+               brew_install_no_argument):
+    assert match(Command('brew install elsticsearch',
+                         stderr=brew_no_available_formula), None)
+    assert not match(Command('brew install git',
+                             stderr=brew_already_installed), None)
+    assert not match(Command('brew install', stderr=brew_install_no_argument),
+                     None)
+
+
+@pytest.mark.skipif(_is_not_okay_to_test(),
+                    reason='No need to run if there\'s no formula')
+def test_get_new_command(brew_no_available_formula):
+    assert get_new_command(Command('brew install elsticsearch',
+                                   stderr=brew_no_available_formula), None)\
+        == 'brew install elasticsearch'
+
+    assert get_new_command(Command('brew install aa',
+                                   stderr=brew_no_available_formula),
+                           None) != 'brew install aha'

tests/rules/test_brew_unknown_command.py

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

tests/rules/test_brew_upgrade.py

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

tests/rules/test_cargo_no_command.py

@@ -0,0 +1,21 @@
+import pytest
+from thefuck.rules.cargo_no_command import match, get_new_command
+from tests.utils import Command
+
+
+no_such_subcommand = """No such subcommand
+
+        Did you mean `build`?
+"""
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='cargo buid', stderr=no_such_subcommand)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('cargo buid', stderr=no_such_subcommand), 'cargo build')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_cd_mkdir.py

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

tests/rules/test_cd_parent.py

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

tests/rules/test_composer_not_command.py

@@ -0,0 +1,53 @@
+import pytest
+from thefuck.rules.composer_not_command import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def composer_not_command():
+    return """
+
+                                    
+  [InvalidArgumentException]        
+  Command "udpate" is not defined.  
+  Did you mean this?                
+      update
+
+
+"""
+
+
+@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                       
+
+
+
+"""
+
+
+def test_match(composer_not_command, composer_not_command_one_of_this):
+    assert match(Command('composer udpate',
+                         stderr=composer_not_command), None)
+    assert match(Command('composer pdate',
+                         stderr=composer_not_command_one_of_this), None)
+    assert not match(Command('ls update', stderr=composer_not_command),
+                     None)
+
+
+def test_get_new_command(composer_not_command, composer_not_command_one_of_this):
+    assert get_new_command(Command('composer udpate',
+                                   stderr=composer_not_command), None) \
+           == 'composer update'
+    assert get_new_command(
+        Command('composer pdate', stderr=composer_not_command_one_of_this),
+        None) == 'composer selfupdate'

tests/rules/test_cp_omitting_directory.py

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

tests/rules/test_dirty_untar.py

@@ -0,0 +1,62 @@
+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)
+    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)
+    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_django_south_ghost.py

@@ -0,0 +1,53 @@
+import pytest
+from thefuck.rules.django_south_ghost import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def stderr():
+    return '''Traceback (most recent call last):
+  File "/home/nvbn/work/.../bin/python", line 42, in <module>
+    exec(compile(__file__f.read(), __file__, "exec"))
+  File "/home/nvbn/work/.../app/manage.py", line 34, in <module>
+    execute_from_command_line(sys.argv)
+  File "/home/nvbn/work/.../lib/django/core/management/__init__.py", line 443, in execute_from_command_line
+    utility.execute()
+  File "/home/nvbn/work/.../lib/django/core/management/__init__.py", line 382, in execute
+    self.fetch_command(subcommand).run_from_argv(self.argv)
+  File "/home/nvbn/work/.../lib/django/core/management/base.py", line 196, in run_from_argv
+    self.execute(*args, **options.__dict__)
+  File "/home/nvbn/work/.../lib/django/core/management/base.py", line 232, in execute
+    output = self.handle(*args, **options)
+  File "/home/nvbn/work/.../app/lib/south/management/commands/migrate.py", line 108, in handle
+    ignore_ghosts = ignore_ghosts,
+  File "/home/nvbn/work/.../app/lib/south/migration/__init__.py", line 193, in migrate_app
+    applied_all = check_migration_histories(applied_all, delete_ghosts, ignore_ghosts)
+  File "/home/nvbn/work/.../app/lib/south/migration/__init__.py", line 88, in check_migration_histories
+    raise exceptions.GhostMigrations(ghosts)
+south.exceptions.GhostMigrations: 
+
+ ! These migrations are in the database but not on disk:
+    <app1: 0033_auto__...>
+    <app1: 0034_fill_...>
+    <app1: 0035_rename_...>
+    <app2: 0003_add_...>
+    <app2: 0004_denormalize_...>
+    <app1: 0033_auto....>
+    <app1: 0034_fill...>
+ ! I'm not trusting myself; either fix this yourself by fiddling
+ ! with the south_migrationhistory table, or pass --delete-ghost-migrations
+ ! to South to have it delete ALL of these records (this may not be good).
+'''
+
+
+def test_match(stderr):
+    assert match(Command('./manage.py migrate', stderr=stderr), None)
+    assert match(Command('python manage.py migrate', stderr=stderr), None)
+    assert not match(Command('./manage.py migrate'), None)
+    assert not match(Command('app migrate', stderr=stderr), None)
+    assert not match(Command('./manage.py test', stderr=stderr), None)
+
+
+def test_get_new_command():
+    assert get_new_command(Command('./manage.py migrate auth'), None)\
+        == './manage.py migrate auth --delete-ghost-migrations'

tests/rules/test_django_south_merge.py

@@ -0,0 +1,43 @@
+import pytest
+from thefuck.rules.django_south_merge import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def stderr():
+    return '''Running migrations for app:
+ ! Migration app:0003_auto... should not have been applied before app:0002_auto__add_field_query_due_date_ but was.
+Traceback (most recent call last):
+  File "/home/nvbn/work/.../bin/python", line 42, in <module>
+    exec(compile(__file__f.read(), __file__, "exec"))
+  File "/home/nvbn/work/.../app/manage.py", line 34, in <module>
+    execute_from_command_line(sys.argv)
+  File "/home/nvbn/work/.../lib/django/core/management/__init__.py", line 443, in execute_from_command_line
+    utility.execute()
+  File "/home/nvbn/work/.../lib/django/core/management/__init__.py", line 382, in execute
+    self.fetch_command(subcommand).run_from_argv(self.argv)
+  File "/home/nvbn/work/.../lib/django/core/management/base.py", line 196, in run_from_argv
+    self.execute(*args, **options.__dict__)
+  File "/home/nvbn/work/.../lib/django/core/management/base.py", line 232, in execute
+    output = self.handle(*args, **options)
+  File "/home/nvbn/work/.../app/lib/south/management/commands/migrate.py", line 108, in handle
+    ignore_ghosts = ignore_ghosts,
+  File "/home/nvbn/work/.../app/lib/south/migration/__init__.py", line 207, in migrate_app
+    raise exceptions.InconsistentMigrationHistory(problems)
+south.exceptions.InconsistentMigrationHistory: Inconsistent migration history
+The following options are available:
+    --merge: will just attempt the migration ignoring any potential dependency conflicts.
+'''
+
+
+def test_match(stderr):
+    assert match(Command('./manage.py migrate', stderr=stderr), None)
+    assert match(Command('python manage.py migrate', stderr=stderr), None)
+    assert not match(Command('./manage.py migrate'), None)
+    assert not match(Command('app migrate', stderr=stderr), None)
+    assert not match(Command('./manage.py test', stderr=stderr), None)
+
+
+def test_get_new_command():
+    assert get_new_command(Command('./manage.py migrate auth'), None) \
+           == './manage.py migrate auth --merge'

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'),
+    ('tags', 'tag')])
+def test_get_new_command(wrong, fixed):
+    command = Command('docker {}'.format(wrong), stderr=stderr(wrong))
+    assert get_new_command(command, None) == 'docker {}'.format(fixed)

tests/rules/test_dry.py

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

tests/rules/test_fix_alt_space.py

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

tests/rules/test_git_add.py

@@ -0,0 +1,39 @@
+import pytest
+from thefuck.rules.git_add import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def did_not_match(target, did_you_forget=True):
+    error = ("error: pathspec '{}' did not match any "
+             "file(s) known to git.".format(target))
+    if did_you_forget:
+        error = ("{}\nDid you forget to 'git add'?'".format(error))
+    return error
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git submodule update unknown',
+            stderr=did_not_match('unknown')),
+    Command(script='git commit unknown',
+            stderr=did_not_match('unknown'))])  # Older versions of Git
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git submodule update known', stderr=('')),
+    Command(script='git commit known', stderr=('')),
+    Command(script='git commit unknown',  # Newer versions of Git
+            stderr=did_not_match('unknown', False))])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git submodule update unknown', stderr=did_not_match('unknown')),
+     'git add -- unknown && git submodule update unknown'),
+    (Command('git commit unknown', stderr=did_not_match('unknown')),  # Old Git
+     'git add -- unknown && git commit unknown')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

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

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

tests/rules/test_git_checkout.py

@@ -0,0 +1,53 @@
+import pytest
+from thefuck.rules.git_checkout import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def did_not_match(target, did_you_forget=False):
+    error = ("error: pathspec '{}' did not match any "
+             "file(s) known to git.".format(target))
+    if did_you_forget:
+        error = ("{}\nDid you forget to 'git add'?'".format(error))
+    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'))])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git submodule update unknown',
+            stderr=did_not_match('unknown', True)),
+    Command(script='git checkout known', stderr=('')),
+    Command(script='git commit known', stderr=(''))])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@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'),
+    (['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

@@ -0,0 +1,26 @@
+import pytest
+from thefuck.rules.git_diff_staged import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git diff 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')])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git diff'), 'git diff --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]
+		       [-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

@@ -1,6 +1,6 @@
 import pytest
-from thefuck.main import Command
 from thefuck.rules.git_not_command import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -25,20 +25,33 @@ stats
 """
 
 
+@pytest.fixture
+def git_not_command_closest():
+    return '''git: 'tags' is not a git command. See 'git --help'.
+
+Did you mean one of these?
+	stage
+	tag
+'''
+
+
 @pytest.fixture
 def git_command():
     return "* master"
 
 
 def test_match(git_not_command, git_command, git_not_command_one_of_this):
-    assert match(Command('git brnch', '', git_not_command), None)
+    assert match(Command('git brnch', stderr=git_not_command), None)
-    assert match(Command('git st', '', git_not_command_one_of_this), None)
+    assert match(Command('git st', stderr=git_not_command_one_of_this), None)
-    assert not match(Command('ls brnch', '', git_not_command), None)
+    assert not match(Command('ls brnch', stderr=git_not_command), None)
-    assert not match(Command('git branch', '', git_command), None)
+    assert not match(Command('git branch', stderr=git_command), None)
 
 
-def test_get_new_command(git_not_command, git_not_command_one_of_this):
+def test_get_new_command(git_not_command, git_not_command_one_of_this,
-    assert get_new_command(Command('git brnch', '', git_not_command), None)\
+                         git_not_command_closest):
-        == 'git branch'
+    assert get_new_command(Command('git brnch', stderr=git_not_command), None) \
-    assert get_new_command(
+           == 'git branch'
-        Command('git st', '', git_not_command_one_of_this), None) == 'git status'
+    assert get_new_command(Command('git st', stderr=git_not_command_one_of_this),
+                           None) == 'git status'
+    assert get_new_command(Command('git tags', stderr=git_not_command_closest),
+                           None) == 'git tag'

tests/rules/test_git_pull.py

@@ -0,0 +1,29 @@
+import pytest
+from thefuck.rules.git_pull import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def stderr():
+    return '''There is no tracking information for the current branch.
+Please specify which branch you want to merge with.
+See git-pull(1) for details
+
+    git pull <remote> <branch>
+
+If you wish to set tracking information for this branch you can do so with:
+
+    git branch --set-upstream-to=<remote>/<branch> master
+
+'''
+
+
+def test_match(stderr):
+    assert match(Command('git pull', stderr=stderr), None)
+    assert not match(Command('git pull'), None)
+    assert not match(Command('ls', stderr=stderr), None)
+
+
+def test_get_new_command(stderr):
+    assert get_new_command(Command('git pull', stderr=stderr), None) \
+           == "git branch --set-upstream-to=origin/master master && git pull"

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

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

@@ -0,0 +1,37 @@
+import pytest
+from thefuck.rules.git_stash import match, get_new_command
+from tests.utils import Command
+
+
+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')
+
+
+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)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git cherry-pick a1b2c3d', stderr=('')),
+    Command(script='git rebase -i HEAD~7', stderr=(''))])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(script='git cherry-pick a1b2c3d', stderr=cherry_pick_error),
+     'git stash && git cherry-pick a1b2c3d'),
+    (Command('git rebase -i HEAD~7', stderr=rebase_error),
+     'git stash && git rebase -i HEAD~7')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_go_run.py

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

tests/rules/test_grep_recursive.py

@@ -0,0 +1,12 @@
+from thefuck.rules.grep_recursive import match, get_new_command
+from tests.utils import Command
+
+
+def test_match():
+    assert match(Command('grep blah .', stderr='grep: .: Is a directory'), None)
+    assert not match(Command(), None)
+
+
+def test_get_new_command():
+    assert get_new_command(
+        Command('grep blah .'), None) == 'grep -r blah .'

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'

tests/rules/test_has_exists_script.py

@@ -1,5 +1,5 @@
 from mock import Mock, patch
-from thefuck.rules. has_exists_script import match, get_new_command
+from thefuck.rules.has_exists_script import match, get_new_command
 
 
 def test_match():

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'),
+    ('pge', 'heroku pg')])
+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

@@ -0,0 +1,42 @@
+import pytest
+from thefuck.rules.history import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def history(mocker):
+    return mocker.patch('thefuck.rules.history.get_history',
+                        return_value=['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_executables',
+                        return_value=['diff', 'ls'])
+
+
+@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', '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', 'alias')
+@pytest.mark.parametrize('script, result', [
+    ('ls cet', 'ls cat'),
+    ('daff x', 'diff x')])
+def test_get_new_command(script, result):
+    assert get_new_command(Command(script), None) == result

tests/rules/test_java.py

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

tests/rules/test_javac.py

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

tests/rules/test_ls_lah.py

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

tests/rules/test_man.py

@@ -0,0 +1,34 @@
+import pytest
+from thefuck.rules.man import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command('man read'),
+    Command('man 2 read'),
+    Command('man 3 read'),
+    Command('man -s2 read'),
+    Command('man -s3 read'),
+    Command('man -s 2 read'),
+    Command('man -s 3 read')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command('man'),
+    Command('man ')])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('man read'), 'man 3 read'),
+    (Command('man 2 read'), 'man 3 read'),
+    (Command('man 3 read'), 'man 2 read'),
+    (Command('man -s2 read'), 'man -s3 read'),
+    (Command('man -s3 read'), 'man -s2 read'),
+    (Command('man -s 2 read'), 'man -s 3 read'),
+    (Command('man -s 3 read'), 'man -s 2 read')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_man_no_space.py

@@ -0,0 +1,12 @@
+from thefuck.rules.man_no_space import match, get_new_command
+from tests.utils import Command
+
+
+def test_match():
+    assert match(Command('mandiff', stderr='mandiff: command not found'), None)
+    assert not match(Command(), None)
+
+
+def test_get_new_command():
+    assert get_new_command(
+        Command('mandiff'), None) == 'man diff'

tests/rules/test_mercurial.py

@@ -0,0 +1,134 @@
+import pytest
+
+from tests.utils import Command
+from thefuck.rules.mercurial import (
+    extract_possisiblities, match, get_new_command
+)
+
+
+@pytest.mark.parametrize('command', [
+    Command('hg base', stderr=(
+        "hg: unknown command 'base'"
+        '\n(did you mean one of blame, phase, rebase?)'
+    )),
+    Command('hg branchch', stderr=(
+        "hg: unknown command 'branchch'"
+        '\n(did you mean one of branch, branches?)'
+    )),
+    Command('hg vert', stderr=(
+        "hg: unknown command 'vert'"
+        '\n(did you mean one of revert?)'
+    )),
+    Command('hg lgo -r tip', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n(did you mean one of log?)'
+    )),
+    Command('hg rerere', stderr=(
+        "hg: unknown command 'rerere'"
+        '\n(did you mean one of revert?)'
+    )),
+    Command('hg re', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n    rebase recover remove rename resolve revert'
+    )),
+    Command('hg re re', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n    rebase recover remove rename resolve revert'
+    )),
+])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command('hg', stderr=(
+        '\nMercurial Distributed SCM\n\nbasic commands:'
+    )),
+    Command('hg asdf', stderr=(
+        "hg: unknown command 'asdf'"
+        '\nMercurial Distributed SCM\n\nbasic commands:'
+    )),
+    Command('hg qwer', stderr=(
+        "hg: unknown command 'qwer'"
+        '\nMercurial Distributed SCM\n\nbasic commands:'
+    )),
+    Command('hg me', stderr=(
+        "\nabort: no repository found in './thefuck' (.hg not found)!"
+    )),
+    Command('hg reb', stderr=(
+        "\nabort: no repository found in './thefuck' (.hg not found)!"
+    )),
+    Command('hg co', stderr=(
+        "\nabort: no repository found in './thefuck' (.hg not found)!"
+    )),
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, possibilities', [
+    (Command('hg base', stderr=(
+        "hg: unknown command 'base'"
+        '\n(did you mean one of blame, phase, rebase?)'
+    )), ['blame', 'phase', 'rebase']),
+    (Command('hg branchch', stderr=(
+        "hg: unknown command 'branchch'"
+        '\n(did you mean one of branch, branches?)'
+    )), ['branch', 'branches']),
+    (Command('hg vert', stderr=(
+        "hg: unknown command 'vert'"
+        '\n(did you mean one of revert?)'
+    )), ['revert']),
+    (Command('hg lgo -r tip', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n(did you mean one of log?)'
+    )), ['log']),
+    (Command('hg rerere', stderr=(
+        "hg: unknown command 'rerere'"
+        '\n(did you mean one of revert?)'
+    )), ['revert']),
+    (Command('hg re', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n    rebase recover remove rename resolve revert'
+    )), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']),
+    (Command('hg re re', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n    rebase recover remove rename resolve revert'
+    )), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']),
+])
+def test_extract_possisiblities(command, possibilities):
+    assert extract_possisiblities(command) == possibilities
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('hg base', stderr=(
+        "hg: unknown command 'base'"
+        '\n(did you mean one of blame, phase, rebase?)'
+    )), 'hg rebase'),
+    (Command('hg branchch', stderr=(
+        "hg: unknown command 'branchch'"
+        '\n(did you mean one of branch, branches?)'
+    )), 'hg branch'),
+    (Command('hg vert', stderr=(
+        "hg: unknown command 'vert'"
+        '\n(did you mean one of revert?)'
+    )), 'hg revert'),
+    (Command('hg lgo -r tip', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n(did you mean one of log?)'
+    )), 'hg log -r tip'),
+    (Command('hg rerere', stderr=(
+        "hg: unknown command 'rerere'"
+        '\n(did you mean one of revert?)'
+    )), 'hg revert'),
+    (Command('hg re', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n    rebase recover remove rename resolve revert'
+    )), 'hg rebase'),
+    (Command('hg re re', stderr=(
+        "hg: command 're' is ambiguous:"
+        '\n    rebase recover remove rename resolve revert'
+    )), 'hg rebase re'),
+])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_mkdir_p.py

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

tests/rules/test_no_command.py

@@ -1,62 +1,29 @@
-from subprocess import PIPE
-from mock import patch, Mock
 import pytest
 from thefuck.rules.no_command import match, get_new_command
-from thefuck.main import Command
+from tests.utils import Command
 
 
-@pytest.fixture
+@pytest.fixture(autouse=True)
-def command_found():
+def get_all_executables(mocker):
-    return b'''No command 'aptget' found, did you mean:
+    mocker.patch('thefuck.rules.no_command.get_all_executables',
- Command 'apt-get' from package 'apt' (main)
+                 return_value=['vim', 'apt-get', 'fsck'])
-aptget: command not found
-'''
-
-@pytest.fixture
-def command_not_found():
-    return b'''No command 'vom' found, but there are 19 similar ones
-vom: command not found
-'''
 
 
-@pytest.fixture
+@pytest.mark.usefixtures('no_memoize')
-def bins_exists(request):
+def test_match():
-    p = patch('thefuck.rules.no_command.which',
+    assert match(Command(stderr='vom: not found', script='vom file.py'), None)
-              return_value=True)
+    assert match(Command(stderr='fucck: not found', script='fucck'), None)
-    p.start()
+    assert not match(Command(stderr='qweqwe: not found', script='qweqwe'), None)
-    request.addfinalizer(p.stop)
+    assert not match(Command(stderr='some text', script='vom file.py'), None)
 
 
-@pytest.fixture
+@pytest.mark.usefixtures('no_memoize')
-def settings():
+def test_get_new_command():
-    class _Settings(object):
+    assert get_new_command(
-        pass
+        Command(stderr='vom: not found',
-    return _Settings
+                script='vom file.py'),
-
+        None) == 'vim file.py'
-
+    assert get_new_command(
-@pytest.mark.usefixtures('bins_exists')
+        Command(stderr='fucck: not found',
-def test_match(command_found, command_not_found, settings):
+                script='fucck'),
-    with patch('thefuck.rules.no_command.Popen') as Popen:
+        Command) == 'fsck'
-        Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('aptget install vim', '', ''), settings)
-        Popen.assert_called_once_with('/usr/lib/command-not-found aptget',
-                                      shell=True, stderr=PIPE)
-        Popen.return_value.stderr.read.return_value = command_not_found
-        assert not match(Command('ls', '', ''), settings)
-
-    with patch('thefuck.rules.no_command.Popen') as Popen:
-        Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('sudo aptget install vim', '', ''),
-                     Mock(command_not_found='test'))
-        Popen.assert_called_once_with('test aptget',
-                                      shell=True, stderr=PIPE)
-
-
-@pytest.mark.usefixtures('bins_exists')
-def test_get_new_command(command_found):
-    with patch('thefuck.rules.no_command._get_output',
-               return_value=command_found.decode()):
-        assert get_new_command(Command('aptget install vim', '', ''), settings)\
-            == 'apt-get install vim'
-        assert get_new_command(Command('sudo aptget install vim', '', ''), settings) \
-            == 'sudo apt-get install vim'

tests/rules/test_no_such_file.py

@@ -0,0 +1,27 @@
+import pytest
+from thefuck.rules.no_such_file import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mv foo bar/foo', stderr="mv: cannot move 'foo' to 'bar/foo': No such file or directory"),
+    Command(script='mv foo bar/', stderr="mv: cannot move 'foo' to 'bar/': No such file or directory"),
+    ])
+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/'),
+    ])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/rules/test_open.py

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

tests/rules/test_pacman.py

@@ -0,0 +1,69 @@
+import pytest
+from mock import patch
+from thefuck.rules import pacman
+from thefuck.rules.pacman import match, get_new_command
+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_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
+'''
+
+
+@pytest.mark.skipif(not getattr(pacman, 'enabled_by_default', True),
+                    reason='Skip if pacman is not available')
+@pytest.mark.parametrize('command', [
+    Command(script='vim', stderr='vim: command not found'),
+    Command(script='sudo vim', stderr='sudo: vim: command not found')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, return_value', [
+    (Command(script='vim', stderr='vim: command not found'), PKGFILE_OUTPUT_VIM),
+    (Command(script='sudo vim', stderr='sudo: vim: command not found'), PKGFILE_OUTPUT_VIM)])
+@patch('thefuck.rules.pacman.subprocess')
+@patch.multiple(pacman, create=True, pacman=pacman_cmd)
+def test_match_mocked(subp_mock, command, return_value):
+    subp_mock.check_output.return_value = return_value
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='vim', stderr=''), Command(),
+    Command(script='sudo vim', stderr=''), Command()])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@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))])
+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')
+@patch.multiple(pacman, create=True, pacman=pacman_cmd)
+def test_get_new_command_mocked(subp_mock, command, new_command, return_value):
+    subp_mock.check_output.return_value = return_value
+    assert get_new_command(command, None) == new_command

tests/rules/test_pip_unknown_command.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.pip_unknown_command import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def pip_unknown_cmd():
+    return '''ERROR: unknown command "instatl" - maybe you meant "install"'''
+
+
+@pytest.fixture
+def pip_unknown_cmd_without_recommend():
+    return '''ERROR: unknown command "i"'''
+
+
+def test_match(pip_unknown_cmd, pip_unknown_cmd_without_recommend):
+    assert match(Command('pip instatl', stderr=pip_unknown_cmd), None)
+    assert not match(Command('pip i',
+                             stderr=pip_unknown_cmd_without_recommend),
+                     None)
+
+
+def test_get_new_command(pip_unknown_cmd):
+    assert get_new_command(Command('pip instatl', stderr=pip_unknown_cmd),
+                           None) == 'pip install'

tests/rules/test_python_command.py

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

tests/rules/test_python_execute.py

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

tests/rules/test_quotation_marks.py

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

tests/rules/test_rm_dir.py

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

tests/rules/test_rm_root.py

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

tests/rules/test_sed_unterminated_s.py

@@ -0,0 +1,28 @@
+import pytest
+from thefuck.rules.sed_unterminated_s import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def sed_unterminated_s():
+    return "sed: -e expression #1, char 9: unterminated `s' command"
+
+
+def test_match(sed_unterminated_s):
+    assert match(Command('sed -e s/foo/bar', stderr=sed_unterminated_s), None)
+    assert match(Command('sed -es/foo/bar', stderr=sed_unterminated_s), None)
+    assert match(Command('sed -e s/foo/bar -e s/baz/quz', stderr=sed_unterminated_s), None)
+    assert not match(Command('sed -e s/foo/bar'), None)
+    assert not match(Command('sed -es/foo/bar'), None)
+    assert not match(Command('sed -e s/foo/bar -e s/baz/quz'), None)
+
+
+def test_get_new_command(sed_unterminated_s):
+    assert get_new_command(Command('sed -e s/foo/bar', stderr=sed_unterminated_s), None) \
+            == 'sed -e s/foo/bar/'
+    assert get_new_command(Command('sed -es/foo/bar', stderr=sed_unterminated_s), None) \
+            == 'sed -es/foo/bar/'
+    assert get_new_command(Command(r"sed -e 's/\/foo/bar'", stderr=sed_unterminated_s), None) \
+            == r"sed -e 's/\/foo/bar/'"
+    assert get_new_command(Command(r"sed -e s/foo/bar -es/baz/quz", stderr=sed_unterminated_s), None) \
+            == r"sed -e s/foo/bar/ -es/baz/quz/"

tests/rules/test_sl_ls.py

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

tests/rules/test_ssh_known_host.py

@@ -0,0 +1,66 @@
+import os
+import pytest
+from mock import Mock
+from thefuck.rules.ssh_known_hosts import match, get_new_command,\
+    side_effect
+from tests.utils import Command
+
+
+@pytest.fixture
+def ssh_error(tmpdir):
+    path = os.path.join(str(tmpdir), 'known_hosts')
+
+    def reset(path):
+        with open(path, 'w') as fh:
+            lines = [
+                '123.234.567.890 asdjkasjdakjsd\n'
+                '98.765.432.321 ejioweojwejrosj\n'
+                '111.222.333.444 qwepoiwqepoiss\n'
+            ]
+            fh.writelines(lines)
+
+    def known_hosts(path):
+        with open(path, 'r') as fh:
+            return fh.readlines()
+
+    reset(path)
+
+    errormsg = u"""@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!
+Someone could be eavesdropping on you right now (man-in-the-middle attack)!
+It is also possible that a host key has just been changed.
+The fingerprint for the RSA key sent by the remote host is
+b6:cb:07:34:c0:a0:94:d3:0d:69:83:31:f4:c5:20:9b.
+Please contact your system administrator.
+Add correct host key in {0} to get rid of this message.
+Offending RSA key in {0}:2
+RSA host key for {1} has changed and you have requested strict checking.
+Host key verification failed.""".format(path, '98.765.432.321')
+
+    return errormsg, path, reset, known_hosts
+
+
+def test_match(ssh_error):
+    errormsg, _, _, _ = ssh_error
+    assert match(Command('ssh', stderr=errormsg), None)
+    assert match(Command('ssh', stderr=errormsg), None)
+    assert match(Command('scp something something', stderr=errormsg), None)
+    assert match(Command('scp something something', stderr=errormsg), None)
+    assert not match(Command(stderr=errormsg), None)
+    assert not match(Command('notssh', stderr=errormsg), None)
+    assert not match(Command('ssh'), None)
+
+
+def test_side_effect(ssh_error):
+    errormsg, path, reset, known_hosts = ssh_error
+    command = Command('ssh user@host', stderr=errormsg)
+    side_effect(command, None)
+    expected = ['123.234.567.890 asdjkasjdakjsd\n', '111.222.333.444 qwepoiwqepoiss\n']
+    assert known_hosts(path) == expected
+
+
+def test_get_new_command(ssh_error, monkeypatch):
+    errormsg, _, _, _ = ssh_error
+    assert get_new_command(Command('ssh user@host', stderr=errormsg), None) == 'ssh user@host'

tests/rules/test_sudo.py

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

tests/rules/test_switch_lang.py

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+
+import pytest
+from thefuck.rules import switch_lang
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(stderr='command not found: фзе-пуе', script=u'фзе-пуе'),
+    Command(stderr='command not found: λσ', script=u'λσ')])
+def test_match(command):
+    assert switch_lang.match(command, None)
+
+
+@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)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(u'фзе-пуе штыефдд мшь'), 'apt-get install vim'),
+    (Command(u'λσ -λα'), 'ls -la')])
+def test_get_new_command(command, new_command):
+    assert switch_lang.get_new_command(command, None) == new_command

tests/rules/test_systemctl.py

@@ -0,0 +1,18 @@
+import pytest
+from thefuck.rules.systemctl import match, get_new_command
+from tests.utils import Command
+
+
+
+def test_match():
+    assert match(Command('systemctl nginx start', stderr='Unknown operation \'nginx\'.'), None)
+    assert match(Command('sudo systemctl nginx start', stderr='Unknown operation \'nginx\'.'), None)
+    assert not match(Command('systemctl start nginx'), None)
+    assert not match(Command('systemctl start nginx'), None)
+    assert not match(Command('sudo systemctl nginx', stderr='Unknown operation \'nginx\'.'), None)
+    assert not match(Command('systemctl nginx', stderr='Unknown operation \'nginx\'.'), None)
+    assert not match(Command('systemctl start wtf', stderr='Failed to start wtf.service: Unit wtf.service failed to load: No such file or directory.'), None)
+
+def test_get_new_command():
+    assert get_new_command(Command('systemctl nginx start'), None) == "systemctl start nginx"
+    assert get_new_command(Command('sudo systemctl nginx start'), None) == "sudo systemctl start nginx"

tests/rules/test_tmux.py

@@ -0,0 +1,19 @@
+import pytest
+from thefuck.rules.tmux import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def tmux_ambiguous():
+    return "ambiguous command: list, could be: " \
+           "list-buffers, list-clients, list-commands, list-keys, " \
+           "list-panes, list-sessions, list-windows"
+
+
+def test_match(tmux_ambiguous):
+    assert match(Command('tmux list', stderr=tmux_ambiguous), None)
+
+
+def test_get_new_command(tmux_ambiguous):
+    assert get_new_command(Command('tmux list', stderr=tmux_ambiguous), None)\
+        == 'tmux list-keys'

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

@@ -0,0 +1,23 @@
+import pytest
+from thefuck.rules.whois import match, get_new_command
+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')])
+def test_match(command):
+    assert match(command, None)
+
+
+def test_not_match():
+    assert not match(Command(script='whois'), None)
+
+
+@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')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command

tests/test_conf.py

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

tests/test_logs.py

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

tests/test_main.py

@@ -1,97 +1,174 @@
+import pytest
 from subprocess import PIPE
 from pathlib import PosixPath, Path
-from mock import patch, Mock
+from mock import Mock
-from thefuck import main
+from thefuck import main, conf, types
+from tests.utils import Rule, Command
 
 
-def test_get_settings():
+def test_load_rule(mocker):
-    with patch('thefuck.main.load_source', return_value=Mock(rules=['bash'])):
-        assert main.get_settings(Path('/')).rules == ['bash']
-    with patch('thefuck.main.load_source', return_value=Mock(spec=[])):
-        assert main.get_settings(Path('/')).rules is None
-
-
-def test_is_rule_enabled():
-    assert main.is_rule_enabled(Mock(rules=None), Path('bash.py'))
-    assert main.is_rule_enabled(Mock(rules=['bash']), Path('bash.py'))
-    assert not main.is_rule_enabled(Mock(rules=['bash']), Path('lisp.py'))
-
-
-def test_load_rule():
     match = object()
     get_new_command = object()
-    with patch('thefuck.main.load_source',
+    load_source = mocker.patch(
-               return_value=Mock(
+        'thefuck.main.load_source',
-                   match=match,
+        return_value=Mock(match=match,
-                   get_new_command=get_new_command)) as load_source:
+                          get_new_command=get_new_command,
-        assert main.load_rule(Path('/rules/bash.py')) == main.Rule(match, get_new_command)
+                          enabled_by_default=True,
-        load_source.assert_called_once_with('bash', '/rules/bash.py')
+                          priority=900,
+                          requires_output=True))
+    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')
 
 
-def test_get_rules():
+class TestGetRules(object):
-    with patch('thefuck.main.Path.glob') as glob, \
+    @pytest.fixture(autouse=True)
-            patch('thefuck.main.load_source',
+    def glob(self, mocker):
-                  lambda x, _: Mock(match=x, get_new_command=x)):
+        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')]
-        assert main.get_rules(
+        monkeypatch.setattr('thefuck.main.load_source',
-            Path('~'),
+                            lambda x, _: Rule(x))
-            Mock(rules=None)) == [main.Rule('bash', 'bash'),
+        assert self._compare_names(
-                                  main.Rule('lisp', 'lisp'),
+            main.get_rules(Path('~'), Mock(rules=conf_rules, priority={})),
-                                  main.Rule('bash', 'bash'),
+            rules)
-                                  main.Rule('lisp', 'lisp')]
+
-        assert main.get_rules(
+    @pytest.mark.parametrize('priority, unordered, ordered', [
-            Path('~'),
+        ({},
-            Mock(rules=['bash'])) == [main.Rule('bash', 'bash'),
+         [Rule('bash', priority=100), Rule('python', priority=5)],
-                                      main.Rule('bash', 'bash')]
+         ['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)
 
 
-def test_get_command():
+class TestGetCommand(object):
-    with patch('thefuck.main.Popen') as Popen, \
+    @pytest.fixture(autouse=True)
-            patch('thefuck.main.os.environ',
+    def Popen(self, monkeypatch):
-                  new_callable=lambda: {}), \
+        Popen = Mock()
-            patch('thefuck.main.wait_output',
-                  return_value=True):
         Popen.return_value.stdout.read.return_value = b'stdout'
         Popen.return_value.stderr.read.return_value = b'stderr'
-        assert main.get_command(Mock(), ['thefuck', 'apt-get',
+        monkeypatch.setattr('thefuck.main.Popen', Popen)
-                                         'search', 'vim']) \
+        return Popen
-               == main.Command('apt-get search vim', 'stdout', 'stderr')
+
+    @pytest.fixture(autouse=True)
+    def prepare(self, monkeypatch):
+        monkeypatch.setattr('thefuck.main.os.environ', {})
+        monkeypatch.setattr('thefuck.main.wait_output', lambda *_: True)
+
+    @pytest.fixture(autouse=True)
+    def generic_shell(self, monkeypatch):
+        monkeypatch.setattr('thefuck.shells.from_shell', lambda x: x)
+        monkeypatch.setattr('thefuck.shells.to_shell', lambda x: x)
+
+    def test_get_command_calls(self, Popen):
+        assert main.get_command(Mock(env={}),
+            ['thefuck', 'apt-get', 'search', 'vim']) \
+               == Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,
                                       stdout=PIPE,
                                       stderr=PIPE,
-                                      env={'LANG': 'C'})
+                                      env={})
+
+    @pytest.mark.parametrize('args, result', [
+        (['thefuck', 'ls', '-la'], 'ls -la'),
+        (['thefuck', 'ls'], 'ls')])
+    def test_get_command_script(self, args, result):
+        if result:
+            assert main.get_command(Mock(env={}), args).script == result
+        else:
+            assert main.get_command(Mock(env={}), args) is None
 
 
-def test_get_matched_rule():
+class TestGetMatchedRule(object):
-    rules = [main.Rule(lambda x, _: x.script == 'cd ..', None),
+    def test_no_match(self):
-             main.Rule(lambda *_: False, None)]
+        assert main.get_matched_rule(
-    assert main.get_matched_rule(main.Command('ls', '', ''),
+            Command('ls'), [Rule('', lambda *_: False)],
-                                 rules, None) is None
+            Mock(no_colors=True)) is None
-    assert main.get_matched_rule(main.Command('cd ..', '', ''),
+
-                                 rules, None) == rules[0]
+    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:'
 
 
-def test_run_rule(capsys):
+class TestRunRule(object):
-    with patch('thefuck.main.confirm', return_value=True):
+    @pytest.fixture(autouse=True)
-        main.run_rule(main.Rule(None, lambda *_: 'new-command'),
+    def confirm(self, mocker):
-                      None, None)
+        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', '')
-    with patch('thefuck.main.confirm', return_value=False):
+
-        main.run_rule(main.Rule(None, lambda *_: 'new-command'),
+    def test_run_rule_with_side_effect(self, capsys):
-                      None, None)
+        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() == ('', '')
 
 
-def test_confirm(capsys):
+class TestConfirm(object):
-    # When confirmation not required:
+    @pytest.fixture
-    assert main.confirm('command', Mock(require_confirmation=False))
+    def stdin(self, mocker):
-    assert capsys.readouterr() == ('', 'command\n')
+        return mocker.patch('sys.stdin.read', return_value='\n')
-    # When confirmation required and confirmed:
+
-    with patch('thefuck.main.sys.stdin.read', return_value='\n'):
+    def test_when_not_required(self, capsys):
-        assert main.confirm('command', Mock(require_confirmation=True))
+        assert main.confirm('command', None, Mock(require_confirmation=False))
-        assert capsys.readouterr() == ('', 'command [Enter/Ctrl+C]')
+        assert capsys.readouterr() == ('', 'command\n')
-    # When confirmation required and ctrl+c:
+
-    with patch('thefuck.main.sys.stdin.read', side_effect=KeyboardInterrupt):
+    def test_with_side_effect_and_without_confirmation(self, capsys):
-        assert not main.confirm('command', Mock(require_confirmation=True))
+        assert main.confirm('command', Mock(), Mock(require_confirmation=False))
-        assert capsys.readouterr() == ('', 'command [Enter/Ctrl+C]Aborted\n')
+        assert capsys.readouterr() == ('', 'command (+side effect)\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 (+side effect) [enter/ctrl+c]')
+
+    def test_when_confirmation_required_and_aborted(self, capsys, stdin):
+        stdin.side_effect = KeyboardInterrupt
+        assert not main.confirm('command', None, Mock(require_confirmation=True,
+                                                      no_colors=True))
+        assert capsys.readouterr() == ('', 'command [enter/ctrl+c]Aborted\n')

tests/test_shells.py

@@ -0,0 +1,235 @@
+import pytest
+from thefuck import shells
+
+
+@pytest.fixture
+def builtins_open(mocker):
+    return mocker.patch('six.moves.builtins.open')
+
+
+@pytest.fixture
+def isfile(mocker):
+    return mocker.patch('os.path.isfile', return_value=True)
+
+
+@pytest.fixture
+@pytest.mark.usefixtures('isfile')
+def history_lines(mocker):
+    def aux(lines):
+        mock = mocker.patch('io.open')
+        mock.return_value.__enter__\
+            .return_value.__iter__.return_value = lines
+    return aux
+
+
+class TestGeneric(object):
+    @pytest.fixture
+    def shell(self):
+        return shells.Generic()
+
+    def test_from_shell(self, shell):
+        assert shell.from_shell('pwd') == 'pwd'
+
+    def test_to_shell(self, shell):
+        assert shell.to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open, shell):
+        assert shell.put_to_history('ls') is None
+        assert builtins_open.call_count == 0
+
+    def test_and_(self, shell):
+        assert shell.and_('ls', 'cd') == 'ls && cd'
+
+    def test_get_aliases(self, shell):
+        assert shell.get_aliases() == {}
+
+    def test_app_alias(self, shell):
+        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'])
+        # We don't know what to do in generic shell with history lines,
+        # so just ignore them:
+        assert list(shell.get_history()) == []
+
+
+@pytest.mark.usefixtures('isfile')
+class TestBash(object):
+    @pytest.fixture
+    def shell(self):
+        return shells.Bash()
+
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.Popen')
+        mock.return_value.stdout.read.return_value = (
+            b'alias fuck=\'eval $(thefuck $(fc -ln -1))\'\n'
+            b'alias l=\'ls -CF\'\n'
+            b'alias la=\'ls -A\'\n'
+            b'alias ll=\'ls -alF\'')
+        return mock
+
+    @pytest.mark.parametrize('before, after', [
+        ('pwd', 'pwd'),
+        ('fuck', 'eval $(thefuck $(fc -ln -1))'),
+        ('awk', 'awk'),
+        ('ll', 'ls -alF')])
+    def test_from_shell(self, before, after, shell):
+        assert shell.from_shell(before) == after
+
+    def test_to_shell(self, shell):
+        assert shell.to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open, shell):
+        shell.put_to_history('ls')
+        builtins_open.return_value.__enter__.return_value. \
+            write.assert_called_once_with('ls\n')
+
+    def test_and_(self, shell):
+        assert shell.and_('ls', 'cd') == 'ls && cd'
+
+    def test_get_aliases(self, shell):
+        assert shell.get_aliases() == {'fuck': 'eval $(thefuck $(fc -ln -1))',
+                                       'l': 'ls -CF',
+                                       'la': 'ls -A',
+                                       'll': 'ls -alF'}
+
+    def test_app_alias(self, shell):
+        assert 'alias fuck' in shell.app_alias('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'])
+        assert list(shell.get_history()) == ['ls', 'rm']
+
+
+@pytest.mark.usefixtures('isfile')
+class TestFish(object):
+    @pytest.fixture
+    def shell(self):
+        return shells.Fish()
+
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.Popen')
+        mock.return_value.stdout.read.return_value = (
+            b'cd\nfish_config\nfuck\nfunced\nfuncsave\ngrep\nhistory\nll\nls\n'
+            b'man\nmath\npopd\npushd\nruby')
+        return mock
+
+    @pytest.fixture
+    def environ(self, monkeypatch):
+        data = {'TF_OVERRIDDEN_ALIASES': 'cd, ls, man, open'}
+        monkeypatch.setattr('thefuck.shells.os.environ', data)
+        return data
+
+    @pytest.mark.usefixture('environ')
+    def test_get_overridden_aliases(self, shell, environ):
+        assert shell._get_overridden_aliases() == ['cd', 'ls', 'man', 'open']
+
+    @pytest.mark.parametrize('before, after', [
+        ('cd', 'cd'),
+        ('pwd', 'pwd'),
+        ('fuck', 'fish -ic "fuck"'),
+        ('find', 'find'),
+        ('funced', 'fish -ic "funced"'),
+        ('grep', 'grep'),
+        ('awk', 'awk'),
+        ('math "2 + 2"', r'fish -ic "math \"2 + 2\""'),
+        ('man', 'man'),
+        ('open', 'open'),
+        ('vim', 'vim'),
+        ('ll', 'fish -ic "ll"'),
+        ('ls', 'ls')])  # Fish has no aliases but functions
+    def test_from_shell(self, before, after, shell):
+        assert shell.from_shell(before) == after
+
+    def test_to_shell(self, shell):
+        assert shell.to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open, mocker, shell):
+        mocker.patch('thefuck.shells.time',
+                     return_value=1430707243.3517463)
+        shell.put_to_history('ls')
+        builtins_open.return_value.__enter__.return_value. \
+            write.assert_called_once_with('- cmd: ls\n   when: 1430707243\n')
+
+    def test_and_(self, shell):
+        assert shell.and_('foo', 'bar') == 'foo; and bar'
+
+    def test_get_aliases(self, shell):
+        assert shell.get_aliases() == {'fish_config': 'fish_config',
+                                       'fuck': 'fuck',
+                                       'funced': 'funced',
+                                       'funcsave': 'funcsave',
+                                       'history': 'history',
+                                       'll': 'll',
+                                       'math': 'math',
+                                       'popd': 'popd',
+                                       'pushd': 'pushd',
+                                       'ruby': 'ruby'}
+
+    def test_app_alias(self, shell):
+        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')
+class TestZsh(object):
+    @pytest.fixture
+    def shell(self):
+        return shells.Zsh()
+
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.Popen')
+        mock.return_value.stdout.read.return_value = (
+            b'fuck=\'eval $(thefuck $(fc -ln -1 | tail -n 1))\'\n'
+            b'l=\'ls -CF\'\n'
+            b'la=\'ls -A\'\n'
+            b'll=\'ls -alF\'')
+        return mock
+
+    @pytest.mark.parametrize('before, after', [
+        ('fuck', 'eval $(thefuck $(fc -ln -1 | tail -n 1))'),
+        ('pwd', 'pwd'),
+        ('ll', 'ls -alF')])
+    def test_from_shell(self, before, after, shell):
+        assert shell.from_shell(before) == after
+
+    def test_to_shell(self, shell):
+        assert shell.to_shell('pwd') == 'pwd'
+
+    def test_put_to_history(self, builtins_open, mocker, shell):
+        mocker.patch('thefuck.shells.time',
+                     return_value=1430707243.3517463)
+        shell.put_to_history('ls')
+        builtins_open.return_value.__enter__.return_value. \
+            write.assert_called_once_with(': 1430707243:0;ls\n')
+
+    def test_and_(self, shell):
+        assert shell.and_('ls', 'cd') == 'ls && cd'
+
+    def test_get_aliases(self, shell):
+        assert shell.get_aliases() == {
+            'fuck': 'eval $(thefuck $(fc -ln -1 | tail -n 1))',
+            'l': 'ls -CF',
+            'la': 'ls -A',
+            'll': 'ls -alF'}
+
+    def test_app_alias(self, shell):
+        assert 'alias fuck' in shell.app_alias('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'])
+        assert list(shell.get_history()) == ['ls', 'rm']

tests/test_types.py

@@ -0,0 +1,16 @@
+from thefuck.types import RulesNamesList, Settings
+from tests.utils import Rule
+
+
+def test_rules_names_list():
+    assert RulesNamesList(['bash', 'lisp']) == ['bash', 'lisp']
+    assert RulesNamesList(['bash', 'lisp']) == RulesNamesList(['bash', 'lisp'])
+    assert Rule('lisp') in RulesNamesList(['lisp'])
+    assert Rule('bash') not in RulesNamesList(['lisp'])
+
+
+def test_update_settings():
+    settings = Settings({'key': 'val'})
+    new_settings = settings.update(key='new-val')
+    assert new_settings.key == 'new-val'
+    assert settings.key == 'val'

tests/test_utils.py

@@ -0,0 +1,101 @@
+import pytest
+from mock import Mock
+from thefuck.utils import git_support, sudo_support, wrap_settings,\
+    memoize, get_closest, get_all_executables, replace_argument
+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'})])
+def test_wrap_settings(override, old, new):
+    fn = lambda _, settings: settings
+    assert wrap_settings(override)(fn)(None, Settings(old)) == new
+
+
+@pytest.mark.parametrize('return_value, command, called, result', [
+    ('ls -lah', 'sudo ls', 'ls', 'sudo ls -lah'),
+    ('ls -lah', 'ls', 'ls', 'ls -lah'),
+    (True, 'sudo ls', 'ls', True),
+    (True, 'ls', 'ls', True),
+    (False, 'sudo ls', 'ls', False),
+    (False, 'ls', 'ls', False)])
+def test_sudo_support(return_value, command, called, result):
+    fn = Mock(return_value=return_value, __name__='')
+    assert sudo_support(fn)(Command(command), None) == result
+    fn.assert_called_once_with(Command(called), None)
+
+
+@pytest.mark.parametrize('called, command, stderr', [
+    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
+    ('git com file', 'git commit --verbose file', "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
+def test_git_support(called, command, stderr):
+    @git_support
+    def fn(command, settings): return command.script
+    assert fn(Command(script=called, stderr=stderr), None) == command
+
+
+@pytest.mark.parametrize('command, is_git', [
+    ('git pull', True),
+    ('hub pull', True),
+    ('git push --set-upstream origin foo', True),
+    ('hub push --set-upstream origin foo', True),
+    ('ls', False),
+    ('cat git', False),
+    ('cat hub', False)])
+def test_git_support_match(command, is_git):
+    @git_support
+    def fn(command, settings): return True
+    assert fn(Command(script=command), None) == is_git
+
+
+def test_memoize():
+    fn = Mock(__name__='fn')
+    memoized = memoize(fn)
+    memoized()
+    memoized()
+    fn.assert_called_once_with()
+
+
+@pytest.mark.usefixtures('no_memoize')
+def test_no_memoize():
+    fn = Mock(__name__='fn')
+    memoized = memoize(fn)
+    memoized()
+    memoized()
+    assert fn.call_count == 2
+
+
+class TestGetClosest(object):
+
+    def test_when_can_match(self):
+        assert 'branch' == get_closest('brnch', ['branch', 'status'])
+
+    def test_when_cant_match(self):
+        assert 'status' == get_closest('st', ['status', 'reset'])
+
+    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

tests/utils.py

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

thefuck/conf.py

@@ -0,0 +1,135 @@
+from copy import copy
+from imp import load_source
+import os
+import sys
+from six import text_type
+from . import logs, types
+
+
+class _DefaultRulesNames(types.RulesNamesList):
+    def __add__(self, items):
+        return _DefaultRulesNames(list(self) + items)
+
+    def __contains__(self, item):
+        return item.enabled_by_default or \
+               super(_DefaultRulesNames, self).__contains__(item)
+
+    def __eq__(self, other):
+        if isinstance(other, _DefaultRulesNames):
+            return super(_DefaultRulesNames, self).__eq__(other)
+        else:
+            return False
+
+
+DEFAULT_RULES = _DefaultRulesNames([])
+DEFAULT_PRIORITY = 1000
+
+
+DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
+                    'wait_command': 3,
+                    'require_confirmation': True,
+                    'no_colors': False,
+                    'debug': False,
+                    'priority': {},
+                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
+
+ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
+               'THEFUCK_WAIT_COMMAND': 'wait_command',
+               'THEFUCK_REQUIRE_CONFIRMATION': 'require_confirmation',
+               'THEFUCK_NO_COLORS': 'no_colors',
+               'THEFUCK_PRIORITY': 'priority',
+               'THEFUCK_DEBUG': 'debug'}
+
+
+SETTINGS_HEADER = u"""# ~/.thefuck/settings.py: The Fuck settings file
+#
+# The rules are defined as in the example bellow:
+#
+# rules = ['cd_parent', 'git_push', 'python_command', 'sudo']
+#
+# The default values are as follows. Uncomment and change to fit your needs.
+# See https://github.com/nvbn/thefuck#settings for more information.
+#
+
+"""
+
+
+def _settings_from_file(user_dir):
+    """Loads settings from file."""
+    settings = load_source('settings',
+                           text_type(user_dir.joinpath('settings.py')))
+    return {key: getattr(settings, key)
+            for key in DEFAULT_SETTINGS.keys()
+            if hasattr(settings, key)}
+
+
+def _rules_from_env(val):
+    """Transforms rules list from env-string to python."""
+    val = val.split(':')
+    if 'DEFAULT_RULES' in val:
+        val = DEFAULT_RULES + [rule for rule in val if rule != 'DEFAULT_RULES']
+    return val
+
+
+def _priority_from_env(val):
+    """Gets priority pairs from env."""
+    for part in val.split(':'):
+        try:
+            rule, priority = part.split('=')
+            yield rule, int(priority)
+        except ValueError:
+            continue
+
+
+def _val_from_env(env, attr):
+    """Transforms env-strings to python."""
+    val = os.environ[env]
+    if attr == 'rules':
+        return _rules_from_env(val)
+    elif attr == 'priority':
+        return dict(_priority_from_env(val))
+    elif attr == 'wait_command':
+        return int(val)
+    elif attr in ('require_confirmation', 'no_colors', 'debug'):
+        return val.lower() == 'true'
+    else:
+        return val
+
+
+def _settings_from_env():
+    """Loads settings from env."""
+    return {attr: _val_from_env(env, attr)
+            for env, attr in ENV_TO_ATTR.items()
+            if env in os.environ}
+
+
+def get_settings(user_dir):
+    """Returns settings filled with values from `settings.py` and env."""
+    conf = copy(DEFAULT_SETTINGS)
+    try:
+        conf.update(_settings_from_file(user_dir))
+    except Exception:
+        logs.exception("Can't load settings from file",
+                       sys.exc_info(),
+                       types.Settings(conf))
+
+    try:
+        conf.update(_settings_from_env())
+    except Exception:
+        logs.exception("Can't load settings from env",
+                       sys.exc_info(),
+                       types.Settings(conf))
+
+    if not isinstance(conf['rules'], types.RulesNamesList):
+        conf['rules'] = types.RulesNamesList(conf['rules'])
+
+    return types.Settings(conf)
+
+
+def initialize_settings_file(user_dir):
+    settings_path = user_dir.joinpath('settings.py')
+    if not settings_path.is_file():
+        with settings_path.open(mode='w') as settings_file:
+            settings_file.write(SETTINGS_HEADER)
+            for setting in DEFAULT_SETTINGS.items():
+                settings_file.write(u'# {} = {}\n'.format(*setting))

thefuck/logs.py

@@ -0,0 +1,74 @@
+from contextlib import contextmanager
+from datetime import datetime
+import sys
+from traceback import format_exception
+import colorama
+
+
+def color(color_, settings):
+    """Utility for ability to disabling colored output."""
+    if settings.no_colors:
+        return ''
+    else:
+        return color_
+
+
+def exception(title, exc_info, settings):
+    sys.stderr.write(
+        u'{warn}[WARN] {title}:{reset}\n{trace}'
+        u'{warn}----------------------------{reset}\n\n'.format(
+            warn=color(colorama.Back.RED + colorama.Fore.WHITE
+                       + colorama.Style.BRIGHT, settings),
+            reset=color(colorama.Style.RESET_ALL, settings),
+            title=title,
+            trace=''.join(format_exception(*exc_info))))
+
+
+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}{reset}{side_effect}\n'.format(
+        command=new_command,
+        side_effect=' (+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}{reset}{side_effect} '
+        '[{green}enter{reset}/{red}ctrl+c{reset}]'.format(
+            command=new_command,
+            side_effect=' (+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,
+        red=color(colorama.Fore.RED, settings),
+        reset=color(colorama.Style.RESET_ALL, settings)))
+
+
+def debug(msg, settings):
+    if settings.debug:
+        sys.stderr.write(u'{blue}{bold}DEBUG:{reset} {msg}\n'.format(
+            msg=msg,
+            reset=color(colorama.Style.RESET_ALL, settings),
+            blue=color(colorama.Fore.BLUE, settings),
+            bold=color(colorama.Style.BRIGHT, settings)))
+
+
+@contextmanager
+def debug_time(msg, settings):
+    started = datetime.now()
+    try:
+        yield
+    finally:
+        debug('{} took: {}'.format(msg, datetime.now() - started), settings)

thefuck/main.py

@@ -1,15 +1,14 @@
-from collections import namedtuple
 from imp import load_source
 from pathlib import Path
 from os.path import expanduser
+from pprint import pformat
 from subprocess import Popen, PIPE
 import os
 import sys
 from psutil import Process, TimeoutExpired
-
+import colorama
-
+import six
-Command = namedtuple('Command', ('script', 'stdout', 'stderr'))
+from . import logs, conf, types, shells
-Rule = namedtuple('Rule', ('match', 'get_new_command'))
 
 
 def setup_user_dir():
@@ -18,42 +17,39 @@ def setup_user_dir():
     rules_dir = user_dir.joinpath('rules')
     if not rules_dir.is_dir():
         rules_dir.mkdir(parents=True)
-    user_dir.joinpath('settings.py').touch()
+    conf.initialize_settings_file(user_dir)
     return user_dir
 
 
-def get_settings(user_dir):
-    """Returns prepared settings module."""
-    settings = load_source('settings',
-                           str(user_dir.joinpath('settings.py')))
-    settings.__dict__.setdefault('rules', None)
-    settings.__dict__.setdefault('wait_command', 3)
-    settings.__dict__.setdefault('require_confirmation', False)
-    return settings
-
-
-def is_rule_enabled(settings, rule):
-    """Returns `True` when rule mentioned in `rules` or `rules`
-    isn't defined.
-
-    """
-    return settings.rules is None or rule.name[:-3] in settings.rules
-
-
 def load_rule(rule):
     """Imports rule module and returns it."""
     rule_module = load_source(rule.name[:-3], str(rule))
-    return Rule(rule_module.match, rule_module.get_new_command)
+    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),
+                      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)
+            if loaded_rule in settings.rules:
+                yield loaded_rule
 
 
 def get_rules(user_dir, settings):
     """Returns all enabled rules."""
-    bundled = Path(__file__).parent\
+    bundled = Path(__file__).parent \
-                            .joinpath('rules')\
+        .joinpath('rules') \
-                            .glob('*.py')
+        .glob('*.py')
     user = user_dir.joinpath('rules').glob('*.py')
-    return [load_rule(rule) for rule in sorted(list(bundled)) + list(user)
+    rules = _get_loaded_rules(sorted(bundled) + sorted(user), settings)
-            if rule.name != '__init__.py' and is_rule_enabled(settings, rule)]
+    return sorted(rules, key=lambda rule: settings.priority.get(
+        rule.name, rule.priority))
 
 
 def wait_output(settings, popen):
@@ -68,7 +64,7 @@ def wait_output(settings, popen):
         proc.wait(settings.wait_command)
         return True
     except TimeoutExpired:
-        for child in proc.get_children(recursive=True):
+        for child in proc.children(recursive=True):
             child.kill()
         proc.kill()
         return False
@@ -76,63 +72,102 @@ def wait_output(settings, popen):
 
 def get_command(settings, args):
     """Creates command from `args` and executes it."""
-    script = ' '.join(args[1:])
+    if six.PY2:
-    result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
+        script = ' '.join(arg.decode('utf-8') for arg in args[1:])
-                   env=dict(os.environ, LANG='C'))
+    else:
-    if wait_output(settings, result):
+        script = ' '.join(args[1:])
-        return Command(script, result.stdout.read().decode('utf-8'),
+
-                       result.stderr.read().decode('utf-8'))
+    if not script:
+        return
+
+    script = shells.from_shell(script)
+    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."""
+    script_only = command.stdout is None and command.stderr is None
+
     for rule in rules:
-        if rule.match(command, settings):
+        if script_only and rule.requires_output:
-            return rule
+            continue
+
+        try:
+            with logs.debug_time(u'Trying rule: {};'.format(rule.name),
+                                 settings):
+                if rule.match(command, settings):
+                    return rule
+        except Exception:
+            logs.rule_failed(rule, sys.exc_info(), settings)
 
 
-def confirm(new_command, settings):
+def confirm(new_command, side_effect, settings):
     """Returns `True` when running of new command confirmed."""
     if not settings.require_confirmation:
-        sys.stderr.write(new_command + '\n')
+        logs.show_command(new_command, side_effect, settings)
         return True
 
-    sys.stderr.write(new_command + ' [Enter/Ctrl+C]')
+    logs.confirm_command(new_command, side_effect, settings)
-    sys.stderr.flush()
     try:
         sys.stdin.read(1)
         return True
     except KeyboardInterrupt:
-        sys.stderr.write('Aborted\n')
+        logs.failed('Aborted', settings)
         return False
 
 
 def run_rule(rule, command, settings):
     """Runs command from rule for passed command."""
-    new_command = rule.get_new_command(command, settings)
+    new_command = shells.to_shell(rule.get_new_command(command, settings))
-    if confirm(new_command, settings):
+    if confirm(new_command, rule.side_effect, settings):
+        if rule.side_effect:
+            rule.side_effect(command, settings)
+        shells.put_to_history(new_command)
         print(new_command)
 
 
-def is_second_run(command):
+# Entry points:
-    """Is it the second run of `fuck`?"""
-    return command.script.startswith('fuck')
-
 
 def main():
+    colorama.init()
     user_dir = setup_user_dir()
-    settings = get_settings(user_dir)
+    settings = conf.get_settings(user_dir)
-
+    with logs.debug_time('Total', settings):
-    command = get_command(settings, sys.argv)
+        logs.debug(u'Run with settings: {}'.format(pformat(settings)), settings)
-    if command:
-        if is_second_run(command):
-            print("echo Can't fuck twice")
-            return
 
+        command = get_command(settings, sys.argv)
         rules = get_rules(user_dir, settings)
+        logs.debug(
+            u'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
+            settings)
+
         matched_rule = get_matched_rule(command, rules, settings)
         if matched_rule:
+            logs.debug(u'Matched rule: {}'.format(matched_rule.name), settings)
             run_rule(matched_rule, command, settings)
             return
 
-    print('echo No fuck given')
+        logs.failed('No fuck given', settings)
+
+
+def print_alias():
+    alias = shells.thefuck_alias()
+    if len(sys.argv) > 1:
+        alias = sys.argv[1]
+    print(shells.app_alias(alias))

thefuck/rules/apt_get.py

@@ -0,0 +1,27 @@
+from thefuck import shells
+from thefuck.utils import sudo_support
+
+try:
+    import CommandNotFound
+except ImportError:
+    enabled_by_default = False
+
+@sudo_support
+def match(command, settings):
+    if 'not found' in command.stderr:
+        try:
+            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
+def get_new_command(command, settings):
+    c = CommandNotFound.CommandNotFound()
+    pkgs = c.getPackages(command.script.split(" ")[0])
+    name, _ = pkgs[0]
+    formatme = shells.and_('sudo apt-get install {}', '{}')
+    return formatme.format(name, command.script)

thefuck/rules/brew_install.py

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

thefuck/rules/brew_unknown_command.py

@@ -0,0 +1,102 @@
+import os
+import re
+import subprocess
+from thefuck.utils import get_closest, replace_argument
+
+BREW_CMD_PATH = '/Library/Homebrew/cmd'
+TAP_PATH = '/Library/Taps'
+TAP_CMD_PATH = '/%s/%s/cmd'
+
+
+def _get_brew_path_prefix():
+    """To get brew path"""
+    try:
+        return subprocess.check_output(['brew', '--prefix'],
+                                       universal_newlines=True).strip()
+    except:
+        return None
+
+
+def _get_brew_commands(brew_path_prefix):
+    """To get brew default commands on local environment"""
+    brew_cmd_path = brew_path_prefix + BREW_CMD_PATH
+
+    commands = [name.replace('.rb', '') for name in os.listdir(brew_cmd_path)
+                if name.endswith('.rb')]
+
+    return commands
+
+
+def _get_brew_tap_specific_commands(brew_path_prefix):
+    """To get tap's specific commands
+    https://github.com/Homebrew/homebrew/blob/master/Library/brew.rb#L115"""
+    commands = []
+    brew_taps_path = brew_path_prefix + TAP_PATH
+
+    for user in _get_directory_names_only(brew_taps_path):
+        taps = _get_directory_names_only(brew_taps_path + '/%s' % user)
+
+        # Brew Taps's naming rule
+        # https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/brew-tap.md#naming-conventions-and-limitations
+        taps = (tap for tap in taps if tap.startswith('homebrew-'))
+        for tap in taps:
+            tap_cmd_path = brew_taps_path + TAP_CMD_PATH % (user, tap)
+
+            if os.path.isdir(tap_cmd_path):
+                commands += (name.replace('brew-', '').replace('.rb', '')
+                             for name in os.listdir(tap_cmd_path)
+                             if _is_brew_tap_cmd_naming(name))
+
+    return commands
+
+
+def _is_brew_tap_cmd_naming(name):
+    if name.startswith('brew-') and name.endswith('.rb'):
+        return True
+
+    return False
+
+
+def _get_directory_names_only(path):
+    return [d for d in os.listdir(path)
+            if os.path.isdir(os.path.join(path, d))]
+
+
+brew_path_prefix = _get_brew_path_prefix()
+
+# Failback commands for testing (Based on Homebrew 0.9.5)
+brew_commands = ['info', 'home', 'options', 'install', 'uninstall',
+                 'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
+                 'doctor', 'create', 'edit']
+
+if brew_path_prefix:
+    try:
+        brew_commands = _get_brew_commands(brew_path_prefix) \
+                        + _get_brew_tap_specific_commands(brew_path_prefix)
+    except OSError:
+        pass
+
+
+def _get_similar_command(command):
+    return get_closest(command, brew_commands)
+
+
+def match(command, settings):
+    is_proper_command = ('brew' in command.script and
+                         'Unknown command' in command.stderr)
+
+    has_possible_commands = False
+    if is_proper_command:
+        broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
+                                command.stderr)[0]
+        has_possible_commands = bool(_get_similar_command(broken_cmd))
+
+    return has_possible_commands
+
+
+def get_new_command(command, settings):
+    broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
+                            command.stderr)[0]
+    new_cmd = _get_similar_command(broken_cmd)
+
+    return replace_argument(command.script, broken_cmd, new_cmd)

thefuck/rules/brew_upgrade.py

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

thefuck/rules/cargo.py

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

thefuck/rules/cargo_no_command.py

@@ -0,0 +1,15 @@
+import re
+from thefuck.utils import replace_argument
+
+
+def match(command, settings):
+    return ('cargo' in command.script
+            and 'No such subcommand' in command.stderr
+            and 'Did you mean' in command.stderr)
+
+
+def get_new_command(command, settings):
+    broken = command.script.split()[1]
+    fix = re.findall(r'Did you mean `([^`]*)`', command.stderr)[0]
+
+    return replace_argument(command.script, broken, fix)

thefuck/rules/cd_correction.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+__author__ = "mmussomele"
+
+"""Attempts to spellcheck and correct failed cd commands"""
+
+import os
+from difflib import get_close_matches
+from thefuck.utils import sudo_support
+from thefuck.rules import cd_mkdir
+
+MAX_ALLOWED_DIFF = 0.6
+
+
+def _get_sub_dirs(parent):
+    """Returns a list of the child directories of the given parent directory"""
+    return [child for child in os.listdir(parent) if os.path.isdir(os.path.join(parent, child))]
+
+
+@sudo_support
+def match(command, settings):
+    """Match function copied from cd_mkdir.py"""
+    return (command.script.startswith('cd ')
+            and ('no such file or directory' in command.stderr.lower()
+                 or 'cd: can\'t cd to' in command.stderr.lower()))
+
+
+@sudo_support
+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. 
+    Change sensitivity by changing MAX_ALLOWED_DIFF. Default value is 0.6
+    """
+    dest = command.script.split()[1].split(os.sep)
+    if dest[-1] == '':
+        dest = dest[:-1]
+    cwd = os.getcwd()
+    for directory in dest:
+        if directory == ".":
+            continue
+        elif directory == "..":
+            cwd = os.path.split(cwd)[0]
+            continue
+        best_matches = get_close_matches(directory, _get_sub_dirs(cwd), cutoff=MAX_ALLOWED_DIFF)
+        if best_matches:
+            cwd = os.path.join(cwd, best_matches[0])
+        else:
+            return cd_mkdir.get_new_command(command, settings)
+    return 'cd "{0}"'.format(cwd)
+
+
+enabled_by_default = True

thefuck/rules/cd_mkdir.py

@@ -0,0 +1,16 @@
+import re
+from thefuck import shells
+from thefuck.utils import sudo_support
+
+
+@sudo_support
+def match(command, settings):
+    return (command.script.startswith('cd ')
+        and ('no such file or directory' in command.stderr.lower()
+            or 'cd: can\'t cd to' in command.stderr.lower()))
+
+
+@sudo_support
+def get_new_command(command, settings):
+    repl = shells.and_('mkdir -p \\1', 'cd \\1')
+    return re.sub(r'^cd (.*)', repl, command.script)

thefuck/rules/composer_not_command.py

@@ -0,0 +1,16 @@
+import re
+from thefuck.utils import replace_argument
+
+
+def match(command, settings):
+    return ('composer' in command.script
+            and ('did you mean this?' in command.stderr.lower()
+                 or 'did you mean one of these?' in command.stderr.lower()))
+
+
+def get_new_command(command, settings):
+    broken_cmd = re.findall(r"Command \"([^']*)\" is not defined", command.stderr)[0]
+    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 replace_argument(command.script, broken_cmd, new_cmd[0].strip())

thefuck/rules/cp_omitting_directory.py

@@ -1,10 +1,14 @@
 import re
+from thefuck.utils import sudo_support
 
 
+@sudo_support
 def match(command, settings):
+    stderr = command.stderr.lower()
     return command.script.startswith('cp ') \
-        and 'cp: omitting directory' in command.stderr.lower()
+        and ('omitting directory' in stderr or 'is a directory' in stderr)
 
 
+@sudo_support
 def get_new_command(command, settings):
     return re.sub(r'^cp', 'cp -a', command.script)

thefuck/rules/cpp11.py

@@ -0,0 +1,9 @@
+def match(command, settings):
+    return (('g++' in command.script or 'clang++' in command.script) and
+            ('This file requires compiler and library support for the '
+             'ISO C++ 2011 standard.' in command.stderr or
+             '-Wc++11-extensions' in command.stderr))
+
+
+def get_new_command(command, settings):
+    return command.script + ' -std=c++11'