Bump to 3.25

This helps you run `apt list --upgradable` after `apt update`,
as it suggests.

.travis.yml

@@ -1,9 +1,51 @@
 language: python
-python:
-  - "3.4"
-  - "3.3"
-  - "2.7"
+sudo: false
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      python: "3.6"
+    - os: linux
+      dist: trusty
+      python: "3.5"
+    - os: linux
+      dist: trusty
+      python: "3.4"
+    - os: linux
+      dist: trusty
+      python: "3.3"
+    - os: linux
+      dist: trusty
+      python: "2.7"
+    - os: osx
+      env: FORMULA="python"
+      language: generic
+    - os: osx
+      env: FORMULA="python3"
+      language: generic
+services:
+  - docker
+addons:
+  apt:
+    packages:
+      - python-commandnotfound
+      - python3-commandnotfound
+before_install:
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update ; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then if brew ls --versions $FORMULA; then brew upgrade $FORMULA || echo Python is up to date; else brew install $FORMULA; fi; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then virtualenv venv -p $FORMULA; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then source venv/bin/activate; fi
+  - pip install -U pip
+  - pip install -U coveralls
 install:
+  - pip install -Ur requirements.txt
   - python setup.py develop
-  - pip install -r requirements.txt
-script: py.test -v
+  - rm -rf build
+script:
+  - flake8
+  - export COVERAGE_PYTHON_VERSION=python-${TRAVIS_PYTHON_VERSION:0:1}
+  - export RUN_TESTS="coverage run --source=thefuck,tests -m py.test -v --capture=sys tests"
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6 && $TRAVIS_OS_NAME != "osx" ]]; then $RUN_TESTS --enable-functional; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 3.6 || $TRAVIS_OS_NAME == "osx" ]]; then $RUN_TESTS; fi
+after_success:
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6 && $TRAVIS_OS_NAME != "osx" ]]; then coveralls; fi

CONTRIBUTING.md

