Bump to 3.27

Replaces install with reinstall when a package is already installed.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,37 @@
+<!-- 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`):
+
+    FILL THIS IN
+
+Your shell and its version (`bash`, `zsh`, *Windows PowerShell*, etc.):
+
+    FILL THIS IN
+
+Your system (Debian 7, ArchLinux, Windows, etc.):
+
+<!-- FILL THIS IN -->
+
+How to reproduce the bug:
+
+    FILL THIS IN
+
+The output of The Fuck with `THEFUCK_DEBUG=true` exported (typically execute `export THEFUCK_DEBUG=true` in your shell before The Fuck):
+
+    FILL THIS IN
+
+If the bug only appears with a specific application, the output of that application and its version:
+
+    FILL THIS IN
+
+Anything else you think is relevant:
+
+<!-- FILL THIS IN -->
+
+<!-- It's only with enough information that we can do something to fix the problem. -->

.travis.yml

@@ -11,17 +11,10 @@ matrix:
     - 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
@@ -32,8 +25,9 @@ addons:
       - 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 brew upgrade python; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then pip3 install virtualenv; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then virtualenv venv -p python3; fi
   - if [[ $TRAVIS_OS_NAME == "osx" ]]; then source venv/bin/activate; fi
   - pip install -U pip
   - pip install -U coveralls

CONTRIBUTING.md

@@ -23,3 +23,37 @@ It's only with enough information that we can do something to fix the problem.
 We gladly accept pull request on the [official
 repository](https://github.com/nvbn/thefuck) for new rules, new features, bug
 fixes, etc.
+
+# Developing
+
+Install `The Fuck` for development:
+
+```bash
+pip install -r requirements.txt
+python setup.py develop
+```
+
+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.md

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 =====================
 
-Copyright (c) 2015 Vladimir Iakovlev
+Copyright (c) 2015-2018 Vladimir Iakovlev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

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

README.md

@@ -1,12 +1,15 @@
 # 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).
+*The Fuck* is a magnificent app, inspired by a [@liamosaur](https://twitter.com/liamosaur/)
+[tweet](https://twitter.com/liamosaur/status/506975850596536320),
+that corrects errors in previous console commands.
+
+
+Is *The Fuck* too slow? [Try the experimental instant mode!](#experimental-instant-mode)
 
 [![gif with examples][examples-link]][examples-link]
 
-Few more examples:
+More examples:
 
 ```bash
 ➜ apt-get install vim
@@ -73,8 +76,8 @@ REPL-y 0.3.1
 ...
 ```
 
-If you are not scared to blindly run the changed command, there is a `require_confirmation`
-[settings](#settings) option:
+If you're not afraid of blindly running corrected commands, the
+`require_confirmation` [settings](#settings) option can be disabled:
 
 ```bash
 ➜ apt-get install vim
@@ -90,34 +93,47 @@ Reading package lists... Done
 
 ## Requirements
 
-- python (2.7+ or 3.3+)
+- python (3.4+)
 - pip
 - python-dev
 
 ## Installation
 
-On OS X you can install `The Fuck` with [Homebrew][homebrew]:
+On OS X, you can install *The Fuck* via [Homebrew][homebrew]:
 
 ```bash
 brew install thefuck
 ```
 
-On Ubuntu you can install `The Fuck` with:
+On Ubuntu, install *The Fuck* with the following commands:
 ```bash
 sudo apt update
 sudo apt install python3-dev python3-pip
-pip3 install --user thefuck
+sudo pip3 install thefuck
 ```
 