@@ -0,0 +1,25 @@
+# Report issues
+If you have any issue with The Fuck, sorry about that, but we will do what we
+can to fix that. Actually, maybe we already have, so first thing to do is to
+update The Fuck and see if the bug is still there.
+
+If it is (sorry again), check if the problem has not already been reported and
+if not, just open an issue on [GitHub](https://github.com/nvbn/thefuck) with
+the following basic information:
+  - the output of `thefuck --version` (something like `The Fuck 3.1 using
+    Python 3.5.0`);
+  - your shell and its version (`bash`, `zsh`, *Windows PowerShell*, etc.);
+  - your system (Debian 7, ArchLinux, Windows, etc.);
+  - how to reproduce the bug;
+  - the output of The Fuck with `THEFUCK_DEBUG=true` exported (typically execute
+    `export THEFUCK_DEBUG=true` in your shell before The Fuck);
+  - if the bug only appears with a specific application, the output of that
+    application and its version;
+  - anything else you think is relevant.
+
+It's only with enough information that we can do something to fix the problem.
+
+# Make a pull request
+We gladly accept pull request on the [official
+repository](https://github.com/nvbn/thefuck) for new rules, new features, bug
+fixes, etc.

MANIFEST.in

@@ -1 +1,2 @@
 include LICENSE.md
+include fastentrypoints.py

README.md

@@ -1,12 +1,14 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck)
-
-**Aliases changed in 1.34.**
+# The Fuck [![Version][version-badge]][version-link] [![Build Status][travis-badge]][travis-link] [![Windows Build Status][appveyor-badge]][appveyor-link] [![Coverage][coverage-badge]][coverage-link] [![MIT License][license-badge]](LICENSE.md)
 
 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:
+The Fuck is too slow? [Try experimental instant mode!](#experimental-instant-mode) 
+
+[![gif with examples][examples-link]][examples-link]
+
+Few more examples:
 
 ```bash
 ➜ apt-get install vim
@@ -14,7 +16,7 @@ E: Could not open lock file /var/lib/dpkg/lock - open (13: Permission denied)
 E: Unable to lock the administration directory (/var/lib/dpkg/), are you root?
 
 ➜ fuck
-sudo apt-get install vim
+sudo apt-get install vim [enter/↑/↓/ctrl+c]
 [sudo] password for nvbn:
 Reading package lists... Done
 ...
@@ -29,7 +31,7 @@ To push the current branch and set the remote as upstream, use
 
 
 ➜ fuck
-git push --set-upstream origin master
+git push --set-upstream origin master [enter/↑/↓/ctrl+c]
 Counting objects: 9, done.
 ...
 ```
@@ -42,7 +44,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)
 ...
 ```
@@ -52,10 +54,10 @@ Python 3.4.2 (default, Oct  8 2014, 13:08:17)
 git: 'brnch' is not a git command. See 'git --help'.
 
 Did you mean this?
-	branch
+    branch
 
 ➜ fuck
-git branch
+git branch [enter/↑/↓/ctrl+c]
 * master
 ```
 
@@ -67,13 +69,13 @@ Did you mean this?
          repl
 
 ➜ fuck
-lein repl
+lein repl [enter/↑/↓/ctrl+c]
 nREPL server started on port 54848 on host 127.0.0.1 - nrepl://127.0.0.1:54848
 REPL-y 0.3.1
 ...
 ```
 
-If you are scared to blindly run the changed command, there is a `require_confirmation`
+If you are not scared to blindly run the changed command, there is a `require_confirmation`
 [settings](#settings) option:
 
 ```bash
@@ -82,7 +84,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
 ...
@@ -90,196 +92,353 @@ Reading package lists... Done
 
 ## Requirements
 
-- python (2.7+ or 3.3+)
+- python (3.3+)
 - pip
 - python-dev
 
 ## Installation
 
-Install `The Fuck` with `pip`:
+On OS X you can install `The Fuck` with [Homebrew][homebrew]:
 
 ```bash
-sudo pip install thefuck
+brew install thefuck
+```
+
+On Ubuntu you can install `The Fuck` with:
+```bash
+sudo apt update
+sudo apt install python3-dev python3-pip
+sudo pip3 install thefuck
+```
+
+On other systems you can install `The Fuck` with `pip`:
+
+```bash
+pip install thefuck
 ```
 
 [Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
 
-And add to the `.bashrc` or `.bash_profile`(for OSX):
+<a href='#manual-installation' name='manual-installation'>#</a>
+You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
 
 ```bash
-alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
+eval $(thefuck --alias)
 # You can use whatever you want as an alias, like for Mondays:
-alias FUCK='fuck'
+eval $(thefuck --alias FUCK)
 ```
 
-Or in your `.zshrc`:
-
-```bash
-alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
-```
-
-If you are using `tcsh`:
-```tcsh
-alias fuck 'set fucked_cmd=`history -h 2 | head -n 1` && eval `thefuck ${fucked_cmd}`'
-```
-
-Alternatively, you can redirect the output of `thefuck-alias`:
-
-```bash
-thefuck-alias >> ~/.bashrc
-```
-
-[Or in your shell config (Bash, Zsh, Fish, Powershell).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
+[Or in your shell config (Bash, Zsh, Fish, Powershell, tcsh).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
 
 Changes will be available only in a new shell session.
 To make them available immediately, run `source ~/.bashrc` (or your shell config file like `.zshrc`).
 
+If you want to run fixed command without confirmation you can use `-y` option:
+
+```bash
+fuck -y
+```
+
+If you want to fix commands recursively until success you can use `-r` option:
+
+```bash
+fuck -r
+```
 
 ## Update
 
 ```bash
-sudo pip install thefuck --upgrade
+pip install thefuck --upgrade
 ```
 
+**Aliases changed in 1.34.**
+
 ## How it works
 
 The Fuck tries to match a rule for the previous command, creates a new command
 using the matched rule and runs it. Rules enabled by default are as follows:
 
+* `ag_literal` &ndash; adds `-Q` to `ag` when suggested;
+* `aws_cli` &ndash; fixes misspelled commands like `aws dynamdb scan`;
 * `cargo` &ndash; runs `cargo build` instead of `cargo`;
 * `cargo_no_command` &ndash; fixes wrongs commands like `cargo buid`;
 * `cd_correction` &ndash; spellchecks and correct failed cd commands;
 * `cd_mkdir` &ndash; creates directories before cd'ing into them;
 * `cd_parent` &ndash; changes `cd..` to `cd ..`;
+* `chmod_x` &ndash; add execution bit;
 * `composer_not_command` &ndash; fixes composer command name;
 * `cp_omitting_directory` &ndash; adds `-a` when you `cp` directory;
-* `cpp11` &ndash; add missing `-std=c++11` to `g++` or `clang++`;
+* `cpp11` &ndash; adds missing `-std=c++11` to `g++` or `clang++`;
+* `dirty_untar` &ndash; fixes `tar x` command that untarred in the current directory;
+* `dirty_unzip` &ndash; fixes `unzip` command that unzipped in the current directory;
 * `django_south_ghost` &ndash; adds `--delete-ghost-migrations` to failed because ghosts django south migration;
 * `django_south_merge` &ndash; adds `--merge` to inconsistent django south migration;
-* `dry` &ndash; fix repetitions like "git git push";
+* `docker_not_command` &ndash; fixes wrong docker commands like `docker tags`;
+* `dry` &ndash; fixes repetitions like `git git push`;
+* `fab_command_not_found` &ndash; fix misspelled fabric commands;
 * `fix_alt_space` &ndash; replaces Alt+Space with Space character;
-* `git_add` &ndash; fix *"Did you forget to 'git add'?"*;
+* `fix_file` &ndash; opens a file with an error in your `$EDITOR`;
+* `gem_unknown_command` &ndash; fixes wrong `gem` commands;
+* `git_add` &ndash; fixes *"pathspec 'foo' did not match any file(s) known to git."*;
+* `git_add_force` &ndash; adds `--force` to `git add <pathspec>...` when paths are .gitignore'd;
+* `git_bisect_usage` &ndash; fixes `git bisect strt`, `git bisect goood`, `git bisect rset`, etc. when bisecting;
+* `git_branch_delete` &ndash; changes `git branch -d` to `git branch -D`;
+* `git_branch_exists` &ndash; offers `git branch -d foo`, `git branch -D foo` or `git checkout foo` when creating a branch that already exists;
 * `git_branch_list` &ndash; catches `git branch list` in place of `git branch` and removes created branch;
-* `git_checkout` &ndash; creates the branch before checking-out;
+* `git_checkout` &ndash; fixes branch name or creates new branch;
+* `git_diff_no_index` &ndash; adds `--no-index` to previous `git diff` on untracked files;
 * `git_diff_staged` &ndash; adds `--staged` to previous `git diff` with unexpected output;
-* `git_no_command` &ndash; fixes wrong git commands like `git brnch`;
+* `git_fix_stash` &ndash; fixes `git stash` commands (misspelled subcommand and missing `save`);
+* `git_flag_after_filename` &ndash; fixes `fatal: bad flag '...' after filename`
+* `git_help_aliased` &ndash; fixes `git help <alias>` commands replacing <alias> with the aliased command;
+* `git_not_command` &ndash; fixes wrong git commands like `git brnch`;
 * `git_pull` &ndash; sets upstream before executing previous `git pull`;
+* `git_pull_clone` &ndash; clones instead of pulling when the repo does not exist;
+* `git_pull_uncommitted_changes` &ndash; stashes changes before pulling and pops them afterwards;
 * `git_push` &ndash; adds `--set-upstream origin $branch` to previous failed `git push`;
-* `git_stash` &ndash; stashes you local modifications before rebasing or switching branch;
-* `go_run` &ndash; appends `.go` extension when compiling/running Go programs
-* `grep_recursive` &ndash; adds `-r` when you trying to grep directory;
+* `git_push_different_branch_names` &ndash; fixes pushes when local brach name does not match remote branch name;
+* `git_push_pull` &ndash; runs `git pull` when `push` was rejected;
+* `git_push_without_commits` &ndash; Creates an initial commit if you forget and only `git add .`, when setting up a new project;
+* `git_rebase_no_changes` &ndash; runs `git rebase --skip` instead of `git rebase --continue` when there are no changes;
+* `git_remote_delete` &ndash; replaces `git remote delete remote_name` with `git remote remove remote_name`;
+* `git_rm_local_modifications` &ndash;  adds `-f` or `--cached` when you try to `rm` a locally modified file;
+* `git_rm_recursive` &ndash; adds `-r` when you try to `rm` a directory;
+* `git_rm_staged` &ndash;  adds `-f` or `--cached` when you try to `rm` a file with staged changes
+* `git_rebase_merge_dir` &ndash; offers `git rebase (--continue | --abort | --skip)` or removing the `.git/rebase-merge` dir when a rebase is in progress;
+* `git_remote_seturl_add` &ndash; runs `git remote add` when `git remote set_url` on nonexistant remote;
+* `git_stash` &ndash; stashes your local modifications before rebasing or switching branch;
+* `git_stash_pop` &ndash; adds your local modifications before popping stash, then resets;
+* `git_tag_force` &ndash; adds `--force` to `git tag <tagname>` when the tag already exists;
+* `git_two_dashes` &ndash; adds a missing dash to commands like `git commit -amend` or `git rebase -continue`;
+* `go_run` &ndash; appends `.go` extension when compiling/running Go programs;
+* `gradle_no_task` &ndash; fixes not found or ambiguous `gradle` task;
+* `gradle_wrapper` &ndash; replaces `gradle` with `./gradlew`;
+* `grep_arguments_order` &ndash; fixes grep arguments order for situations like `grep -lir . test`;
+* `grep_recursive` &ndash; adds `-r` when you trying to `grep` directory;
+* `grunt_task_not_found` &ndash; fixes misspelled `grunt` commands;
+* `gulp_not_task` &ndash; fixes misspelled `gulp` tasks;
 * `has_exists_script` &ndash; prepends `./` when script/binary exists;
+* `heroku_multiple_apps` &ndash; add `--app <app>` to `heroku` commands like `heroku pg`;
+* `heroku_not_command` &ndash; fixes wrong `heroku` commands like `heroku log`;
+* `history` &ndash; tries to replace command with most similar command from history;
+* `hostscli` &ndash; tries to fix `hostscli` usage;
+* `ifconfig_device_not_found` &ndash; fixes wrong device names like `wlan0` to `wlp2s0`;
 * `java` &ndash; removes `.java` extension when running Java programs;
 * `javac` &ndash; appends missing `.java` when compiling Java files;
 * `lein_not_task` &ndash; fixes wrong `lein` tasks like `lein rpl`;
-* `ls_lah` &ndash; adds -lah to ls;
-* `man` &ndash; change manual section;
+* `ln_no_hard_link` &ndash; catches hard link creation on directories, suggest symbolic link;
+* `ln_s_order` &ndash; fixes `ln -s` arguments order;
+* `ls_all` &ndash; adds `-A` to `ls` when output is empty;
+* `ls_lah` &ndash; adds `-lah` to `ls`;
+* `man` &ndash; changes manual section;
 * `man_no_space` &ndash; fixes man commands without spaces, for example `mandiff`;
+* `mercurial` &ndash; fixes wrong `hg` commands;
+* `missing_space_before_subcommand` &ndash; fixes command with missing space like `npminstall`;
 * `mkdir_p` &ndash; adds `-p` when you trying to create directory without parent;
+* `mvn_no_command` &ndash; adds `clean package` to `mvn`;
+* `mvn_unknown_lifecycle_phase` &ndash; fixes misspelled lifecycle phases with `mvn`;
+* `npm_missing_script` &ndash; fixes `npm` custom script name in `npm run-script <script>`;
+* `npm_run_script` &ndash; adds missing `run-script` for custom `npm` scripts;
+* `npm_wrong_command` &ndash; fixes wrong npm commands like `npm urgrade`;
 * `no_command` &ndash; fixes wrong console commands, for example `vom/vim`;
 * `no_such_file` &ndash; creates missing directories with `mv` and `cp` commands;
-* `open` &ndash; prepends `http` to address passed to `open`;
-* `pip_unknown_command` &ndash; fixes wrong pip commands, for example `pip instatl/pip install`;
+* `open` &ndash; either prepends `http://` to address passed to `open` or create a new file or directory and passes it to `open`;
+* `pip_unknown_command` &ndash; fixes wrong `pip` commands, for example `pip instatl/pip install`;
+* `php_s` &ndash; replaces `-s` by `-S` when trying to run a local php server;
+* `port_already_in_use` &ndash; kills process that bound port;
+* `prove_recursively` &ndash; adds `-r` when called with directory;
 * `python_command` &ndash; prepends `python` when you trying to run not executable/without `./` python script;
 * `python_execute` &ndash; appends missing `.py` when executing Python files;
-* `quotation_marks` &ndash; fixes uneven usage of `'` and `"` when containing args'
+* `quotation_marks` &ndash; fixes uneven usage of `'` and `"` when containing args';
+* `path_from_history` &ndash; replaces not found path with similar absolute path from history;
+* `react_native_command_unrecognized` &ndash; fixes unrecognized `react-native` commands;
+* `remove_trailing_cedilla` &ndash; remove trailling cedillas `ç`, a common typo for european keyboard layouts;
 * `rm_dir` &ndash; adds `-rf` when you trying to remove directory;
-* `sed` &ndash; adds missing '/' to `sed`'s `s` commands;
+* `scm_correction` &ndash; corrects wrong scm like `hg log` to `git log`;
+* `sed_unterminated_s` &ndash; adds missing '/' to `sed`'s `s` commands;
 * `sl_ls` &ndash; changes `sl` to `ls`;
 * `ssh_known_hosts` &ndash; removes host from `known_hosts` on warning;
 * `sudo` &ndash; prepends `sudo` to previous command if it failed because of permissions;
-* `switch_layout` &ndash; switches command from your local layout to en;
-* `systemctl` &ndash; correctly orders parameters of confusing systemctl;
+* `sudo_command_from_user_path` &ndash; runs commands from users `$PATH` with `sudo`;
+* `switch_lang` &ndash; switches command from your local layout to en;
+* `systemctl` &ndash; correctly orders parameters of confusing `systemctl`;
 * `test.py` &ndash; runs `py.test` instead of `test.py`;
-* `tmux` &ndash; fixes tmux commands;
-* `whois` &ndash; fixes `whois` command.
+* `touch` &ndash; creates missing directories before "touching";
+* `tsuru_login` &ndash; runs `tsuru login` if not authenticated or session expired;
+* `tsuru_not_command` &ndash; fixes wrong `tsuru` commands like `tsuru shell`;
+* `tmux` &ndash; fixes `tmux` commands;
+* `unknown_command` &ndash; fixes hadoop hdfs-style "unknown command", for example adds missing '-' to the command on `hdfs dfs ls`;
+* `vagrant_up` &ndash; starts up the vagrant instance;
+* `whois` &ndash; fixes `whois` command;
+* `workon_doesnt_exists` &ndash; fixes `virtualenvwrapper` env name os suggests to create new.
+* `yarn_alias` &ndash; fixes aliased `yarn` commands like `yarn ls`;
+* `yarn_command_not_found` &ndash; fixes misspelled `yarn` commands;
+* `yarn_command_replaced` &ndash; fixes replaced `yarn` commands;
+* `yarn_help` &ndash; makes it easier to open `yarn` documentation;
 
 Enabled by default only on specific platforms:
 
-* `apt_get` &ndash; installs app from apt if it not installed;
+* `apt_get` &ndash; installs app from apt if it not installed (requires `python-commandnotfound` / `python3-commandnotfound`);
+* `apt_get_search` &ndash; changes trying to search using `apt-get` with searching using `apt-cache`;
+* `apt_invalid_operation` &ndash; fixes invalid `apt` and `apt-get` calls, like `apt-get isntall vim`;
+* `apt_list_upgradable` &ndash; helps you run `apt list --upgradable` after `apt update`;
+* `brew_cask_dependency` &ndash; installs cask dependencies;
 * `brew_install` &ndash; fixes formula name for `brew install`;
+* `brew_link` &ndash; adds `--overwrite --dry-run` if linking fails;
+* `brew_uninstall` &ndash; adds `--force` to `brew uninstall` if multiple versions were installed;
 * `brew_unknown_command` &ndash; fixes wrong brew commands, for example `brew docto/brew doctor`;
-* `brew_upgrade` &ndash; appends `--all` to `brew upgrade` as per Homebrew's new behaviour
-* `pacman` &ndash; installs app with `pacman` or `yaourt` if it is not installed.
+* `brew_update_formula` &ndash; turns `brew update <formula>` into `brew upgrade <formula>`;
+* `dnf_no_such_command` &ndash; fixes mistyped DNF commands;
+* `pacman` &ndash; installs app with `pacman` if it is not installed (uses `yaourt` if available);
+* `pacman_not_found` &ndash; fixes package name with `pacman` or `yaourt`.
 
 Bundled, but not enabled by default:
 
+* `git_push_force` &ndash; adds `--force-with-lease` to a `git push` (may conflict with `git_push_pull`);
 * `rm_root` &ndash; adds `--no-preserve-root` to `rm -rf /` command.
 
 ## Creating your own rules
 
 For adding your own rule you should create `your-rule-name.py`
-in `~/.thefuck/rules`. Rule should contain two functions:
-`match(command: Command, settings: Settings) -> bool`
-and `get_new_command(command: Command, settings: Settings) -> str`.
-Also the rule can contain optional function
-`side_effect(command: Command, settings: Settings) -> None` and
-optional boolean `enabled_by_default`.
+in `~/.config/thefuck/rules`. The rule should contain two functions:
 
-`Command` has three attributes: `script`, `stdout` and `stderr`.
+```python
+match(command: Command) -> bool
+get_new_command(command: Command) -> str | list[str]
+```
 
-`Settings` is a special object filled with `~/.thefuck/settings.py` and values from env, [more](#settings).
+Also the rule can contain an optional function
+
+```python
+side_effect(old_command: Command, fixed_command: str) -> None
+```
+and optional `enabled_by_default`, `requires_output` and `priority` variables.
+
+`Command` has three attributes: `script`, `output` and `script_parts`.
+Rule shouldn't change `Command`.
+
+
+*Rules api changed in 3.0:* For accessing settings in rule you need to import it with `from thefuck.conf import settings`.
+`settings` is a special object filled with `~/.config/thefuck/settings.py` and values from env ([see more below](#settings)).
 
 Simple example of the rule for running script with `sudo`:
 
 ```python
-def match(command, settings):
-    return ('permission denied' in command.stderr.lower()
-            or 'EACCES' in command.stderr)
+def match(command):
+    return ('permission denied' in command.output.lower()
+            or 'EACCES' in command.output)
 
 
-def get_new_command(command, settings):
+def get_new_command(command):
     return 'sudo {}'.format(command.script)
 
 # Optional:
 enabled_by_default = True
 
-def side_effect(command, settings):
+def side_effect(command, fixed_command):
     subprocess.call('chmod 777 .', shell=True)
 
-priority = 1000  # Lower first
+priority = 1000  # Lower first, default is 1000
+
+requires_output = True
 ```
 
 [More examples of rules](https://github.com/nvbn/thefuck/tree/master/thefuck/rules),
-[utility functions for rules](https://github.com/nvbn/thefuck/tree/master/thefuck/utils.py).
+[utility functions for rules](https://github.com/nvbn/thefuck/tree/master/thefuck/utils.py),
+[app/os-specific helpers](https://github.com/nvbn/thefuck/tree/master/thefuck/specific/).
 
 ## Settings
 
-The Fuck has a few settings parameters which can be changed in `~/.thefuck/settings.py`:
+The Fuck has a few settings parameters which can be changed in `$XDG_CONFIG_HOME/thefuck/settings.py` (`$XDG_CONFIG_HOME` defaults to `~/.config`):
 
 * `rules` &ndash; list of enabled rules, by default `thefuck.conf.DEFAULT_RULES`;
-* `require_confirmation` &ndash; requires confirmation before running new command, by default `False`;
+* `exclude_rules` &ndash; list of disabled rules, by default `[]`;
+* `require_confirmation` &ndash; requires confirmation before running new command, by default `True`;
 * `wait_command` &ndash; max amount of time in seconds for getting previous command output;
 * `no_colors` &ndash; disable colored output;
-* `priority` &ndash; dict with rules priorities, rule with lower `priority` will be matched first.
+* `priority` &ndash; dict with rules priorities, rule with lower `priority` will be matched first;
+* `debug` &ndash; enables debug output, by default `False`;
+* `history_limit` &ndash; numeric value of how many history commands will be scanned, like `2000`;
+* `alter_history` &ndash; push fixed command to history, by default `True`;
+* `wait_slow_command` &ndash; max amount of time in seconds for getting previous command output if it in `slow_commands` list;
+* `slow_commands` &ndash; list of slow commands.
 
 Example of `settings.py`:
 
 ```python
 rules = ['sudo', 'no_command']
+exclude_rules = ['git_push']
 require_confirmation = True
 wait_command = 10
 no_colors = False
 priority = {'sudo': 100, 'no_command': 9999}
+debug = False
+history_limit = 9999
+wait_slow_command = 20
+slow_commands = ['react-native', 'gradle']
 ```
 
 Or via environment variables:
 
 * `THEFUCK_RULES` &ndash; list of enabled rules, like `DEFAULT_RULES:rm_root` or `sudo:no_command`;
+* `THEFUCK_EXCLUDE_RULES` &ndash; list of disabled rules, like `git_pull:git_push`;
 * `THEFUCK_REQUIRE_CONFIRMATION` &ndash; require confirmation before running new command, `true/false`;
 * `THEFUCK_WAIT_COMMAND` &ndash; max amount of time in seconds for getting previous command output;
 * `THEFUCK_NO_COLORS` &ndash; disable colored output, `true/false`;
 * `THEFUCK_PRIORITY` &ndash; priority of the rules, like `no_command=9999:apt_get=100`,
-rule with lower `priority` will be matched first.
+rule with lower `priority` will be matched first;
+* `THEFUCK_DEBUG` &ndash; enables debug output, `true/false`;
+* `THEFUCK_HISTORY_LIMIT` &ndash; how many history commands will be scanned, like `2000`;
+* `THEFUCK_ALTER_HISTORY` &ndash; push fixed command to history `true/false`;
+* `THEFUCK_WAIT_SLOW_COMMAND` &ndash; max amount of time in seconds for getting previous command output if it in `slow_commands` list;
+* `THEFUCK_SLOW_COMMANDS` &ndash; list of slow commands, like `lein:gradle`.
 
 For example:
 
 ```bash
 export THEFUCK_RULES='sudo:no_command'
+export THEFUCK_EXCLUDE_RULES='git_pull:git_push'
 export THEFUCK_REQUIRE_CONFIRMATION='true'
 export THEFUCK_WAIT_COMMAND=10
 export THEFUCK_NO_COLORS='false'
 export THEFUCK_PRIORITY='no_command=9999:apt_get=100'
+export THEFUCK_HISTORY_LIMIT='2000'
+```
+
+## Third-party packages with rules
+
+If you want to make very specific rules or rules, that you don't want to make public,
+but share with other people.
+You can create a special package with name `thefuck_contrib_*` with following structure:
+
+```
+thefuck_contrib_foo
+  thefuck_contrib_foo
+    rules
+      __init__.py
+      *third-party rules*
+    __init__.py
+    *third-party-utils*
+  setup.py
+```
+
+And thefuck will find all rules from `rules` module.
+
+## Experimental instant mode
+
+By default The Fuck reruns a previous command and that takes time,
+in instant mode The Fuck logs output with [script](https://en.wikipedia.org/wiki/Script_(Unix))
+and just reads the log.
+
+[![gif with instant mode][instant-mode-gif-link]][instant-mode-gif-link]
+
+At the moment only Python 3 with bash or zsh is supported.
+
+For enabling instant mode you need to add `--enable-experimental-instant-mode`
+to alias initialization in your `.bashrc`, `.bash_profile` or `.zshrc` like:
+
+```bash
+eval $(thefuck --alias --enable-experimental-instant-mode)
 ```
 
 ## Developing
@@ -291,11 +450,44 @@ pip install -r requirements.txt
 python setup.py develop
 ```
 
-Run tests:
+Run code style checks:
+
+```bash
+flake8
+```
+
+Run unit tests:
 
 ```bash
 py.test
 ```
 
+Run unit and functional tests (requires docker):
+
+```bash
+py.test --enable-functional
+```
+
+For sending package to pypi:
+
+```bash
+sudo apt-get install pandoc
+./release.py
+```
+
 ## License MIT
 Project License can be found [here](LICENSE.md).
+
+
+[version-badge]:   https://img.shields.io/pypi/v/thefuck.svg?label=version
+[version-link]:    https://pypi.python.org/pypi/thefuck/
+[travis-badge]:    https://travis-ci.org/nvbn/thefuck.svg?branch=master
+[travis-link]:     https://travis-ci.org/nvbn/thefuck
+[appveyor-badge]:  https://ci.appveyor.com/api/projects/status/1sskj4imj02um0gu/branch/master?svg=true
+[appveyor-link]:   https://ci.appveyor.com/project/nvbn/thefuck
+[coverage-badge]:  https://img.shields.io/coveralls/nvbn/thefuck.svg
+[coverage-link]:   https://coveralls.io/github/nvbn/thefuck
+[license-badge]:   https://img.shields.io/badge/license-MIT-007EC7.svg
+[examples-link]:   https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif
+[instant-mode-gif-link]:   https://raw.githubusercontent.com/nvbn/thefuck/master/example_instant_mode.gif
+[homebrew]:        http://brew.sh/

appveyor.yml

@@ -0,0 +1,24 @@
+build: false
+
+environment:
+  matrix:
+    - PYTHON: "C:/Python27"
+    - PYTHON: "C:/Python33"
+    - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python35"
+    - PYTHON: "C:/Python36"
+
+init:
+  - "ECHO %PYTHON%"
+  - ps: "ls C:/Python*"
+
+install:
+  - "curl -fsS -o C:/get-pip.py https://bootstrap.pypa.io/get-pip.py"
+  - "%PYTHON%/python.exe C:/get-pip.py"
+  - "%PYTHON%/Scripts/pip.exe install -U setuptools"
+  - "%PYTHON%/python.exe setup.py develop"
+  - "%PYTHON%/Scripts/pip.exe install -U -r requirements.txt"
+
+test_script:
+  - "%PYTHON%/python.exe -m flake8"
+  - "%PYTHON%/Scripts/py.test.exe -sv"

fastentrypoints.py

@@ -0,0 +1,110 @@
+# Copyright (c) 2016, Aaron Christianson
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'''
+Monkey patch setuptools to write faster console_scripts with this format:
+
+    import sys
+    from mymodule import entry_function
+    sys.exit(entry_function())
+
+This is better.
+
+(c) 2016, Aaron Christianson
+http://github.com/ninjaaron/fast-entry_points
+'''
+from setuptools.command import easy_install
+import re
+TEMPLATE = '''\
+# -*- coding: utf-8 -*-
+# EASY-INSTALL-ENTRY-SCRIPT: '{3}','{4}','{5}'
+__requires__ = '{3}'
+import re
+import sys
+
+from {0} import {1}
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+    sys.exit({2}())'''
+
+
+@classmethod
+def get_args(cls, dist, header=None):
+    """
+    Yield write_script() argument tuples for a distribution's
+    console_scripts and gui_scripts entry points.
+    """
+    if header is None:
+        header = cls.get_header()
+    spec = str(dist.as_requirement())
+    for type_ in 'console', 'gui':
+        group = type_ + '_scripts'
+        for name, ep in dist.get_entry_map(group).items():
+            # ensure_safe_name
+            if re.search(r'[\\/]', name):
+                raise ValueError("Path separators not allowed in script names")
+            script_text = TEMPLATE.format(
+                          ep.module_name, ep.attrs[0], '.'.join(ep.attrs),
+                          spec, group, name)
+            args = cls._get_script_args(type_, name, header, script_text)
+            for res in args:
+                yield res
+
+
+easy_install.ScriptWriter.get_args = get_args
+
+
+def main():
+    import os
+    import re
+    import shutil
+    import sys
+    dests = sys.argv[1:] or ['.']
+    filename = re.sub('\.pyc$', '.py', __file__)
+
+    for dst in dests:
+        shutil.copy(filename, dst)
+        manifest_path = os.path.join(dst, 'MANIFEST.in')
+        setup_path = os.path.join(dst, 'setup.py')
+
+        # Insert the include statement to MANIFEST.in if not present
+        with open(manifest_path, 'a+') as manifest:
+            manifest.seek(0)
+            manifest_content = manifest.read()
+            if not 'include fastentrypoints.py' in manifest_content:
+                manifest.write(('\n' if manifest_content else '')
+                               + 'include fastentrypoints.py')
+
+        # Insert the import statement to setup.py if not present
+        with open(setup_path, 'a+') as setup:
+            setup.seek(0)
+            setup_content = setup.read()
+            if not 'import fastentrypoints' in setup_content:
+                setup.seek(0)
+                setup.truncate()
+                setup.write('import fastentrypoints\n' + setup_content)
+
+print(__name__)

install.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Installation script is deprecated!"
+echo "For installation instruction please visit https://github.com/nvbn/thefuck"

release.py

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

requirements.txt

@@ -1,4 +1,11 @@
+pip
+flake8
 pytest
 mock
 pytest-mock
 wheel
+setuptools>=17.1
+pexpect
+pypandoc
+pytest-benchmark
+pytest-docker-pexpect

setup.py

@@ -1,35 +1,57 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
+import pkg_resources
 import sys
+import os
+import fastentrypoints
 
-if sys.version_info < (2, 7):
+
+try:
+    if int(pkg_resources.get_distribution("pip").version.split('.')[0]) < 6:
+        print('pip older than 6.0 not supported, please upgrade pip with:\n\n'
+              '    pip install -U pip')
+        sys.exit(-1)
+except pkg_resources.DistributionNotFound:
+    pass
+
+if os.environ.get('CONVERT_README'):
+    import pypandoc
+
+    long_description = pypandoc.convert('README.md', 'rst')
+else:
+    long_description = ''
+
+version = sys.version_info[:2]
+if version < (2, 7):
     print('thefuck requires Python version 2.7 or later' +
-          ' ({}.{} detected).'.format(*sys.version_info[:2]))
+          ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
-elif (3, 0) < sys.version_info < (3, 3):
+elif (3, 0) < version < (3, 3):
     print('thefuck requires Python version 3.3 or later' +
-          ' ({}.{} detected).'.format(*sys.version_info[:2]))
+          ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '1.47'
+VERSION = '3.25'
 
-install_requires = ['psutil', 'colorama', 'six']
-
-if sys.version_info < (3, 4):
-    install_requires.append('pathlib')
+install_requires = ['psutil', 'colorama', 'six', 'decorator', 'pyte']
+extras_require = {':python_version<"3.4"': ['pathlib2'],
+                  ':python_version<"3.3"': ['backports.shutil_get_terminal_size'],
+                  ":sys_platform=='win32'": ['win_unicode_console']}
 
 setup(name='thefuck',
       version=VERSION,
       description="Magnificent app which corrects your previous console command",
+      long_description=long_description,
       author='Vladimir Iakovlev',
       author_email='nvbn.rm@gmail.com',
       url='https://github.com/nvbn/thefuck',
       license='MIT',
       packages=find_packages(exclude=['ez_setup', 'examples',
-                                      'tests', 'release']),
+                                      'tests', 'tests.*', 'release']),
       include_package_data=True,
       zip_safe=False,
       install_requires=install_requires,
+      extras_require=extras_require,
       entry_points={'console_scripts': [
-          'thefuck = thefuck.main:main',
-          'thefuck-alias = thefuck.shells:app_alias']})
+          'thefuck = thefuck.entrypoints.main:main',
+          'fuck = thefuck.entrypoints.not_configured:main']})

tests/conftest.py

@@ -0,0 +1,69 @@
+import os
+import pytest
+from thefuck import shells
+from thefuck import conf, const
+from thefuck.system import Path
+
+shells.shell = shells.Generic()
+
+
+def pytest_addoption(parser):
+    """Adds `--enable-functional` argument."""
+    group = parser.getgroup("thefuck")
+    group.addoption('--enable-functional', action="store_true", default=False,
+                    help="Enable functional tests")
+
+
+@pytest.fixture
+def no_memoize(monkeypatch):
+    monkeypatch.setattr('thefuck.utils.memoize.disabled', True)
+
+
+@pytest.fixture(autouse=True)
+def settings(request):
+    def _reset_settings():
+        conf.settings.clear()
+        conf.settings.update(const.DEFAULT_SETTINGS)
+
+    request.addfinalizer(_reset_settings)
+    conf.settings.user_dir = Path('~/.thefuck')
+    return conf.settings
+
+
+@pytest.fixture
+def no_colors(settings):
+    settings.no_colors = True
+
+
+@pytest.fixture(autouse=True)
+def no_cache(monkeypatch):
+    monkeypatch.setattr('thefuck.utils.cache.disabled', True)
+
+
+@pytest.fixture(autouse=True)
+def functional(request):
+    if request.node.get_marker('functional') \
+            and not request.config.getoption('enable_functional'):
+        pytest.skip('functional tests are disabled')
+
+
+@pytest.fixture
+def source_root():
+    return Path(__file__).parent.parent.resolve()
+
+
+@pytest.fixture
+def set_shell(monkeypatch):
+    def _set(cls):
+        shell = cls()
+        monkeypatch.setattr('thefuck.shells.shell', shell)
+        return shell
+
+    return _set
+
+
+@pytest.fixture(autouse=True)
+def os_environ(monkeypatch):
+    env = {'PATH': os.environ['PATH']}
+    monkeypatch.setattr('os.environ', env)
+    return env

tests/entrypoints/test_alias.py

@@ -0,0 +1,30 @@
+from mock import Mock
+import pytest
+from thefuck.entrypoints.alias import _get_alias
+
+
+@pytest.mark.parametrize(
+    'py2, enable_experimental_instant_mode, which, is_instant', [
+        (False, True, True, True),
+        (False, False, True, False),
+        (False, True, False, False),
+        (True, True, True, False),
+        (True, True, False, False),
+        (True, False, True, False)])
+def test_get_alias(monkeypatch, mocker, py2,
+                   enable_experimental_instant_mode,
+                   which, is_instant):
+    monkeypatch.setattr('six.PY2', py2)
+    args = Mock(
+        enable_experimental_instant_mode=enable_experimental_instant_mode,
+        alias='fuck', )
+    mocker.patch('thefuck.entrypoints.alias.which', return_value=which)
+    shell = Mock(app_alias=lambda _: 'app_alias',
+                 instant_mode_alias=lambda _: 'instant_mode_alias')
+    monkeypatch.setattr('thefuck.entrypoints.alias.shell', shell)
+
+    alias = _get_alias(args)
+    if is_instant:
+        assert alias == 'instant_mode_alias'
+    else:
+        assert alias == 'app_alias'

tests/entrypoints/test_fix_command.py

@@ -0,0 +1,26 @@
+import pytest
+from mock import Mock
+from thefuck.entrypoints.fix_command import _get_raw_command
+
+
+class TestGetRawCommand(object):
+    def test_from_force_command_argument(self):
+        known_args = Mock(force_command=['git', 'brunch'])
+        assert _get_raw_command(known_args) == ['git', 'brunch']
+
+    def test_from_command_argument(self, os_environ):
+        os_environ['TF_HISTORY'] = None
+        known_args = Mock(force_command=None,
+                          command=['sl'])
+        assert _get_raw_command(known_args) == ['sl']
+
+    @pytest.mark.parametrize('history, result', [
+        ('git br', 'git br'),
+        ('git br\nfcuk', 'git br'),
+        ('git br\nfcuk\nls', 'ls'),
+        ('git br\nfcuk\nls\nfuk', 'ls')])
+    def test_from_history(self, os_environ, history, result):
+        os_environ['TF_HISTORY'] = history
+        known_args = Mock(force_command=None,
+                          command=None)
+        assert _get_raw_command(known_args) == [result]

tests/entrypoints/test_not_configured.py

@@ -0,0 +1,140 @@
+import pytest
+import json
+from six import StringIO
+from mock import MagicMock
+from thefuck.shells.generic import ShellConfiguration
+from thefuck.entrypoints.not_configured import main
+
+
+@pytest.fixture(autouse=True)
+def usage_tracker(mocker):
+    return mocker.patch(
+        'thefuck.entrypoints.not_configured._get_not_configured_usage_tracker_path',
+        new_callable=MagicMock)
+
+
+@pytest.fixture(autouse=True)
+def usage_tracker_io(usage_tracker):
+    io = StringIO()
+    usage_tracker.return_value \
+                 .open.return_value \
+                 .__enter__.return_value = io
+    return io
+
+
+@pytest.fixture(autouse=True)
+def usage_tracker_exists(usage_tracker):
+    usage_tracker.return_value \
+                 .exists.return_value = True
+    return usage_tracker.return_value.exists
+
+
+def _assert_tracker_updated(usage_tracker_io, pid):
+    usage_tracker_io.seek(0)
+    info = json.load(usage_tracker_io)
+    assert info['pid'] == pid
+
+
+def _change_tracker(usage_tracker_io, pid):
+    usage_tracker_io.truncate(0)
+    info = {'pid': pid, 'time': 0}
+    json.dump(info, usage_tracker_io)
+    usage_tracker_io.seek(0)
+
+
+@pytest.fixture(autouse=True)
+def shell_pid(mocker):
+    return mocker.patch('thefuck.entrypoints.not_configured._get_shell_pid',
+                        new_callable=MagicMock)
+
+
+@pytest.fixture(autouse=True)
+def shell(mocker):
+    shell = mocker.patch('thefuck.entrypoints.not_configured.shell',
+                         new_callable=MagicMock)
+    shell.get_history.return_value = []
+    shell.how_to_configure.return_value = ShellConfiguration(
+        content='eval $(thefuck --alias)',
+        path='/tmp/.bashrc',
+        reload='bash',
+        can_configure_automatically=True)
+    return shell
+
+
+@pytest.fixture(autouse=True)
+def shell_config(mocker):
+    path_mock = mocker.patch('thefuck.entrypoints.not_configured.Path',
+                             new_callable=MagicMock)
+    return path_mock.return_value \
+        .expanduser.return_value \
+        .open.return_value \
+        .__enter__.return_value
+
+
+@pytest.fixture(autouse=True)
+def logs(mocker):
+    return mocker.patch('thefuck.entrypoints.not_configured.logs',
+                        new_callable=MagicMock)
+
+
+def test_for_generic_shell(shell, logs):
+    shell.how_to_configure.return_value = None
+    main()
+    logs.how_to_configure_alias.assert_called_once()
+
+
+def test_on_first_run(usage_tracker_io, usage_tracker_exists, shell_pid, logs):
+    shell_pid.return_value = 12
+    main()
+    usage_tracker_exists.return_value = False
+    _assert_tracker_updated(usage_tracker_io, 12)
+    logs.how_to_configure_alias.assert_called_once()
+
+
+def test_on_run_after_other_commands(usage_tracker_io, shell_pid, shell, logs):
+    shell_pid.return_value = 12
+    shell.get_history.return_value = ['fuck', 'ls']
+    _change_tracker(usage_tracker_io, 12)
+    main()
+    logs.how_to_configure_alias.assert_called_once()
+
+
+def test_on_first_run_from_current_shell(usage_tracker_io, shell_pid,
+                                         shell, logs):
+    shell.get_history.return_value = ['fuck']
+    shell_pid.return_value = 12
+    main()
+    _assert_tracker_updated(usage_tracker_io, 12)
+    logs.how_to_configure_alias.assert_called_once()
+
+
+def test_when_cant_configure_automatically(shell_pid, shell, logs):
+    shell_pid.return_value = 12
+    shell.how_to_configure.return_value = ShellConfiguration(
+        content='eval $(thefuck --alias)',
+        path='/tmp/.bashrc',
+        reload='bash',
+        can_configure_automatically=False)
+    main()
+    logs.how_to_configure_alias.assert_called_once()
+
+
+def test_when_already_configured(usage_tracker_io, shell_pid,
+                                 shell, shell_config, logs):
+    shell.get_history.return_value = ['fuck']
+    shell_pid.return_value = 12
+    _change_tracker(usage_tracker_io, 12)
+    shell_config.read.return_value = 'eval $(thefuck --alias)'
+    main()
+    logs.already_configured.assert_called_once()
+
+
+def test_when_successfully_configured(usage_tracker_io, shell_pid,
+                                      shell, shell_config, logs):
+    shell.get_history.return_value = ['fuck']
+    shell_pid.return_value = 12
+    _change_tracker(usage_tracker_io, 12)
+    shell_config.read.return_value = ''
+    main()
+    shell_config.write.assert_any_call('eval $(thefuck --alias)')
+    logs.configured_successfully.assert_called_once()

tests/functional/plots.py

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

tests/functional/test_bash.py

@@ -0,0 +1,68 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_confirmation, \
+    refuse_with_confirmation, history_changed, history_not_changed, \
+    select_command_with_arrows, how_to_configure
+
+
+python_3 = (u'thefuck/python3-bash',
+            u'FROM python:3',
+            u'sh')
+
+python_2 = (u'thefuck/python2-bash',
+            u'FROM python:2',
+            u'sh')
+
+
+init_bashrc = u'''echo '
+export SHELL=/bin/bash
+export PS1="$ "
+echo > $HISTFILE
+eval $(thefuck --alias {})
+echo "instant mode ready: $THEFUCK_INSTANT_MODE"
+' > ~/.bashrc'''
+
+
+@pytest.fixture(params=[(python_3, False),
+                        (python_3, True),
+                        (python_2, False)])
+def proc(request, spawnu, TIMEOUT):
+    container, instant_mode = request.param
+    proc = spawnu(*container)
+    proc.sendline(u"pip install /src")
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
+    proc.sendline(init_bashrc.format(
+        u'--enable-experimental-instant-mode' if instant_mode else ''))
+    proc.sendline(u"bash")
+    if instant_mode:
+        assert proc.expect([TIMEOUT, u'instant mode ready: True'])
+    return proc
+
+
+@pytest.mark.functional
+def test_with_confirmation(proc, TIMEOUT):
+    with_confirmation(proc, TIMEOUT)
+    history_changed(proc, TIMEOUT, u'echo test')
+
+
+@pytest.mark.functional
+def test_select_command_with_arrows(proc, TIMEOUT):
+    select_command_with_arrows(proc, TIMEOUT)
+    history_changed(proc, TIMEOUT, u'git help')
+
+
+@pytest.mark.functional
+def test_refuse_with_confirmation(proc, TIMEOUT):
+    refuse_with_confirmation(proc, TIMEOUT)
+    history_not_changed(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_without_confirmation(proc, TIMEOUT):
+    without_confirmation(proc, TIMEOUT)
+    history_changed(proc, TIMEOUT, u'echo test')
+
+
+@pytest.mark.functional
+def test_how_to_configure_alias(proc, TIMEOUT):
+    proc.sendline('unset -f fuck')
+    how_to_configure(proc, TIMEOUT)

tests/functional/test_fish.py

@@ -0,0 +1,52 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_confirmation, \
+    refuse_with_confirmation, select_command_with_arrows
+
+containers = (('thefuck/python3-fish',
+               u'''FROM python:3
+                   # Use jessie-backports since it has the fish package. See here for details:
+                   # https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile
+                   RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
+                   RUN apt-get update
+                   RUN apt-get install -yy fish''',
+               u'fish'),
+              ('thefuck/python2-fish',
+               u'''FROM python:2
+                   # Use jessie-backports since it has the fish package. See here for details:
+                   # https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile
+                   RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
+                   RUN apt-get update
+                   RUN apt-get install -yy fish''',
+               u'fish'))
+
+
+@pytest.fixture(params=containers)
+def proc(request, spawnu, TIMEOUT):
+    proc = spawnu(*request.param)
+    proc.sendline(u"pip install /src")
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
+    proc.sendline(u'thefuck --alias > ~/.config/fish/config.fish')
+    proc.sendline(u'fish')
+    return proc
+
+
+@pytest.mark.functional
+def test_with_confirmation(proc, TIMEOUT):
+    with_confirmation(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_select_command_with_arrows(proc, TIMEOUT):
+    select_command_with_arrows(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_refuse_with_confirmation(proc, TIMEOUT):
+    refuse_with_confirmation(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_without_confirmation(proc, TIMEOUT):
+    without_confirmation(proc, TIMEOUT)
+
+# TODO: ensure that history changes.

tests/functional/test_performance.py

@@ -0,0 +1,45 @@
+import pytest
+import time
+
+dockerfile = u'''
+FROM python:3
+RUN adduser --disabled-password --gecos '' test
+ENV SEED "{seed}"
+WORKDIR /src
+USER test
+RUN echo 'eval $(thefuck --alias)' > /home/test/.bashrc
+RUN echo > /home/test/.bash_history
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+USER root
+'''.format(seed=time.time())
+
+
+def plot(proc, TIMEOUT):
+    proc.sendline(u'cd /home/test/')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'No fucks given'])
+    proc.sendline(u'git init')
+    proc.sendline(u'git add .')
+    proc.sendline(u'git commit -a -m init')
+    proc.sendline(u'git brnch')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'git branch'])
+    proc.send('\n')
+    assert proc.expect([TIMEOUT, u'master'])
+    proc.sendline(u'echo test')
+    proc.sendline(u'echo tst')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'echo test'])
+    proc.send('\n')
+    assert proc.expect([TIMEOUT, u'test'])
+
+
+@pytest.mark.functional
+@pytest.mark.benchmark(min_rounds=10)
+def test_performance(spawnu, TIMEOUT, benchmark):
+    proc = spawnu(u'thefuck/python3-bash-performance',
+                  dockerfile, u'bash')
+    proc.sendline(u'pip install /src')
+    proc.sendline(u'su test')
+    assert benchmark(plot, proc, TIMEOUT) is None

tests/functional/test_tcsh.py

@@ -0,0 +1,47 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_confirmation, \
+    refuse_with_confirmation, select_command_with_arrows
+
+containers = (('thefuck/python3-tcsh',
+               u'''FROM python:3
+                   RUN apt-get update
+                   RUN apt-get install -yy tcsh''',
+               u'tcsh'),
+              ('thefuck/python2-tcsh',
+               u'''FROM python:2
+                   RUN apt-get update
+                   RUN apt-get install -yy tcsh''',
+               u'tcsh'))
+
+
+@pytest.fixture(params=containers)
+def proc(request, spawnu, TIMEOUT):
+    proc = spawnu(*request.param)
+    proc.sendline(u'pip install /src')
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
+    proc.sendline(u'tcsh')
+    proc.sendline(u'setenv PYTHONIOENCODING utf8')
+    proc.sendline(u'eval `thefuck --alias`')
+    return proc
+
+
+@pytest.mark.functional
+def test_with_confirmation(proc, TIMEOUT):
+    with_confirmation(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_select_command_with_arrows(proc, TIMEOUT):
+    select_command_with_arrows(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_refuse_with_confirmation(proc, TIMEOUT):
+    refuse_with_confirmation(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_without_confirmation(proc, TIMEOUT):
+    without_confirmation(proc, TIMEOUT)
+
+# TODO: ensure that history changes.

tests/functional/test_zsh.py

@@ -0,0 +1,75 @@
+import pytest
+from tests.functional.plots import with_confirmation, without_confirmation, \
+    refuse_with_confirmation, history_changed, history_not_changed, \
+    select_command_with_arrows, how_to_configure
+
+
+python_3 = ('thefuck/python3-zsh',
+            u'''FROM python:3
+                RUN apt-get update
+                RUN apt-get install -yy zsh''',
+            u'sh')
+
+python_2 = ('thefuck/python2-zsh',
+            u'''FROM python:2
+                RUN apt-get update
+                RUN apt-get install -yy zsh''',
+            u'sh')
+
+
+init_zshrc = u'''echo '
+export SHELL=/usr/bin/zsh
+export HISTFILE=~/.zsh_history
+echo > $HISTFILE
+export SAVEHIST=100
+export HISTSIZE=100
+eval $(thefuck --alias {})
+setopt INC_APPEND_HISTORY
+echo "instant mode ready: $THEFUCK_INSTANT_MODE"
+' > ~/.zshrc'''
+
+
+@pytest.fixture(params=[(python_3, False),
+                        (python_3, True),
+                        (python_2, False)])
+def proc(request, spawnu, TIMEOUT):
+    container, instant_mode = request.param
+    proc = spawnu(*container)
+    proc.sendline(u'pip install /src')
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
+    proc.sendline(init_zshrc.format(
+        u'--enable-experimental-instant-mode' if instant_mode else ''))
+    proc.sendline(u"zsh")
+    if instant_mode:
+        assert proc.expect([TIMEOUT, u'instant mode ready: True'])
+    return proc
+
+
+@pytest.mark.functional
+def test_with_confirmation(proc, TIMEOUT):
+    with_confirmation(proc, TIMEOUT)
+    history_changed(proc, TIMEOUT, u'echo test')
+
+
+@pytest.mark.functional
+def test_select_command_with_arrows(proc, TIMEOUT):
+    select_command_with_arrows(proc, TIMEOUT)
+    history_changed(proc, TIMEOUT, u'git help')
+
+
+@pytest.mark.functional
+def test_refuse_with_confirmation(proc, TIMEOUT):
+    refuse_with_confirmation(proc, TIMEOUT)
+    history_not_changed(proc, TIMEOUT)
+
+
+@pytest.mark.functional
+def test_without_confirmation(proc, TIMEOUT):
+    without_confirmation(proc, TIMEOUT)
+    history_changed(proc, TIMEOUT, u'echo test')
+
+
+@pytest.mark.functional
+def test_how_to_configure_alias(proc, TIMEOUT):
+    proc.sendline(u'unfunction fuck')
+    how_to_configure(proc, TIMEOUT)

tests/rules/conftest.py

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

tests/rules/test_ag_literal.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.ag_literal import get_new_command, match
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return ('ERR: Bad regex! pcre_compile() failed at position 1: missing )\n'
+            'If you meant to search for a literal string, run ag with -Q\n')
+
+
+@pytest.mark.parametrize('script', ['ag \('])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['ag foo'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, new_cmd', [
+    ('ag \(', 'ag -Q \(')])
+def test_get_new_command(script, new_cmd, output):
+    assert get_new_command((Command(script, output))) == new_cmd

tests/rules/test_apt_get.py

@@ -1,59 +1,55 @@
 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
+from thefuck.types 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',
+@pytest.mark.parametrize('command, packages', [
+    (Command('vim', 'vim: command not found'),
      [('vim', 'main'), ('vim-tiny', 'main')]),
-    (Command('convert'), 'sudo apt-get install imagemagick && convert',
+    (Command('sudo vim', 'vim: command not found'),
+     [('vim', 'main'), ('vim-tiny', 'main')]),
+    (Command('vim', "The program 'vim' is currently not installed. You can install it by typing: sudo apt install vim"),
+     [('vim', 'main'), ('vim-tiny', 'main')])])
+def test_match(mocker, command, packages):
+    mocker.patch('thefuck.rules.apt_get.which', return_value=None)
+    mock = mocker.patch('thefuck.rules.apt_get.command_not_found',
+                        create=True)
+    mock.getPackages.return_value = packages
+
+    assert match(command)
+
+
+@pytest.mark.parametrize('command, packages, which', [
+    (Command('a_bad_cmd', 'a_bad_cmd: command not found'),
+     [], None),
+    (Command('vim', ''), [], None),
+    (Command('', ''), [], None),
+    (Command('vim', 'vim: command not found'),
+     ['vim'], '/usr/bin/vim'),
+    (Command('sudo vim', 'vim: command not found'),
+     ['vim'], '/usr/bin/vim')])
+def test_not_match(mocker, command, packages, which):
+    mocker.patch('thefuck.rules.apt_get.which', return_value=which)
+    mock = mocker.patch('thefuck.rules.apt_get.command_not_found',
+                        create=True)
+    mock.getPackages.return_value = packages
+
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, new_command, packages', [
+    (Command('vim', ''), 'sudo apt-get install vim && vim',
+     [('vim', 'main'), ('vim-tiny', 'main')]),
+    (Command('convert', ''), 'sudo apt-get install imagemagick && convert',
+     [('imagemagick', 'main'),
+      ('graphicsmagick-imagemagick-compat', 'universe')]),
+    (Command('sudo vim', ''), 'sudo apt-get install vim && sudo vim',
+     [('vim', 'main'), ('vim-tiny', 'main')]),
+    (Command('sudo convert', ''), 'sudo apt-get install imagemagick && sudo convert',
      [('imagemagick', 'main'),
       ('graphicsmagick-imagemagick-compat', 'universe')])])
-@patch('thefuck.rules.apt_get.CommandNotFound', create=True)
-@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
+def test_get_new_command(mocker, command, new_command, packages):
+    mock = mocker.patch('thefuck.rules.apt_get.command_not_found',
+                        create=True)
+    mock.getPackages.return_value = packages
+    assert get_new_command(command) == new_command

tests/rules/test_apt_get_search.py

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

tests/rules/test_apt_invalid_operation.py

@@ -0,0 +1,122 @@
+from io import BytesIO
+import pytest
+from thefuck.types import Command
+from thefuck.rules.apt_invalid_operation import match, get_new_command, \
+    _get_operations
+
+invalid_operation = 'E: Invalid operation {}'.format
+apt_help = b'''apt 1.0.10.2ubuntu1 for amd64 compiled on Oct  5 2015 15:55:05
+Usage: apt [options] command
+
+CLI for apt.
+Basic commands:
+ list - list packages based on package names
+ search - search in package descriptions
+ show - show package details
+
+ update - update list of available packages
+
+ install - install packages
+ remove  - remove packages
+
+ upgrade - upgrade the system by installing/upgrading packages
+ full-upgrade - upgrade the system by removing/installing/upgrading packages
+
+ edit-sources - edit the source information file
+'''
+apt_operations = ['list', 'search', 'show', 'update', 'install', 'remove',
+                  'upgrade', 'full-upgrade', 'edit-sources']
+
+apt_get_help = b'''apt 1.0.10.2ubuntu1 for amd64 compiled on Oct  5 2015 15:55:05
+Usage: apt-get [options] command
+       apt-get [options] install|remove pkg1 [pkg2 ...]
+       apt-get [options] source pkg1 [pkg2 ...]
+
+apt-get is a simple command line interface for downloading and
+installing packages. The most frequently used commands are update
+and install.
+
+Commands:
+   update - Retrieve new lists of packages
+   upgrade - Perform an upgrade
+   install - Install new packages (pkg is libc6 not libc6.deb)
+   remove - Remove packages
+   autoremove - Remove automatically all unused packages
+   purge - Remove packages and config files
+   source - Download source archives
+   build-dep - Configure build-dependencies for source packages
+   dist-upgrade - Distribution upgrade, see apt-get(8)
+   dselect-upgrade - Follow dselect selections
+   clean - Erase downloaded archive files
+   autoclean - Erase old downloaded archive files
+   check - Verify that there are no broken dependencies
+   changelog - Download and display the changelog for the given package
+   download - Download the binary package into the current directory
+
+Options:
+  -h  This help text.
+  -q  Loggable output - no progress indicator
+  -qq No output except for errors
+  -d  Download only - do NOT install or unpack archives
+  -s  No-act. Perform ordering simulation
+  -y  Assume Yes to all queries and do not prompt
+  -f  Attempt to correct a system with broken dependencies in place
+  -m  Attempt to continue if archives are unlocatable
+  -u  Show a list of upgraded packages as well
+  -b  Build the source package after fetching it
+  -V  Show verbose version numbers
+  -c=? Read this configuration file
+  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp
+See the apt-get(8), sources.list(5) and apt.conf(5) manual
+pages for more information and options.
+                       This APT has Super Cow Powers.
+'''
+apt_get_operations = ['update', 'upgrade', 'install', 'remove', 'autoremove',
+                      'purge', 'source', 'build-dep', 'dist-upgrade',
+                      'dselect-upgrade', 'clean', 'autoclean', 'check',
+                      'changelog', 'download']
+
+
+@pytest.mark.parametrize('script, output', [
+    ('apt', invalid_operation('saerch')),
+    ('apt-get', invalid_operation('isntall')),
+    ('apt-cache', invalid_operation('rumove'))])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('vim', invalid_operation('vim')),
+    ('apt-get', "")])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.fixture
+def set_help(mocker):
+    mock = mocker.patch('subprocess.Popen')
+
+    def _set_text(text):
+        mock.return_value.stdout = BytesIO(text)
+
+    return _set_text
+
+
+@pytest.mark.parametrize('app, help_text, operations', [
+    ('apt', apt_help, apt_operations),
+    ('apt-get', apt_get_help, apt_get_operations)
+])
+def test_get_operations(set_help, app, help_text, operations):
+    set_help(help_text)
+    assert _get_operations(app) == operations
+
+
+@pytest.mark.parametrize('script, output, help_text, result', [
+    ('apt-get isntall vim', invalid_operation('isntall'),
+     apt_get_help, 'apt-get install vim'),
+    ('apt saerch vim', invalid_operation('saerch'),
+     apt_help, 'apt search vim'),
+])
+def test_get_new_command(set_help, output, script, help_text, result):
+    set_help(help_text)
+    assert get_new_command(Command(script, output))[0] == result

tests/rules/test_apt_list_upgradable.py

@@ -0,0 +1,72 @@
+import pytest
+from thefuck.rules.apt_list_upgradable import get_new_command, match
+from thefuck.types import Command
+
+match_output = '''
+Hit:1 http://us.archive.ubuntu.com/ubuntu zesty InRelease
+Hit:2 http://us.archive.ubuntu.com/ubuntu zesty-updates InRelease
+Get:3 http://us.archive.ubuntu.com/ubuntu zesty-backports InRelease [89.2 kB]
+Hit:4 http://security.ubuntu.com/ubuntu zesty-security InRelease
+Hit:5 http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu zesty InRelease
+Hit:6 https://download.docker.com/linux/ubuntu zesty InRelease
+Hit:7 https://cli-assets.heroku.com/branches/stable/apt ./ InRelease
+Fetched 89.2 kB in 0s (122 kB/s)
+Reading package lists... Done
+Building dependency tree
+Reading state information... Done
+8 packages can be upgraded. Run 'apt list --upgradable' to see them.
+'''
+
+no_match_output = '''
+Hit:1 http://us.archive.ubuntu.com/ubuntu zesty InRelease
+Get:2 http://us.archive.ubuntu.com/ubuntu zesty-updates InRelease [89.2 kB]
+Get:3 http://us.archive.ubuntu.com/ubuntu zesty-backports InRelease [89.2 kB]
+Get:4 http://security.ubuntu.com/ubuntu zesty-security InRelease [89.2 kB]
+Hit:5 https://cli-assets.heroku.com/branches/stable/apt ./ InRelease
+Hit:6 http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu zesty InRelease
+Hit:7 https://download.docker.com/linux/ubuntu zesty InRelease
+Get:8 http://us.archive.ubuntu.com/ubuntu zesty-updates/main i386 Packages [232 kB]
+Get:9 http://us.archive.ubuntu.com/ubuntu zesty-updates/main amd64 Packages [235 kB]
+Get:10 http://us.archive.ubuntu.com/ubuntu zesty-updates/main amd64 DEP-11 Metadata [55.2 kB]
+Get:11 http://us.archive.ubuntu.com/ubuntu zesty-updates/main DEP-11 64x64 Icons [32.3 kB]
+Get:12 http://us.archive.ubuntu.com/ubuntu zesty-updates/universe amd64 Packages [156 kB]
+Get:13 http://us.archive.ubuntu.com/ubuntu zesty-updates/universe i386 Packages [156 kB]
+Get:14 http://us.archive.ubuntu.com/ubuntu zesty-updates/universe amd64 DEP-11 Metadata [175 kB]
+Get:15 http://us.archive.ubuntu.com/ubuntu zesty-updates/universe DEP-11 64x64 Icons [253 kB]
+Get:16 http://us.archive.ubuntu.com/ubuntu zesty-updates/multiverse amd64 DEP-11 Metadata [5,840 B]
+Get:17 http://us.archive.ubuntu.com/ubuntu zesty-backports/universe amd64 DEP-11 Metadata [4,588 B]
+Get:18 http://security.ubuntu.com/ubuntu zesty-security/main amd64 DEP-11 Metadata [12.7 kB]
+Get:19 http://security.ubuntu.com/ubuntu zesty-security/main DEP-11 64x64 Icons [17.6 kB]
+Get:20 http://security.ubuntu.com/ubuntu zesty-security/universe amd64 DEP-11 Metadata [21.6 kB]
+Get:21 http://security.ubuntu.com/ubuntu zesty-security/universe DEP-11 64x64 Icons [47.7 kB]
+Get:22 http://security.ubuntu.com/ubuntu zesty-security/multiverse amd64 DEP-11 Metadata [208 B]
+Fetched 1,673 kB in 0s (1,716 kB/s)
+Reading package lists... Done
+Building dependency tree
+Reading state information... Done
+All packages are up to date.
+'''
+
+
+def test_match():
+    assert match(Command('sudo apt update', match_output))
+
+
+@pytest.mark.parametrize('command', [
+    Command('apt-cache search foo', ''),
+    Command('aptitude search foo', ''),
+    Command('apt search foo', ''),
+    Command('apt-get install foo', ''),
+    Command('apt-get source foo', ''),
+    Command('apt-get clean', ''),
+    Command('apt-get remove', ''),
+    Command('apt-get update', ''),
+    Command('sudo apt update', no_match_output)
+])
+def test_not_match(command):
+    assert not match(command)
+
+
+def test_get_new_command():
+    new_command = get_new_command(Command('sudo apt update', match_output))
+    assert new_command == 'apt list --upgradable'

tests/rules/test_aws_cli.py

@@ -0,0 +1,101 @@
+import pytest
+
+from thefuck.rules.aws_cli import match, get_new_command
+from thefuck.types import Command
+
+
+no_suggestions = '''\
+usage: aws [options] <command> <subcommand> [<subcommand> ...] [parameters]
+To see help text, you can run:
+
+  aws help
+  aws <command> help
+  aws <command> <subcommand> help
+aws: error: argument command: Invalid choice, valid choices are:
+
+dynamodb                                 | dynamodbstreams
+ec2                                      | ecr
+'''
+
+
+misspelled_command = '''\
+usage: aws [options] <command> <subcommand> [<subcommand> ...] [parameters]
+To see help text, you can run:
+
+  aws help
+  aws <command> help
+  aws <command> <subcommand> help
+aws: error: argument command: Invalid choice, valid choices are:
+
+dynamodb                                 | dynamodbstreams
+ec2                                      | ecr
+
+
+Invalid choice: 'dynamdb', maybe you meant:
+
+  * dynamodb
+'''
+
+
+misspelled_subcommand = '''\
+usage: aws [options] <command> <subcommand> [<subcommand> ...] [parameters]
+To see help text, you can run:
+
+  aws help
+  aws <command> help
+  aws <command> <subcommand> help
+aws: error: argument operation: Invalid choice, valid choices are:
+
+query                                    | scan
+update-item                              | update-table
+
+
+Invalid choice: 'scn', maybe you meant:
+
+  * scan
+'''
+
+
+misspelled_subcommand_with_multiple_options = '''\
+usage: aws [options] <command> <subcommand> [<subcommand> ...] [parameters]
+To see help text, you can run:
+
+  aws help
+  aws <command> help
+  aws <command> <subcommand> help
+aws: error: argument operation: Invalid choice, valid choices are:
+
+describe-table                           | get-item
+list-tables                              | put-item
+
+
+Invalid choice: 't-item', maybe you meant:
+
+  * put-item
+  * get-item
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command('aws dynamdb scan', misspelled_command),
+    Command('aws dynamodb scn', misspelled_subcommand),
+    Command('aws dynamodb t-item',
+            misspelled_subcommand_with_multiple_options)])
+def test_match(command):
+    assert match(command)
+
+
+def test_not_match():
+    assert not match(Command('aws dynamodb invalid', no_suggestions))
+
+
+@pytest.mark.parametrize('command, result', [
+    (Command('aws dynamdb scan', misspelled_command),
+     ['aws dynamodb scan']),
+    (Command('aws dynamodb scn', misspelled_subcommand),
+     ['aws dynamodb scan']),
+    (Command('aws dynamodb t-item',
+             misspelled_subcommand_with_multiple_options),
+     ['aws dynamodb put-item', 'aws dynamodb get-item'])])
+def test_get_new_command(command, result):
+    assert get_new_command(command) == result

tests/rules/test_brew_cask_dependency.py

@@ -0,0 +1,35 @@
+import pytest
+from thefuck.rules.brew_cask_dependency import match, get_new_command
+from thefuck.types import Command
+
+
+output = '''sshfs: OsxfuseRequirement unsatisfied!
+
+You can install with Homebrew-Cask:
+  brew cask install osxfuse
+
+You can download from:
+  https://osxfuse.github.io/
+Error: An unsatisfied requirement failed this build.'''
+
+
+def test_match():
+    command = Command('brew install sshfs', output)
+    assert match(command)
+
+
+@pytest.mark.parametrize('script, output', [
+    ('brew link sshfs', output),
+    ('cat output', output),
+    ('brew install sshfs', '')])
+def test_not_match(script, output):
+    command = Command(script, output)
+    assert not match(command)
+
+
+@pytest.mark.parametrize('before, after', [
+    ('brew install sshfs',
+     'brew cask install osxfuse && brew install sshfs')])
+def test_get_new_command(before, after):
+    command = Command(before, output)
+    assert get_new_command(command) == after

tests/rules/test_brew_install.py

@@ -1,7 +1,7 @@
 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
+from thefuck.rules.brew_install import _get_formulas
+from thefuck.types import Command
 
 
 @pytest.fixture
@@ -20,9 +20,7 @@ def brew_already_installed():
 
 
 def _is_not_okay_to_test():
-    if 'elasticsearch' not in brew_formulas:
-        return True
-    return False
+    return 'elasticsearch' not in _get_formulas()
 
 
 @pytest.mark.skipif(_is_not_okay_to_test(),
@@ -30,20 +28,19 @@ def _is_not_okay_to_test():
 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)
+                         brew_no_available_formula))
     assert not match(Command('brew install git',
-                             stderr=brew_already_installed), None)
-    assert not match(Command('brew install', stderr=brew_install_no_argument),
-                     None)
+                             brew_already_installed))
+    assert not match(Command('brew install', brew_install_no_argument))
 
 
 @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_no_available_formula))\
         == 'brew install elasticsearch'
 
     assert get_new_command(Command('brew install aa',
-                                   stderr=brew_no_available_formula),
-                           None) != 'brew install aha'
+                                   brew_no_available_formula))\
+        != 'brew install aha'

tests/rules/test_brew_link.py

@@ -0,0 +1,37 @@
+import pytest
+from thefuck.types import Command
+from thefuck.rules.brew_link import get_new_command, match
+
+
+@pytest.fixture
+def output():
+    return ("Error: Could not symlink bin/gcp\n"
+            "Target /usr/local/bin/gcp\n"
+            "already exists. You may want to remove it:\n"
+            "  rm '/usr/local/bin/gcp'\n"
+            "\n"
+            "To force the link and overwrite all conflicting files:\n"
+            "  brew link --overwrite coreutils\n"
+            "\n"
+            "To list all files that would be deleted:\n"
+            "  brew link --overwrite --dry-run coreutils\n")
+
+
+@pytest.fixture
+def new_command(formula):
+    return 'brew link --overwrite --dry-run {}'.format(formula)
+
+
+@pytest.mark.parametrize('script', ['brew link coreutils', 'brew ln coreutils'])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['brew link coreutils'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, formula, ', [('brew link coreutils', 'coreutils')])
+def test_get_new_command(output, new_command, script, formula):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_brew_uninstall.py

@@ -0,0 +1,31 @@
+import pytest
+from thefuck.types import Command
+from thefuck.rules.brew_uninstall import get_new_command, match
+
+
+@pytest.fixture
+def output():
+    return ("Uninstalling /usr/local/Cellar/tbb/4.4-20160916... (118 files, 1.9M)\n"
+            "tbb 4.4-20160526, 4.4-20160722 are still installed.\n"
+            "Remove all versions with `brew uninstall --force tbb`.\n")
+
+
+@pytest.fixture
+def new_command(formula):
+    return 'brew uninstall --force {}'.format(formula)
+
+
+@pytest.mark.parametrize('script', ['brew uninstall tbb', 'brew rm tbb', 'brew remove tbb'])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['brew remove gnuplot'])
+def test_not_match(script):
+    output = 'Uninstalling /usr/local/Cellar/gnuplot/5.0.4_1... (44 files, 2.3M)\n'
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, formula, ', [('brew uninstall tbb', 'tbb')])
+def test_get_new_command(output, new_command, script, formula):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_brew_unknown_command.py

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

tests/rules/test_brew_update_formula.py

@@ -0,0 +1,28 @@
+import pytest
+from thefuck.types import Command
+from thefuck.rules.brew_update_formula import get_new_command, match
+
+
+output = ("Error: This command updates brew itself, and does not take formula"
+          " names.\nUse 'brew upgrade thefuck'.")
+
+
+def test_match():
+    command = Command('brew update thefuck', output)
+    assert match(command)
+
+
+@pytest.mark.parametrize('script', [
+    'brew upgrade foo',
+    'brew update'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, formula, ', [
+    ('brew update foo', 'foo'),
+    ('brew update bar zap', 'bar zap')])
+def test_get_new_command(script, formula):
+    command = Command(script, output)
+    new_command = 'brew upgrade {}'.format(formula)
+    assert get_new_command(command) == new_command

tests/rules/test_brew_upgrade.py

@@ -1,15 +0,0 @@
-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

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

tests/rules/test_cd_mkdir.py

@@ -1,25 +1,25 @@
 import pytest
 from thefuck.rules.cd_mkdir import match, get_new_command
-from tests.utils import Command
+from thefuck.types 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')])
+    Command('cd foo', 'cd: foo: No such file or directory'),
+    Command('cd foo/bar/baz',
+            'cd: foo: No such file or directory'),
+    Command('cd foo/bar/baz', 'cd: can\'t cd to foo/bar/baz')])
 def test_match(command):
-    assert match(command, None)
+    assert match(command)
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='cd foo', stderr=''), Command()])
+    Command('cd foo', ''), Command('', '')])
 def test_not_match(command):
-    assert not match(command, None)
+    assert not match(command)
 
 
 @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')])
+    (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
+    assert get_new_command(command) == new_command

tests/rules/test_cd_parent.py

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

tests/rules/test_chmod_x.py

@@ -0,0 +1,39 @@
+import pytest
+from thefuck.types import Command
+from thefuck.rules.chmod_x import match, get_new_command
+
+
+@pytest.fixture
+def file_exists(mocker):
+    return mocker.patch('os.path.exists', return_value=True)
+
+
+@pytest.fixture
+def file_access(mocker):
+    return mocker.patch('os.access', return_value=False)
+
+
+@pytest.mark.usefixtures('file_exists', 'file_access')
+@pytest.mark.parametrize('script, output', [
+    ('./gradlew build', 'gradlew: Permission denied'),
+    ('./install.sh --help', 'install.sh: permission denied')])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output, exists, callable', [
+    ('./gradlew build', 'gradlew: Permission denied', True, True),
+    ('./gradlew build', 'gradlew: Permission denied', False, False),
+    ('./gradlew build', 'gradlew: error', True, False),
+    ('gradlew build', 'gradlew: Permission denied', True, False)])
+def test_not_match(file_exists, file_access, script, output, exists, callable):
+    file_exists.return_value = exists
+    file_access.return_value = callable
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, result', [
+    ('./gradlew build', 'chmod +x gradlew && ./gradlew build'),
+    ('./install.sh --help', 'chmod +x install.sh && ./install.sh --help')])
+def test_get_new_command(script, result):
+    assert get_new_command(Command(script, '')) == result

tests/rules/test_composer_not_command.py

@@ -1,53 +1,56 @@
 import pytest
 from thefuck.rules.composer_not_command import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
 def composer_not_command():
-    return """
-
-                                    
-  [InvalidArgumentException]        
-  Command "udpate" is not defined.  
-  Did you mean this?                
-      update
-
-
-"""
+    # that weird spacing is part of the actual command output
+    return (
+        '\n'
+        '\n'
+        '                                    \n'
+        '  [InvalidArgumentException]        \n'
+        '  Command "udpate" is not defined.  \n'
+        '  Did you mean this?                \n'
+        '      update                        \n'
+        '                                    \n'
+        '\n'
+        '\n'
+    )
 
 
 @pytest.fixture
 def composer_not_command_one_of_this():
-    return """
-                            
-
-
-  [InvalidArgumentException]       
-  Command "pdate" is not defined.  
-  Did you mean one of these?       
-      selfupdate                   
-      self-update                  
-      update                       
-
-
-
-"""
+    # that weird spacing is part of the actual command output
+    return (
+        '\n'
+        '\n'
+        '                                   \n'
+        '  [InvalidArgumentException]       \n'
+        '  Command "pdate" is not defined.  \n'
+        '  Did you mean one of these?       \n'
+        '      selfupdate                   \n'
+        '      self-update                  \n'
+        '      update                       \n'
+        '                                   \n'
+        '\n'
+        '\n'
+    )
 
 
 def test_match(composer_not_command, composer_not_command_one_of_this):
     assert match(Command('composer udpate',
-                         stderr=composer_not_command), None)
+                         composer_not_command))
     assert match(Command('composer pdate',
-                         stderr=composer_not_command_one_of_this), None)
-    assert not match(Command('ls update', stderr=composer_not_command),
-                     None)
+                         composer_not_command_one_of_this))
+    assert not match(Command('ls update', composer_not_command))
 
 
 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'
+    assert (get_new_command(Command('composer udpate',
+                                    composer_not_command))
+            == 'composer update')
+    assert (get_new_command(Command('composer pdate',
+                                    composer_not_command_one_of_this))
+            == '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 thefuck.types import Command
 
 
-def test_match():
-    assert match(Mock(script='cp dir', stderr="cp: omitting directory 'dir'"),
-                 None)
-    assert not match(Mock(script='some dir',
-                          stderr="cp: omitting directory 'dir'"), None)
-    assert not match(Mock(script='cp dir', stderr=""), None)
+@pytest.mark.parametrize('script, output', [
+    ('cp dir', 'cp: dor: is a directory'),
+    ('cp dir', "cp: omitting directory 'dir'")])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('some dir', 'cp: dor: is a directory'),
+    ('some dir', "cp: omitting directory 'dir'"),
+    ('cp dir', '')])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
 def test_get_new_command():
-    assert get_new_command(Mock(script='cp dir'), None) == 'cp -a dir'
+    assert get_new_command(Command('cp dir', '')) == 'cp -a dir'

tests/rules/test_dirty_untar.py

@@ -0,0 +1,73 @@
+import os
+import pytest
+import tarfile
+from thefuck.rules.dirty_untar import match, get_new_command, side_effect, \
+                                      tar_extensions  # noqa: E126
+from thefuck.types import Command
+
+
+@pytest.fixture
+def tar_error(tmpdir):
+    def fixture(filename):
+        path = os.path.join(str(tmpdir), filename)
+
+        def reset(path):
+            os.mkdir('d')
+            with tarfile.TarFile(path, 'w') as archive:
+                for file in ('a', 'b', 'c', 'd/e'):
+                    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', 'd'}
+        assert set(os.listdir('./d')) == {'e'}
+
+    return fixture
+
+
+parametrize_extensions = pytest.mark.parametrize('ext', tar_extensions)
+
+# (filename as typed by the user, unquoted filename, quoted filename as per shells.quote)
+parametrize_filename = pytest.mark.parametrize('filename, unquoted, quoted', [
+    ('foo{}', 'foo{}', 'foo{}'),
+    ('"foo bar{}"', 'foo bar{}', "'foo bar{}'")])
+
+parametrize_script = pytest.mark.parametrize('script, fixed', [
+    ('tar xvf {}', 'mkdir -p {dir} && tar xvf {filename} -C {dir}'),
+    ('tar -xvf {}', 'mkdir -p {dir} && tar -xvf {filename} -C {dir}'),
+    ('tar --extract -f {}', 'mkdir -p {dir} && tar --extract -f {filename} -C {dir}')])
+
+
+@parametrize_extensions
+@parametrize_filename
+@parametrize_script
+def test_match(ext, tar_error, filename, unquoted, quoted, script, fixed):
+    tar_error(unquoted.format(ext))
+    assert match(Command(script.format(filename.format(ext)), ''))
+
+
+@parametrize_extensions
+@parametrize_filename
+@parametrize_script
+def test_side_effect(ext, tar_error, filename, unquoted, quoted, script, fixed):
+    tar_error(unquoted.format(ext))
+    side_effect(Command(script.format(filename.format(ext)), ''), None)
+    assert set(os.listdir('.')) == {unquoted.format(ext), 'd'}
+
+
+@parametrize_extensions
+@parametrize_filename
+@parametrize_script
+def test_get_new_command(ext, tar_error, filename, unquoted, quoted, script, fixed):
+    tar_error(unquoted.format(ext))
+    assert (get_new_command(Command(script.format(filename.format(ext)), ''))
+            == fixed.format(dir=quoted.format(''), filename=filename.format(ext)))

tests/rules/test_dirty_unzip.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+import os
+import pytest
+import zipfile
+from thefuck.rules.dirty_unzip import match, get_new_command, side_effect
+from thefuck.types import Command
+from unicodedata import normalize
+
+
+@pytest.fixture
+def zip_error(tmpdir):
+    def zip_error_inner(filename):
+        path = os.path.join(str(tmpdir), filename)
+
+        def reset(path):
+            with zipfile.ZipFile(path, 'w') as archive:
+                archive.writestr('a', '1')
+                archive.writestr('b', '2')
+                archive.writestr('c', '3')
+
+                archive.writestr('d/e', '4')
+
+                archive.extractall()
+
+        os.chdir(str(tmpdir))
+        reset(path)
+
+        dir_list = os.listdir(u'.')
+        if filename not in dir_list:
+            filename = normalize('NFD', filename)
+
+        assert set(dir_list) == {filename, 'a', 'b', 'c', 'd'}
+        assert set(os.listdir('./d')) == {'e'}
+    return zip_error_inner
+
+
+@pytest.mark.parametrize('script,filename', [
+    (u'unzip café', u'café.zip'),
+    (u'unzip café.zip', u'café.zip'),
+    (u'unzip foo', u'foo.zip'),
+    (u'unzip foo.zip', u'foo.zip')])
+def test_match(zip_error, script, filename):
+    zip_error(filename)
+    assert match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script,filename', [
+    (u'unzip café', u'café.zip'),
+    (u'unzip café.zip', u'café.zip'),
+    (u'unzip foo', u'foo.zip'),
+    (u'unzip foo.zip', u'foo.zip')])
+def test_side_effect(zip_error, script, filename):
+    zip_error(filename)
+    side_effect(Command(script, ''), None)
+
+    dir_list = os.listdir(u'.')
+    if filename not in set(dir_list):
+        filename = normalize('NFD', filename)
+
+    assert set(dir_list) == {filename, 'd'}
+
+
+@pytest.mark.parametrize('script,fixed,filename', [
+    (u'unzip café', u"unzip café -d 'café'", u'café.zip'),
+    (u'unzip foo', u'unzip foo -d foo', u'foo.zip'),
+    (u"unzip 'foo bar.zip'", u"unzip 'foo bar.zip' -d 'foo bar'", u'foo.zip'),
+    (u'unzip foo.zip', u'unzip foo.zip -d foo', u'foo.zip')])
+def test_get_new_command(zip_error, script, fixed, filename):
+    zip_error(filename)
+    assert get_new_command(Command(script, '')) == fixed

tests/rules/test_django_south_ghost.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.django_south_ghost import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return '''Traceback (most recent call last):
   File "/home/nvbn/work/.../bin/python", line 42, in <module>
     exec(compile(__file__f.read(), __file__, "exec"))
@@ -37,17 +37,17 @@ south.exceptions.GhostMigrations:
  ! 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).
-'''
+'''  # noqa
 
 
-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_match(output):
+    assert match(Command('./manage.py migrate', output))
+    assert match(Command('python manage.py migrate', output))
+    assert not match(Command('./manage.py migrate', ''))
+    assert not match(Command('app migrate', output))
+    assert not match(Command('./manage.py test', output))
 
 
 def test_get_new_command():
-    assert get_new_command(Command('./manage.py migrate auth'), None)\
+    assert get_new_command(Command('./manage.py migrate auth', ''))\
         == './manage.py migrate auth --delete-ghost-migrations'

tests/rules/test_django_south_merge.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.django_south_merge import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     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):
@@ -30,14 +30,14 @@ The following options are available:
 '''
 
 
-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_match(output):
+    assert match(Command('./manage.py migrate', output))
+    assert match(Command('python manage.py migrate', output))
+    assert not match(Command('./manage.py migrate', ''))
+    assert not match(Command('app migrate', output))
+    assert not match(Command('./manage.py test', output))
 
 
 def test_get_new_command():
-    assert get_new_command(Command('./manage.py migrate auth'), None) \
-           == './manage.py migrate auth --merge'
+    assert (get_new_command(Command('./manage.py migrate auth', ''))
+            == './manage.py migrate auth --merge')

tests/rules/test_dnf_no_such_command.py

@@ -0,0 +1,190 @@
+from io import BytesIO
+import pytest
+from thefuck.types import Command
+from thefuck.rules.dnf_no_such_command import match, get_new_command, _get_operations
+
+
+help_text = b'''usage: dnf [options] COMMAND
+
+List of Main Commands:
+
+autoremove                remove all unneeded packages that were originally installed as dependencies
+check                     check for problems in the packagedb
+check-update              check for available package upgrades
+clean                     remove cached data
+deplist                   List package's dependencies and what packages provide them
+distro-sync               synchronize installed packages to the latest available versions
+downgrade                 Downgrade a package
+group                     display, or use, the groups information
+help                      display a helpful usage message
+history                   display, or use, the transaction history
+info                      display details about a package or group of packages
+install                   install a package or packages on your system
+list                      list a package or groups of packages
+makecache                 generate the metadata cache
+mark                      mark or unmark installed packages as installed by user.
+provides                  find what package provides the given value
+reinstall                 reinstall a package
+remove                    remove a package or packages from your system
+repolist                  display the configured software repositories
+repoquery                 search for packages matching keyword
+repository-packages       run commands on top of all packages in given repository
+search                    search package details for the given string
+shell                     run an interactive DNF shell
+swap                      run an interactive dnf mod for remove and install one spec
+updateinfo                display advisories about packages
+upgrade                   upgrade a package or packages on your system
+upgrade-minimal           upgrade, but only 'newest' package match which fixes a problem that affects your system
+
+List of Plugin Commands:
+
+builddep                  Install build dependencies for package or spec file
+config-manager            manage dnf configuration options and repositories
+copr                      Interact with Copr repositories.
+debug-dump                dump information about installed rpm packages to file
+debug-restore             restore packages recorded in debug-dump file
+debuginfo-install         install debuginfo packages
+download                  Download package to current directory
+needs-restarting          determine updated binaries that need restarting
+playground                Interact with Playground repository.
+repoclosure               Display a list of unresolved dependencies for repositories
+repograph                 Output a full package dependency graph in dot format
+repomanage                Manage a directory of rpm packages
+reposync                  download all packages from remote repo
+
+Optional arguments:
+  -c [config file], --config [config file]
+                        config file location
+  -q, --quiet           quiet operation
+  -v, --verbose         verbose operation
+  --version             show DNF version and exit
+  --installroot [path]  set install root
+  --nodocs              do not install documentations
+  --noplugins           disable all plugins
+  --enableplugin [plugin]
+                        enable plugins by name
+  --disableplugin [plugin]
+                        disable plugins by name
+  --releasever RELEASEVER
+                        override the value of $releasever in config and repo
+                        files
+  --setopt SETOPTS      set arbitrary config and repo options
+  --skip-broken         resolve depsolve problems by skipping packages
+  -h, --help, --help-cmd
+                        show command help
+  --allowerasing        allow erasing of installed packages to resolve
+                        dependencies
+  -b, --best            try the best available package versions in
+                        transactions.
+  -C, --cacheonly       run entirely from system cache, don't update cache
+  -R [minutes], --randomwait [minutes]
+                        maximum command wait time
+  -d [debug level], --debuglevel [debug level]
+                        debugging output level
+  --debugsolver         dumps detailed solving results into files
+  --showduplicates      show duplicates, in repos, in list/search commands
+  -e ERRORLEVEL, --errorlevel ERRORLEVEL
+                        error output level
+  --obsoletes           enables dnf's obsoletes processing logic for upgrade
+                        or display capabilities that the package obsoletes for
+                        info, list and repoquery
+  --rpmverbosity [debug level name]
+                        debugging output level for rpm
+  -y, --assumeyes       automatically answer yes for all questions
+  --assumeno            automatically answer no for all questions
+  --enablerepo [repo]
+  --disablerepo [repo]
+  --repo [repo], --repoid [repo]
+                        enable just specific repositories by an id or a glob,
+                        can be specified multiple times
+  -x [package], --exclude [package], --excludepkgs [package]
+                        exclude packages by name or glob
+  --disableexcludes [repo], --disableexcludepkgs [repo]
+                        disable excludepkgs
+  --repofrompath [repo,path]
+                        label and path to additional repository, can be
+                        specified multiple times.
+  --noautoremove        disable removal of dependencies that are no longer
+                        used
+  --nogpgcheck          disable gpg signature checking
+  --color COLOR         control whether colour is used
+  --refresh             set metadata as expired before running the command
+  -4                    resolve to IPv4 addresses only
+  -6                    resolve to IPv6 addresses only
+  --destdir DESTDIR, --downloaddir DESTDIR
+                        set directory to copy packages to
+  --downloadonly        only download packages
+  --bugfix              Include bugfix relevant packages, in updates
+  --enhancement         Include enhancement relevant packages, in updates
+  --newpackage          Include newpackage relevant packages, in updates
+  --security            Include security relevant packages, in updates
+  --advisory ADVISORY, --advisories ADVISORY
+                        Include packages needed to fix the given advisory, in
+                        updates
+  --bzs BUGZILLA        Include packages needed to fix the given BZ, in
+                        updates
+  --cves CVES           Include packages needed to fix the given CVE, in
+                        updates
+  --sec-severity {Critical,Important,Moderate,Low}, --secseverity {Critical,Important,Moderate,Low}
+                        Include security relevant packages matching the
+                        severity, in updates
+  --forcearch ARCH      Force the use of an architecture
+'''
+
+dnf_operations = ['autoremove', 'check', 'check-update', 'clean', 'deplist',
+                  'distro-sync', 'downgrade', 'group', 'help', 'history',
+                  'info', 'install', 'list', 'makecache', 'mark', 'provides',
+                  'reinstall', 'remove', 'repolist', 'repoquery',
+                  'repository-packages', 'search', 'shell', 'swap', 'updateinfo',
+                  'upgrade', 'upgrade-minimal', 'builddep', 'config-manager',
+                  'copr', 'debug-dump', 'debug-restore', 'debuginfo-install',
+                  'download', 'needs-restarting', 'playground', 'repoclosure',
+                  'repograph', 'repomanage', 'reposync']
+
+
+def invalid_command(command):
+    return """No such command: %s. Please use /usr/bin/dnf --help
+It could be a DNF plugin command, try: "dnf install 'dnf-command(%s)'"
+""" % (command, command)
+
+
+@pytest.mark.parametrize('output', [
+    (invalid_command('saerch')),
+    (invalid_command('isntall'))
+])
+def test_match(output):
+    assert match(Command('dnf', output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('pip', invalid_command('isntall')),
+    ('vim', "")
+])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.fixture
+def set_help(mocker):
+    mock = mocker.patch('subprocess.Popen')
+
+    def _set_text(text):
+        mock.return_value.stdout = BytesIO(text)
+
+    return _set_text
+
+
+def test_get_operations(set_help):
+    set_help(help_text)
+    assert _get_operations() == dnf_operations
+
+
+@pytest.mark.parametrize('script, output, result', [
+    ('dnf isntall vim', invalid_command('isntall'),
+     'dnf install vim'),
+    ('dnf saerch vim', invalid_command('saerch'),
+     'dnf search vim'),
+])
+def test_get_new_command(set_help, output, script, result):
+    set_help(help_text)
+    assert result in get_new_command(Command(script, output))

tests/rules/test_docker_not_command.py

@@ -0,0 +1,129 @@
+import pytest
+from io import BytesIO
+from thefuck.types 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 output(cmd):
+    return "docker: '{}' is not a docker command.\n" \
+           "See 'docker --help'.".format(cmd)
+
+
+def test_match():
+    assert match(Command('docker pes', output('pes')))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('docker ps', ''),
+    ('cat pes', output('pes'))])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.usefixtures('docker_help')
+@pytest.mark.parametrize('wrong, fixed', [
+    ('pes', ['ps', 'push', 'pause']),
+    ('tags', ['tag', 'stats', 'images'])])
+def test_get_new_command(wrong, fixed):
+    command = Command('docker {}'.format(wrong), output(wrong))
+    assert get_new_command(command) == ['docker {}'.format(x) for x in fixed]

tests/rules/test_dry.py

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

tests/rules/test_fab_command_not_found.py

@@ -0,0 +1,48 @@
+import pytest
+from thefuck.rules.fab_command_not_found import match, get_new_command
+from thefuck.types import Command
+
+output = '''
+Warning: Command(s) not found:
+    extenson
+    deloyp
+
+Available commands:
+
+    update_config
+    prepare_extension
+    Template               A string class for supporting $-substitutions.
+    deploy
+    glob                   Return a list of paths matching a pathname pattern.
+    install_web
+    set_version
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command('fab extenson', output),
+    Command('fab deloyp', output),
+    Command('fab extenson deloyp', output)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('gulp extenson', output),
+    Command('fab deloyp', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('script, result', [
+    ('fab extenson', 'fab prepare_extension'),
+    ('fab extenson:version=2016',
+     'fab prepare_extension:version=2016'),
+    ('fab extenson:version=2016 install_web set_version:val=0.5.0',
+     'fab prepare_extension:version=2016 install_web set_version:val=0.5.0'),
+    ('fab extenson:version=2016 deloyp:beta=true -H the.fuck',
+     'fab prepare_extension:version=2016 deploy:beta=true -H the.fuck'),
+])
+def test_get_new_command(script, result):
+    command = Command(script, output)
+    assert get_new_command(command) == result

tests/rules/test_fix_alt_space.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 from thefuck.rules.fix_alt_space import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 def test_match():
@@ -11,12 +11,12 @@ def test_match():
 
     """
     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)
+                         u'-bash:  grep: command not found'))
+    assert not match(Command('ps -ef | grep foo', ''))
+    assert not match(Command('', ''))
 
 
 def test_get_new_command():
     """ Replace the Alt+Space character by a simple space """
-    assert get_new_command(Command(u'ps -ef | grep foo'), None)\
-           == 'ps -ef | grep foo'
+    assert (get_new_command(Command(u'ps -ef | grep foo', ''))
+            == 'ps -ef | grep foo')

tests/rules/test_fix_file.py

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

tests/rules/test_gem_unknown_command.py

@@ -0,0 +1,82 @@
+import pytest
+from six import BytesIO
+from thefuck.rules.gem_unknown_command import match, get_new_command
+from thefuck.types import Command
+
+output = '''
+ERROR:  While executing gem ... (Gem::CommandLineError)
+    Unknown command {}
+'''
+
+gem_help_commands_stdout = b'''
+GEM commands are:
+
+    build             Build a gem from a gemspec
+    cert              Manage RubyGems certificates and signing settings
+    check             Check a gem repository for added or missing files
+    cleanup           Clean up old versions of installed gems
+    contents          Display the contents of the installed gems
+    dependency        Show the dependencies of an installed gem
+    environment       Display information about the RubyGems environment
+    fetch             Download a gem and place it in the current directory
+    generate_index    Generates the index files for a gem server directory
+    help              Provide help on the 'gem' command
+    install           Install a gem into the local repository
+    list              Display local gems whose name matches REGEXP
+    lock              Generate a lockdown list of gems
+    mirror            Mirror all gem files (requires rubygems-mirror)
+    open              Open gem sources in editor
+    outdated          Display all gems that need updates
+    owner             Manage gem owners of a gem on the push server
+    pristine          Restores installed gems to pristine condition from files
+                      located in the gem cache
+    push              Push a gem up to the gem server
+    query             Query gem information in local or remote repositories
+    rdoc              Generates RDoc for pre-installed gems
+    search            Display remote gems whose name matches REGEXP
+    server            Documentation and gem repository HTTP server
+    sources           Manage the sources and cache file RubyGems uses to search
+                      for gems
+    specification     Display gem specification (in yaml)
+    stale             List gems along with access times
+    uninstall         Uninstall gems from the local repository
+    unpack            Unpack an installed gem to the current directory
+    update            Update installed gems to the latest version
+    which             Find the location of a library file you can require
+    yank              Remove a pushed gem from the index
+
+For help on a particular command, use 'gem help COMMAND'.
+
+Commands may be abbreviated, so long as they are unambiguous.
+e.g. 'gem i rake' is short for 'gem install rake'.
+
+'''
+
+
+@pytest.fixture(autouse=True)
+def gem_help_commands(mocker):
+    patch = mocker.patch('subprocess.Popen')
+    patch.return_value.stdout = BytesIO(gem_help_commands_stdout)
+    return patch
+
+
+@pytest.mark.parametrize('script, command', [
+    ('gem isntall jekyll', 'isntall'),
+    ('gem last --local', 'last')])
+def test_match(script, command):
+    assert match(Command(script, output.format(command)))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('gem install jekyll', ''),
+    ('git log', output.format('log'))])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output, result', [
+    ('gem isntall jekyll', output.format('isntall'), 'gem install jekyll'),
+    ('gem last --local', output.format('last'), 'gem list --local')])
+def test_get_new_command(script, output, result):
+    new_command = get_new_command(Command(script, output))
+    assert new_command[0] == result

tests/rules/test_git_add.py

@@ -1,39 +1,40 @@
 import pytest
 from thefuck.rules.git_add import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
+
+
+@pytest.fixture(autouse=True)
+def path_exists(mocker):
+    return mocker.patch('thefuck.rules.git_add.Path.exists',
+                        return_value=True)
 
 
 @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
+def output(target):
+    return ("error: pathspec '{}' did not match any "
+            'file(s) known to git.'.format(target))
 
 
-@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('script, target', [
+    ('git submodule update unknown', 'unknown'),
+    ('git commit unknown', 'unknown')])
+def test_match(output, script, target):
+    assert match(Command(script, output))
 
 
-@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('script, target, exists', [
+    ('git submodule update known', '', True),
+    ('git commit known', '', True),
+    ('git submodule update known', output, False)])
+def test_not_match(path_exists, output, script, target, exists):
+    path_exists.return_value = exists
+    assert not match(Command(script, output))
 
 
-@pytest.mark.parametrize('command, new_command', [
-    (Command('git submodule update unknown', stderr=did_not_match('unknown')),
+@pytest.mark.parametrize('script, target, new_command', [
+    ('git submodule update unknown', 'unknown',
      'git add -- unknown && git submodule update unknown'),
-    (Command('git commit unknown', stderr=did_not_match('unknown')),  # Old Git
+    ('git commit unknown', 'unknown',
      'git add -- unknown && git commit unknown')])
-def test_get_new_command(command, new_command):
-    assert get_new_command(command, None) == new_command
+def test_get_new_command(output, script, target, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_add_force.py

@@ -0,0 +1,22 @@
+import pytest
+from thefuck.rules.git_add_force import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return ('The following paths are ignored by one of your .gitignore files:\n'
+            'dist/app.js\n'
+            'dist/background.js\n'
+            'dist/options.js\n'
+            'Use -f if you really want to add them.\n')
+
+
+def test_match(output):
+    assert match(Command('git add dist/*.js', output))
+    assert not match(Command('git add dist/*.js', ''))
+
+
+def test_get_new_command(output):
+    assert (get_new_command(Command('git add dist/*.js', output))
+            == "git add --force dist/*.js")

tests/rules/test_git_bisect_usage.py

@@ -0,0 +1,30 @@
+import pytest
+from thefuck.types import Command
+from thefuck.rules.git_bisect_usage import match, get_new_command
+
+
+@pytest.fixture
+def output():
+    return ("usage: git bisect [help|start|bad|good|new|old"
+            "|terms|skip|next|reset|visualize|replay|log|run]")
+
+
+@pytest.mark.parametrize('script', [
+    'git bisect strt', 'git bisect rset', 'git bisect goood'])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', [
+    'git bisect', 'git bisect start', 'git bisect good'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, new_cmd, ', [
+    ('git bisect goood', ['good', 'old', 'log']),
+    ('git bisect strt', ['start', 'terms', 'reset']),
+    ('git bisect rset', ['reset', 'next', 'start'])])
+def test_get_new_command(output, script, new_cmd):
+    new_cmd = ['git bisect %s' % cmd for cmd in new_cmd]
+    assert get_new_command(Command(script, output)) == new_cmd

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 thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    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(output):
+    assert match(Command('git branch -d branch', output))
+    assert not match(Command('git branch -d branch', ''))
+    assert not match(Command('ls', output))
+
+
+def test_get_new_command(output):
+    assert get_new_command(Command('git branch -d branch', output))\
+        == "git branch -D branch"

tests/rules/test_git_branch_exists.py

@@ -0,0 +1,34 @@
+import pytest
+from thefuck.rules.git_branch_exists import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output(branch_name):
+    return "fatal: A branch named '{}' already exists.".format(branch_name)
+
+
+@pytest.fixture
+def new_command(branch_name):
+    return [cmd.format(branch_name) for cmd in [
+        'git branch -d {0} && git branch {0}',
+        'git branch -d {0} && git checkout -b {0}',
+        'git branch -D {0} && git branch {0}',
+        'git branch -D {0} && git checkout -b {0}', 'git checkout {0}']]
+
+
+@pytest.mark.parametrize('script, branch_name', [
+    ('git branch foo', 'foo'), ('git checkout bar', 'bar')])
+def test_match(output, script, branch_name):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['git branch foo', 'git checkout bar'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, branch_name, ', [
+    ('git branch foo', 'foo'), ('git checkout bar', 'bar')])
+def test_get_new_command(output, new_command, script, branch_name):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_branch_list.py

@@ -1,18 +1,19 @@
-from thefuck import shells
 from thefuck.rules.git_branch_list import match, get_new_command
-from tests.utils import Command
+from thefuck.shells import shell
+from thefuck.types import Command
+
 
 def test_match():
-    assert match(Command('git branch list'), None)
+    assert match(Command('git branch list', ''))
 
 
 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)
+    assert not match(Command('', ''))
+    assert not match(Command('git commit', ''))
+    assert not match(Command('git branch', ''))
+    assert not match(Command('git stash list', ''))
 
 
 def test_get_new_command():
-    assert (get_new_command(Command('git branch list'), None) ==
-            shells.and_('git branch --delete list', 'git branch'))
+    assert (get_new_command(Command('git branch list', '')) ==
+            shell.and_('git branch --delete list', 'git branch'))

tests/rules/test_git_checkout.py

@@ -1,6 +1,7 @@
 import pytest
-from thefuck.rules.git_checkout import match, get_new_command
-from tests.utils import Command
+from io import BytesIO
+from thefuck.rules.git_checkout import match, get_branches, get_new_command
+from thefuck.types import Command
 
 
 @pytest.fixture
@@ -12,26 +13,57 @@ def did_not_match(target, did_you_forget=False):
     return error
 
 
+@pytest.fixture
+def git_branch(mocker, branches):
+    mock = mocker.patch('subprocess.Popen')
+    mock.return_value.stdout = BytesIO(branches)
+    return mock
+
+
 @pytest.mark.parametrize('command', [
-    Command(script='git checkout unknown', stderr=did_not_match('unknown')),
-    Command(script='git commit unknown', stderr=did_not_match('unknown'))])
+    Command('git checkout unknown', did_not_match('unknown')),
+    Command('git commit unknown', did_not_match('unknown'))])
 def test_match(command):
-    assert match(command, None)
+    assert match(command)
 
 
 @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=(''))])
+    Command('git submodule update unknown',
+            did_not_match('unknown', True)),
+    Command('git checkout known', ''),
+    Command('git commit known', '')])
 def test_not_match(command):
-    assert not match(command, None)
+    assert not match(command)
 
 
-@pytest.mark.parametrize('command, new_command', [
-    (Command(script='git checkout unknown', stderr=did_not_match('unknown')),
+@pytest.mark.parametrize('branches, branch_list', [
+    (b'', []),
+    (b'* master', ['master']),
+    (b'  remotes/origin/master', ['master']),
+    (b'  just-another-branch', ['just-another-branch']),
+    (b'* master\n  just-another-branch', ['master', 'just-another-branch']),
+    (b'* master\n  remotes/origin/master\n  just-another-branch',
+     ['master', 'master', 'just-another-branch'])])
+def test_get_branches(branches, branch_list, git_branch):
+    git_branch(branches)
+    assert list(get_branches()) == branch_list
+
+
+@pytest.mark.parametrize('branches, command, new_command', [
+    (b'',
+     Command('git checkout unknown', did_not_match('unknown')),
      'git branch unknown && git checkout unknown'),
-    (Command('git commit unknown', stderr=did_not_match('unknown')),
-     'git branch unknown && git commit unknown')])
-def test_get_new_command(command, new_command):
-    assert get_new_command(command, None) == new_command
+    (b'',
+     Command('git commit unknown', did_not_match('unknown')),
+     'git branch unknown && git commit unknown'),
+    (b'  test-random-branch-123',
+     Command('git checkout tst-rdm-brnch-123',
+             did_not_match('tst-rdm-brnch-123')),
+     'git checkout test-random-branch-123'),
+    (b'  test-random-branch-123',
+     Command('git commit tst-rdm-brnch-123',
+             did_not_match('tst-rdm-brnch-123')),
+     'git commit test-random-branch-123')])
+def test_get_new_command(branches, command, new_command, git_branch):
+    git_branch(branches)
+    assert get_new_command(command) == new_command

tests/rules/test_git_diff_no_index.py

@@ -0,0 +1,23 @@
+import pytest
+from thefuck.rules.git_diff_no_index import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command('git diff foo bar', '')])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('git diff --no-index foo bar', ''),
+    Command('git diff foo', ''),
+    Command('git diff foo bar baz', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git diff foo bar', ''), 'git diff --no-index foo bar')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_git_diff_staged.py

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

tests/rules/test_git_fix_stash.py

@@ -0,0 +1,35 @@
+import pytest
+from thefuck.rules.git_fix_stash import match, get_new_command
+from thefuck.types import Command
+
+
+git_stash_err = '''
+usage: git stash list [<options>]
+   or: git stash show [<stash>]
+   or: git stash drop [-q|--quiet] [<stash>]
+   or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
+   or: git stash branch <branchname> [<stash>]
+   or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
+\t\t       [-u|--include-untracked] [-a|--all] [<message>]]
+   or: git stash clear
+'''
+
+
+@pytest.mark.parametrize('wrong', [
+    'git stash opp',
+    'git stash Some message',
+    'git stash saev Some message'])
+def test_match(wrong):
+    assert match(Command(wrong, git_stash_err))
+
+
+def test_not_match():
+    assert not match(Command("git", git_stash_err))
+
+
+@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, git_stash_err)) == fixed

tests/rules/test_git_flag_after_filename.py

@@ -0,0 +1,40 @@
+import pytest
+from thefuck.rules.git_flag_after_filename import match, get_new_command
+from thefuck.types import Command
+
+command1 = Command('git log README.md -p',
+                   "fatal: bad flag '-p' used after filename")
+command2 = Command('git log README.md -p CONTRIBUTING.md',
+                   "fatal: bad flag '-p' used after filename")
+command3 = Command('git log -p README.md --name-only',
+                   "fatal: bad flag '--name-only' used after filename")
+command4 = Command('git log README.md -p',
+                   "fatal: option '-p' must come before non-option arguments")
+command5 = Command('git log README.md -p CONTRIBUTING.md',
+                   "fatal: option '-p' must come before non-option arguments")
+command6 = Command('git log -p README.md --name-only',
+                   "fatal: option '--name-only' must come before non-option arguments")
+
+
+@pytest.mark.parametrize('command', [
+    command1, command2, command3, command4, command5, command6])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('git log README.md', ''),
+    Command('git log -p README.md', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, result', [
+    (command1, "git log -p README.md"),
+    (command2, "git log -p README.md CONTRIBUTING.md"),
+    (command3, "git log -p --name-only README.md"),
+    (command4, "git log -p README.md"),
+    (command5, "git log -p README.md CONTRIBUTING.md"),
+    (command6, "git log -p --name-only README.md")])
+def test_get_new_command(command, result):
+    assert get_new_command(command) == result

tests/rules/test_git_help_aliased.py

@@ -0,0 +1,24 @@
+import pytest
+from thefuck.rules.git_help_aliased import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('script, output', [
+    ('git help st', "`git st' is aliased to `status'"),
+    ('git help ds', "`git ds' is aliased to `diff --staged'")])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('git help status', "GIT-STATUS(1)...Git Manual...GIT-STATUS(1)"),
+    ('git help diff', "GIT-DIFF(1)...Git Manual...GIT-DIFF(1)")])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output, new_command', [
+    ('git help st', "`git st' is aliased to `status'", 'git help status'),
+    ('git help ds', "`git ds' is aliased to `diff --staged'", 'git help diff')])
+def test_get_new_command(script, output, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_not_command.py

@@ -1,13 +1,13 @@
 import pytest
 from thefuck.rules.git_not_command import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
 def git_not_command():
     return """git: 'brnch' is not a git command. See 'git --help'.
 
-Did you mean this?
+The most similar command is
 branch
 """
 
@@ -16,7 +16,7 @@ branch
 def git_not_command_one_of_this():
     return """git: 'st' is not a git command. See 'git --help'.
 
-Did you mean one of these?
+The most similar commands are
 status
 reset
 stage
@@ -25,20 +25,33 @@ stats
 """
 
 
+@pytest.fixture
+def git_not_command_closest():
+    return '''git: 'tags' is not a git command. See 'git --help'.
+
+The most similar commands are
+\tstage
+\ttag
+'''
+
+
 @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', stderr=git_not_command), None)
-    assert match(Command('git st', stderr=git_not_command_one_of_this), None)
-    assert not match(Command('ls brnch', stderr=git_not_command), None)
-    assert not match(Command('git branch', stderr=git_command), None)
+    assert match(Command('git brnch', git_not_command))
+    assert match(Command('git st', git_not_command_one_of_this))
+    assert not match(Command('ls brnch', git_not_command))
+    assert not match(Command('git branch', git_command))
 
 
-def test_get_new_command(git_not_command, git_not_command_one_of_this):
-    assert get_new_command(Command('git brnch', stderr=git_not_command), None)\
-        == 'git branch'
-    assert get_new_command(Command('git st', stderr=git_not_command_one_of_this),
-                           None) == 'git status'
+def test_get_new_command(git_not_command, git_not_command_one_of_this,
+                         git_not_command_closest):
+    assert (get_new_command(Command('git brnch', git_not_command))
+            == ['git branch'])
+    assert (get_new_command(Command('git st', git_not_command_one_of_this))
+            == ['git stats', 'git stash', 'git stage'])
+    assert (get_new_command(Command('git tags', git_not_command_closest))
+            == ['git tag', 'git stage'])

tests/rules/test_git_pull.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_pull import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     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
@@ -18,12 +18,12 @@ If you wish to set tracking information for this branch you can do so with:
 '''
 
 
-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_match(output):
+    assert match(Command('git pull', output))
+    assert not match(Command('git pull', ''))
+    assert not match(Command('ls', output))
 
 
-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"
+def test_get_new_command(output):
+    assert (get_new_command(Command('git pull', output))
+            == "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 thefuck.types 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('git pull git@github.com:mcarton/thefuck.git', git_err)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command('git pull git@github.com:mcarton/thefuck.git', git_err), 'git clone git@github.com:mcarton/thefuck.git')])
+def test_get_new_command(command, output):
+    assert get_new_command(command) == output

tests/rules/test_git_pull_uncommitted_changes.py

@@ -0,0 +1,19 @@
+import pytest
+from thefuck.rules.git_pull_uncommitted_changes import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return '''error: Cannot pull with rebase: You have unstaged changes.'''
+
+
+def test_match(output):
+    assert match(Command('git pull', output))
+    assert not match(Command('git pull', ''))
+    assert not match(Command('ls', output))
+
+
+def test_get_new_command(output):
+    assert (get_new_command(Command('git pull', output))
+            == "git stash && git pull && git stash pop")

tests/rules/test_git_pull_unstaged_changes.py

@@ -0,0 +1,19 @@
+import pytest
+from thefuck.rules.git_pull_uncommitted_changes import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return '''error: Cannot pull with rebase: Your index contains uncommitted changes.'''
+
+
+def test_match(output):
+    assert match(Command('git pull', output))
+    assert not match(Command('git pull', ''))
+    assert not match(Command('ls', output))
+
+
+def test_get_new_command(output):
+    assert (get_new_command(Command('git pull', output))
+            == "git stash && git pull && git stash pop")

tests/rules/test_git_push.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_push import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return '''fatal: The current branch master has no upstream branch.
 To push the current branch and set the remote as upstream, use
 
@@ -13,12 +13,21 @@ To push the current branch and set the remote as upstream, use
 '''
 
 
-def test_match(stderr):
-    assert match(Command('git push master', stderr=stderr), None)
-    assert not match(Command('git push master'), None)
-    assert not match(Command('ls', stderr=stderr), None)
+def test_match(output):
+    assert match(Command('git push', output))
+    assert match(Command('git push master', output))
+    assert not match(Command('git push master', ''))
+    assert not match(Command('ls', output))
 
 
-def test_get_new_command(stderr):
-    assert get_new_command(Command(stderr=stderr), None)\
+def test_get_new_command(output):
+    assert get_new_command(Command('git push', output))\
         == "git push --set-upstream origin master"
+    assert get_new_command(Command('git push -u', output))\
+        == "git push --set-upstream origin master"
+    assert get_new_command(Command('git push -u origin', output))\
+        == "git push --set-upstream origin master"
+    assert get_new_command(Command('git push --set-upstream origin', output))\
+        == "git push --set-upstream origin master"
+    assert get_new_command(Command('git push --quiet', output))\
+        == "git push --set-upstream origin master --quiet"

tests/rules/test_git_push_different_branch_names.py

@@ -0,0 +1,39 @@
+import pytest
+from thefuck.rules.git_push_different_branch_names import get_new_command, match
+from thefuck.types import Command
+
+
+output = """fatal: The upstream branch of your current branch does not match
+the name of your current branch.  To push to the upstream branch
+on the remote, use
+
+    git push origin HEAD:%s
+
+To push to the branch of the same name on the remote, use
+
+    git push origin %s
+
+To choose either option permanently, see push.default in 'git help config'.
+"""
+
+
+def error_msg(localbranch, remotebranch):
+    return output % (remotebranch, localbranch)
+
+
+def test_match():
+    assert match(Command('git push', error_msg('foo', 'bar')))
+
+
+@pytest.mark.parametrize('command', [
+    Command('vim', ''),
+    Command('git status', error_msg('foo', 'bar')),
+    Command('git push', '')
+])
+def test_not_match(command):
+    assert not match(command)
+
+
+def test_get_new_command():
+    new_command = get_new_command(Command('git push', error_msg('foo', 'bar')))
+    assert new_command == 'git push origin HEAD:bar'

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 thefuck.types 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('git push', git_err),
+    Command('git push nvbn', git_err),
+    Command('git push nvbn master', git_err)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('git push', git_ok),
+    Command('git push', git_uptodate),
+    Command('git push nvbn', git_ok),
+    Command('git push nvbn master', git_uptodate),
+    Command('git push nvbn', git_ok),
+    Command('git push nvbn master', git_uptodate)])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command('git push', git_err), 'git push --force-with-lease'),
+    (Command('git push nvbn', git_err), 'git push --force-with-lease nvbn'),
+    (Command('git push nvbn master', git_err), 'git push --force-with-lease nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command) == output

tests/rules/test_git_push_pull.py

@@ -0,0 +1,73 @@
+import pytest
+from thefuck.rules.git_push_pull import match, get_new_command
+from thefuck.types 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_err2 = '''
+To /tmp/foo
+ ! [rejected]        master -> master (non-fast-forward)
+ error: failed to push some refs to '/tmp/bar'
+hint: Updates were rejected because the remote contains work that you do
+hint: not have locally. This is usually caused by another repository pushing
+hint: to the same ref. You may want to first integrate the remote changes
+hint: (e.g., '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('git push', git_err),
+    Command('git push nvbn', git_err),
+    Command('git push nvbn master', git_err),
+    Command('git push', git_err2),
+    Command('git push nvbn', git_err2),
+    Command('git push nvbn master', git_err2)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('git push', git_ok),
+    Command('git push', git_uptodate),
+    Command('git push nvbn', git_ok),
+    Command('git push nvbn master', git_uptodate),
+    Command('git push nvbn', git_ok),
+    Command('git push nvbn master', git_uptodate)])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command('git push', git_err), 'git pull && git push'),
+    (Command('git push nvbn', git_err),
+     'git pull nvbn && git push nvbn'),
+    (Command('git push nvbn master', git_err),
+     'git pull nvbn master && git push nvbn master'),
+    (Command('git push', git_err2), 'git pull && git push'),
+    (Command('git push nvbn', git_err2),
+     'git pull nvbn && git push nvbn'),
+    (Command('git push nvbn master', git_err2),
+     'git pull nvbn master && git push nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command) == output

tests/rules/test_git_push_without_commits.py

@@ -0,0 +1,27 @@
+import pytest
+
+from thefuck.types import Command
+from thefuck.rules.git_push_without_commits import (
+    fix,
+    get_new_command,
+    match,
+)
+
+command = 'git push -u origin master'
+expected_error = '''
+error: src refspec master does not match any.
+error: failed to push some refs to 'git@github.com:User/repo.git'
+'''
+
+
+@pytest.mark.parametrize('command', [Command(command, expected_error)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command, result', [(
+    Command(command, expected_error),
+    fix.format(command=command),
+)])
+def test_get_new_command(command, result):
+    assert get_new_command(command) == result

tests/rules/test_git_rebase_merge_dir.py

@@ -0,0 +1,42 @@
+import pytest
+from thefuck.rules.git_rebase_merge_dir import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return ('\n\nIt seems that there is already a rebase-merge directory, and\n'
+            'I wonder if you are in the middle of another rebase.  If that is the\n'
+            'case, please try\n'
+            '\tgit rebase (--continue | --abort | --skip)\n'
+            'If that is not the case, please\n'
+            '\trm -fr "/foo/bar/baz/egg/.git/rebase-merge"\n'
+            'and run me again.  I am stopping in case you still have something\n'
+            'valuable there.\n')
+
+
+@pytest.mark.parametrize('script', [
+    'git rebase master',
+    'git rebase -skip',
+    'git rebase'])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['git rebase master', 'git rebase -abort'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, result', [
+    ('git rebase master', [
+        'git rebase --abort', 'git rebase --skip', 'git rebase --continue',
+        'rm -fr "/foo/bar/baz/egg/.git/rebase-merge"']),
+    ('git rebase -skip', [
+        'git rebase --skip', 'git rebase --abort', 'git rebase --continue',
+        'rm -fr "/foo/bar/baz/egg/.git/rebase-merge"']),
+    ('git rebase', [
+        'git rebase --skip', 'git rebase --abort', 'git rebase --continue',
+        'rm -fr "/foo/bar/baz/egg/.git/rebase-merge"'])])
+def test_get_new_command(output, script, result):
+    assert get_new_command(Command(script, output)) == result

tests/rules/test_git_rebase_no_changes.py

@@ -0,0 +1,28 @@
+import pytest
+from thefuck.rules.git_rebase_no_changes import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return '''Applying: Test commit
+No changes - did you forget to use 'git add'?
+If there is nothing left to stage, chances are that something else
+already introduced the same changes; you might want to skip this patch.
+
+When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".
+
+'''
+
+
+def test_match(output):
+    assert match(Command('git rebase --continue', output))
+    assert not match(Command('git rebase --continue', ''))
+    assert not match(Command('git rebase --skip', ''))
+
+
+def test_get_new_command(output):
+    assert (get_new_command(Command('git rebase --continue', output)) ==
+            'git rebase --skip')

tests/rules/test_git_remote_delete.py

@@ -0,0 +1,24 @@
+import pytest
+from thefuck.rules.git_remote_delete import get_new_command, match
+from thefuck.types import Command
+
+
+def test_match():
+    assert match(Command('git remote delete foo', ''))
+
+
+@pytest.mark.parametrize('command', [
+    Command('git remote remove foo', ''),
+    Command('git remote add foo', ''),
+    Command('git commit', '')
+])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git remote delete foo', ''), 'git remote remove foo'),
+    (Command('git remote delete delete', ''), 'git remote remove delete'),
+])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_git_remote_seturl_add.py

@@ -0,0 +1,26 @@
+import pytest
+from thefuck.rules.git_remote_seturl_add import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command('git remote set-url origin url', "fatal: No such remote")])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('git remote set-url origin url', ""),
+    Command('git remote add origin url', ''),
+    Command('git remote remove origin', ''),
+    Command('git remote prune origin', ''),
+    Command('git remote set-branches origin branch', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git remote set-url origin git@github.com:nvbn/thefuck.git', ''),
+     'git remote add origin git@github.com:nvbn/thefuck.git')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_git_rm_local_modifications.py

@@ -0,0 +1,28 @@
+import pytest
+from thefuck.rules.git_rm_local_modifications import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output(target):
+    return ('error: the following file has local modifications:\n    {}\n(use '
+            '--cached to keep the file, or -f to force removal)').format(target)
+
+
+@pytest.mark.parametrize('script, target', [
+    ('git rm foo', 'foo'),
+    ('git rm foo bar', 'bar')])
+def test_match(output, script, target):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['git rm foo', 'git rm foo bar', 'git rm'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, target, new_command', [
+    ('git rm foo', 'foo', ['git rm --cached foo', 'git rm -f foo']),
+    ('git rm foo bar', 'bar', ['git rm --cached foo bar', 'git rm -f foo bar'])])
+def test_get_new_command(output, script, target, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_rm_recursive.py

@@ -0,0 +1,27 @@
+import pytest
+from thefuck.rules.git_rm_recursive import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output(target):
+    return "fatal: not removing '{}' recursively without -r".format(target)
+
+
+@pytest.mark.parametrize('script, target', [
+    ('git rm foo', 'foo'),
+    ('git rm foo bar', 'foo bar')])
+def test_match(output, script, target):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['git rm foo', 'git rm foo bar'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, target, new_command', [
+    ('git rm foo', 'foo', 'git rm -r foo'),
+    ('git rm foo bar', 'foo bar', 'git rm -r foo bar')])
+def test_get_new_command(output, script, target, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_rm_staged.py

@@ -0,0 +1,28 @@
+import pytest
+from thefuck.rules.git_rm_staged import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output(target):
+    return ('error: the following file has changes staged in the index:\n    {}\n(use '
+            '--cached to keep the file, or -f to force removal)').format(target)
+
+
+@pytest.mark.parametrize('script, target', [
+    ('git rm foo', 'foo'),
+    ('git rm foo bar', 'bar')])
+def test_match(output, script, target):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', ['git rm foo', 'git rm foo bar', 'git rm'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, target, new_command', [
+    ('git rm foo', 'foo', ['git rm --cached foo', 'git rm -f foo']),
+    ('git rm foo bar', 'bar', ['git rm --cached foo bar', 'git rm -f foo bar'])])
+def test_get_new_command(output, script, target, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_stash.py

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

tests/rules/test_git_stash_pop.py

@@ -0,0 +1,18 @@
+import pytest
+from thefuck.rules.git_stash_pop import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return '''error: Your local changes to the following files would be overwritten by merge:'''
+
+
+def test_match(output):
+    assert match(Command('git stash pop', output))
+    assert not match(Command('git stash', ''))
+
+
+def test_get_new_command(output):
+    assert (get_new_command(Command('git stash pop', output))
+            == "git add --update && git stash pop && git reset .")

tests/rules/test_git_tag_force.py

@@ -0,0 +1,18 @@
+import pytest
+from thefuck.rules.git_tag_force import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return '''fatal: tag 'alert' already exists'''
+
+
+def test_match(output):
+    assert match(Command('git tag alert', output))
+    assert not match(Command('git tag alert', ''))
+
+
+def test_get_new_command(output):
+    assert (get_new_command(Command('git tag alert', output))
+            == "git tag --force alert")

tests/rules/test_git_two_dashes.py

@@ -0,0 +1,45 @@
+import pytest
+from thefuck.rules.git_two_dashes import match, get_new_command
+from thefuck.types import Command
+
+
+output = 'error: did you mean `{}` (with two dashes ?)'.format
+
+
+@pytest.mark.parametrize('command', [
+    Command('git add -patch', output('--patch')),
+    Command('git checkout -patch', output('--patch')),
+    Command('git commit -amend', output('--amend')),
+    Command('git push -tags', output('--tags')),
+    Command('git rebase -continue', output('--continue'))])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('git add --patch', ''),
+    Command('git checkout --patch', ''),
+    Command('git commit --amend', ''),
+    Command('git push --tags', ''),
+    Command('git rebase --continue', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command('git add -patch', output('--patch')),
+        'git add --patch'),
+    (Command('git checkout -patch', output('--patch')),
+        'git checkout --patch'),
+    (Command('git checkout -patch', output('--patch')),
+        'git checkout --patch'),
+    (Command('git init -bare', output('--bare')),
+        'git init --bare'),
+    (Command('git commit -amend', output('--amend')),
+        'git commit --amend'),
+    (Command('git push -tags', output('--tags')),
+        'git push --tags'),
+    (Command('git rebase -continue', output('--continue')),
+        'git rebase --continue')])
+def test_get_new_command(command, output):
+    assert get_new_command(command) == output