-On other systems you can install `The Fuck` with `pip`:
+On FreeBSD, install *The Fuck* with the following commands:
+```bash
+sudo portsnap fetch update
+cd /usr/ports/misc/thefuck && sudo make install clean
+```
+
+On ChromeOS, install *The Fuck* using [chromebrew](https://github.com/skycocker/chromebrew) with the following command:
+```bash
+crew install thefuck
+```
+
+On other systems, install *The Fuck*  by using `pip`:
 
 ```bash
-pip install --user thefuck
+pip install thefuck
 ```
 
-[Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
+[Alternatively, you may use an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
 
-You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
+<a href='#manual-installation' name='manual-installation'>#</a>
+It is recommended that you place this command in your `.bash_profile`,
+`.bashrc`, `.zshrc` or other startup script:
 
 ```bash
 eval $(thefuck --alias)
@@ -127,28 +143,36 @@ eval $(thefuck --alias FUCK)
 
 [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`).
+Changes are only available in a new shell session. To make changes immediately
+available, run `source ~/.bashrc` (or your shell config file like `.zshrc`).
 
-If you want separate alias for running fixed command without confirmation you can use alias like:
+To run fixed commands without confirmation, use the `-y` option:
 
 ```bash
-alias fuck-it='export THEFUCK_REQUIRE_CONFIRMATION=False; fuck; export THEFUCK_REQUIRE_CONFIRMATION=True'
+fuck -y
 ```
 
-## Update
+To fix commands recursively until succeeding, use the `-r` option:
 
 ```bash
-pip install --user thefuck --upgrade
+fuck -r
 ```
 
-**Aliases changed in 1.34.**
+## Updating
+
+```bash
+pip3 install thefuck --upgrade
+```
+
+**Note: Alias functionality was changed in v1.34 of *The Fuck***
 
 ## 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:
+*The Fuck* attempts to match the previous command with a rule. If a match is
+found, a new command is created using the matched rule and executed. The
+following rules are enabled by default:
 
+* `adb_unknown_command` &ndash; fixes misspelled commands like `adb logcta`;
 * `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`;
@@ -177,19 +201,24 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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; fixes branch name or creates new branch;
+* `git_commit_amend` &ndash; offers `git commit --amend` after previous commit;
 * `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_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_merge` &ndash; adds remote to branch names;
+* `git_merge_unrelated` &ndash; adds `--allow-unrelated-histories` when required
 * `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_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
@@ -203,10 +232,11 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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;
+* `grep_recursive` &ndash; adds `-r` when you try 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;
@@ -214,6 +244,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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`;
+* `long_form_help` &ndash; changes `-h` to `--help` when the short form version is not supported
 * `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;
@@ -222,7 +253,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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;
+* `mkdir_p` &ndash; adds `-p` when you try to create a 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>`;
@@ -232,14 +263,16 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `no_such_file` &ndash; creates missing directories with `mv` and `cp` commands;
 * `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;
-* `python_command` &ndash; prepends `python` when you trying to run not executable/without `./` python script;
+* `prove_recursively` &ndash; adds `-r` when called with directory;
+* `python_command` &ndash; prepends `python` when you try to run non-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';
 * `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;
+* `rm_dir` &ndash; adds `-rf` when you try to remove a directory;
 * `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`;
@@ -254,6 +287,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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`;
+* `unsudo` &ndash; removes `sudo` from previous command if a process refuses to run on super user privilege.
 * `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.
@@ -262,55 +296,63 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `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:
+The following rules are enabled by default on specific platforms only:
 
 * `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`;
+* `apt_upgrade` &ndash; helps you run `apt upgrade` after `apt list --upgradable`;
+* `brew_cask_dependency` &ndash; installs cask dependencies;
 * `brew_install` &ndash; fixes formula name for `brew install`;
+* `brew_reinstall` &ndash; turns `brew install <formula>` into `brew reinstall <formula>`;
 * `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_update_formula` &ndash; turns `brew update <formula>` into `brew upgrade <formula>`;
-* `brew_upgrade` &ndash; appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
+* `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:
+The following commands are bundled with *The Fuck*, but are 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 `~/.config/thefuck/rules`. The rule should contain two functions:
+To add your own rule, create a file named `your-rule-name.py`
+in `~/.config/thefuck/rules`. The rule file must contain two functions:
 
 ```python
 match(command: Command) -> bool
 get_new_command(command: Command) -> str | list[str]
 ```
 
-Also the rule can contain an optional function
+Additionally, rules can contain optional functions:
 
 ```python
 side_effect(old_command: Command, fixed_command: str) -> None
 ```
-and optional `enabled_by_default`, `requires_output` and `priority` variables.
+Rules can also contain the optional variables `enabled_by_default`, `requires_output` and `priority`.
 
-`Command` has three attributes: `script`, `stdout`, `stderr` and `script_parts`.
-Rule shouldn't change `Command`.
+`Command` has three attributes: `script`, `output` and `script_parts`.
+Your rule should not 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)).
+**Rules api changed in 3.0:** To access a rule's settings, import it with
+ `from thefuck.conf import settings`
+  
+`settings` is a special object assembled from `~/.config/thefuck/settings.py`, 
+and values from env ([see more below](#settings)).
 
-Simple example of the rule for running script with `sudo`:
+A simple example rule for running a script with `sudo`:
 
 ```python
 def match(command):
-    return ('permission denied' in command.stderr.lower()
-            or 'EACCES' in command.stderr)
+    return ('permission denied' in command.output.lower()
+            or 'EACCES' in command.output)
 
 
 def get_new_command(command):
@@ -333,7 +375,8 @@ requires_output = True
 
 ## Settings
 
-The Fuck has a few settings parameters which can be changed in `$XDG_CONFIG_HOME/thefuck/settings.py` (`$XDG_CONFIG_HOME` defaults to `~/.config`):
+Several *The Fuck* parameters can be changed in the file `$XDG_CONFIG_HOME/thefuck/settings.py`
+(`$XDG_CONFIG_HOME` defaults to `~/.config`):
 
 * `rules` &ndash; list of enabled rules, by default `thefuck.conf.DEFAULT_RULES`;
 * `exclude_rules` &ndash; list of disabled rules, by default `[]`;
@@ -347,7 +390,7 @@ The Fuck has a few settings parameters which can be changed in `$XDG_CONFIG_HOME
 * `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`:
+An example of `settings.py`:
 
 ```python
 rules = ['sudo', 'no_command']
@@ -389,39 +432,47 @@ export THEFUCK_PRIORITY='no_command=9999:apt_get=100'
 export THEFUCK_HISTORY_LIMIT='2000'
 ```
 
+## Third-party packages with rules
+
+If you'd like to make a specific set of non-public rules, but would still like
+to share them with others, create a package named `thefuck_contrib_*` with
+the following structure:
+
+```
+thefuck_contrib_foo
+  thefuck_contrib_foo
+    rules
+      __init__.py
+      *third-party rules*
+    __init__.py
+    *third-party-utils*
+  setup.py
+```
+
+*The Fuck* will find rules located in the `rules` module.
+
+## Experimental instant mode
+
+The default behavior of *The Fuck* requires time to re-run previous commands.
+When in instant mode, *The Fuck* saves time by logging output with [script](https://en.wikipedia.org/wiki/Script_(Unix)),
+then reading the log.
+
+[![gif with instant mode][instant-mode-gif-link]][instant-mode-gif-link]
+
+Currently, instant mode only supports Python 3 with bash or zsh.
+
+To enable instant mode, add `--enable-experimental-instant-mode`
+to the alias initialization in `.bashrc`, `.bash_profile` or `.zshrc`.
+
+For example:
+
+```bash
+eval $(thefuck --alias --enable-experimental-instant-mode)
+```
+
 ## Developing
 
-Install `The Fuck` for development:
-
-```bash
-pip install -r requirements.txt
-python setup.py develop
-```
-
-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
-```
+See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## License MIT
 Project License can be found [here](LICENSE.md).
@@ -429,12 +480,13 @@ 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://img.shields.io/travis/nvbn/thefuck.svg
+[travis-badge]:    https://travis-ci.org/nvbn/thefuck.svg?branch=master
 [travis-link]:     https://travis-ci.org/nvbn/thefuck
-[appveyor-badge]:  https://img.shields.io/appveyor/ci/nvbn/thefuck.svg?label=windows%20build
+[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

@@ -3,7 +3,6 @@ build: false
 environment:
   matrix:
     - PYTHON: "C:/Python27"
-    - PYTHON: "C:/Python33"
     - PYTHON: "C:/Python34"
     - PYTHON: "C:/Python35"
     - PYTHON: "C:/Python36"
@@ -13,7 +12,7 @@ init:
   - ps: "ls C:/Python*"
 
 install:
-  - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/get-pip.py')
+  - "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"

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__)

requirements.txt

@@ -1,4 +1,3 @@
-pip
 flake8
 pytest
 mock

setup.py

@@ -3,6 +3,8 @@ from setuptools import setup, find_packages
 import pkg_resources
 import sys
 import os
+import fastentrypoints
+
 
 try:
     if int(pkg_resources.get_distribution("pip").version.split('.')[0]) < 6:
@@ -24,15 +26,16 @@ if version < (2, 7):
     print('thefuck requires Python version 2.7 or later' +
           ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
-elif (3, 0) < version < (3, 3):
-    print('thefuck requires Python version 3.3 or later' +
+elif (3, 0) < version < (3, 4):
+    print('thefuck requires Python version 3.4 or later' +
           ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '3.16'
+VERSION = '3.27'
 
-install_requires = ['psutil', 'colorama', 'six', 'decorator']
+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',
@@ -50,5 +53,5 @@ setup(name='thefuck',
       install_requires=install_requires,
       extras_require=extras_require,
       entry_points={'console_scripts': [
-          'thefuck = thefuck.main:main',
-          'fuck = thefuck.not_configured:main']})
+          'thefuck = thefuck.entrypoints.main:main',
+          'fuck = thefuck.entrypoints.not_configured:main']})

tests/conftest.py

@@ -1,3 +1,4 @@
+import os
 import pytest
 from thefuck import shells
 from thefuck import conf, const
@@ -7,7 +8,7 @@ shells.shell = shells.Generic()
 
 
 def pytest_addoption(parser):
-    """Adds `--run-without-docker` argument."""
+    """Adds `--enable-functional` argument."""
     group = parser.getgroup("thefuck")
     group.addoption('--enable-functional', action="store_true", default=False,
                     help="Enable functional tests")
@@ -52,11 +53,17 @@ def source_root():
 
 
 @pytest.fixture
-def set_shell(monkeypatch, request):
+def set_shell(monkeypatch):
     def _set(cls):
         shell = cls()
         monkeypatch.setattr('thefuck.shells.shell', shell)
-        request.addfinalizer()
         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

@@ -1,40 +1,56 @@
 import pytest
+import json
+from six import StringIO
 from mock import MagicMock
 from thefuck.shells.generic import ShellConfiguration
-from thefuck.not_configured import main
+from thefuck.entrypoints.not_configured import main
 
 
 @pytest.fixture(autouse=True)
 def usage_tracker(mocker):
     return mocker.patch(
-        'thefuck.not_configured._get_not_configured_usage_tracker_path',
+        'thefuck.entrypoints.not_configured._get_not_configured_usage_tracker_path',
         new_callable=MagicMock)
 
 
-def _assert_tracker_updated(usage_tracker, pid):
+@pytest.fixture(autouse=True)
+def usage_tracker_io(usage_tracker):
+    io = StringIO()
     usage_tracker.return_value \
-        .open.return_value \
-        .__enter__.return_value \
-        .write.assert_called_once_with(str(pid))
+                 .open.return_value \
+                 .__enter__.return_value = io
+    return io
 
 
-def _change_tracker(usage_tracker, pid):
-    usage_tracker.return_value.exists.return_value = True
+@pytest.fixture(autouse=True)
+def usage_tracker_exists(usage_tracker):
     usage_tracker.return_value \
-        .open.return_value \
-        .__enter__.return_value \
-        .read.return_value = str(pid)
+                 .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.not_configured._get_shell_pid',
+    return mocker.patch('thefuck.entrypoints.not_configured._get_shell_pid',
                         new_callable=MagicMock)
 
 
 @pytest.fixture(autouse=True)
 def shell(mocker):
-    shell = mocker.patch('thefuck.not_configured.shell',
+    shell = mocker.patch('thefuck.entrypoints.not_configured.shell',
                          new_callable=MagicMock)
     shell.get_history.return_value = []
     shell.how_to_configure.return_value = ShellConfiguration(
@@ -47,7 +63,7 @@ def shell(mocker):
 
 @pytest.fixture(autouse=True)
 def shell_config(mocker):
-    path_mock = mocker.patch('thefuck.not_configured.Path',
+    path_mock = mocker.patch('thefuck.entrypoints.not_configured.Path',
                              new_callable=MagicMock)
     return path_mock.return_value \
         .expanduser.return_value \
@@ -57,7 +73,7 @@ def shell_config(mocker):
 
 @pytest.fixture(autouse=True)
 def logs(mocker):
-    return mocker.patch('thefuck.not_configured.logs',
+    return mocker.patch('thefuck.entrypoints.not_configured.logs',
                         new_callable=MagicMock)
 
 
@@ -67,29 +83,28 @@ def test_for_generic_shell(shell, logs):
     logs.how_to_configure_alias.assert_called_once()
 
 
-def test_on_first_run(usage_tracker, shell_pid, logs):
+def test_on_first_run(usage_tracker_io, usage_tracker_exists, shell_pid, logs):
     shell_pid.return_value = 12
-    usage_tracker.return_value.exists.return_value = False
     main()
-    _assert_tracker_updated(usage_tracker, 12)
+    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, shell_pid, shell, logs):
+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, 12)
+    _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, shell_pid,
+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
-    _change_tracker(usage_tracker, 55)
     main()
-    _assert_tracker_updated(usage_tracker, 12)
+    _assert_tracker_updated(usage_tracker_io, 12)
     logs.how_to_configure_alias.assert_called_once()
 
 
@@ -104,21 +119,21 @@ def test_when_cant_configure_automatically(shell_pid, shell, logs):
     logs.how_to_configure_alias.assert_called_once()
 
 
-def test_when_already_configured(usage_tracker, shell_pid,
+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, 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_successfuly_configured(usage_tracker, shell_pid,
-                                     shell, shell_config, logs):
+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, 12)
+    _change_tracker(usage_tracker_io, 12)
     shell_config.read.return_value = ''
     main()
     shell_config.write.assert_any_call('eval $(thefuck --alias)')

tests/functional/test_bash.py

@@ -3,22 +3,38 @@ from tests.functional.plots import with_confirmation, without_confirmation, \
     refuse_with_confirmation, history_changed, history_not_changed, \
     select_command_with_arrows, how_to_configure
 
-containers = ((u'thefuck/python3-bash',
-               u'FROM python:3',
-               u'bash'),
-              (u'thefuck/python2-bash',
-               u'FROM python:2',
-               u'bash'))
+
+python_3 = (u'thefuck/python3-bash',
+            u'FROM python:3',
+            u'sh')
+
+python_2 = (u'thefuck/python2-bash',
+            u'FROM python:2',
+            u'sh')
 
 
-@pytest.fixture(params=containers)
+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):
-    proc = spawnu(*request.param)
+    container, instant_mode = request.param
+    proc = spawnu(*container)
     proc.sendline(u"pip install /src")
     assert proc.expect([TIMEOUT, u'Successfully installed'])
-    proc.sendline(u"export PS1='$ '")
-    proc.sendline(u'eval $(thefuck --alias)')
-    proc.sendline(u'echo > $HISTFILE')
+    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
 
 

tests/functional/test_zsh.py

@@ -3,29 +3,45 @@ from tests.functional.plots import with_confirmation, without_confirmation, \
     refuse_with_confirmation, history_changed, history_not_changed, \
     select_command_with_arrows, how_to_configure
 
-containers = (('thefuck/python3-zsh',
-               u'''FROM python:3
-                   RUN apt-get update
-                   RUN apt-get install -yy zsh''',
-               u'zsh'),
-              ('thefuck/python2-zsh',
-               u'''FROM python:2
-                   RUN apt-get update
-                   RUN apt-get install -yy zsh''',
-               u'zsh'))
+
+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')
 
 
-@pytest.fixture(params=containers)
+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):
-    proc = spawnu(*request.param)
+    container, instant_mode = request.param
+    proc = spawnu(*container)
     proc.sendline(u'pip install /src')
     assert proc.expect([TIMEOUT, u'Successfully installed'])
-    proc.sendline(u'eval $(thefuck --alias)')
-    proc.sendline(u'export HISTFILE=~/.zsh_history')
-    proc.sendline(u'echo > $HISTFILE')
-    proc.sendline(u'export SAVEHIST=100')
-    proc.sendline(u'export HISTSIZE=100')
-    proc.sendline(u'setopt INC_APPEND_HISTORY')
+    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
 
 

tests/rules/test_adb_unknown_command.py

@@ -0,0 +1,41 @@
+import pytest
+from thefuck.rules.adb_unknown_command import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return '''Android Debug Bridge version 1.0.31
+
+ -d                            - directs command to the only connected USB device
+                                 returns an error if more than one USB device is present.
+ -e                            - directs command to the only running emulator.
+                                 returns an error if more than one emulator is running.
+ -s <specific device>          - directs command to the device or emulator with the given
+                                 serial number or qualifier. Overrides ANDROID_SERIAL
+                                 environment variable.
+'''
+
+
+@pytest.mark.parametrize('script', [
+    ('adb lgcat'),
+    ('adb puhs')])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', [
+    'git branch foo',
+    'abd push'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, new_command', [
+    ('adb puhs test.bin /sdcard/test.bin', 'adb push test.bin /sdcard/test.bin'),
+    ('adb -s 1111 logcta', 'adb -s 1111 logcat'),
+    ('adb -P 666 pulll /sdcard/test.bin', 'adb -P 666 pull /sdcard/test.bin'),
+    ('adb -d logcatt', 'adb -d logcat'),
+    ('adb -e reboott', 'adb -e reboot')])
+def test_get_new_command(script, output, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_ag_literal.py

@@ -1,25 +1,25 @@
 import pytest
 from thefuck.rules.ag_literal import get_new_command, match
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+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, stderr):
-    assert match(Command(script=script, stderr=stderr))
+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=script))
+    assert not match(Command(script, ''))
 
 
 @pytest.mark.parametrize('script, new_cmd', [
     ('ag \(', 'ag -Q \(')])
-def test_get_new_command(script, new_cmd, stderr):
-    assert get_new_command((Command(script=script, stderr=stderr))) == new_cmd
+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,55 +1,53 @@
 import pytest
 from thefuck.rules.apt_get import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.mark.parametrize('command, packages', [
-    (Command(script='vim', stderr='vim: command not found'),
+    (Command('vim', 'vim: command not found'),
      [('vim', 'main'), ('vim-tiny', 'main')]),
-    (Command(script='sudo vim', stderr='vim: command not found'),
+    (Command('sudo vim', 'vim: command not found'),
      [('vim', 'main'), ('vim-tiny', 'main')]),
-    (Command(script='vim', stderr="The program 'vim' is currently not installed. You can install it by typing: sudo apt install vim"),
+    (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
+    mocker.patch('thefuck.rules.apt_get._get_packages',
+                 create=True, return_value=packages)
 
     assert match(command)
 
 
 @pytest.mark.parametrize('command, packages, which', [
-    (Command(script='a_bad_cmd', stderr='a_bad_cmd: command not found'),
+    (Command('a_bad_cmd', 'a_bad_cmd: command not found'),
      [], None),
-    (Command(script='vim', stderr=''), [], None),
-    (Command(), [], None),
-    (Command(script='vim', stderr='vim: command not found'),
+    (Command('vim', ''), [], None),
+    (Command('', ''), [], None),
+    (Command('vim', 'vim: command not found'),
      ['vim'], '/usr/bin/vim'),
-    (Command(script='sudo vim', stderr='vim: command not found'),
+    (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
+    mocker.patch('thefuck.rules.apt_get._get_packages',
+                 create=True, return_value=packages)
 
     assert not match(command)
 
 
 @pytest.mark.parametrize('command, new_command, packages', [
-    (Command('vim'), 'sudo apt-get install vim && vim',
+    (Command('vim', ''), 'sudo apt-get install vim && vim',
      [('vim', 'main'), ('vim-tiny', 'main')]),
-    (Command('convert'), 'sudo apt-get install imagemagick && convert',
+    (Command('convert', ''), 'sudo apt-get install imagemagick && convert',
      [('imagemagick', 'main'),
       ('graphicsmagick-imagemagick-compat', 'universe')]),
-    (Command('sudo vim'), 'sudo apt-get install vim && sudo vim',
+    (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',
+    (Command('sudo convert', ''), 'sudo apt-get install imagemagick && sudo convert',
      [('imagemagick', 'main'),
       ('graphicsmagick-imagemagick-compat', 'universe')])])
 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
+    mocker.patch('thefuck.rules.apt_get._get_packages',
+                 create=True, return_value=packages)
+
     assert get_new_command(command) == new_command

tests/rules/test_apt_get_search.py

@@ -1,25 +1,26 @@
 import pytest
 from thefuck.rules.apt_get_search import get_new_command, match
-from tests.utils import Command
+from thefuck.types import Command
 
 
 def test_match():
-    assert match(Command('apt-get search foo'))
+    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')
+    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():
-    assert get_new_command(Command('apt-get search foo')) == 'apt-cache search foo'
+    new_command = get_new_command(Command('apt-get search foo', ''))
+    assert new_command == 'apt-cache search foo'

tests/rules/test_apt_invalid_operation.py

@@ -1,6 +1,6 @@
 from io import BytesIO
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.apt_invalid_operation import match, get_new_command, \
     _get_operations
 
@@ -77,19 +77,19 @@ apt_get_operations = ['update', 'upgrade', 'install', 'remove', 'autoremove',
                       'changelog', 'download']
 
 
-@pytest.mark.parametrize('script, stderr', [
+@pytest.mark.parametrize('script, output', [
     ('apt', invalid_operation('saerch')),
     ('apt-get', invalid_operation('isntall')),
     ('apt-cache', invalid_operation('rumove'))])
-def test_match(script, stderr):
-    assert match(Command(script, stderr=stderr))
+def test_match(script, output):
+    assert match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stderr', [
+@pytest.mark.parametrize('script, output', [
     ('vim', invalid_operation('vim')),
     ('apt-get', "")])
-def test_not_match(script, stderr):
-    assert not match(Command(script, stderr=stderr))
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
 @pytest.fixture
@@ -111,12 +111,12 @@ def test_get_operations(set_help, app, help_text, operations):
     assert _get_operations(app) == operations
 
 
-@pytest.mark.parametrize('script, stderr, help_text, result', [
+@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, stderr, script, help_text, result):
+def test_get_new_command(set_help, output, script, help_text, result):
     set_help(help_text)
-    assert get_new_command(Command(script, stderr=stderr))[0] == result
+    assert get_new_command(Command(script, output))[0] == result

tests/rules/test_apt_list_upgradable.py

@@ -0,0 +1,75 @@
+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 == 'sudo apt list --upgradable'
+
+    new_command = get_new_command(Command('apt update', match_output))
+    assert new_command == 'apt list --upgradable'

tests/rules/test_apt_upgrade.py

@@ -0,0 +1,36 @@
+import pytest
+from thefuck.rules.apt_upgrade import get_new_command, match
+from thefuck.types import Command
+
+match_output = '''
+Listing... Done
+heroku/stable 6.15.2-1 amd64 [upgradable from: 6.14.43-1]
+resolvconf/zesty-updates,zesty-updates 1.79ubuntu4.1 all [upgradable from: 1.79ubuntu4]
+squashfs-tools/zesty-updates 1:4.3-3ubuntu2.17.04.1 amd64 [upgradable from: 1:4.3-3ubuntu2]
+unattended-upgrades/zesty-updates,zesty-updates 0.93.1ubuntu2.4 all [upgradable from: 0.93.1ubuntu2.3]
+'''
+
+no_match_output = '''
+Listing... Done
+'''
+
+
+def test_match():
+    assert match(Command('apt list --upgradable', match_output))
+    assert match(Command('sudo apt list --upgradable', match_output))
+
+
+@pytest.mark.parametrize('command', [
+    Command('apt list --upgradable', no_match_output),
+    Command('sudo apt list --upgradable', no_match_output)
+])
+def test_not_match(command):
+    assert not match(command)
+
+
+def test_get_new_command():
+    new_command = get_new_command(Command('apt list --upgradable', match_output))
+    assert new_command == 'apt upgrade'
+
+    new_command = get_new_command(Command('sudo apt list --upgradable', match_output))
+    assert new_command == 'sudo apt upgrade'

tests/rules/test_aws_cli.py

@@ -1,7 +1,7 @@
 import pytest
 
 from thefuck.rules.aws_cli import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 no_suggestions = '''\
@@ -77,25 +77,25 @@ Invalid choice: 't-item', maybe you meant:
 
 
 @pytest.mark.parametrize('command', [
-    Command('aws dynamdb scan', stderr=misspelled_command),
-    Command('aws dynamodb scn', stderr=misspelled_subcommand),
+    Command('aws dynamdb scan', misspelled_command),
+    Command('aws dynamodb scn', misspelled_subcommand),
     Command('aws dynamodb t-item',
-            stderr=misspelled_subcommand_with_multiple_options)])
+            misspelled_subcommand_with_multiple_options)])
 def test_match(command):
     assert match(command)
 
 
 def test_not_match():
-    assert not match(Command('aws dynamodb invalid', stderr=no_suggestions))
+    assert not match(Command('aws dynamodb invalid', no_suggestions))
 
 
 @pytest.mark.parametrize('command, result', [
-    (Command('aws dynamdb scan', stderr=misspelled_command),
+    (Command('aws dynamdb scan', misspelled_command),
      ['aws dynamodb scan']),
-    (Command('aws dynamodb scn', stderr=misspelled_subcommand),
+    (Command('aws dynamodb scn', misspelled_subcommand),
      ['aws dynamodb scan']),
     (Command('aws dynamodb t-item',
-             stderr=misspelled_subcommand_with_multiple_options),
+             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 _get_formulas
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
@@ -28,19 +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))
+                         brew_no_available_formula))
     assert not match(Command('brew install git',
-                             stderr=brew_already_installed))
-    assert not match(Command('brew install', stderr=brew_install_no_argument))
+                             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))\
+                                   brew_no_available_formula))\
         == 'brew install elasticsearch'
 
     assert get_new_command(Command('brew install aa',
-                                   stderr=brew_no_available_formula))\
+                                   brew_no_available_formula))\
         != 'brew install aha'

tests/rules/test_brew_link.py

@@ -1,10 +1,10 @@
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.brew_link import get_new_command, match
 
 
 @pytest.fixture
-def stderr():
+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"
@@ -23,16 +23,15 @@ def new_command(formula):
 
 
 @pytest.mark.parametrize('script', ['brew link coreutils', 'brew ln coreutils'])
-def test_match(stderr, script):
-    assert match(Command(script=script, stderr=stderr))
+def test_match(output, script):
+    assert match(Command(script, output))
 
 
 @pytest.mark.parametrize('script', ['brew link coreutils'])
 def test_not_match(script):
-    stderr = ''
-    assert not match(Command(script=script, stderr=stderr))
+    assert not match(Command(script, ''))
 
 
 @pytest.mark.parametrize('script, formula, ', [('brew link coreutils', 'coreutils')])
-def test_get_new_command(stderr, new_command, script, formula):
-    assert get_new_command(Command(script=script, stderr=stderr)) == new_command
+def test_get_new_command(output, new_command, script, formula):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_brew_reinstall.py

@@ -0,0 +1,28 @@
+import pytest
+from thefuck.types import Command
+from thefuck.rules.brew_reinstall import get_new_command, match
+
+
+output = ("Warning: thefuck 9.9 is already installed and up-to-date\nTo "
+          "reinstall 9.9, run `brew reinstall thefuck`")
+
+
+def test_match():
+    command = Command('brew install thefuck', output)
+    assert match(command)
+
+
+@pytest.mark.parametrize('script', [
+    'brew reinstall thefuck',
+    'brew install foo'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script, formula, ', [
+    ('brew install foo', 'foo'),
+    ('brew install bar zap', 'bar zap')])
+def test_get_new_command(script, formula):
+    command = Command(script, output)
+    new_command = 'brew reinstall {}'.format(formula)
+    assert get_new_command(command) == new_command

tests/rules/test_brew_uninstall.py

@@ -1,10 +1,10 @@
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.brew_uninstall import get_new_command, match
 
 
 @pytest.fixture
-def stdout():
+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")
@@ -16,16 +16,16 @@ def new_command(formula):
 
 
 @pytest.mark.parametrize('script', ['brew uninstall tbb', 'brew rm tbb', 'brew remove tbb'])
-def test_match(stdout, script):
-    assert match(Command(script=script, stdout=stdout))
+def test_match(output, script):
+    assert match(Command(script, output))
 
 
 @pytest.mark.parametrize('script', ['brew remove gnuplot'])
 def test_not_match(script):
-    stdout = 'Uninstalling /usr/local/Cellar/gnuplot/5.0.4_1... (44 files, 2.3M)\n'
-    assert not match(Command(script=script, stdout=stdout))
+    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(stdout, new_command, script, formula):
-    assert get_new_command(Command(script=script, stdout=stdout)) == new_command
+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.types import Command
 
 
 @pytest.fixture
@@ -15,15 +15,15 @@ def brew_unknown_cmd2():
 
 
 def test_match(brew_unknown_cmd):
-    assert match(Command('brew inst', stderr=brew_unknown_cmd))
+    assert match(Command('brew inst', brew_unknown_cmd))
     for command in _brew_commands():
-        assert not match(Command('brew ' + command))
+        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))
+    assert (get_new_command(Command('brew inst', brew_unknown_cmd))
             == ['brew list', 'brew install', 'brew uninstall'])
 
-    cmds = get_new_command(Command('brew instaa', stderr=brew_unknown_cmd2))
+    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

@@ -1,30 +1,28 @@
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.brew_update_formula import get_new_command, match
 
 
-@pytest.fixture
-def stderr():
-    return ("Error: This command updates brew itself, and does not take formula"
-            " names.\nUse 'brew upgrade <formula>'.")
+output = ("Error: This command updates brew itself, and does not take formula"
+          " names.\nUse 'brew upgrade thefuck'.")
 
 
-@pytest.fixture
-def new_command(formula):
-    return 'brew upgrade {}'.format(formula)
+def test_match():
+    command = Command('brew update thefuck', output)
+    assert match(command)
 
 
-@pytest.mark.parametrize('script', ['brew update foo', 'brew update bar zap'])
-def test_match(stderr, script):
-    assert match(Command(script=script, stderr=stderr))
-
-
-@pytest.mark.parametrize('script', ['brew upgrade foo', 'brew update'])
+@pytest.mark.parametrize('script', [
+    'brew upgrade foo',
+    'brew update'])
 def test_not_match(script):
-    assert not match(Command(script=script, stderr=''))
+    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(stderr, new_command, script, formula):
-    assert get_new_command(Command(script=script, stderr=stderr)) == new_command
+    ('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)
-
-
-@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) == new_command

tests/rules/test_cargo_no_command.py

@@ -1,6 +1,6 @@
 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_old = """No such subcommand
@@ -15,14 +15,14 @@ no_such_subcommand = """error: no such subcommand
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='cargo buid', stderr=no_such_subcommand_old),
-    Command(script='cargo buils', stderr=no_such_subcommand)])
+    Command('cargo buid', no_such_subcommand_old),
+    Command('cargo buils', no_such_subcommand)])
 def test_match(command):
     assert match(command)
 
 
 @pytest.mark.parametrize('command, new_command', [
-    (Command('cargo buid', stderr=no_such_subcommand_old), 'cargo build'),
-    (Command('cargo buils', 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) == new_command

tests/rules/test_cd_correction.py

@@ -0,0 +1,23 @@
+import pytest
+from thefuck.rules.cd_correction import match
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('command', [
+    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'),
+    Command('cd /foo/bar/', 'cd: The directory "/foo/bar/" does not exist')])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('cd foo', ''), Command('', '')])
+def test_not_match(command):
+    assert not match(command)
+
+
+# Note that get_new_command uses local filesystem, so not testing it here.
+# Instead, see the functional test `functional.test_cd_correction`

tests/rules/test_cd_mkdir.py

@@ -1,25 +1,26 @@
 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'),
+    Command('cd /foo/bar/', 'cd: The directory "/foo/bar/" does not exist')])
 def test_match(command):
     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)
 
 
 @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) == 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'))
-    assert not match(Command())
+    assert match(Command('cd..', 'cd..: command not found'))
+    assert not match(Command('', ''))
 
 
 def test_get_new_command():
-    assert get_new_command(
-        Command('cd..')) == 'cd ..'
+    assert get_new_command(Command('cd..', '')) == 'cd ..'

tests/rules/test_chmod_x.py

@@ -1,5 +1,5 @@
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.chmod_x import match, get_new_command
 
 
@@ -14,26 +14,26 @@ def file_access(mocker):
 
 
 @pytest.mark.usefixtures('file_exists', 'file_access')
-@pytest.mark.parametrize('script, stderr', [
+@pytest.mark.parametrize('script, output', [
     ('./gradlew build', 'gradlew: Permission denied'),
     ('./install.sh --help', 'install.sh: permission denied')])
-def test_match(script, stderr):
-    assert match(Command(script, stderr=stderr))
+def test_match(script, output):
+    assert match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stderr, exists, callable', [
+@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, stderr, exists, callable):
+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, stderr=stderr))
+    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
+    assert get_new_command(Command(script, '')) == result

tests/rules/test_composer_not_command.py

@@ -1,6 +1,6 @@
 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
@@ -41,16 +41,16 @@ def composer_not_command_one_of_this():
 
 def test_match(composer_not_command, composer_not_command_one_of_this):
     assert match(Command('composer udpate',
-                         stderr=composer_not_command))
+                         composer_not_command))
     assert match(Command('composer pdate',
-                         stderr=composer_not_command_one_of_this))
-    assert not match(Command('ls update', stderr=composer_not_command))
+                         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))
+                                    composer_not_command))
             == 'composer update')
     assert (get_new_command(Command('composer pdate',
-                                    stderr=composer_not_command_one_of_this))
+                                    composer_not_command_one_of_this))
             == 'composer selfupdate')

tests/rules/test_cp_omitting_directory.py

@@ -1,22 +1,22 @@
 import pytest
 from thefuck.rules.cp_omitting_directory import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
-@pytest.mark.parametrize('script, stderr', [
+@pytest.mark.parametrize('script, output', [
     ('cp dir', 'cp: dor: is a directory'),
     ('cp dir', "cp: omitting directory 'dir'")])
-def test_match(script, stderr):
-    assert match(Command(script, stderr=stderr))
+def test_match(script, output):
+    assert match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stderr', [
+@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, stderr):
-    assert not match(Command(script, stderr=stderr))
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
 def test_get_new_command():
-    assert get_new_command(Command(script='cp dir')) == 'cp -a dir'
+    assert get_new_command(Command('cp dir', '')) == 'cp -a dir'

tests/rules/test_dirty_untar.py

@@ -3,7 +3,7 @@ import pytest
 import tarfile
 from thefuck.rules.dirty_untar import match, get_new_command, side_effect, \
                                       tar_extensions  # noqa: E126
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
@@ -39,7 +39,6 @@ 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{}'"),
     ('"foo bar{}"', 'foo bar{}', "'foo bar{}'")])
 
 parametrize_script = pytest.mark.parametrize('script, fixed', [
@@ -53,7 +52,7 @@ parametrize_script = pytest.mark.parametrize('script, fixed', [
 @parametrize_script
 def test_match(ext, tar_error, filename, unquoted, quoted, script, fixed):
     tar_error(unquoted.format(ext))
-    assert match(Command(script=script.format(filename.format(ext))))
+    assert match(Command(script.format(filename.format(ext)), ''))
 
 
 @parametrize_extensions
@@ -61,7 +60,7 @@ def test_match(ext, tar_error, filename, unquoted, quoted, script, fixed):
 @parametrize_script
 def test_side_effect(ext, tar_error, filename, unquoted, quoted, script, fixed):
     tar_error(unquoted.format(ext))
-    side_effect(Command(script=script.format(filename.format(ext))), None)
+    side_effect(Command(script.format(filename.format(ext)), ''), None)
     assert set(os.listdir('.')) == {unquoted.format(ext), 'd'}
 
 
@@ -70,5 +69,5 @@ def test_side_effect(ext, tar_error, filename, unquoted, quoted, script, fixed):
 @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=script.format(filename.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

@@ -4,7 +4,7 @@ import os
 import pytest
 import zipfile
 from thefuck.rules.dirty_unzip import match, get_new_command, side_effect
-from tests.utils import Command
+from thefuck.types import Command
 from unicodedata import normalize
 
 
@@ -42,7 +42,7 @@ def zip_error(tmpdir):
     (u'unzip foo.zip', u'foo.zip')])
 def test_match(zip_error, script, filename):
     zip_error(filename)
-    assert match(Command(script=script))
+    assert match(Command(script, ''))
 
 
 @pytest.mark.parametrize('script,filename', [
@@ -52,7 +52,7 @@ def test_match(zip_error, script, filename):
     (u'unzip foo.zip', u'foo.zip')])
 def test_side_effect(zip_error, script, filename):
     zip_error(filename)
-    side_effect(Command(script=script), None)
+    side_effect(Command(script, ''), None)
 
     dir_list = os.listdir(u'.')
     if filename not in set(dir_list):
@@ -64,9 +64,8 @@ def test_side_effect(zip_error, script, filename):
 @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 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=script)) == fixed
+    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"))
@@ -40,14 +40,14 @@ south.exceptions.GhostMigrations:
 '''  # noqa
 
 
-def test_match(stderr):
-    assert match(Command('./manage.py migrate', stderr=stderr))
-    assert match(Command('python manage.py migrate', stderr=stderr))
-    assert not match(Command('./manage.py migrate'))
-    assert not match(Command('app migrate', stderr=stderr))
-    assert not match(Command('./manage.py test', stderr=stderr))
+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'))\
+    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))
-    assert match(Command('python manage.py migrate', stderr=stderr))
-    assert not match(Command('./manage.py migrate'))
-    assert not match(Command('app migrate', stderr=stderr))
-    assert not match(Command('./manage.py test', stderr=stderr))
+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'))
+    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

@@ -1,6 +1,6 @@
 import pytest
 from io import BytesIO
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.docker_not_command import get_new_command, match
 
 
@@ -104,20 +104,20 @@ Run 'docker COMMAND --help' for more information on a command.
     return mock
 
 
-def stderr(cmd):
+def output(cmd):
     return "docker: '{}' is not a docker command.\n" \
            "See 'docker --help'.".format(cmd)
 
 
 def test_match():
-    assert match(Command('docker pes', stderr=stderr('pes')))
+    assert match(Command('docker pes', output('pes')))
 
 
-@pytest.mark.parametrize('script, stderr', [
+@pytest.mark.parametrize('script, output', [
     ('docker ps', ''),
-    ('cat pes', stderr('pes'))])
-def test_not_match(script, stderr):
-    assert not match(Command(script, stderr=stderr))
+    ('cat pes', output('pes'))])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
 @pytest.mark.usefixtures('docker_help')
@@ -125,5 +125,5 @@ def test_not_match(script, stderr):
     ('pes', ['ps', 'push', 'pause']),
     ('tags', ['tag', 'stats', 'images'])])
 def test_get_new_command(wrong, fixed):
-    command = Command('docker {}'.format(wrong), stderr=stderr(wrong))
+    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)
 
 
 @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) == new_command

tests/rules/test_fab_command_not_found.py

@@ -1,13 +1,12 @@
 import pytest
 from thefuck.rules.fab_command_not_found import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
-stderr = '''
+output = '''
 Warning: Command(s) not found:
     extenson
     deloyp
-'''
-stdout = '''
+
 Available commands:
 
     update_config
@@ -21,16 +20,16 @@ Available commands:
 
 
 @pytest.mark.parametrize('command', [
-    Command('fab extenson', stderr=stderr),
-    Command('fab deloyp', stderr=stderr),
-    Command('fab extenson deloyp', stderr=stderr)])
+    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', stderr=stderr),
-    Command('fab deloyp')])
+    Command('gulp extenson', output),
+    Command('fab deloyp', '')])
 def test_not_match(command):
     assert not match(command)
 
@@ -45,5 +44,5 @@ def test_not_match(command):
      'fab prepare_extension:version=2016 deploy:beta=true -H the.fuck'),
 ])
 def test_get_new_command(script, result):
-    command = Command(script, stdout, stderr)
+    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'))
-    assert not match(Command('ps -ef | grep foo'))
-    assert not match(Command())
+                         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'))
+    assert (get_new_command(Command(u'ps -ef | grep foo', ''))
             == 'ps -ef | grep foo')

tests/rules/test_fix_file.py

@@ -3,12 +3,12 @@
 import pytest
 import os
 from thefuck.rules.fix_file import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
-# (script, file, line, col (or None), stdout, stderr)
+# (script, file, line, col (or None), output)
 tests = (
-('gcc a.c', 'a.c', 3, 1, '',
+('gcc a.c', 'a.c', 3, 1,
 """
 a.c: In function 'main':
 a.c:3:1: error: expected expression before '}' token
@@ -16,47 +16,47 @@ a.c:3:1: error: expected expression before '}' token
   ^
 """),
 
-('clang a.c', 'a.c', 3, 1, '',
+('clang a.c', 'a.c', 3, 1,
 """
 a.c:3:1: error: expected expression
 }
 ^
 """),
 
-('perl a.pl', 'a.pl', 3, None, '',
+('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, '',
+('perl a.pl', 'a.pl', 2, None,
 """
 Search pattern not terminated at a.pl line 2.
 """),
 
-('sh a.sh', 'a.sh', 2, None, '',
+('sh a.sh', 'a.sh', 2, None,
 """
 a.sh: line 2: foo: command not found
 """),
 
-('zsh a.sh', 'a.sh', 2, None, '',
+('zsh a.sh', 'a.sh', 2, None,
 """
 a.sh:2: command not found: foo
 """),
 
-('bash a.sh', 'a.sh', 2, None, '',
+('bash a.sh', 'a.sh', 2, None,
 """
 a.sh: line 2: foo: command not found
 """),
 
-('rustc a.rs', 'a.rs', 2, 5, '',
+('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, '',
+('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: `+`
@@ -67,7 +67,7 @@ Could not compile `test`.
 To learn more, run the command again with --verbose.
 """),
 
-('python a.py', 'a.py', 2, None, '',
+('python a.py', 'a.py', 2, None,
 """
   File "a.py", line 2
       +
@@ -75,7 +75,7 @@ To learn more, run the command again with --verbose.
 SyntaxError: invalid syntax
 """),
 
-('python a.py', 'a.py', 8, None, '',
+('python a.py', 'a.py', 8, None,
 """
 Traceback (most recent call last):
   File "a.py", line 8, in <module>
@@ -89,7 +89,7 @@ Traceback (most recent call last):
 TypeError: first argument must be string or compiled pattern
 """),
 
-(u'python café.py', u'café.py', 8, None, '',
+(u'python café.py', u'café.py', 8, None,
 u"""
 Traceback (most recent call last):
   File "café.py", line 8, in <module>
@@ -103,43 +103,43 @@ Traceback (most recent call last):
 TypeError: first argument must be string or compiled pattern
 """),
 
-('ruby a.rb', 'a.rb', 3, None, '',
+('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', 'a.lua', 2, None,
 """
 lua: a.lua:2: unexpected symbol near '+'
 """),
 
-('fish a.sh', '/tmp/fix-error/a.sh', 2, None, '',
+('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, '',
+('./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', 'a.ll', 1, 2,
 """
 llc: a.ll:1:2: error: expected top-level entity
 +
 ^
 """),
 
-('go build a.go', 'a.go', 1, 2, '',
+('go build a.go', 'a.go', 1, 2,
 """
 can't load package:
 a.go:1:2: expected 'package', found '+'
 """),
 
-('make', 'Makefile', 2, None, '',
+('make', 'Makefile', 2, None,
 """
 bidule
 make: bidule: Command not found
@@ -147,12 +147,12 @@ Makefile:2: recipe for target 'target' failed
 make: *** [target] Error 127
 """),
 
-('git st', '/home/martin/.config/git/config', 1, None, '',
+('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, '',
+('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);
@@ -176,7 +176,7 @@ ReferenceError: conole is not defined
 ./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,
 """
@@ -190,7 +190,7 @@ test = ('fish a.sh', '/tmp/fix-error/a.sh', 2, None, '', "\\nfish: Unknown comma
 E       NameError: name 'mocker' is not defined
 
 /home/thefuck/tests/rules/test_fix_file.py:218: NameError
-""", ''),
+"""),
 )  # noqa
 
 
@@ -199,7 +199,7 @@ E       NameError: name 'mocker' is not defined
 def test_match(mocker, monkeypatch, test):
     mocker.patch('os.path.isfile', return_value=True)
     monkeypatch.setenv('EDITOR', 'dummy_editor')
-    assert match(Command(stdout=test[4], stderr=test[5]))
+    assert match(Command('', test[4]))
 
 
 @pytest.mark.parametrize('test', tests)
@@ -209,7 +209,7 @@ def test_no_editor(mocker, monkeypatch, test):
     if 'EDITOR' in os.environ:
         monkeypatch.delenv('EDITOR')
 
-    assert not match(Command(stdout=test[4], stderr=test[5]))
+    assert not match(Command('', test[4]))
 
 
 @pytest.mark.parametrize('test', tests)
@@ -218,7 +218,7 @@ def test_not_file(mocker, monkeypatch, test):
     mocker.patch('os.path.isfile', return_value=False)
     monkeypatch.setenv('EDITOR', 'dummy_editor')
 
-    assert not match(Command(stdout=test[4], stderr=test[5]))
+    assert not match(Command('', test[4]))
 
 
 @pytest.mark.parametrize('test', tests)
@@ -234,7 +234,7 @@ 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(script=test[0], stdout=test[4], stderr=test[5])
+    cmd = Command(test[0], test[4])
     settings.fixcolcmd = '{editor} {file} +{line}:{col}'
 
     if test[3]:

tests/rules/test_gem_unknown_command.py

@@ -1,9 +1,9 @@
 import pytest
 from six import BytesIO
 from thefuck.rules.gem_unknown_command import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
-stderr = '''
+output = '''
 ERROR:  While executing gem ... (Gem::CommandLineError)
     Unknown command {}
 '''
@@ -64,19 +64,19 @@ def gem_help_commands(mocker):
     ('gem isntall jekyll', 'isntall'),
     ('gem last --local', 'last')])
 def test_match(script, command):
-    assert match(Command(script, stderr=stderr.format(command)))
+    assert match(Command(script, output.format(command)))
 
 
-@pytest.mark.parametrize('script, stderr', [
+@pytest.mark.parametrize('script, output', [
     ('gem install jekyll', ''),
-    ('git log', stderr.format('log'))])
-def test_not_match(script, stderr):
-    assert not match(Command(script, stderr=stderr))
+    ('git log', output.format('log'))])
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stderr, result', [
-    ('gem isntall jekyll', stderr.format('isntall'), 'gem install jekyll'),
-    ('gem last --local', stderr.format('last'), 'gem list --local')])
-def test_get_new_command(script, stderr, result):
-    new_command = get_new_command(Command(script, stderr=stderr))
+@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,6 +1,6 @@
 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)
@@ -10,7 +10,7 @@ def path_exists(mocker):
 
 
 @pytest.fixture
-def stderr(target):
+def output(target):
     return ("error: pathspec '{}' did not match any "
             'file(s) known to git.'.format(target))
 
@@ -18,17 +18,17 @@ def stderr(target):
 @pytest.mark.parametrize('script, target', [
     ('git submodule update unknown', 'unknown'),
     ('git commit unknown', 'unknown')])
-def test_match(stderr, script, target):
-    assert match(Command(script=script, stderr=stderr))
+def test_match(output, script, target):
+    assert match(Command(script, output))
 
 
 @pytest.mark.parametrize('script, target, exists', [
     ('git submodule update known', '', True),
     ('git commit known', '', True),
-    ('git submodule update known', stderr, False)])
-def test_not_match(path_exists, stderr, script, target, exists):
+    ('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=script, stderr=stderr))
+    assert not match(Command(script, output))
 
 
 @pytest.mark.parametrize('script, target, new_command', [
@@ -36,5 +36,5 @@ def test_not_match(path_exists, stderr, script, target, exists):
      'git add -- unknown && git submodule update unknown'),
     ('git commit unknown', 'unknown',
      'git add -- unknown && git commit unknown')])
-def test_get_new_command(stderr, script, target, new_command):
-    assert get_new_command(Command(script=script, stderr=stderr)) == 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

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_add_force import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return ('The following paths are ignored by one of your .gitignore files:\n'
             'dist/app.js\n'
             'dist/background.js\n'
@@ -12,11 +12,11 @@ def stderr():
             'Use -f if you really want to add them.\n')
 
 
-def test_match(stderr):
-    assert match(Command('git add dist/*.js', stderr=stderr))
-    assert not match(Command('git add dist/*.js'))
+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(stderr):
-    assert (get_new_command(Command('git add dist/*.js', stderr=stderr))
+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

@@ -1,30 +1,30 @@
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.git_bisect_usage import match, get_new_command
 
 
 @pytest.fixture
-def stderr():
+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(stderr, script):
-    assert match(Command(script=script, stderr=stderr))
+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=script, stderr=''))
+    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(stderr, script, new_cmd):
+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=script, stderr=stderr)) == new_cmd
+    assert get_new_command(Command(script, output)) == new_cmd

tests/rules/test_git_branch_delete.py

@@ -1,22 +1,22 @@
 import pytest
 from thefuck.rules.git_branch_delete import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+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(stderr):
-    assert match(Command('git branch -d branch', stderr=stderr))
-    assert not match(Command('git branch -d branch'))
-    assert not match(Command('ls', stderr=stderr))
+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(stderr):
-    assert get_new_command(Command('git branch -d branch', stderr=stderr))\
+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

@@ -1,11 +1,11 @@
 import pytest
 from thefuck.rules.git_branch_exists import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr(branch_name):
-    return "fatal: A branch named '{}' already exists.".format(branch_name)
+def output(src_branch_name):
+    return "fatal: A branch named '{}' already exists.".format(src_branch_name)
 
 
 @pytest.fixture
@@ -17,18 +17,25 @@ def new_command(branch_name):
         '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(stderr, script, branch_name):
-    assert match(Command(script=script, stderr=stderr))
+@pytest.mark.parametrize('script, src_branch_name, branch_name', [
+    ('git branch foo', 'foo', 'foo'),
+    ('git checkout bar', 'bar', 'bar'),
+    ('git checkout -b "let\'s-push-this"', '"let\'s-push-this"', '"let\'s-push-this"')])
+def test_match(output, script, branch_name):
+    assert match(Command(script, output))
 
 
-@pytest.mark.parametrize('script', ['git branch foo', 'git checkout bar'])
+@pytest.mark.parametrize('script', [
+    'git branch foo',
+    'git checkout bar',
+    'git checkout -b "let\'s-push-this"'])
 def test_not_match(script):
-    assert not match(Command(script=script, stderr=''))
+    assert not match(Command(script, ''))
 
 
-@pytest.mark.parametrize('script, branch_name, ', [
-    ('git branch foo', 'foo'), ('git checkout bar', 'bar')])
-def test_get_new_command(stderr, new_command, script, branch_name):
-    assert get_new_command(Command(script=script, stderr=stderr)) == new_command
+@pytest.mark.parametrize('script, src_branch_name, branch_name', [
+    ('git branch foo', 'foo', 'foo'),
+    ('git checkout bar', 'bar', 'bar'),
+    ('git checkout -b "let\'s-push-this"', "let's-push-this", "let\\'s-push-this")])
+def test_get_new_command(output, new_command, script, src_branch_name, branch_name):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_branch_list.py

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

tests/rules/test_git_checkout.py

@@ -1,7 +1,7 @@
 import pytest
 from io import BytesIO
 from thefuck.rules.git_checkout import match, get_branches, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
@@ -21,17 +21,17 @@ def git_branch(mocker, branches):
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git checkout unknown', stderr=did_not_match('unknown')),
-    Command(script='git commit unknown', stderr=did_not_match('unknown'))])
+    Command('git checkout unknown', did_not_match('unknown')),
+    Command('git commit unknown', did_not_match('unknown'))])
 def test_match(command):
     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)
 
@@ -51,18 +51,18 @@ def test_get_branches(branches, branch_list, git_branch):
 
 @pytest.mark.parametrize('branches, command, new_command', [
     (b'',
-     Command(script='git checkout unknown', stderr=did_not_match('unknown')),
-     'git branch unknown && git checkout unknown'),
+     Command('git checkout unknown', did_not_match('unknown')),
+     'git checkout -b unknown'),
     (b'',
-     Command('git commit unknown', stderr=did_not_match('unknown')),
+     Command('git commit unknown', did_not_match('unknown')),
      'git branch unknown && git commit unknown'),
     (b'  test-random-branch-123',
-     Command(script='git checkout tst-rdm-brnch-123',
-             stderr=did_not_match('tst-rdm-brnch-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(script='git commit tst-rdm-brnch-123',
-             stderr=did_not_match('tst-rdm-brnch-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)

tests/rules/test_git_commit_amend.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.git_commit_amend import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('script, output', [
+    ('git commit -m "test"', 'test output'),
+    ('git commit', '')])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', [
+    'git branch foo',
+    'git checkout feature/test_commit',
+    'git push'])
+def test_not_match(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script', [
+    ('git commit -m "test commit"'),
+    ('git commit')])
+def test_get_new_command(script):
+    assert get_new_command(Command(script, '')) == 'git commit --amend'

tests/rules/test_git_diff_no_index.py

@@ -1,23 +1,23 @@
 import pytest
 from thefuck.rules.git_diff_no_index import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git diff foo bar')])
+    Command('git diff foo bar', '')])
 def test_match(command):
     assert match(command)
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git diff --no-index foo bar'),
-    Command(script='git diff foo'),
-    Command(script='git diff foo bar baz')])
+    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')])
+    (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,26 +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 foo'),
-    Command(script='git diff')])
+    Command('git diff foo', ''),
+    Command('git diff', '')])
 def test_match(command):
     assert match(command)
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git diff --staged'),
-    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)
 
 
 @pytest.mark.parametrize('command, new_command', [
-    (Command('git diff'), 'git diff --staged'),
-    (Command('git diff foo'), 'git diff --staged foo')])
+    (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) == new_command

tests/rules/test_git_fix_stash.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.git_fix_stash import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 git_stash_err = '''
@@ -20,11 +20,11 @@ usage: git stash list [<options>]
     'git stash Some message',
     'git stash saev Some message'])
 def test_match(wrong):
-    assert match(Command(wrong, stderr=git_stash_err))
+    assert match(Command(wrong, git_stash_err))
 
 
 def test_not_match():
-    assert not match(Command("git", stderr=git_stash_err))
+    assert not match(Command("git", git_stash_err))
 
 
 @pytest.mark.parametrize('wrong,fixed', [
@@ -32,4 +32,4 @@ def test_not_match():
     ('git stash Some message', 'git stash save Some message'),
     ('git stash saev Some message', 'git stash save Some message')])
 def test_get_new_command(wrong, fixed):
-    assert get_new_command(Command(wrong, stderr=git_stash_err)) == fixed
+    assert get_new_command(Command(wrong, git_stash_err)) == fixed

tests/rules/test_git_flag_after_filename.py

@@ -1,24 +1,30 @@
 import pytest
 from thefuck.rules.git_flag_after_filename import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 command1 = Command('git log README.md -p',
-                   stderr="fatal: bad flag '-p' used after filename")
+                   "fatal: bad flag '-p' used after filename")
 command2 = Command('git log README.md -p CONTRIBUTING.md',
-                   stderr="fatal: bad flag '-p' used after filename")
+                   "fatal: bad flag '-p' used after filename")
 command3 = Command('git log -p README.md --name-only',
-                   stderr="fatal: bad flag '--name-only' used after filename")
+                   "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])
+    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')])
+    Command('git log README.md', ''),
+    Command('git log -p README.md', '')])
 def test_not_match(command):
     assert not match(command)
 
@@ -26,6 +32,9 @@ def test_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")])
+    (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

@@ -1,24 +1,24 @@
 import pytest
 from thefuck.rules.git_help_aliased import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
-@pytest.mark.parametrize('script, stdout', [
+@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, stdout):
-    assert match(Command(script=script, stdout=stdout))
+def test_match(script, output):
+    assert match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stdout', [
+@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, stdout):
-    assert not match(Command(script=script, stdout=stdout))
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stdout, new_command', [
+@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, stdout, new_command):
-    assert get_new_command(Command(script=script, stdout=stdout)) == new_command
+def test_get_new_command(script, output, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_merge.py

@@ -0,0 +1,26 @@
+import pytest
+from thefuck.rules.git_merge import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return 'merge: local - not something we can merge\n\n' \
+        'Did you mean this?\n\tremote/local'
+
+
+def test_match(output):
+    assert match(Command('git merge test', output))
+    assert not match(Command('git merge master', ''))
+    assert not match(Command('ls', output))
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git merge local', output()),
+     'git merge remote/local'),
+    (Command('git merge -m "test" local', output()),
+     'git merge -m "test" remote/local'),
+    (Command('git merge -m "test local" local', output()),
+     'git merge -m "test local" remote/local')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_git_merge_unrelated.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.git_merge_unrelated import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return 'fatal: refusing to merge unrelated histories'
+
+
+def test_match(output):
+    assert match(Command('git merge test', output))
+    assert not match(Command('git merge master', ''))
+    assert not match(Command('ls', output))
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('git merge local', output()),
+     'git merge local --allow-unrelated-histories'),
+    (Command('git merge -m "test" local', output()),
+     'git merge -m "test" local --allow-unrelated-histories'),
+    (Command('git merge -m "test local" local', output()),
+     'git merge -m "test local" local --allow-unrelated-histories')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == 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
@@ -29,7 +29,7 @@ stats
 def git_not_command_closest():
     return '''git: 'tags' is not a git command. See 'git --help'.
 
-Did you mean one of these?
+The most similar commands are
 \tstage
 \ttag
 '''
@@ -41,17 +41,17 @@ def git_command():
 
 
 def test_match(git_not_command, git_command, git_not_command_one_of_this):
-    assert match(Command('git brnch', stderr=git_not_command))
-    assert match(Command('git st', stderr=git_not_command_one_of_this))
-    assert not match(Command('ls brnch', stderr=git_not_command))
-    assert not match(Command('git branch', stderr=git_command))
+    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,
                          git_not_command_closest):
-    assert (get_new_command(Command('git brnch', stderr=git_not_command))
+    assert (get_new_command(Command('git brnch', git_not_command))
             == ['git branch'])
-    assert (get_new_command(Command('git st', stderr=git_not_command_one_of_this))
+    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', stderr=git_not_command_closest))
+    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))
-    assert not match(Command('git pull'))
-    assert not match(Command('ls', stderr=stderr))
+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))
+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

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.git_pull_clone import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 git_err = '''
@@ -10,12 +10,12 @@ Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git pull git@github.com:mcarton/thefuck.git', stderr=git_err)])
+    Command('git pull git@github.com:mcarton/thefuck.git', git_err)])
 def test_match(command):
     assert match(command)
 
 
 @pytest.mark.parametrize('command, output', [
-    (Command(script='git pull git@github.com:mcarton/thefuck.git', stderr=git_err), 'git clone git@github.com:mcarton/thefuck.git')])
+    (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

@@ -1,19 +1,19 @@
 import pytest
 from thefuck.rules.git_pull_uncommitted_changes import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return '''error: Cannot pull with rebase: You have unstaged changes.'''
 
 
-def test_match(stderr):
-    assert match(Command('git pull', stderr=stderr))
-    assert not match(Command('git pull'))
-    assert not match(Command('ls', stderr=stderr))
+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))
+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

@@ -1,19 +1,19 @@
 import pytest
 from thefuck.rules.git_pull_uncommitted_changes import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return '''error: Cannot pull with rebase: Your index contains uncommitted changes.'''
 
 
-def test_match(stderr):
-    assert match(Command('git pull', stderr=stderr))
-    assert not match(Command('git pull'))
-    assert not match(Command('ls', stderr=stderr))
+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))
+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,33 +1,71 @@
 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():
-    return '''fatal: The current branch master has no upstream branch.
+def output(branch_name):
+    if not branch_name:
+        return ''
+    return '''fatal: The current branch {} has no upstream branch.
 To push the current branch and set the remote as upstream, use
 
-    git push --set-upstream origin master
+    git push --set-upstream origin {}
 
+'''.format(branch_name, branch_name)
+
+
+@pytest.fixture
+def output_bitbucket():
+    return '''Total 0 (delta 0), reused 0 (delta 0)
+remote:
+remote: Create pull request for feature/set-upstream:
+remote:   https://bitbucket.org/set-upstream
+remote:
+To git@bitbucket.org:test.git
+   e5e7fbb..700d998  feature/set-upstream -> feature/set-upstream
+Branch feature/set-upstream set up to track remote branch feature/set-upstream from origin.
 '''
 
 
-def test_match(stderr):
-    assert match(Command('git push', stderr=stderr))
-    assert match(Command('git push master', stderr=stderr))
-    assert not match(Command('git push master'))
-    assert not match(Command('ls', stderr=stderr))
+@pytest.mark.parametrize('script, branch_name', [
+    ('git push', 'master'),
+    ('git push origin', 'master')])
+def test_match(output, script, branch_name):
+    assert match(Command(script, output))
 
 
-def test_get_new_command(stderr):
-    assert get_new_command(Command('git push', stderr=stderr))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push -u', stderr=stderr))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push -u origin', stderr=stderr))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push --set-upstream origin', stderr=stderr))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push --quiet', stderr=stderr))\
-        == "git push --set-upstream origin master --quiet"
+def test_match_bitbucket(output_bitbucket):
+    assert not match(Command('git push origin', output_bitbucket))
+
+
+@pytest.mark.parametrize('script, branch_name', [
+    ('git push master', None),
+    ('ls', 'master')])
+def test_not_match(output, script, branch_name):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, branch_name, new_command', [
+    ('git push', 'master',
+     'git push --set-upstream origin master'),
+    ('git push master', 'master',
+     'git push --set-upstream origin master'),
+    ('git push -u', 'master',
+     'git push --set-upstream origin master'),
+    ('git push -u origin', 'master',
+     'git push --set-upstream origin master'),
+    ('git push origin', 'master',
+     'git push --set-upstream origin master'),
+    ('git push --set-upstream origin', 'master',
+     'git push --set-upstream origin master'),
+    ('git push --quiet', 'master',
+     'git push --set-upstream origin master --quiet'),
+    ('git push --quiet origin', 'master',
+     'git push --set-upstream origin master --quiet'),
+    ('git -c test=test push --quiet origin', 'master',
+     'git -c test=test push --set-upstream origin master --quiet'),
+    ('git push', "test's",
+     "git push --set-upstream origin test\\'s")])
+def test_get_new_command(output, script, branch_name, new_command):
+    assert get_new_command(Command(script, output)) == new_command

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

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.git_push_force import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 git_err = '''
@@ -26,27 +26,27 @@ To /tmp/bar
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git push', stderr=git_err),
-    Command(script='git push nvbn', stderr=git_err),
-    Command(script='git push nvbn master', stderr=git_err)])
+    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(script='git push', stderr=git_ok),
-    Command(script='git push', stderr=git_uptodate),
-    Command(script='git push nvbn', stderr=git_ok),
-    Command(script='git push nvbn master', stderr=git_uptodate),
-    Command(script='git push nvbn', stderr=git_ok),
-    Command(script='git push nvbn master', stderr=git_uptodate)])
+    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(script='git push', stderr=git_err), 'git push --force-with-lease'),
-    (Command(script='git push nvbn', stderr=git_err), 'git push --force-with-lease nvbn'),
-    (Command(script='git push nvbn master', stderr=git_err), 'git push --force-with-lease nvbn master')])
+    (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

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.git_push_pull import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 git_err = '''
@@ -37,37 +37,37 @@ To /tmp/bar
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git push', stderr=git_err),
-    Command(script='git push nvbn', stderr=git_err),
-    Command(script='git push nvbn master', stderr=git_err),
-    Command(script='git push', stderr=git_err2),
-    Command(script='git push nvbn', stderr=git_err2),
-    Command(script='git push nvbn master', stderr=git_err2)])
+    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(script='git push', stderr=git_ok),
-    Command(script='git push', stderr=git_uptodate),
-    Command(script='git push nvbn', stderr=git_ok),
-    Command(script='git push nvbn master', stderr=git_uptodate),
-    Command(script='git push nvbn', stderr=git_ok),
-    Command(script='git push nvbn master', stderr=git_uptodate)])
+    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(script='git push', stderr=git_err), 'git pull && git push'),
-    (Command(script='git push nvbn', stderr=git_err),
+    (Command('git push', git_err), 'git pull && git push'),
+    (Command('git push nvbn', git_err),
      'git pull nvbn && git push nvbn'),
-    (Command(script='git push nvbn master', stderr=git_err),
+    (Command('git push nvbn master', git_err),
      'git pull nvbn master && git push nvbn master'),
-    (Command(script='git push', stderr=git_err2), 'git pull && git push'),
-    (Command(script='git push nvbn', stderr=git_err2),
+    (Command('git push', git_err2), 'git pull && git push'),
+    (Command('git push nvbn', git_err2),
      'git pull nvbn && git push nvbn'),
-    (Command(script='git push nvbn master', stderr=git_err2),
+    (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

@@ -1,6 +1,6 @@
 import pytest
 
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.git_push_without_commits import (
     fix,
     get_new_command,
@@ -14,13 +14,13 @@ error: failed to push some refs to 'git@github.com:User/repo.git'
 '''
 
 
-@pytest.mark.parametrize('command', [Command(command, stderr=expected_error)])
+@pytest.mark.parametrize('command', [Command(command, expected_error)])
 def test_match(command):
     assert match(command)
 
 
 @pytest.mark.parametrize('command, result', [(
-    Command(command, stderr=expected_error),
+    Command(command, expected_error),
     fix.format(command=command),
 )])
 def test_get_new_command(command, result):

tests/rules/test_git_rebase_merge_dir.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_rebase_merge_dir import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+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'
@@ -16,14 +16,16 @@ def stderr():
 
 
 @pytest.mark.parametrize('script', [
-    ('git rebase master'), ('git rebase -skip'), ('git rebase')])
-def test_match(stderr, script):
-    assert match(Command(script=script, stderr=stderr))
+    '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=script))
+    assert not match(Command(script, ''))
 
 
 @pytest.mark.parametrize('script, result', [
@@ -36,5 +38,5 @@ def test_not_match(script):
     ('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(stderr, script, result):
-    assert get_new_command(Command(script=script, stderr=stderr)) == result
+def test_get_new_command(output, script, result):
+    assert get_new_command(Command(script, output)) == result

tests/rules/test_git_rebase_no_changes.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_rebase_no_changes import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stdout():
+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
@@ -17,12 +17,12 @@ To check out the original branch and stop rebasing, run "git rebase --abort".
 '''
 
 
-def test_match(stdout):
-    assert match(Command('git rebase --continue', stdout=stdout))
-    assert not match(Command('git rebase --continue'))
-    assert not match(Command('git rebase --skip'))
+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(stdout):
-    assert (get_new_command(Command('git rebase --continue', stdout=stdout)) ==
+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

@@ -1,26 +1,26 @@
 import pytest
 from thefuck.rules.git_remote_seturl_add import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git remote set-url origin url', stderr="fatal: No such remote")])
+    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', stderr=""),
-    Command('git remote add origin url'),
-    Command('git remote remove origin'),
-    Command('git remote prune origin'),
-    Command('git remote set-branches origin branch')])
+    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'),
+    (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

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_rm_local_modifications import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr(target):
+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)
 
@@ -12,17 +12,17 @@ def stderr(target):
 @pytest.mark.parametrize('script, target', [
     ('git rm foo', 'foo'),
     ('git rm foo bar', 'bar')])
-def test_match(stderr, script, target):
-    assert match(Command(script=script, stderr=stderr))
+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=script, stderr=''))
+    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(stderr, script, target, new_command):
-    assert get_new_command(Command(script=script, stderr=stderr)) == 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_rm_recursive.py

@@ -1,27 +1,27 @@
 import pytest
 from thefuck.rules.git_rm_recursive import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr(target):
+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(stderr, script, target):
-    assert match(Command(script=script, stderr=stderr))
+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=script, stderr=''))
+    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(stderr, script, target, new_command):
-    assert get_new_command(Command(script=script, stderr=stderr)) == 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_rm_staged.py

@@ -1,10 +1,10 @@
 import pytest
 from thefuck.rules.git_rm_staged import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr(target):
+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)
 
@@ -12,17 +12,17 @@ def stderr(target):
 @pytest.mark.parametrize('script, target', [
     ('git rm foo', 'foo'),
     ('git rm foo bar', 'bar')])
-def test_match(stderr, script, target):
-    assert match(Command(script=script, stderr=stderr))
+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=script, stderr=''))
+    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(stderr, script, target, new_command):
-    assert get_new_command(Command(script=script, stderr=stderr)) == 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_stash.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.git_stash import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 cherry_pick_error = (
@@ -15,23 +15,23 @@ rebase_error = (
 
 
 @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)
 
 
 @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)
 
 
 @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) == new_command

tests/rules/test_git_stash_pop.py

@@ -1,18 +1,18 @@
 import pytest
 from thefuck.rules.git_stash_pop import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return '''error: Your local changes to the following files would be overwritten by merge:'''
 
 
-def test_match(stderr):
-    assert match(Command('git stash pop', stderr=stderr))
-    assert not match(Command('git stash'))
+def test_match(output):
+    assert match(Command('git stash pop', output))
+    assert not match(Command('git stash', ''))
 
 
-def test_get_new_command(stderr):
-    assert (get_new_command(Command('git stash pop', stderr=stderr))
+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

@@ -1,18 +1,18 @@
 import pytest
 from thefuck.rules.git_tag_force import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture
-def stderr():
+def output():
     return '''fatal: tag 'alert' already exists'''
 
 
-def test_match(stderr):
-    assert match(Command('git tag alert', stderr=stderr))
-    assert not match(Command('git tag alert'))
+def test_match(output):
+    assert match(Command('git tag alert', output))
+    assert not match(Command('git tag alert', ''))
 
 
-def test_get_new_command(stderr):
-    assert (get_new_command(Command('git tag alert', stderr=stderr))
+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

@@ -1,47 +1,45 @@
 import pytest
 from thefuck.rules.git_two_dashes import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
-@pytest.fixture
-def stderr(meant):
-    return 'error: did you mean `%s` (with two dashes ?)' % meant
+output = 'error: did you mean `{}` (with two dashes ?)'.format
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git add -patch', stderr=stderr('--patch')),
-    Command(script='git checkout -patch', stderr=stderr('--patch')),
-    Command(script='git commit -amend', stderr=stderr('--amend')),
-    Command(script='git push -tags', stderr=stderr('--tags')),
-    Command(script='git rebase -continue', stderr=stderr('--continue'))])
+    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(script='git add --patch'),
-    Command(script='git checkout --patch'),
-    Command(script='git commit --amend'),
-    Command(script='git push --tags'),
-    Command(script='git rebase --continue')])
+    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(script='git add -patch', stderr=stderr('--patch')),
+    (Command('git add -patch', output('--patch')),
         'git add --patch'),
-    (Command(script='git checkout -patch', stderr=stderr('--patch')),
+    (Command('git checkout -patch', output('--patch')),
         'git checkout --patch'),
-    (Command(script='git checkout -patch', stderr=stderr('--patch')),
+    (Command('git checkout -patch', output('--patch')),
         'git checkout --patch'),
-    (Command(script='git init -bare', stderr=stderr('--bare')),
+    (Command('git init -bare', output('--bare')),
         'git init --bare'),
-    (Command(script='git commit -amend', stderr=stderr('--amend')),
+    (Command('git commit -amend', output('--amend')),
         'git commit --amend'),
-    (Command(script='git push -tags', stderr=stderr('--tags')),
+    (Command('git push -tags', output('--tags')),
         'git push --tags'),
-    (Command(script='git rebase -continue', stderr=stderr('--continue')),
+    (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)
 
 
 @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) == new_command

tests/rules/test_gradle_not_task.py

@@ -1,7 +1,7 @@
 import pytest
 from io import BytesIO
 from thefuck.rules.gradle_no_task import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 gradle_tasks = b'''
 :tasks
@@ -97,7 +97,7 @@ BUILD SUCCESSFUL
 Total time: 1.936 secs
 '''
 
-stderr_not_found = '''
+output_not_found = '''
 
 FAILURE: Build failed with an exception.
 
@@ -108,7 +108,7 @@ Task '{}' not found in root project 'org.rerenderer_example.snake'.
 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
 
-stderr_ambiguous = '''
+output_ambiguous = '''
 
 FAILURE: Build failed with an exception.
 
@@ -128,31 +128,31 @@ def tasks(mocker):
 
 
 @pytest.mark.parametrize('command', [
-    Command('./gradlew assembler', stderr=stderr_ambiguous('assembler')),
-    Command('./gradlew instar', stderr=stderr_not_found('instar')),
-    Command('gradle assembler', stderr=stderr_ambiguous('assembler')),
-    Command('gradle instar', stderr=stderr_not_found('instar'))])
+    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', stderr=stderr_ambiguous('assembler')),
-    Command('npm instar', stderr=stderr_not_found('instar'))])
+    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', stderr=stderr_ambiguous('assembler')),
+    (Command('./gradlew assembler', output_ambiguous('assembler')),
      './gradlew assemble'),
-    (Command('./gradlew instardebug', stderr=stderr_not_found('instardebug')),
+    (Command('./gradlew instardebug', output_not_found('instardebug')),
      './gradlew installDebug'),
-    (Command('gradle assembler', stderr=stderr_ambiguous('assembler')),
+    (Command('gradle assembler', output_ambiguous('assembler')),
      'gradle assemble'),
-    (Command('gradle instardebug', stderr=stderr_not_found('instardebug')),
+    (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

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.gradle_wrapper import match, get_new_command
-from tests.utils import Command
+from thefuck.types import Command
 
 
 @pytest.fixture(autouse=True)
@@ -10,8 +10,8 @@ def exists(mocker):
 
 
 @pytest.mark.parametrize('command', [
-    Command('gradle tasks', stderr='gradle: not found'),
-    Command('gradle build', stderr='gradle: not found')])
+    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)
 
@@ -19,9 +19,9 @@ def test_match(mocker, command):
 
 
 @pytest.mark.parametrize('command, gradlew, which', [
-    (Command('gradle tasks', stderr='gradle: not found'), False, None),
-    (Command('gradle tasks', stderr='command not found'), True, '/usr/bin/gradle'),
-    (Command('npm tasks', stderr='npm: not found'), True, None)])
+    (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
@@ -34,5 +34,5 @@ def test_not_match(mocker, exists, command, gradlew, which):
     ('gradle --help', './gradlew --help'),
     ('gradle build -c', './gradlew build -c')])
 def test_get_new_command(script, result):
-    command = Command(script)
+    command = Command(script, '')
     assert get_new_command(command) == result

tests/rules/test_grep_arguments_order.py

@@ -1,8 +1,8 @@
 import pytest
 from thefuck.rules.grep_arguments_order import get_new_command, match
-from tests.utils import Command
+from thefuck.types import Command
 
-stderr = 'grep: {}: No such file or directory'.format
+output = 'grep: {}: No such file or directory'.format
 
 
 @pytest.fixture(autouse=True)
@@ -16,25 +16,25 @@ def os_path(monkeypatch):
     ('egrep test.py test', 'test'),
     ('egrep -lir . test', 'test')])
 def test_match(script, file):
-    assert match(Command(script, stderr=stderr(file)))
+    assert match(Command(script, output(file)))
 
 
-@pytest.mark.parametrize('script, stderr', [
-    ('cat test.py', stderr('test')),
+@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, stderr):
-    assert not match(Command(script, stderr=stderr))
+def test_not_match(script, output):
+    assert not match(Command(script, output))
 
 
-@pytest.mark.parametrize('script, stderr, result', [
-    ('grep test.py test', stderr('test'), 'grep test test.py'),
-    ('grep -lir . test', stderr('test'), 'grep -lir test .'),
-    ('grep . test -lir', stderr('test'), 'grep test -lir .'),
-    ('egrep test.py test', stderr('test'), 'egrep test test.py'),
-    ('egrep -lir . test', stderr('test'), 'egrep -lir test .'),
-    ('egrep . test -lir', stderr('test'), 'egrep test -lir .')])
-def test_get_new_command(script, stderr, result):
-    assert get_new_command(Command(script, stderr=stderr)) == result
+@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,15 +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'))
-    assert match(Command(u'grep café .', stderr='grep: .: Is a directory'))
-    assert not match(Command())
+    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 .')) == 'grep -r blah .'
-    assert get_new_command(Command(u'grep café .')) == u'grep -r café .'
+    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

@@ -2,10 +2,10 @@
 
 from io import BytesIO
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.grunt_task_not_found import match, get_new_command
 
-stdout = '''
+output = '''
 Warning: Task "{}" not found. Use --force to continue.
 
 Aborted due to warnings.
@@ -107,23 +107,23 @@ def grunt_help(mocker):
 
 
 @pytest.mark.parametrize('command', [
-    Command('grunt defualt', stdout('defualt')),
-    Command('grunt buld:css', stdout('buld:css'))])
+    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', stdout('nuild')),
-    Command('grunt rm')])
+    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', stdout('defualt')), 'grunt default'),
-    (Command('grunt cmpass:all', stdout('cmpass:all')), 'grunt compass:all'),
-    (Command('grunt cmpass:all --color', stdout('cmpass:all')),
+    (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

@@ -1,10 +1,10 @@
 import pytest
 from io import BytesIO
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.gulp_not_task import match, get_new_command
 
 
-def stdout(task):
+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
@@ -12,12 +12,12 @@ def stdout(task):
 
 
 def test_match():
-    assert match(Command('gulp srve', stdout('srve')))
+    assert match(Command('gulp srve', output('srve')))
 
 
 @pytest.mark.parametrize('script, stdout', [
     ('gulp serve', ''),
-    ('cat srve', stdout('srve'))])
+    ('cat srve', output('srve'))])
 def test_not_march(script, stdout):
     assert not match(Command(script, stdout))
 
@@ -25,5 +25,5 @@ def test_not_march(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', stdout('srve'))
+    command = Command('gulp srve', output('srve'))
     assert get_new_command(command) == ['gulp serve', 'gulp default']

tests/rules/test_has_exists_script.py

@@ -1,18 +1,18 @@
 from mock import patch
 from thefuck.rules.has_exists_script import match, get_new_command
-from ..utils import Command
+from thefuck.types import Command
 
 
 def test_match():
     with patch('os.path.exists', return_value=True):
-        assert match(Command(script='main', stderr='main: command not found'))
-        assert match(Command(script='main --help',
-                             stderr='main: command not found'))
-        assert not match(Command(script='main', stderr=''))
+        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(Command(script='main', stderr='main: command not found'))
+        assert not match(Command('main', 'main: command not found'))
 
 
 def test_get_new_command():
-    assert get_new_command(Command(script='main --help')) == './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

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from tests.utils import Command
+from thefuck.types import Command
 from thefuck.rules.heroku_not_command import match, get_new_command
 
 
-suggest_stderr = '''
+suggest_output = '''
  ▸    log is not a heroku command.
  ▸    Perhaps you meant logs?
  ▸    Run heroku _ to run heroku logs.
@@ -15,17 +15,17 @@ suggest_stderr = '''
 @pytest.mark.parametrize('cmd', ['log'])
 def test_match(cmd):
     assert match(
-        Command('heroku {}'.format(cmd), stderr=suggest_stderr))
+        Command('heroku {}'.format(cmd), suggest_output))
 
 
-@pytest.mark.parametrize('script, stderr', [
-    ('cat log', suggest_stderr)])
-def test_not_match(script, stderr):
-    assert not match(Command(script, stderr=stderr))
+@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), stderr=suggest_stderr)
+    command = Command('heroku {}'.format(cmd), suggest_output)
     assert get_new_command(command) == result

tests/rules/test_history.py

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

tests/rules/test_hostscli.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.hostscli import no_website, get_new_command, match
-from tests.utils import Command
+from thefuck.types import Command
 
 no_website_long = '''
 {}:
@@ -15,15 +15,13 @@ type `hostscli websites` to see a list of websites that you can block/unblock
 
 
 @pytest.mark.parametrize('command', [
-    Command('hostscli block a_website_that_does_not_exist',
-            stderr=no_website_long)])
+    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',
-            stderr=no_website_long),
+    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