tests/rules/test_go_run.py

@@ -1,17 +1,17 @@
 import pytest
 from thefuck.rules.go_run import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='go run foo'), 
-    Command(script='go run bar')])
+    Command('go run foo', ''),
+    Command('go run bar', '')])
 def test_match(command):
-    assert match(command, None)
+    assert match(command)
 
 
 @pytest.mark.parametrize('command, new_command', [
-    (Command('go run foo'), 'go run foo.go'),
-    (Command('go run bar'), 'go run bar.go')])
+    (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
+    assert get_new_command(command) == new_command

tests/rules/test_gradle_not_task.py

@@ -0,0 +1,158 @@
+import pytest
+from io import BytesIO
+from thefuck.rules.gradle_no_task import match, get_new_command
+from thefuck.types import Command
+
+gradle_tasks = b'''
+:tasks
+
+------------------------------------------------------------
+All tasks runnable from root project
+------------------------------------------------------------
+
+Android tasks
+-------------
+androidDependencies - Displays the Android dependencies of the project.
+signingReport - Displays the signing info for each variant.
+sourceSets - Prints out all the source sets defined in this project.
+
+Build tasks
+-----------
+assemble - Assembles all variants of all applications and secondary packages.
+assembleAndroidTest - Assembles all the Test applications.
+assembleDebug - Assembles all Debug builds.
+assembleRelease - Assembles all Release builds.
+build - Assembles and tests this project.
+buildDependents - Assembles and tests this project and all projects that depend on it.
+buildNeeded - Assembles and tests this project and all projects it depends on.
+compileDebugAndroidTestSources
+compileDebugSources
+compileDebugUnitTestSources
+compileReleaseSources
+compileReleaseUnitTestSources
+extractDebugAnnotations - Extracts Android annotations for the debug variant into the archive file
+extractReleaseAnnotations - Extracts Android annotations for the release variant into the archive file
+mockableAndroidJar - Creates a version of android.jar that's suitable for unit tests.
+
+Build Setup tasks
+-----------------
+init - Initializes a new Gradle build. [incubating]
+wrapper - Generates Gradle wrapper files. [incubating]
+
+Help tasks
+----------
+components - Displays the components produced by root project 'org.rerenderer_example.snake'. [incubating]
+dependencies - Displays all dependencies declared in root project 'org.rerenderer_example.snake'.
+dependencyInsight - Displays the insight into a specific dependency in root project 'org.rerenderer_example.snake'.
+help - Displays a help message.
+model - Displays the configuration model of root project 'org.rerenderer_example.snake'. [incubating]
+projects - Displays the sub-projects of root project 'org.rerenderer_example.snake'.
+properties - Displays the properties of root project 'org.rerenderer_example.snake'.
+tasks - Displays the tasks runnable from root project 'org.rerenderer_example.snake' (some of the displayed tasks may belong to subprojects).
+
+Install tasks
+-------------
+installDebug - Installs the Debug build.
+installDebugAndroidTest - Installs the android (on device) tests for the Debug build.
+installRelease - Installs the Release build.
+uninstallAll - Uninstall all applications.
+uninstallDebug - Uninstalls the Debug build.
+uninstallDebugAndroidTest - Uninstalls the android (on device) tests for the Debug build.
+uninstallRelease - Uninstalls the Release build.
+
+React tasks
+-----------
+bundleDebugJsAndAssets - bundle JS and assets for Debug.
+bundleReleaseJsAndAssets - bundle JS and assets for Release.
+
+Verification tasks
+------------------
+check - Runs all checks.
+clean - Deletes the build directory.
+connectedAndroidTest - Installs and runs instrumentation tests for all flavors on connected devices.
+connectedCheck - Runs all device checks on currently connected devices.
+connectedDebugAndroidTest - Installs and runs the tests for debug on connected devices.
+deviceAndroidTest - Installs and runs instrumentation tests using all Device Providers.
+deviceCheck - Runs all device checks using Device Providers and Test Servers.
+lint - Runs lint on all variants.
+lintDebug - Runs lint on the Debug build.
+lintRelease - Runs lint on the Release build.
+test - Run unit tests for all variants.
+testDebugUnitTest - Run unit tests for the debug build.
+testReleaseUnitTest - Run unit tests for the release build.
+
+Other tasks
+-----------
+assembleDefault
+copyDownloadableDepsToLibs
+jarDebugClasses
+jarReleaseClasses
+
+To see all tasks and more detail, run gradlew tasks --all
+
+To see more detail about a task, run gradlew help --task <task>
+
+BUILD SUCCESSFUL
+
+Total time: 1.936 secs
+'''
+
+output_not_found = '''
+
+FAILURE: Build failed with an exception.
+
+* What went wrong:
+Task '{}' not found in root project 'org.rerenderer_example.snake'.
+
+* Try:
+Run gradlew tasks to get a list of available tasks. Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.
+'''.format
+
+output_ambiguous = '''
+
+FAILURE: Build failed with an exception.
+
+* What went wrong:
+Task '{}' is ambiguous in root project 'org.rerenderer_example.snake'. Candidates are: 'assembleRelease', 'assembleReleaseUnitTest'.
+
+* Try:
+Run gradlew tasks to get a list of available tasks. Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.
+'''.format
+
+
+@pytest.fixture(autouse=True)
+def tasks(mocker):
+    patch = mocker.patch('thefuck.rules.gradle_no_task.Popen')
+    patch.return_value.stdout = BytesIO(gradle_tasks)
+    return patch
+
+
+@pytest.mark.parametrize('command', [
+    Command('./gradlew assembler', output_ambiguous('assembler')),
+    Command('./gradlew instar', output_not_found('instar')),
+    Command('gradle assembler', output_ambiguous('assembler')),
+    Command('gradle instar', output_not_found('instar'))])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('./gradlew assemble', ''),
+    Command('gradle assemble', ''),
+    Command('npm assembler', output_ambiguous('assembler')),
+    Command('npm instar', output_not_found('instar'))])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, result', [
+    (Command('./gradlew assembler', output_ambiguous('assembler')),
+     './gradlew assemble'),
+    (Command('./gradlew instardebug', output_not_found('instardebug')),
+     './gradlew installDebug'),
+    (Command('gradle assembler', output_ambiguous('assembler')),
+     'gradle assemble'),
+    (Command('gradle instardebug', output_not_found('instardebug')),
+     'gradle installDebug')])
+def test_get_new_command(command, result):
+    assert get_new_command(command)[0] == result

tests/rules/test_gradle_wrapper.py

@@ -0,0 +1,38 @@
+import pytest
+from thefuck.rules.gradle_wrapper import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture(autouse=True)
+def exists(mocker):
+    return mocker.patch('thefuck.rules.gradle_wrapper.os.path.isfile',
+                        return_value=True)
+
+
+@pytest.mark.parametrize('command', [
+    Command('gradle tasks', 'gradle: not found'),
+    Command('gradle build', 'gradle: not found')])
+def test_match(mocker, command):
+    mocker.patch('thefuck.rules.gradle_wrapper.which', return_value=None)
+
+    assert match(command)
+
+
+@pytest.mark.parametrize('command, gradlew, which', [
+    (Command('gradle tasks', 'gradle: not found'), False, None),
+    (Command('gradle tasks', 'command not found'), True, '/usr/bin/gradle'),
+    (Command('npm tasks', 'npm: not found'), True, None)])
+def test_not_match(mocker, exists, command, gradlew, which):
+    mocker.patch('thefuck.rules.gradle_wrapper.which', return_value=which)
+    exists.return_value = gradlew
+
+    assert not match(command)
+
+
+@pytest.mark.parametrize('script, result', [
+    ('gradle assemble', './gradlew assemble'),
+    ('gradle --help', './gradlew --help'),
+    ('gradle build -c', './gradlew build -c')])
+def test_get_new_command(script, result):
+    command = Command(script, '')
+    assert get_new_command(command) == result

tests/rules/test_grep_arguments_order.py

@@ -0,0 +1,40 @@
+import pytest
+from thefuck.rules.grep_arguments_order import get_new_command, match
+from thefuck.types import Command
+
+output = 'grep: {}: No such file or directory'.format
+
+
+@pytest.fixture(autouse=True)
+def os_path(monkeypatch):
+    monkeypatch.setattr('os.path.isfile', lambda x: not x.startswith('-'))
+
+
+@pytest.mark.parametrize('script, file', [
+    ('grep test.py test', 'test'),
+    ('grep -lir . test', 'test'),
+    ('egrep test.py test', 'test'),
+    ('egrep -lir . test', 'test')])
+def test_match(script, file):
+    assert match(Command(script, output(file)))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('cat test.py', output('test')),
+    ('grep test test.py', ''),
+    ('grep -lir test .', ''),
+    ('egrep test test.py', ''),
+    ('egrep -lir test .', '')])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output, result', [
+    ('grep test.py test', output('test'), 'grep test test.py'),
+    ('grep -lir . test', output('test'), 'grep -lir test .'),
+    ('grep . test -lir', output('test'), 'grep test -lir .'),
+    ('egrep test.py test', output('test'), 'egrep test test.py'),
+    ('egrep -lir . test', output('test'), 'egrep -lir test .'),
+    ('egrep . test -lir', output('test'), 'egrep test -lir .')])
+def test_get_new_command(script, output, result):
+    assert get_new_command(Command(script, output)) == result

tests/rules/test_grep_recursive.py

@@ -1,12 +1,15 @@
+# -*- coding: utf-8 -*-
+
 from thefuck.rules.grep_recursive import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 def test_match():
-    assert match(Command('grep blah .', stderr='grep: .: Is a directory'), None)
-    assert not match(Command(), None)
+    assert match(Command('grep blah .', 'grep: .: Is a directory'))
+    assert match(Command(u'grep café .', 'grep: .: Is a directory'))
+    assert not match(Command('', ''))
 
 
 def test_get_new_command():
-    assert get_new_command(
-        Command('grep blah .'), None) == 'grep -r blah .'
+    assert get_new_command(Command('grep blah .', '')) == 'grep -r blah .'
+    assert get_new_command(Command(u'grep café .', '')) == u'grep -r café .'

tests/rules/test_grunt_task_not_found.py

@@ -0,0 +1,129 @@
+# -*- encoding: utf-8 -*-
+
+from io import BytesIO
+import pytest
+from thefuck.types import Command
+from thefuck.rules.grunt_task_not_found import match, get_new_command
+
+output = '''
+Warning: Task "{}" not found. Use --force to continue.
+
+Aborted due to warnings.
+
+
+Execution Time (2016-08-13 21:01:40 UTC+3)
+loading tasks  11ms  ▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇▇ 92%
+Total 12ms
+
+'''.format
+
+grunt_help_stdout = b'''
+Grunt: The JavaScript Task Runner (v0.4.5)
+
+Usage
+ grunt [options] [task [task ...]]
+
+Options
+    --help, -h  Display this help text.
+        --base  Specify an alternate base path. By default, all file paths are
+                relative to the Gruntfile. (grunt.file.setBase) *
+    --no-color  Disable colored output.
+   --gruntfile  Specify an alternate Gruntfile. By default, grunt looks in the
+                current or parent directories for the nearest Gruntfile.js or
+                Gruntfile.coffee file.
+   --debug, -d  Enable debugging mode for tasks that support it.
+       --stack  Print a stack trace when exiting with a warning or fatal error.
+   --force, -f  A way to force your way past warnings. Want a suggestion? Don't
+                use this option, fix your code.
+       --tasks  Additional directory paths to scan for task and "extra" files.
+                (grunt.loadTasks) *
+         --npm  Npm-installed grunt plugins to scan for task and "extra" files.
+                (grunt.loadNpmTasks) *
+    --no-write  Disable writing files (dry run).
+ --verbose, -v  Verbose mode. A lot more information output.
+ --version, -V  Print the grunt version. Combine with --verbose for more info.
+  --completion  Output shell auto-completion rules. See the grunt-cli
+                documentation for more information.
+
+Options marked with * have methods exposed via the grunt API and should instead
+be specified inside the Gruntfile wherever possible.
+
+Available tasks
+  autoprefixer  Prefix CSS files. *
+    concurrent  Run grunt tasks concurrently *
+         clean  Clean files and folders. *
+       compass  Compile Sass to CSS using Compass *
+        concat  Concatenate files. *
+       connect  Start a connect web server. *
+          copy  Copy files. *
+        cssmin  Minify CSS *
+       htmlmin  Minify HTML *
+      imagemin  Minify PNG, JPEG, GIF and SVG images *
+        jshint  Validate files with JSHint. *
+        uglify  Minify files with UglifyJS. *
+         watch  Run predefined tasks whenever watched files change.
+       filerev  File revisioning based on content hashing *
+        cdnify  Replace scripts with refs to the Google CDN *
+         karma  run karma. *
+         newer  Run a task with only those source files that have been modified
+                since the last successful run.
+     any-newer  DEPRECATED TASK.  Use the "newer" task instead
+ newer-postrun  Internal task.
+   newer-clean  Remove cached timestamps.
+    ngAnnotate  Add, remove and rebuild AngularJS dependency injection
+                annotations *
+    ngconstant  Dynamic angular constant generator task. *
+        svgmin  Minify SVG *
+        usemin  Replaces references to non-minified scripts / stylesheets *
+ useminPrepare  Using HTML markup as the primary source of information *
+       wiredep  Inject Bower components into your source code. *
+         serve  Compile then start a connect web server
+        server  DEPRECATED TASK. Use the "serve" task instead
+          test  Alias for "clean:server", "ngconstant:test", "wiredep",
+                "concurrent:test", "autoprefixer", "connect:test", "karma"
+                tasks.
+         build  Alias for "ngconstant:production", "clean:dist", "wiredep",
+                "useminPrepare", "concurrent:dist", "autoprefixer", "concat",
+                "ngAnnotate", "copy:dist", "cdnify", "cssmin", "uglify",
+                "filerev", "usemin", "htmlmin" tasks.
+       default  Alias for "newer:jshint", "test", "build" tasks.
+
+Tasks run in the order specified. Arguments may be passed to tasks that accept
+them by using colons, like "lint:files". Tasks marked with * are "multi tasks"
+and will iterate over all sub-targets if no argument is specified.
+
+The list of available tasks may change based on tasks directories or grunt
+plugins specified in the Gruntfile or via command-line options.
+
+For more information, see http://gruntjs.com/
+'''
+
+
+@pytest.fixture(autouse=True)
+def grunt_help(mocker):
+    patch = mocker.patch('thefuck.rules.grunt_task_not_found.Popen')
+    patch.return_value.stdout = BytesIO(grunt_help_stdout)
+    return patch
+
+
+@pytest.mark.parametrize('command', [
+    Command('grunt defualt', output('defualt')),
+    Command('grunt buld:css', output('buld:css'))])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('npm nuild', output('nuild')),
+    Command('grunt rm', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, result', [
+    (Command('grunt defualt', output('defualt')), 'grunt default'),
+    (Command('grunt cmpass:all', output('cmpass:all')), 'grunt compass:all'),
+    (Command('grunt cmpass:all --color', output('cmpass:all')),
+     'grunt compass:all --color')])
+def test_get_new_command(command, result):
+    assert get_new_command(command) == result

tests/rules/test_gulp_not_task.py

@@ -0,0 +1,29 @@
+import pytest
+from io import BytesIO
+from thefuck.types import Command
+from thefuck.rules.gulp_not_task import match, get_new_command
+
+
+def output(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', output('srve')))
+
+
+@pytest.mark.parametrize('script, stdout', [
+    ('gulp serve', ''),
+    ('cat srve', output('srve'))])
+def test_not_march(script, stdout):
+    assert not match(Command(script, stdout))
+
+
+def test_get_new_command(mocker):
+    mock = mocker.patch('subprocess.Popen')
+    mock.return_value.stdout = BytesIO(b'serve \nbuild \ndefault \n')
+    command = Command('gulp srve', output('srve'))
+    assert get_new_command(command) == ['gulp serve', 'gulp default']

tests/rules/test_has_exists_script.py

@@ -1,20 +1,18 @@
-from mock import Mock, patch
+from mock import patch
 from thefuck.rules.has_exists_script import match, get_new_command
+from thefuck.types import Command
 
 
 def test_match():
     with patch('os.path.exists', return_value=True):
-        assert match(Mock(script='main', stderr='main: command not found'),
-                     None)
-        assert match(Mock(script='main --help',
-                          stderr='main: command not found'),
-                     None)
-        assert not match(Mock(script='main', stderr=''), None)
+        assert match(Command('main', 'main: command not found'))
+        assert match(Command('main --help',
+                             'main: command not found'))
+        assert not match(Command('main', ''))
 
     with patch('os.path.exists', return_value=False):
-        assert not match(Mock(script='main', stderr='main: command not found'),
-                         None)
+        assert not match(Command('main', 'main: command not found'))
 
 
 def test_get_new_command():
-    assert get_new_command(Mock(script='main --help'), None) == './main --help'
+    assert get_new_command(Command('main --help', '')) == './main --help'

tests/rules/test_heroku_multiple_apps.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+from thefuck.types import Command
+from thefuck.rules.heroku_multiple_apps import match, get_new_command
+
+
+suggest_output = '''
+ ▸    Multiple apps in git remotes
+ ▸    Usage: --remote heroku-dev
+ ▸    or: --app myapp-dev
+ ▸    Your local git repository has more than 1 app referenced in git remotes.
+ ▸    Because of this, we can't determine which app you want to run this command against.
+ ▸    Specify the app you want with --app or --remote.
+ ▸    Heroku remotes in repo:
+ ▸    myapp (heroku)
+ ▸    myapp-dev (heroku-dev)
+ ▸
+ ▸    https://devcenter.heroku.com/articles/multiple-environments
+'''
+
+not_match_output = '''
+=== HEROKU_POSTGRESQL_TEAL_URL, DATABASE_URL
+Plan:                  Hobby-basic
+Status:                Available
+Connections:           20/20
+PG Version:            9.6.4
+Created:               2017-01-01 00:00 UTC
+Data Size:             99.9 MB
+Tables:                99
+Rows:                  12345/10000000 (In compliance)
+Fork/Follow:           Unsupported
+Rollback:              Unsupported
+Continuous Protection: Off
+Add-on:                postgresql-round-12345
+'''
+
+
+@pytest.mark.parametrize('cmd', ['pg'])
+def test_match(cmd):
+    assert match(
+        Command('heroku {}'.format(cmd), suggest_output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('heroku pg', not_match_output)])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('cmd, result', [
+    ('pg', ['heroku pg --app myapp', 'heroku pg --app myapp-dev'])])
+def test_get_new_command(cmd, result):
+    command = Command('heroku {}'.format(cmd), suggest_output)
+    assert get_new_command(command) == result

tests/rules/test_heroku_not_command.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+from thefuck.types import Command
+from thefuck.rules.heroku_not_command import match, get_new_command
+
+
+suggest_output = '''
+ ▸    log is not a heroku command.
+ ▸    Perhaps you meant logs?
+ ▸    Run heroku _ to run heroku logs.
+ ▸    Run heroku help for a list of available commands.'''
+
+
+@pytest.mark.parametrize('cmd', ['log'])
+def test_match(cmd):
+    assert match(
+        Command('heroku {}'.format(cmd), suggest_output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('cat log', suggest_output)])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('cmd, result', [
+    ('log', 'heroku logs')])
+def test_get_new_command(cmd, result):
+    command = Command('heroku {}'.format(cmd), suggest_output)
+    assert get_new_command(command) == result

tests/rules/test_history.py

@@ -0,0 +1,27 @@
+import pytest
+from thefuck.rules.history import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture(autouse=True)
+def history_without_current(mocker):
+    return mocker.patch(
+        'thefuck.rules.history.get_valid_history_without_current',
+        return_value=['ls cat', 'diff x'])
+
+
+@pytest.mark.parametrize('script', ['ls cet', 'daff x'])
+def test_match(script):
+    assert match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script', ['apt-get', 'nocommand y'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@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, '')) == result

tests/rules/test_hostscli.py

@@ -0,0 +1,27 @@
+import pytest
+from thefuck.rules.hostscli import no_website, get_new_command, match
+from thefuck.types import Command
+
+no_website_long = '''
+{}:
+
+No Domain list found for website: a_website_that_does_not_exist
+
+Please raise a Issue here: https://github.com/dhilipsiva/hostscli/issues/new
+if you think we should add domains for this website.
+
+type `hostscli websites` to see a list of websites that you can block/unblock
+'''.format(no_website)
+
+
+@pytest.mark.parametrize('command', [
+    Command('hostscli block a_website_that_does_not_exist', no_website_long)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command, result', [(
+    Command('hostscli block a_website_that_does_not_exist', no_website_long),
+    ['hostscli websites'])])
+def test_get_new_command(command, result):
+    assert get_new_command(command) == result