Bump to 3.31

Improves performance in WSL

Fix #1036

* Add excluded_search_path_prefixes setting

Allows filtering the paths used to search for commands
Can be useful to filter out /mnt/ in WSL for performance

* Add test for excluded_search_path_prefixes

* Apply suggestions from code review

Co-authored-by: Pablo Aguiar <scorphus@gmail.com>

Co-authored-by: Pablo Aguiar <scorphus@gmail.com>

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.py]
+max_line_length = 119

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+<!-- 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 and Bash 4.4.12(1)-release`):
+
+    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. -->

.github/workflows/test.yml

@@ -0,0 +1,49 @@
+name: Tests
+
+on: [push, pull_request]
+
+env:
+  PYTHON_LATEST: 3.9
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10-dev]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Cache dependencies
+        id: cache-deps
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ env.pythonLocation }}/bin/*
+            ${{ env.pythonLocation }}/lib/*
+            ${{ env.pythonLocation }}/scripts/*
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('setup.py', 'requirements.txt') }}
+      - name: Install The Fuck with all dependencies
+        if: steps.cache-deps.outputs.cache-hit != 'true'
+        run: |
+          pip install -Ur requirements.txt coveralls
+          python setup.py develop
+      - name: Lint
+        if: matrix.os == 'ubuntu-latest' && matrix.python-version == env.PYTHON_LATEST
+        run: flake8
+      - name: Run tests
+        if: matrix.os != 'ubuntu-latest' || matrix.python-version != env.PYTHON_LATEST
+        run: coverage run --source=thefuck,tests -m pytest -v --capture=sys tests
+      - name: Run tests (including functional)
+        if: matrix.os == 'ubuntu-latest' && matrix.python-version == env.PYTHON_LATEST
+        run: coverage run --source=thefuck,tests -m pytest -v --capture=sys tests --enable-functional
+      - name: Post coverage results
+        if: matrix.os == 'ubuntu-latest' && matrix.python-version == env.PYTHON_LATEST
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: coveralls --service=github

.travis.yml

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

CONTRIBUTING.md

@@ -23,3 +23,39 @@ 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
+
+[Create and activate a Python 3 virtual environment.](https://docs.python.org/3/tutorial/venv.html)
+
+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-2021 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

README.md

@@ -1,14 +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)
+# The Fuck [![Version][version-badge]][version-link] [![Build Status][workflow-badge]][workflow-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.
 
-The Fuck is too slow? [Try experimental instant mode!](#experimental-instant-mode) 
+
+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
@@ -75,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,37 +91,63 @@ Reading package lists... Done
 ...
 ```
 
+## Contents
+
+1. [Requirements](#requirements)
+2. [Installations](#installation)
+3. [Updating](#updating)
+4. [How it works](#how-it-works)
+5. [Creating your own rules](#creating-your-own-rules)
+6. [Settings](#settings)
+7. [Third party packages with rules](#third-party-packages-with-rules)
+8. [Experimental instant mode](#experimental-instant-mode)
+9. [Developing](#developing)
+10. [License](#license-mit)
+
 ## Requirements
 
-- python (3.3+)
+- python (3.4+)
 - pip
 - python-dev
 
+##### [Back to Contents](#contents)
+
 ## Installation
 
-On OS X you can install `The Fuck` with [Homebrew][homebrew]:
+On OS X, you can install *The Fuck* via [Homebrew][homebrew] (or via [Linuxbrew][linuxbrew] on Linux):
 
 ```bash
 brew install thefuck
 ```
 
-On Ubuntu you can install `The Fuck` with:
+On Ubuntu / Mint, install *The Fuck* with the following commands:
 ```bash
 sudo apt update
-sudo apt install python3-dev python3-pip
+sudo apt install python3-dev python3-pip python3-setuptools
 sudo pip3 install thefuck
 ```
 
-On other systems you can install `The Fuck` with `pip`:
+On FreeBSD, install *The Fuck* with the following commands:
+```bash
+pkg install thefuck
+```
+
+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 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)
 
 <a href='#manual-installation' name='manual-installation'>#</a>
-You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
+It is recommended that you place this command in your `.bash_profile`,
+`.bashrc`, `.zshrc` or other startup script:
 
 ```bash
 eval $(thefuck --alias)
@@ -130,50 +157,62 @@ 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 to run fixed command without confirmation you can use `-y` option:
+To run fixed commands without confirmation, use the `--yeah` option (or just `-y` for short, or `--hard` if you're especially frustrated):
 
 ```bash
-fuck -y
+fuck --yeah
 ```
 
-If you want to fix commands recursively until success you can use `-r` option:
+To fix commands recursively until succeeding, use the `-r` option:
 
 ```bash
 fuck -r
 ```
 
-## Update
+##### [Back to Contents](#contents)
+
+## Updating
 
 ```bash
-pip install thefuck --upgrade
+pip3 install thefuck --upgrade
 ```
 
-**Aliases changed in 1.34.**
+**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`;
+* `az_cli` &ndash; fixes misspelled commands like `az providers`;
 * `cargo` &ndash; runs `cargo build` instead of `cargo`;
 * `cargo_no_command` &ndash; fixes wrongs commands like `cargo buid`;
+* `cat_dir` &ndash; replaces `cat` with `ls` when you try to `cat` a directory;
 * `cd_correction` &ndash; spellchecks and correct failed cd commands;
+* `cd_cs` &ndash; changes `cs` to `cd`;
 * `cd_mkdir` &ndash; creates directories before cd'ing into them;
 * `cd_parent` &ndash; changes `cd..` to `cd ..`;
 * `chmod_x` &ndash; add execution bit;
+* `choco_install` &ndash; append common suffixes for chocolatey packages;
 * `composer_not_command` &ndash; fixes composer command name;
+* `conda_mistype` &ndash; fixes conda commands;
+* `cp_create_destination` &ndash; creates a new directory when you attempt to `cp` or `mv` to a non existent one
 * `cp_omitting_directory` &ndash; adds `-a` when you `cp` directory;
 * `cpp11` &ndash; adds missing `-std=c++11` to `g++` or `clang++`;
 * `dirty_untar` &ndash; fixes `tar x` command that untarred in the current directory;
 * `dirty_unzip` &ndash; fixes `unzip` command that unzipped in the current directory;
 * `django_south_ghost` &ndash; adds `--delete-ghost-migrations` to failed because ghosts django south migration;
 * `django_south_merge` &ndash; adds `--merge` to inconsistent django south migration;
+* `docker_login` &ndash; executes a `docker login` and repeats the previous command;
 * `docker_not_command` &ndash; fixes wrong docker commands like `docker tags`;
+* `docker_image_being_used_by_container` &dash; removes the container that is using the image before removing the image;
 * `dry` &ndash; fixes repetitions like `git git push`;
 * `fab_command_not_found` &ndash; fix misspelled fabric commands;
 * `fix_alt_space` &ndash; replaces Alt+Space with Space character;
@@ -183,14 +222,22 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_add_force` &ndash; adds `--force` to `git add <pathspec>...` when paths are .gitignore'd;
 * `git_bisect_usage` &ndash; fixes `git bisect strt`, `git bisect goood`, `git bisect rset`, etc. when bisecting;
 * `git_branch_delete` &ndash; changes `git branch -d` to `git branch -D`;
+* `git_branch_delete_checked_out` &ndash; changes `git branch -d` to `git checkout master && git branch -D` when trying to delete a checked out branch;
 * `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_clone_git_clone` &ndash; replaces `git clone git clone ...` with `git clone ...`
+* `git_commit_amend` &ndash; offers `git commit --amend` after previous commit;
+* `git_commit_reset` &ndash; offers `git reset HEAD~` 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_hook_bypass` &ndash; adds `--no-verify` flag previous to `git am`, `git commit`, or `git push` command;
+* `git_lfs_mistype` &ndash; fixes mistyped `git lfs <command>` commands;
+* `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;
@@ -205,19 +252,21 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_rm_recursive` &ndash; adds `-r` when you try to `rm` a directory;
 * `git_rm_staged` &ndash;  adds `-f` or `--cached` when you try to `rm` a file with staged changes
 * `git_rebase_merge_dir` &ndash; offers `git rebase (--continue | --abort | --skip)` or removing the `.git/rebase-merge` dir when a rebase is in progress;
-* `git_remote_seturl_add` &ndash; runs `git remote add` when `git remote set_url` on nonexistant remote;
+* `git_remote_seturl_add` &ndash; runs `git remote add` when `git remote set_url` on nonexistent remote;
 * `git_stash` &ndash; stashes your local modifications before rebasing or switching branch;
 * `git_stash_pop` &ndash; adds your local modifications before popping stash, then resets;
 * `git_tag_force` &ndash; adds `--force` to `git tag <tagname>` when the tag already exists;
 * `git_two_dashes` &ndash; adds a missing dash to commands like `git commit -amend` or `git rebase -continue`;
 * `go_run` &ndash; appends `.go` extension when compiling/running Go programs;
+* `go_unknown_command` &ndash; fixes wrong `go` commands, for example `go bulid`;
 * `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_arguments_order` &ndash; fixes `grep` arguments order for situations like `grep -lir . test`;
+* `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;
@@ -225,6 +274,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;
@@ -233,26 +283,30 @@ 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`;
+* `mvn_unknown_lifecycle_phase` &ndash; fixes misspelled life cycle phases with `mvn`;
 * `npm_missing_script` &ndash; fixes `npm` custom script name in `npm run-script <script>`;
 * `npm_run_script` &ndash; adds missing `run-script` for custom `npm` scripts;
 * `npm_wrong_command` &ndash; fixes wrong npm commands like `npm urgrade`;
 * `no_command` &ndash; fixes wrong console commands, for example `vom/vim`;
 * `no_such_file` &ndash; creates missing directories with `mv` and `cp` commands;
+* `omnienv_no_such_command` &ndash; fixes wrong commands for `goenv`, `nodenv`, `pyenv` and `rbenv` (eg.: `pyenv isntall` or `goenv list`);
 * `open` &ndash; either prepends `http://` to address passed to `open` or create a new file or directory and passes it to `open`;
+* `pip_install` &ndash; fixes permission issues with `pip install` commands by adding `--user` or prepending `sudo` if necessary;
 * `pip_unknown_command` &ndash; fixes wrong `pip` commands, for example `pip instatl/pip install`;
 * `php_s` &ndash; replaces `-s` by `-S` when trying to run a local php server;
 * `port_already_in_use` &ndash; kills process that bound port;
 * `prove_recursively` &ndash; adds `-r` when called with directory;
-* `python_command` &ndash; prepends `python` when you trying to run not executable/without `./` python script;
+* `python_command` &ndash; prepends `python` when you try to run non-executable/without `./` python script;
 * `python_execute` &ndash; appends missing `.py` when executing Python files;
+* `python_module_error` &ndash; fixes ModuleNotFoundError by trying to `pip install` that module;
 * `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;
+* `remove_shell_prompt_literal` &ndash; remove leading shell prompt symbol `$`, common when copying commands from documentations;
+* `remove_trailing_cedilla` &ndash; remove trailing cedillas `ç`, a common typo for european keyboard layouts;
+* `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`;
@@ -261,12 +315,14 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `sudo_command_from_user_path` &ndash; runs commands from users `$PATH` with `sudo`;
 * `switch_lang` &ndash; switches command from your local layout to en;
 * `systemctl` &ndash; correctly orders parameters of confusing `systemctl`;
+* `terraform_init.py` &ndash; run `terraform init` before plan or apply;
 * `test.py` &ndash; runs `py.test` instead of `test.py`;
 * `touch` &ndash; creates missing directories before "touching";
 * `tsuru_login` &ndash; runs `tsuru login` if not authenticated or session expired;
 * `tsuru_not_command` &ndash; fixes wrong `tsuru` commands like `tsuru shell`;
 * `tmux` &ndash; fixes `tmux` commands;
 * `unknown_command` &ndash; fixes hadoop hdfs-style "unknown command", for example adds missing '-' to the command on `hdfs dfs ls`;
+* `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.
@@ -275,51 +331,65 @@ 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:
+##### [Back to Contents](#contents)
+
+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>`;
 * `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`.
+* `nixos_cmd_not_found` &ndash; installs apps on NixOS;
+* `pacman` &ndash; installs app with `pacman` if it is not installed (uses `yay` or `yaourt` if available);
+* `pacman_invalid_option` &ndash; replaces lowercase `pacman` options with uppercase.
+* `pacman_not_found` &ndash; fixes package name with `pacman`, `yay` or `yaourt`.
+* `yum_invalid_operation` &ndash; fixes invalid `yum` calls, like `yum isntall vim`;
 
-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.
 
+##### [Back to Contents](#contents)
+
 ## 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`, `output` and `script_parts`.
-Rule shouldn't change `Command`.
+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`
 
-Simple example of the rule for running script with `sudo`:
+`settings` is a special object assembled from `~/.config/thefuck/settings.py`,
+and values from env ([see more below](#settings)).
+
+A simple example rule for running a script with `sudo`:
 
 ```python
 def match(command):
@@ -345,11 +415,14 @@ requires_output = True
 [utility functions for rules](https://github.com/nvbn/thefuck/tree/master/thefuck/utils.py),
 [app/os-specific helpers](https://github.com/nvbn/thefuck/tree/master/thefuck/specific/).
 
+##### [Back to Contents](#contents)
+
 ## 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`;
+* `rules` &ndash; list of enabled rules, by default `thefuck.const.DEFAULT_RULES`;
 * `exclude_rules` &ndash; list of disabled rules, by default `[]`;
 * `require_confirmation` &ndash; requires confirmation before running new command, by default `True`;
 * `wait_command` &ndash; max amount of time in seconds for getting previous command output;
@@ -359,9 +432,11 @@ The Fuck has a few settings parameters which can be changed in `$XDG_CONFIG_HOME
 * `history_limit` &ndash; numeric value of how many history commands will be scanned, like `2000`;
 * `alter_history` &ndash; push fixed command to history, by default `True`;
 * `wait_slow_command` &ndash; max amount of time in seconds for getting previous command output if it in `slow_commands` list;
-* `slow_commands` &ndash; list of slow commands.
+* `slow_commands` &ndash; list of slow commands;
+* `num_close_matches` &ndash; maximum number of close matches to suggest, by default `3`.
+* `excluded_search_path_prefixes` &ndash; path prefixes to ignore when searching for commands, by default `[]`.
 
-Example of `settings.py`:
+An example of `settings.py`:
 
 ```python
 rules = ['sudo', 'no_command']
@@ -374,6 +449,7 @@ debug = False
 history_limit = 9999
 wait_slow_command = 20
 slow_commands = ['react-native', 'gradle']
+num_close_matches = 5
 ```
 
 Or via environment variables:
@@ -389,7 +465,9 @@ rule with lower `priority` will be matched first;
 * `THEFUCK_HISTORY_LIMIT` &ndash; how many history commands will be scanned, like `2000`;
 * `THEFUCK_ALTER_HISTORY` &ndash; push fixed command to history `true/false`;
 * `THEFUCK_WAIT_SLOW_COMMAND` &ndash; max amount of time in seconds for getting previous command output if it in `slow_commands` list;
-* `THEFUCK_SLOW_COMMANDS` &ndash; list of slow commands, like `lein:gradle`.
+* `THEFUCK_SLOW_COMMANDS` &ndash; list of slow commands, like `lein:gradle`;
+* `THEFUCK_NUM_CLOSE_MATCHES` &ndash; maximum number of close matches to suggest, like `5`.
+* `THEFUCK_EXCLUDED_SEARCH_PATH_PREFIXES` &ndash; path prefixes to ignore when searching for commands, by default `[]`.
 
 For example:
 
@@ -401,58 +479,56 @@ export THEFUCK_WAIT_COMMAND=10
 export THEFUCK_NO_COLORS='false'
 export THEFUCK_PRIORITY='no_command=9999:apt_get=100'
 export THEFUCK_HISTORY_LIMIT='2000'
+export THEFUCK_NUM_CLOSE_MATCHES='5'
 ```
 
+##### [Back to Contents](#contents)
+
+## 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.
+
+##### [Back to Contents](#contents)
+
 ## Experimental instant mode
 
-By default The Fuck reruns a previous command and that takes time,
-in instant mode The Fuck logs output with [script](https://en.wikipedia.org/wiki/Script_(Unix))
-and just reads the log.
+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]
 
-At the moment only Python 3 with bash or zsh is supported.
+Currently, instant mode only supports Python 3 with bash or zsh. zsh's autocorrect function also needs to be disabled in order for thefuck to work properly.
 
-For enabling instant mode you need to add `--enable-experimental-instant-mode`
-to alias initialization in your `.bashrc`, `.bash_profile` or `.zshrc` like:
+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)
 ```
 
+##### [Back to Contents](#contents)
+
 ## 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).
@@ -460,13 +536,14 @@ Project License can be found [here](LICENSE.md).
 
 [version-badge]:   https://img.shields.io/pypi/v/thefuck.svg?label=version
 [version-link]:    https://pypi.python.org/pypi/thefuck/
-[travis-badge]:    https://travis-ci.org/nvbn/thefuck.svg?branch=master
-[travis-link]:     https://travis-ci.org/nvbn/thefuck
-[appveyor-badge]:  https://ci.appveyor.com/api/projects/status/1sskj4imj02um0gu/branch/master?svg=true
-[appveyor-link]:   https://ci.appveyor.com/project/nvbn/thefuck
+[workflow-badge]:  https://github.com/nvbn/thefuck/workflows/Tests/badge.svg
+[workflow-link]:   https://github.com/nvbn/thefuck/actions?query=workflow%3ATests
 [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/
+[homebrew]:        https://brew.sh/
+[linuxbrew]:       https://linuxbrew.sh/
+
+##### [Back to Contents](#contents)

appveyor.yml

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

fastentrypoints.py

@@ -37,7 +37,7 @@ http://github.com/ninjaaron/fast-entry_points
 '''
 from setuptools.command import easy_install
 import re
-TEMPLATE = '''\
+TEMPLATE = r'''\
 # -*- coding: utf-8 -*-
 # EASY-INSTALL-ENTRY-SCRIPT: '{3}','{4}','{5}'
 __requires__ = '{3}'
@@ -83,7 +83,7 @@ def main():
     import shutil
     import sys
     dests = sys.argv[1:] or ['.']
-    filename = re.sub('\.pyc$', '.py', __file__)
+    filename = re.sub(r'\.pyc$', '.py', __file__)
 
     for dst in dests:
         shutil.copy(filename, dst)

release.py

@@ -32,4 +32,6 @@ call('git push --tags', shell=True)
 
 env = os.environ
 env['CONVERT_README'] = 'true'
-call('python setup.py sdist bdist_wheel upload', shell=True, env=env)
+call('rm -rf dist/*', shell=True, env=env)
+call('python setup.py sdist bdist_wheel', shell=True, env=env)
+call('twine upload dist/*', shell=True, env=env)

requirements.txt

@@ -1,4 +1,3 @@
-pip
 flake8
 pytest
 mock
@@ -9,3 +8,4 @@ pexpect
 pypandoc
 pytest-benchmark
 pytest-docker-pexpect
+twine

setup.py

@@ -26,16 +26,17 @@ 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, 5):
+    print('thefuck requires Python version 3.5 or later' +
           ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '3.24'
+VERSION = '3.31'
 
 install_requires = ['psutil', 'colorama', 'six', 'decorator', 'pyte']
 extras_require = {':python_version<"3.4"': ['pathlib2'],
                   ':python_version<"3.3"': ['backports.shutil_get_terminal_size'],
+                  ':python_version<="2.7"': ['decorator<5'],
                   ":sys_platform=='win32'": ['win_unicode_console']}
 
 setup(name='thefuck',

snapcraft.yaml

@@ -0,0 +1,25 @@
+name: thefuck
+version: stable
+version-script: git -C parts/thefuck/build describe --abbrev=0 --tags
+summary: Magnificent app which corrects your previous console command.
+description: |
+  The Fuck tries to match a rule for the previous command,
+  creates a new command using the matched rule and runs it.
+
+grade: stable
+confinement: classic
+
+apps:
+  thefuck:
+    command: bin/thefuck
+    environment:
+        PYTHONIOENCODING: utf-8
+  fuck:
+    command: bin/fuck
+    environment:
+        PYTHONIOENCODING: utf-8
+
+parts:
+  thefuck:
+    source: https://github.com/nvbn/thefuck.git
+    plugin: python

tests/conftest.py

@@ -7,6 +7,10 @@ from thefuck.system import Path
 shells.shell = shells.Generic()
 
 
+def pytest_configure(config):
+    config.addinivalue_line("markers", "functional: mark test as functional")
+
+
 def pytest_addoption(parser):
     """Adds `--enable-functional` argument."""
     group = parser.getgroup("thefuck")
@@ -42,7 +46,7 @@ def no_cache(monkeypatch):
 
 @pytest.fixture(autouse=True)
 def functional(request):
-    if request.node.get_marker('functional') \
+    if request.node.get_closest_marker('functional') \
             and not request.config.getoption('enable_functional'):
         pytest.skip('functional tests are disabled')
 

tests/functional/test_performance.py

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

tests/output_readers/test_rerun.py

@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+
+from mock import Mock, patch
+from psutil import AccessDenied, TimeoutExpired
+
+from thefuck.output_readers import rerun
+
+
+class TestRerun(object):
+    def setup_method(self, test_method):
+        self.patcher = patch('thefuck.output_readers.rerun.Process')
+        process_mock = self.patcher.start()
+        self.proc_mock = process_mock.return_value = Mock()
+
+    def teardown_method(self, test_method):
+        self.patcher.stop()
+
+    @patch('thefuck.output_readers.rerun._wait_output', return_value=False)
+    @patch('thefuck.output_readers.rerun.Popen')
+    def test_get_output(self, popen_mock, wait_output_mock):
+        popen_mock.return_value.stdout.read.return_value = b'output'
+        assert rerun.get_output('', '') is None
+        wait_output_mock.assert_called_once()
+
+    def test_wait_output_is_slow(self, settings):
+        assert rerun._wait_output(Mock(), True)
+        self.proc_mock.wait.assert_called_once_with(settings.wait_slow_command)
+
+    def test_wait_output_is_not_slow(self, settings):
+        assert rerun._wait_output(Mock(), False)
+        self.proc_mock.wait.assert_called_once_with(settings.wait_command)
+
+    @patch('thefuck.output_readers.rerun._kill_process')
+    def test_wait_output_timeout(self, kill_process_mock):
+        self.proc_mock.wait.side_effect = TimeoutExpired(3)
+        self.proc_mock.children.return_value = []
+        assert not rerun._wait_output(Mock(), False)
+        kill_process_mock.assert_called_once_with(self.proc_mock)
+
+    @patch('thefuck.output_readers.rerun._kill_process')
+    def test_wait_output_timeout_children(self, kill_process_mock):
+        self.proc_mock.wait.side_effect = TimeoutExpired(3)
+        self.proc_mock.children.return_value = [Mock()] * 2
+        assert not rerun._wait_output(Mock(), False)
+        assert kill_process_mock.call_count == 3
+
+    def test_kill_process(self):
+        proc = Mock()
+        rerun._kill_process(proc)
+        proc.kill.assert_called_once_with()
+
+    @patch('thefuck.output_readers.rerun.logs')
+    def test_kill_process_access_denied(self, logs_mock):
+        proc = Mock()
+        proc.kill.side_effect = AccessDenied()
+        rerun._kill_process(proc)
+        proc.kill.assert_called_once_with()
+        logs_mock.debug.assert_called_once()

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

@@ -9,7 +9,7 @@ def output():
             'If you meant to search for a literal string, run ag with -Q\n')
 
 
-@pytest.mark.parametrize('script', ['ag \('])
+@pytest.mark.parametrize('script', ['ag \\('])
 def test_match(script, output):
     assert match(Command(script, output))
 
@@ -20,6 +20,6 @@ def test_not_match(script):
 
 
 @pytest.mark.parametrize('script, new_cmd', [
-    ('ag \(', 'ag -Q \(')])
+    ('ag \\(', 'ag -Q \\(')])
 def test_get_new_command(script, new_cmd, output):
     assert get_new_command((Command(script, output))) == new_cmd

tests/rules/test_apt_get.py

@@ -12,9 +12,8 @@ from thefuck.types import Command
      [('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)
 
@@ -30,9 +29,8 @@ def test_match(mocker, command, packages):
      ['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)
 
@@ -49,7 +47,7 @@ def test_not_match(mocker, command, packages, which):
      [('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_invalid_operation.py

@@ -76,6 +76,45 @@ apt_get_operations = ['update', 'upgrade', 'install', 'remove', 'autoremove',
                       'dselect-upgrade', 'clean', 'autoclean', 'check',
                       'changelog', 'download']
 
+new_apt_get_help = b'''apt 1.6.12 (amd64)
+Usage: apt-get [options] command
+       apt-get [options] install|remove pkg1 [pkg2 ...]
+       apt-get [options] source pkg1 [pkg2 ...]
+
+apt-get is a command line interface for retrieval of packages
+and information about them from authenticated sources and
+for installation, upgrade and removal of packages together
+with their dependencies.
+
+Most used commands:
+  update - Retrieve new lists of packages
+  upgrade - Perform an upgrade
+  install - Install new packages (pkg is libc6 not libc6.deb)
+  remove - Remove packages
+  purge - Remove packages and config files
+  autoremove - Remove automatically all unused packages
+  dist-upgrade - Distribution upgrade, see apt-get(8)
+  dselect-upgrade - Follow dselect selections
+  build-dep - Configure build-dependencies for source packages
+  clean - Erase downloaded archive files
+  autoclean - Erase old downloaded archive files
+  check - Verify that there are no broken dependencies
+  source - Download source archives
+  download - Download the binary package into the current directory
+  changelog - Download and display the changelog for the given package
+
+See apt-get(8) for more information about the available commands.
+Configuration options and syntax is detailed in apt.conf(5).
+Information about how to configure sources can be found in sources.list(5).
+Package and version choices can be expressed via apt_preferences(5).
+Security details are available in apt-secure(8).
+                                        This APT has Super Cow Powers.
+'''
+new_apt_get_operations = ['update', 'upgrade', 'install', 'remove', 'purge',
+                          'autoremove', 'dist-upgrade', 'dselect-upgrade',
+                          'build-dep', 'clean', 'autoclean', 'check',
+                          'source', 'download', 'changelog']
+
 
 @pytest.mark.parametrize('script, output', [
     ('apt', invalid_operation('saerch')),
@@ -104,7 +143,8 @@ def set_help(mocker):
 
 @pytest.mark.parametrize('app, help_text, operations', [
     ('apt', apt_help, apt_operations),
-    ('apt-get', apt_get_help, apt_get_operations)
+    ('apt-get', apt_get_help, apt_get_operations),
+    ('apt-get', new_apt_get_help, new_apt_get_operations)
 ])
 def test_get_operations(set_help, app, help_text, operations):
     set_help(help_text)
@@ -116,6 +156,8 @@ def test_get_operations(set_help, app, help_text, operations):
      apt_get_help, 'apt-get install vim'),
     ('apt saerch vim', invalid_operation('saerch'),
      apt_help, 'apt search vim'),
+    ('apt uninstall vim', invalid_operation('uninstall'),
+     apt_help, 'apt remove vim'),
 ])
 def test_get_new_command(set_help, output, script, help_text, result):
     set_help(help_text)

tests/rules/test_apt_list_upgradable.py

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+from thefuck.rules.apt_list_upgradable import get_new_command, match
+from thefuck.types import Command
+
+full_english_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.
+'''
+
+match_output = [
+    full_english_output,
+    'Führen Sie »apt list --upgradable« aus, um sie anzuzeigen.'  # German
+]
+
+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.
+'''
+
+
+@pytest.mark.parametrize('output', match_output)
+def test_match(output):
+    assert match(Command('sudo apt update', 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)
+
+
+@pytest.mark.parametrize('output', match_output)
+def test_get_new_command(output):
+    new_command = get_new_command(Command('sudo apt update', output))
+    assert new_command == 'sudo apt list --upgradable'
+
+    new_command = get_new_command(Command('apt update', 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_az_cli.py

@@ -0,0 +1,44 @@
+import pytest
+
+from thefuck.rules.az_cli import match, get_new_command
+from thefuck.types import Command
+
+
+no_suggestions = '''\
+az provider: error: the following arguments are required: _subcommand
+usage: az provider [-h] {list,show,register,unregister,operation} ...
+'''
+
+
+misspelled_command = '''\
+az: 'providers' is not in the 'az' command group. See 'az --help'.
+
+The most similar choice to 'providers' is:
+    provider
+'''
+
+misspelled_subcommand = '''\
+az provider: 'lis' is not in the 'az provider' command group. See 'az provider --help'.
+
+The most similar choice to 'lis' is:
+    list
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command('az providers', misspelled_command),
+    Command('az provider lis', misspelled_subcommand)])
+def test_match(command):
+    assert match(command)
+
+
+def test_not_match():
+    assert not match(Command('az provider', no_suggestions))
+
+
+@pytest.mark.parametrize('command, result', [
+    (Command('az providers list', misspelled_command), ['az provider list']),
+    (Command('az provider lis', misspelled_subcommand), ['az provider list'])
+])
+def test_get_new_command(command, result):
+    assert get_new_command(command) == result

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

@@ -0,0 +1,39 @@
+import pytest
+from thefuck.rules.cat_dir import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def isdir(mocker):
+    return mocker.patch('thefuck.rules.cat_dir'
+                        '.os.path.isdir')
+
+
+@pytest.mark.parametrize('command', [
+    Command('cat foo', 'cat: foo: Is a directory\n'),
+    Command('cat /foo/bar/', 'cat: /foo/bar/: Is a directory\n'),
+    Command('cat cat/', 'cat: cat/: Is a directory\n'),
+])
+def test_match(command, isdir):
+    isdir.return_value = True
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('cat foo', 'foo bar baz'),
+    Command('cat foo bar', 'foo bar baz'),
+    Command('notcat foo bar', 'some output'),
+])
+def test_not_match(command, isdir):
+    isdir.return_value = False
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('cat foo', 'cat: foo: Is a directory\n'), 'ls foo'),
+    (Command('cat /foo/bar/', 'cat: /foo/bar/: Is a directory\n'), 'ls /foo/bar/'),
+    (Command('cat cat', 'cat: cat: Is a directory\n'), 'ls cat'),
+])
+def test_get_new_command(command, new_command):
+    isdir.return_value = True
+    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_cs.py

@@ -0,0 +1,11 @@
+from thefuck.rules.cd_cs import match, get_new_command
+from thefuck.types import Command
+
+
+def test_match():
+    assert match(Command('cs', 'cs: command not found'))
+    assert match(Command('cs /etc/', 'cs: command not found'))
+
+
+def test_get_new_command():
+    assert get_new_command(Command('cs /etc/', 'cs: command not found')) == 'cd /etc/'

tests/rules/test_cd_mkdir.py

@@ -7,7 +7,8 @@ from thefuck.types import 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/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)
 

tests/rules/test_choco_install.py

@@ -0,0 +1,86 @@
+import pytest
+from thefuck.rules.choco_install import match, get_new_command
+from thefuck.types import Command
+
+
+package_not_found_error = (
+    'Chocolatey v0.10.15\n'
+    'Installing the following packages:\n'
+    'logstitcher\n'
+    'By installing you accept licenses for the packages.\n'
+    'logstitcher not installed. The package was not found with the source(s) listed.\n'
+    ' Source(s): \'https://chocolatey.org/api/v2/\'\n'
+    ' NOTE: When you specify explicit sources, it overrides default sources.\n'
+    'If the package version is a prerelease and you didn\'t specify `--pre`,\n'
+    ' the package may not be found.\n'
+    'Please see https://chocolatey.org/docs/troubleshooting for more\n'
+    ' assistance.\n'
+    '\n'
+    'Chocolatey installed 0/1 packages. 1 packages failed.\n'
+    ' See the log for details (C:\\ProgramData\\chocolatey\\logs\\chocolatey.log).\n'
+    '\n'
+    'Failures\n'
+    ' - logstitcher - logstitcher not installed. The package was not found with the source(s) listed.\n'
+    ' Source(s): \'https://chocolatey.org/api/v2/\'\n'
+    ' NOTE: When you specify explicit sources, it overrides default sources.\n'
+    'If the package version is a prerelease and you didn\'t specify `--pre`,\n'
+    ' the package may not be found.\n'
+    'Please see https://chocolatey.org/docs/troubleshooting for more\n'
+    ' assistance.\n'
+)
+
+
+@pytest.mark.parametrize('command', [
+    Command('choco install logstitcher', package_not_found_error),
+    Command('cinst logstitcher', package_not_found_error),
+    Command('choco install logstitcher -y', package_not_found_error),
+    Command('cinst logstitcher -y', package_not_found_error),
+    Command('choco install logstitcher -y -n=test', package_not_found_error),
+    Command('cinst logstitcher -y -n=test', package_not_found_error),
+    Command('choco install logstitcher -y -n=test /env', package_not_found_error),
+    Command('cinst logstitcher -y -n=test /env', package_not_found_error),
+    Command('choco install chocolatey -y', package_not_found_error),
+    Command('cinst chocolatey -y', package_not_found_error)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('choco /?', ''),
+    Command('choco upgrade logstitcher', ''),
+    Command('cup logstitcher', ''),
+    Command('choco upgrade logstitcher -y', ''),
+    Command('cup logstitcher -y', ''),
+    Command('choco upgrade logstitcher -y -n=test', ''),
+    Command('cup logstitcher -y -n=test', ''),
+    Command('choco upgrade logstitcher -y -n=test /env', ''),
+    Command('cup logstitcher -y -n=test /env', ''),
+    Command('choco upgrade chocolatey -y', ''),
+    Command('cup chocolatey -y', ''),
+    Command('choco uninstall logstitcher', ''),
+    Command('cuninst logstitcher', ''),
+    Command('choco uninstall logstitcher -y', ''),
+    Command('cuninst logstitcher -y', ''),
+    Command('choco uninstall logstitcher -y -n=test', ''),
+    Command('cuninst logstitcher -y -n=test', ''),
+    Command('choco uninstall logstitcher -y -n=test /env', ''),
+    Command('cuninst logstitcher -y -n=test /env', ''),
+    Command('choco uninstall chocolatey -y', ''),
+    Command('cuninst chocolatey -y', '')])
+def not_test_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('before, after', [
+    ('choco install logstitcher', 'choco install logstitcher.install'),
+    ('cinst logstitcher', 'cinst logstitcher.install'),
+    ('choco install logstitcher -y', 'choco install logstitcher.install -y'),
+    ('cinst logstitcher -y', 'cinst logstitcher.install -y'),
+    ('choco install logstitcher -y -n=test', 'choco install logstitcher.install -y -n=test'),
+    ('cinst logstitcher -y -n=test', 'cinst logstitcher.install -y -n=test'),
+    ('choco install logstitcher -y -n=test /env', 'choco install logstitcher.install -y -n=test /env'),
+    ('cinst logstitcher -y -n=test /env', 'cinst logstitcher.install -y -n=test /env'),
+    ('choco install chocolatey -y', 'choco install chocolatey.install -y'),
+    ('cinst chocolatey -y', 'cinst chocolatey.install -y'), ])
+def test_get_new_command(before, after):
+    assert (get_new_command(Command(before, '')) == after)

tests/rules/test_conda_mistype.py

@@ -0,0 +1,24 @@
+import pytest
+
+from thefuck.rules.conda_mistype import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def mistype_response():
+    return """
+
+CommandNotFoundError: No command 'conda lst'.
+Did you mean 'conda list'?
+
+    """
+
+
+def test_match(mistype_response):
+    assert match(Command('conda lst', mistype_response))
+    err_response = 'bash: codna: command not found'
+    assert not match(Command('codna list', err_response))
+
+
+def test_get_new_command(mistype_response):
+    assert (get_new_command(Command('conda lst', mistype_response)) == ['conda list'])

tests/rules/test_cp_create_destination.py

@@ -0,0 +1,30 @@
+import pytest
+from thefuck.rules.cp_create_destination import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize(
+    "script, output",
+    [("cp", "cp: directory foo does not exist\n"), ("mv", "No such file or directory")],
+)
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize(
+    "script, output", [("cp", ""), ("mv", ""), ("ls", "No such file or directory")]
+)
+def test_not_match(script, output):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize(
+    "script, output, new_command",
+    [
+        ("cp foo bar/", "cp: directory foo does not exist\n", "mkdir -p bar/ && cp foo bar/"),
+        ("mv foo bar/", "No such file or directory", "mkdir -p bar/ && mv foo bar/"),
+        ("cp foo bar/baz/", "cp: directory foo does not exist\n", "mkdir -p bar/baz/ && cp foo bar/baz/"),
+    ],
+)
+def test_get_new_command(script, output, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_docker_image_being_used_by_container.py

@@ -0,0 +1,27 @@
+from thefuck.rules.docker_image_being_used_by_container import match, get_new_command
+from thefuck.types import Command
+
+
+def test_match():
+    err_response = """Error response from daemon: conflict: unable to delete cd809b04b6ff (cannot be forced) - image is being used by running container e5e2591040d1"""
+    assert match(Command('docker image rm -f cd809b04b6ff', err_response))
+
+
+def test_not_match():
+    err_response = 'bash: docker: command not found'
+    assert not match(Command('docker image rm -f cd809b04b6ff', err_response))
+
+
+def test_not_docker_command():
+    err_response = """Error response from daemon: conflict: unable to delete cd809b04b6ff (cannot be forced) - image is being used by running container e5e2591040d1"""
+    assert not match(Command('git image rm -f cd809b04b6ff', err_response))
+
+
+def test_get_new_command():
+    err_response = """
+        Error response from daemon: conflict: unable to delete cd809b04b6ff (cannot be forced) - image
+        is being used by running container e5e2591040d1
+        """
+    result = get_new_command(Command('docker image rm -f cd809b04b6ff', err_response))
+    expected = 'docker container rm -f e5e2591040d1 && docker image rm -f cd809b04b6ff'
+    assert result == expected

tests/rules/test_docker_login.py

@@ -0,0 +1,37 @@
+from thefuck.rules.docker_login import match, get_new_command
+from thefuck.types import Command
+
+
+def test_match():
+    err_response1 = """
+    Sending build context to Docker daemon  118.8kB
+Step 1/6 : FROM foo/bar:fdb7c6d
+pull access denied for foo/bar, repository does not exist or may require 'docker login'
+"""
+    assert match(Command('docker build -t artifactory:9090/foo/bar:fdb7c6d .', err_response1))
+
+    err_response2 = """
+    The push refers to repository [artifactory:9090/foo/bar]
+push access denied for foo/bar, repository does not exist or may require 'docker login'
+"""
+    assert match(Command('docker push artifactory:9090/foo/bar:fdb7c6d', err_response2))
+
+    err_response3 = """
+    docker push artifactory:9090/foo/bar:fdb7c6d
+The push refers to repository [artifactory:9090/foo/bar]
+9c29c7ad209d: Preparing
+71f3ad53dfe0: Preparing
+f58ee068224c: Preparing
+aeddc924d0f7: Preparing
+c2040e5d6363: Preparing
+4d42df4f350f: Preparing
+35723dab26f9: Preparing
+71f3ad53dfe0: Pushed
+cb95fa0faeb1: Layer already exists
+"""
+    assert not match(Command('docker push artifactory:9090/foo/bar:fdb7c6d', err_response3))
+
+
+def test_get_new_command():
+    assert get_new_command(Command('docker build -t artifactory:9090/foo/bar:fdb7c6d .', '')) == 'docker login && docker build -t artifactory:9090/foo/bar:fdb7c6d .'
+    assert get_new_command(Command('docker push artifactory:9090/foo/bar:fdb7c6d', '')) == 'docker login && docker push artifactory:9090/foo/bar:fdb7c6d'

tests/rules/test_docker_not_command.py

@@ -4,6 +4,46 @@ from thefuck.types import Command
 from thefuck.rules.docker_not_command import get_new_command, match
 
 
+_DOCKER_SWARM_OUTPUT = '''
+Usage:	docker swarm COMMAND
+
+Manage Swarm
+
+Commands:
+  ca          Display and rotate the root CA
+  init        Initialize a swarm
+  join        Join a swarm as a node and/or manager
+  join-token  Manage join tokens
+  leave       Leave the swarm
+  unlock      Unlock swarm
+  unlock-key  Manage the unlock key
+  update      Update the swarm
+
+Run 'docker swarm COMMAND --help' for more information on a command.
+'''
+_DOCKER_IMAGE_OUTPUT = '''
+Usage:	docker image COMMAND
+
+Manage images
+
+Commands:
+  build       Build an image from a Dockerfile
+  history     Show the history of an image
+  import      Import the contents from a tarball to create a filesystem image
+  inspect     Display detailed information on one or more images
+  load        Load an image from a tar archive or STDIN
+  ls          List images
+  prune       Remove unused images
+  pull        Pull an image or a repository from a registry
+  push        Push an image or a repository to a registry
+  rm          Remove one or more images
+  save        Save one or more images to a tar archive (streamed to STDOUT by default)
+  tag         Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE
+
+Run 'docker image COMMAND --help' for more information on a command.
+'''
+
+
 @pytest.fixture
 def docker_help(mocker):
     help = b'''Usage: docker [OPTIONS] COMMAND [arg...]
@@ -104,6 +144,94 @@ Run 'docker COMMAND --help' for more information on a command.
     return mock
 
 
+@pytest.fixture
+def docker_help_new(mocker):
+    helptext_new = b'''
+Usage:	docker [OPTIONS] COMMAND
+
+A self-sufficient runtime for containers
+
+Options:
+      --config string      Location of client config files (default "/Users/ik1ne/.docker")
+  -c, --context string     Name of the context to use to connect to the daemon (overrides DOCKER_HOST env var
+                           and default context set with "docker context use")
+  -D, --debug              Enable debug mode
+  -H, --host list          Daemon socket(s) to connect to
+  -l, --log-level string   Set the logging level ("debug"|"info"|"warn"|"error"|"fatal") (default "info")
+      --tls                Use TLS; implied by --tlsverify
+      --tlscacert string   Trust certs signed only by this CA (default "/Users/ik1ne/.docker/ca.pem")
+      --tlscert string     Path to TLS certificate file (default "/Users/ik1ne/.docker/cert.pem")
+      --tlskey string      Path to TLS key file (default "/Users/ik1ne/.docker/key.pem")
+      --tlsverify          Use TLS and verify the remote
+  -v, --version            Print version information and quit
+
+Management Commands:
+  builder     Manage builds
+  config      Manage Docker configs
+  container   Manage containers
+  context     Manage contexts
+  image       Manage images
+  network     Manage networks
+  node        Manage Swarm nodes
+  plugin      Manage plugins
+  secret      Manage Docker secrets
+  service     Manage services
+  stack       Manage Docker stacks
+  swarm       Manage Swarm
+  system      Manage Docker
+  trust       Manage trust on Docker images
+  volume      Manage volumes
+
+Commands:
+  attach      Attach local standard input, output, and error streams to a running container
+  build       Build an image from a Dockerfile
+  commit      Create a new image from a container's changes
+  cp          Copy files/folders between a container and the local filesystem
+  create      Create a new container
+  diff        Inspect changes to files or directories on a container's filesystem
+  events      Get real time events from the server
+  exec        Run a command in a running container
+  export      Export a container's filesystem as a tar archive
+  history     Show the history of an image
+  images      List images
+  import      Import the contents from a tarball to create a filesystem image
+  info        Display system-wide information
+  inspect     Return low-level information on Docker objects
+  kill        Kill one or more running containers
+  load        Load an image from a tar archive or STDIN
+  login       Log in to a Docker registry
+  logout      Log out from a Docker registry
+  logs        Fetch the logs of a container
+  pause       Pause all processes within one or more containers
+  port        List port mappings or a specific mapping for the container
+  ps          List containers
+  pull        Pull an image or a repository from a registry
+  push        Push an image or a repository to a registry
+  rename      Rename a container
+  restart     Restart one or more containers
+  rm          Remove one or more containers
+  rmi         Remove one or more images
+  run         Run a command in a new container
+  save        Save one or more images to a tar archive (streamed to STDOUT by default)
+  search      Search the Docker Hub for images
+  start       Start one or more stopped containers
+  stats       Display a live stream of container(s) resource usage statistics
+  stop        Stop one or more running containers
+  tag         Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE
+  top         Display the running processes of a container
+  unpause     Unpause all processes within one or more containers
+  update      Update configuration of one or more containers
+  version     Show the Docker version information
+  wait        Block until one or more containers stop, then print their exit codes
+
+Run 'docker COMMAND --help' for more information on a command.
+'''
+    mock = mocker.patch('subprocess.Popen')
+    mock.return_value.stdout = BytesIO(b'')
+    mock.return_value.stderr = BytesIO(helptext_new)
+    return mock
+
+
 def output(cmd):
     return "docker: '{}' is not a docker command.\n" \
            "See 'docker --help'.".format(cmd)
@@ -113,6 +241,24 @@ def test_match():
     assert match(Command('docker pes', output('pes')))
 
 
+# tests docker (management command)
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, output', [
+    ('docker swarn', output('swarn')),
+    ('docker imge', output('imge'))])
+def test_match_management_cmd(script, output):
+    assert match(Command(script, output))
+
+
+# tests docker (management cmd) (management subcmd)
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, output', [
+    ('docker swarm int', _DOCKER_SWARM_OUTPUT),
+    ('docker image la', _DOCKER_IMAGE_OUTPUT)])
+def test_match_management_subcmd(script, output):
+    assert match(Command(script, output))
+
+
 @pytest.mark.parametrize('script, output', [
     ('docker ps', ''),
     ('cat pes', output('pes'))])
@@ -120,10 +266,28 @@ def test_not_match(script, output):
     assert not match(Command(script, output))
 
 
-@pytest.mark.usefixtures('docker_help')
+@pytest.mark.usefixtures('no_memoize', 'docker_help')
 @pytest.mark.parametrize('wrong, fixed', [
     ('pes', ['ps', 'push', 'pause']),
     ('tags', ['tag', 'stats', 'images'])])
 def test_get_new_command(wrong, fixed):
     command = Command('docker {}'.format(wrong), output(wrong))
     assert get_new_command(command) == ['docker {}'.format(x) for x in fixed]
+
+
+@pytest.mark.usefixtures('no_memoize', 'docker_help_new')
+@pytest.mark.parametrize('wrong, fixed', [
+    ('swarn', ['swarm', 'start', 'search']),
+    ('inage', ['image', 'images', 'rename'])])
+def test_get_new_management_command(wrong, fixed):
+    command = Command('docker {}'.format(wrong), output(wrong))
+    assert get_new_command(command) == ['docker {}'.format(x) for x in fixed]
+
+
+@pytest.mark.usefixtures('no_memoize', 'docker_help_new')
+@pytest.mark.parametrize('wrong, fixed, output', [
+    ('swarm int', ['swarm init', 'swarm join', 'swarm join-token'], _DOCKER_SWARM_OUTPUT),
+    ('image la', ['image load', 'image ls', 'image tag'], _DOCKER_IMAGE_OUTPUT)])
+def test_get_new_management_command_subcommand(wrong, fixed, output):
+    command = Command('docker {}'.format(wrong), output)
+    assert get_new_command(command) == ['docker {}'.format(x) for x in fixed]

tests/rules/test_fix_file.py

@@ -2,62 +2,54 @@
 
 import pytest
 import os
+from collections import namedtuple
 from thefuck.rules.fix_file import match, get_new_command
 from thefuck.types import Command
 
+FixFileTest = namedtuple('FixFileTest', ['script', 'file', 'line', 'col', 'output'])
 
-# (script, file, line, col (or None), output)
 tests = (
-('gcc a.c', 'a.c', 3, 1,
-"""
+    FixFileTest('gcc a.c', 'a.c', 3, 1, """
 a.c: In function 'main':
 a.c:3:1: error: expected expression before '}' token
  }
   ^
 """),
 
-('clang a.c', 'a.c', 3, 1,
-"""
+    FixFileTest('clang a.c', 'a.c', 3, 1, """
 a.c:3:1: error: expected expression
 }
 ^
 """),
 
-('perl a.pl', 'a.pl', 3, None,
-"""
+    FixFileTest('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,
-"""
+    FixFileTest('perl a.pl', 'a.pl', 2, None, """
 Search pattern not terminated at a.pl line 2.
 """),
 
-('sh a.sh', 'a.sh', 2, None,
-"""
+    FixFileTest('sh a.sh', 'a.sh', 2, None, """
 a.sh: line 2: foo: command not found
 """),
 
-('zsh a.sh', 'a.sh', 2, None,
-"""
+    FixFileTest('zsh a.sh', 'a.sh', 2, None, """
 a.sh:2: command not found: foo
 """),
 
-('bash a.sh', 'a.sh', 2, None,
-"""
+    FixFileTest('bash a.sh', 'a.sh', 2, None, """
 a.sh: line 2: foo: command not found
 """),
 
-('rustc a.rs', 'a.rs', 2, 5,
-"""
+    FixFileTest('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,
-"""
+    FixFileTest('cargo build', 'src/lib.rs', 3, 5, """
    Compiling test v0.1.0 (file:///tmp/fix-error/test)
    src/lib.rs:3:5: 3:6 error: unexpected token: `+`
    src/lib.rs:3     +
@@ -67,16 +59,14 @@ Could not compile `test`.
 To learn more, run the command again with --verbose.
 """),
 
-('python a.py', 'a.py', 2, None,
-"""
+    FixFileTest('python a.py', 'a.py', 2, None, """
   File "a.py", line 2
       +
           ^
 SyntaxError: invalid syntax
 """),
 
-('python a.py', 'a.py', 8, None,
-"""
+    FixFileTest('python a.py', 'a.py', 8, None, """
 Traceback (most recent call last):
   File "a.py", line 8, in <module>
     match("foo")
@@ -89,8 +79,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"""
+    FixFileTest(u'python café.py', u'café.py', 8, None, u"""
 Traceback (most recent call last):
   File "café.py", line 8, in <module>
     match("foo")
@@ -103,57 +92,48 @@ Traceback (most recent call last):
 TypeError: first argument must be string or compiled pattern
 """),
 
-('ruby a.rb', 'a.rb', 3, None,
-"""
+    FixFileTest('ruby a.rb', 'a.rb', 3, None, """
 a.rb:3: syntax error, unexpected keyword_end
 """),
 
-('lua a.lua', 'a.lua', 2, None,
-"""
+    FixFileTest('lua a.lua', 'a.lua', 2, None, """
 lua: a.lua:2: unexpected symbol near '+'
 """),
 
-('fish a.sh', '/tmp/fix-error/a.sh', 2, None,
-"""
+    FixFileTest('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,
-"""
+    FixFileTest('./a', './a', 2, None, """
 awk: ./a:2: BEGIN { print "Hello, world!" + }
 awk: ./a:2:                                 ^ syntax error
 """),
 
-('llc a.ll', 'a.ll', 1, 2,
-"""
+    FixFileTest('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,
-"""
+    FixFileTest('go build a.go', 'a.go', 1, 2, """
 can't load package:
 a.go:1:2: expected 'package', found '+'
 """),
 
-('make', 'Makefile', 2, None,
-"""
+    FixFileTest('make', 'Makefile', 2, None, """
 bidule
 make: bidule: Command not found
 Makefile:2: recipe for target 'target' failed
 make: *** [target] Error 127
 """),
 
-('git st', '/home/martin/.config/git/config', 1, None,
-"""
+    FixFileTest('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,
-"""
+    FixFileTest('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);
 ^
@@ -170,16 +150,14 @@ ReferenceError: conole is not defined
     at node.js:814:3
 """),
 
-('pep8', './tests/rules/test_systemctl.py', 17, 80,
-"""
+    FixFileTest('pep8', './tests/rules/test_systemctl.py', 17, 80, """
 ./tests/rules/test_systemctl.py:17:80: E501 line too long (93 > 79 characters)
 ./tests/rules/test_systemctl.py:18:80: E501 line too long (103 > 79 characters)
 ./tests/rules/test_whois.py:20:80: E501 line too long (89 > 79 characters)
 ./tests/rules/test_whois.py:22:80: E501 line too long (83 > 79 characters)
 """),
 
-('py.test', '/home/thefuck/tests/rules/test_fix_file.py', 218, None,
-"""
+    FixFileTest('py.test', '/home/thefuck/tests/rules/test_fix_file.py', 218, None, """
 monkeypatch = <_pytest.monkeypatch.monkeypatch object at 0x7fdb76a25b38>
 test = ('fish a.sh', '/tmp/fix-error/a.sh', 2, None, '', "\\nfish: Unknown command 'foo'\\n/tmp/fix-error/a.sh (line 2): foo\\n                              ^\\n")
 
@@ -191,7 +169,7 @@ E       NameError: name 'mocker' is not defined
 
 /home/thefuck/tests/rules/test_fix_file.py:218: NameError
 """),
-)  # noqa
+)
 
 
 @pytest.mark.parametrize('test', tests)
@@ -199,7 +177,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('', test[4]))
+    assert match(Command('', test.output))
 
 
 @pytest.mark.parametrize('test', tests)
@@ -209,7 +187,7 @@ def test_no_editor(mocker, monkeypatch, test):
     if 'EDITOR' in os.environ:
         monkeypatch.delenv('EDITOR')
 
-    assert not match(Command('', test[4]))
+    assert not match(Command('', test.output))
 
 
 @pytest.mark.parametrize('test', tests)
@@ -218,7 +196,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('', test[4]))
+    assert not match(Command('', test.output))
 
 
 @pytest.mark.parametrize('test', tests)
@@ -234,12 +212,12 @@ def test_get_new_command_with_settings(mocker, monkeypatch, test, settings):
     mocker.patch('os.path.isfile', return_value=True)
     monkeypatch.setenv('EDITOR', 'dummy_editor')
 
-    cmd = Command(test[0], test[4])
+    cmd = Command(test.script, test.output)
     settings.fixcolcmd = '{editor} {file} +{line}:{col}'
 
-    if test[3]:
+    if test.col:
         assert (get_new_command(cmd) ==
-                u'dummy_editor {} +{}:{} && {}'.format(test[1], test[2], test[3], test[0]))
+                u'dummy_editor {} +{}:{} && {}'.format(test.file, test.line, test.col, test.script))
     else:
         assert (get_new_command(cmd) ==
-                u'dummy_editor {} +{} && {}'.format(test[1], test[2], test[0]))
+                u'dummy_editor {} +{} && {}'.format(test.file, test.line, test.script))

tests/rules/test_git_branch_delete_checked_out.py

@@ -0,0 +1,29 @@
+import pytest
+from thefuck.rules.git_branch_delete_checked_out import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return "error: Cannot delete branch 'foo' checked out at '/bar/foo'"
+
+
+@pytest.mark.parametrize("script", ["git branch -d foo", "git branch -D foo"])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize("script", ["git branch -d foo", "git branch -D foo"])
+def test_not_match(script):
+    assert not match(Command(script, "Deleted branch foo (was a1b2c3d)."))
+
+
+@pytest.mark.parametrize(
+    "script, new_command",
+    [
+        ("git branch -d foo", "git checkout master && git branch -D foo"),
+        ("git branch -D foo", "git checkout master && git branch -D foo"),
+    ],
+)
+def test_get_new_command(script, new_command, output):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_git_branch_exists.py

@@ -4,8 +4,8 @@ from thefuck.types import Command
 
 
 @pytest.fixture
-def output(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')])
+@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, ''))
 
 
-@pytest.mark.parametrize('script, branch_name, ', [
-    ('git branch foo', 'foo'), ('git checkout bar', 'bar')])
-def test_get_new_command(output, new_command, script, branch_name):
+@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_checkout.py

@@ -4,7 +4,6 @@ from thefuck.rules.git_checkout import match, get_branches, get_new_command
 from thefuck.types import Command
 
 
-@pytest.fixture
 def did_not_match(target, did_you_forget=False):
     error = ("error: pathspec '{}' did not match any "
              "file(s) known to git.".format(target))
@@ -40,6 +39,11 @@ def test_not_match(command):
     (b'', []),
     (b'* master', ['master']),
     (b'  remotes/origin/master', ['master']),
+    (b'  remotes/origin/test/1', ['test/1']),
+    (b'  remotes/origin/test/1/2/3', ['test/1/2/3']),
+    (b'  test/1', ['test/1']),
+    (b'  test/1/2/3', ['test/1/2/3']),
+    (b'  remotes/origin/HEAD -> origin/master', []),
     (b'  just-another-branch', ['just-another-branch']),
     (b'* master\n  just-another-branch', ['master', 'just-another-branch']),
     (b'* master\n  remotes/origin/master\n  just-another-branch',
@@ -52,18 +56,18 @@ def test_get_branches(branches, branch_list, git_branch):
 @pytest.mark.parametrize('branches, command, new_command', [
     (b'',
      Command('git checkout unknown', did_not_match('unknown')),
-     'git branch unknown && git checkout unknown'),
+     ['git checkout -b unknown']),
     (b'',
      Command('git commit unknown', did_not_match('unknown')),
-     'git branch unknown && git commit unknown'),
+     ['git branch unknown && git commit unknown']),
     (b'  test-random-branch-123',
      Command('git checkout tst-rdm-brnch-123',
              did_not_match('tst-rdm-brnch-123')),
-     'git checkout test-random-branch-123'),
+     ['git checkout test-random-branch-123', 'git checkout -b tst-rdm-brnch-123']),
     (b'  test-random-branch-123',
      Command('git commit tst-rdm-brnch-123',
              did_not_match('tst-rdm-brnch-123')),
-     'git commit test-random-branch-123')])
+     ['git commit test-random-branch-123'])])
 def test_get_new_command(branches, command, new_command, git_branch):
     git_branch(branches)
     assert get_new_command(command) == new_command

tests/rules/test_git_clone_git_clone.py

@@ -0,0 +1,24 @@
+from thefuck.rules.git_clone_git_clone import match, get_new_command
+from thefuck.types import Command
+
+
+output_clean = """
+fatal: Too many arguments.
+
+usage: git clone [<options>] [--] <repo> [<dir>]
+"""
+
+
+def test_match():
+    assert match(Command('git clone git clone foo', output_clean))
+
+
+def test_not_match():
+    assert not match(Command('', ''))
+    assert not match(Command('git branch', ''))
+    assert not match(Command('git clone foo', ''))
+    assert not match(Command('git clone foo bar baz', output_clean))
+
+
+def test_get_new_command():
+    assert get_new_command(Command('git clone git clone foo', output_clean)) == 'git clone foo'

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

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.git_commit_reset 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 reset HEAD~'

tests/rules/test_git_flag_after_filename.py

@@ -8,10 +8,16 @@ command2 = Command('git log README.md -p CONTRIBUTING.md',
                    "fatal: bad flag '-p' used after filename")
 command3 = Command('git log -p README.md --name-only',
                    "fatal: bad flag '--name-only' used after filename")
+command4 = Command('git log README.md -p',
+                   "fatal: option '-p' must come before non-option arguments")
+command5 = Command('git log README.md -p CONTRIBUTING.md',
+                   "fatal: option '-p' must come before non-option arguments")
+command6 = Command('git log -p README.md --name-only',
+                   "fatal: option '--name-only' must come before non-option arguments")
 
 
 @pytest.mark.parametrize('command', [
-    command1, command2, command3])
+    command1, command2, command3, command4, command5, command6])
 def test_match(command):
     assert 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_hook_bypass.py

@@ -0,0 +1,43 @@
+import pytest
+from thefuck.rules.git_hook_bypass import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize(
+    "command",
+    [
+        Command("git am", ""),
+        Command("git commit", ""),
+        Command("git commit -m 'foo bar'", ""),
+        Command("git push", ""),
+        Command("git push -u foo bar", ""),
+    ],
+)
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize(
+    "command",
+    [
+        Command("git add foo", ""),
+        Command("git status", ""),
+        Command("git diff foo bar", ""),
+    ],
+)
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize(
+    "command, new_command",
+    [
+        (Command("git am", ""), "git am --no-verify"),
+        (Command("git commit", ""), "git commit --no-verify"),
+        (Command("git commit -m 'foo bar'", ""), "git commit --no-verify -m 'foo bar'"),
+        (Command("git push", ""), "git push --no-verify"),
+        (Command("git push -p", ""), "git push --no-verify -p"),
+    ],
+)
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_git_lfs_mistype.py

@@ -0,0 +1,29 @@
+import pytest
+
+from thefuck.rules.git_lfs_mistype import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def mistype_response():
+    return """
+Error: unknown command "evn" for "git-lfs"
+
+Did you mean this?
+        env
+        ext
+
+Run 'git-lfs --help' for usage.
+    """
+
+
+def test_match(mistype_response):
+    assert match(Command('git lfs evn', mistype_response))
+    err_response = 'bash: git: command not found'
+    assert not match(Command('git lfs env', err_response))
+    assert not match(Command('docker lfs env', mistype_response))
+
+
+def test_get_new_command(mistype_response):
+    assert (get_new_command(Command('git lfs evn', mistype_response))
+            == ['git lfs env', 'git lfs ext'])

tests/rules/test_git_merge.py

@@ -0,0 +1,24 @@
+import pytest
+from thefuck.rules.git_merge import match, get_new_command
+from thefuck.types import Command
+
+
+output = 'merge: local - not something we can merge\n\n' \
+         'Did you mean this?\n\tremote/local'
+
+
+def test_match():
+    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,23 @@
+import pytest
+from thefuck.rules.git_merge_unrelated import match, get_new_command
+from thefuck.types import Command
+
+
+output = 'fatal: refusing to merge unrelated histories'
+
+
+def test_match():
+    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_push.py

@@ -4,30 +4,72 @@ from thefuck.types import Command
 
 
 @pytest.fixture
-def output():
-    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(output):
-    assert match(Command('git push', output))
-    assert match(Command('git push master', output))
-    assert not match(Command('git push master', ''))
-    assert not match(Command('ls', output))
+@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(output):
-    assert get_new_command(Command('git push', output))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push -u', output))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push -u origin', output))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push --set-upstream origin', output))\
-        == "git push --set-upstream origin master"
-    assert get_new_command(Command('git push --quiet', output))\
-        == "git push --set-upstream origin master --quiet"
+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"),
+    ('git push --force', 'master',
+     'git push --set-upstream origin master --force'),
+    ('git push --force-with-lease', 'master',
+     'git push --set-upstream origin master --force-with-lease')])
+def test_get_new_command(output, script, branch_name, new_command):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_go_unknown_command.py

@@ -0,0 +1,82 @@
+import pytest
+from io import BytesIO
+from thefuck.rules.go_unknown_command import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def build_misspelled_output():
+    return '''go bulid: unknown command
+Run 'go help' for usage.'''
+
+
+@pytest.fixture
+def go_stderr(mocker):
+    stderr = b'''Go is a tool for managing Go source code.
+
+Usage:
+
+\tgo <command> [arguments]
+
+The commands are:
+
+\tbug         start a bug report
+\tbuild       compile packages and dependencies
+\tclean       remove object files and cached files
+\tdoc         show documentation for package or symbol
+\tenv         print Go environment information
+\tfix         update packages to use new APIs
+\tfmt         gofmt (reformat) package sources
+\tgenerate    generate Go files by processing source
+\tget         add dependencies to current module and install them
+\tinstall     compile and install packages and dependencies
+\tlist        list packages or modules
+\tmod         module maintenance
+\trun         compile and run Go program
+\ttest        test packages
+\ttool        run specified go tool
+\tversion     print Go version
+\tvet         report likely mistakes in packages
+
+Use "go help <command>" for more information about a command.
+
+Additional help topics:
+
+\tbuildconstraint build constraints
+\tbuildmode       build modes
+\tc               calling between Go and C
+\tcache           build and test caching
+\tenvironment     environment variables
+\tfiletype        file types
+\tgo.mod          the go.mod file
+\tgopath          GOPATH environment variable
+\tgopath-get      legacy GOPATH go get
+\tgoproxy         module proxy protocol
+\timportpath      import path syntax
+\tmodules         modules, module versions, and more
+\tmodule-get      module-aware go get
+\tmodule-auth     module authentication using go.sum
+\tmodule-private  module configuration for non-public modules
+\tpackages        package lists and patterns
+\ttestflag        testing flags
+\ttestfunc        testing functions
+
+Use "go help <topic>" for more information about that topic.
+
+'''
+    mock = mocker.patch('subprocess.Popen')
+    mock.return_value.stderr = BytesIO(stderr)
+    return mock
+
+
+def test_match(build_misspelled_output):
+    assert match(Command('go bulid', build_misspelled_output))
+
+
+def test_not_match():
+    assert not match(Command('go run', 'go run: no go files listed'))
+
+
+@pytest.mark.usefixtures('no_memoize', 'go_stderr')
+def test_get_new_command(build_misspelled_output):
+    assert get_new_command(Command('go bulid', build_misspelled_output)) == 'go build'

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

@@ -0,0 +1,22 @@
+import pytest
+from thefuck.rules.long_form_help import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('output', [
+    'Try \'grep --help\' for more information.'])
+def test_match(output):
+    assert match(Command('grep -h', output))
+
+
+def test_not_match():
+    assert not match(Command('', ''))
+
+
+@pytest.mark.parametrize('before, after', [
+    ('grep -h', 'grep --help'),
+    ('tar -h', 'tar --help'),
+    ('docker run -h', 'docker run --help'),
+    ('cut -h', 'cut --help')])
+def test_get_new_command(before, after):
+    assert get_new_command(Command(before, '')) == after

tests/rules/test_nixos_cmd_not_found.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.nixos_cmd_not_found import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command('vim', 'nix-env -iA nixos.vim')])
+def test_match(mocker, command):
+    mocker.patch('thefuck.rules.nixos_cmd_not_found', return_value=None)
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('vim', ''),
+    Command('', '')])
+def test_not_match(mocker, command):
+    mocker.patch('thefuck.rules.nixos_cmd_not_found', return_value=None)
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('vim', 'nix-env -iA nixos.vim'), 'nix-env -iA nixos.vim && vim'),
+    (Command('pacman', 'nix-env -iA nixos.pacman'), 'nix-env -iA nixos.pacman && pacman')])
+def test_get_new_command(mocker, command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_no_command.py

@@ -6,7 +6,7 @@ from thefuck.types import Command
 @pytest.fixture(autouse=True)
 def get_all_executables(mocker):
     mocker.patch('thefuck.rules.no_command.get_all_executables',
-                 return_value=['vim', 'fsck', 'git', 'go'])
+                 return_value=['vim', 'fsck', 'git', 'go', 'python'])
 
 
 @pytest.fixture(autouse=True)
@@ -20,6 +20,7 @@ def history_without_current(mocker):
 @pytest.mark.parametrize('script, output', [
     ('vom file.py', 'vom: not found'),
     ('fucck', 'fucck: not found'),
+    ('puthon', "'puthon' is not recognized as an internal or external command"),
     ('got commit', 'got: command not found')])
 def test_match(mocker, script, output):
     mocker.patch('thefuck.rules.no_command.which', return_value=None)

tests/rules/test_omnienv_no_such_command.py

@@ -0,0 +1,57 @@
+import pytest
+
+from thefuck.rules.omnienv_no_such_command import get_new_command, match
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output(pyenv_cmd):
+    return "pyenv: no such command `{}'".format(pyenv_cmd)
+
+
+@pytest.fixture(autouse=True)
+def Popen(mocker):
+    mock = mocker.patch('thefuck.rules.omnienv_no_such_command.Popen')
+    mock.return_value.stdout.readlines.return_value = (
+        b'--version\nactivate\ncommands\ncompletions\ndeactivate\nexec_\n'
+        b'global\nhelp\nhooks\ninit\ninstall\nlocal\nprefix_\n'
+        b'realpath.dylib\nrehash\nroot\nshell\nshims\nuninstall\nversion_\n'
+        b'version-file\nversion-file-read\nversion-file-write\nversion-name_\n'
+        b'version-origin\nversions\nvirtualenv\nvirtualenv-delete_\n'
+        b'virtualenv-init\nvirtualenv-prefix\nvirtualenvs_\n'
+        b'virtualenvwrapper\nvirtualenvwrapper_lazy\nwhence\nwhich_\n'
+    ).split()
+    return mock
+
+
+@pytest.mark.parametrize('script, pyenv_cmd', [
+    ('pyenv globe', 'globe'),
+    ('pyenv intall 3.8.0', 'intall'),
+    ('pyenv list', 'list'),
+])
+def test_match(script, pyenv_cmd, output):
+    assert match(Command(script, output=output))
+
+
+def test_match_goenv_output_quote():
+    """test goenv's specific output with quotes (')"""
+    assert match(Command('goenv list', output="goenv: no such command 'list'"))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('pyenv global', 'system'),
+    ('pyenv versions', '  3.7.0\n  3.7.1\n* 3.7.2\n'),
+    ('pyenv install --list', '  3.7.0\n  3.7.1\n  3.7.2\n'),
+])
+def test_not_match(script, output):
+    assert not match(Command(script, output=output))
+
+
+@pytest.mark.parametrize('script, pyenv_cmd, result', [
+    ('pyenv globe', 'globe', 'pyenv global'),
+    ('pyenv intall 3.8.0', 'intall', 'pyenv install 3.8.0'),
+    ('pyenv list', 'list', 'pyenv install --list'),
+    ('pyenv remove 3.8.0', 'remove', 'pyenv uninstall 3.8.0'),
+])
+def test_get_new_command(script, pyenv_cmd, output, result):
+    assert result in get_new_command(Command(script, output))

tests/rules/test_pacman_invalid_option.py

@@ -0,0 +1,30 @@
+import pytest
+from thefuck.rules.pacman_invalid_option import get_new_command, match
+from thefuck.types import Command
+
+good_output = """community/shared_meataxe 1.0-3
+    A set of programs for working with matrix representations over finite fields
+"""
+
+bad_output = "error: invalid option '-"
+
+
+@pytest.mark.parametrize("option", "SURQFDVT")
+def test_not_match_good_output(option):
+    assert not match(Command("pacman -{}s meat".format(option), good_output))
+
+
+@pytest.mark.parametrize("option", "azxcbnm")
+def test_not_match_bad_output(option):
+    assert not match(Command("pacman -{}v meat".format(option), bad_output))
+
+
+@pytest.mark.parametrize("option", "surqfdvt")
+def test_match(option):
+    assert match(Command("pacman -{}v meat".format(option), bad_output))
+
+
+@pytest.mark.parametrize("option", "surqfdvt")
+def test_get_new_command(option):
+    new_command = get_new_command(Command("pacman -{}v meat".format(option), ""))
+    assert new_command == "pacman -{}v meat".format(option.upper())

tests/rules/test_pacman_not_found.py

@@ -11,6 +11,7 @@ extra/llvm35 3.5.2-13/usr/bin/llc'''
 @pytest.mark.skipif(not getattr(pacman_not_found, 'enabled_by_default', True),
                     reason='Skip if pacman is not available')
 @pytest.mark.parametrize('command', [
+    Command('yay -S llc', 'error: target not found: llc'),
     Command('yaourt -S llc', 'error: target not found: llc'),
     Command('pacman llc', 'error: target not found: llc'),
     Command('sudo pacman llc', 'error: target not found: llc')])
@@ -19,6 +20,7 @@ def test_match(command):
 
 
 @pytest.mark.parametrize('command', [
+    Command('yay -S llc', 'error: target not found: llc'),
     Command('yaourt -S llc', 'error: target not found: llc'),
     Command('pacman llc', 'error: target not found: llc'),
     Command('sudo pacman llc', 'error: target not found: llc')])
@@ -31,6 +33,7 @@ def test_match_mocked(subp_mock, command):
 @pytest.mark.skipif(not getattr(pacman_not_found, 'enabled_by_default', True),
                     reason='Skip if pacman is not available')
 @pytest.mark.parametrize('command, fixed', [
+    (Command('yay -S llc', 'error: target not found: llc'), ['yay -S extra/llvm', 'yay -S extra/llvm35']),
     (Command('yaourt -S llc', 'error: target not found: llc'), ['yaourt -S extra/llvm', 'yaourt -S extra/llvm35']),
     (Command('pacman -S llc', 'error: target not found: llc'), ['pacman -S extra/llvm', 'pacman -S extra/llvm35']),
     (Command('sudo pacman -S llc', 'error: target not found: llc'), ['sudo pacman -S extra/llvm', 'sudo pacman -S extra/llvm35'])])
@@ -39,6 +42,7 @@ def test_get_new_command(command, fixed):
 
 
 @pytest.mark.parametrize('command, fixed', [
+    (Command('yay -S llc', 'error: target not found: llc'), ['yay -S extra/llvm', 'yay -S extra/llvm35']),
     (Command('yaourt -S llc', 'error: target not found: llc'), ['yaourt -S extra/llvm', 'yaourt -S extra/llvm35']),
     (Command('pacman -S llc', 'error: target not found: llc'), ['pacman -S extra/llvm', 'pacman -S extra/llvm35']),
     (Command('sudo pacman -S llc', 'error: target not found: llc'), ['sudo pacman -S extra/llvm', 'sudo pacman -S extra/llvm35'])])

tests/rules/test_pip_install.py

@@ -0,0 +1,27 @@
+# -*- coding: UTF-8 -*-
+from thefuck.rules.pip_install import match, get_new_command
+from thefuck.types import Command
+
+
+def test_match():
+    response1 = """
+    Could not install packages due to an EnvironmentError: [Errno 13] Permission denied: '/Library/Python/2.7/site-packages/entrypoints.pyc'
+Consider using the `--user` option or check the permissions.
+"""
+    assert match(Command('pip install -r requirements.txt', response1))
+
+    response2 = """
+Collecting bacon
+  Downloading https://files.pythonhosted.org/packages/b2/81/19fb79139ee71c8bc4e5a444546f318e2b87253b8939ec8a7e10d63b7341/bacon-0.3.1.zip (11.0MB)
+    100% |████████████████████████████████| 11.0MB 3.0MB/s
+Installing collected packages: bacon
+  Running setup.py install for bacon ... done
+Successfully installed bacon-0.3.1
+"""
+    assert not match(Command('pip install bacon', response2))
+
+
+def test_get_new_command():
+    assert get_new_command(Command('pip install -r requirements.txt', '')) == 'pip install --user -r requirements.txt'
+    assert get_new_command(Command('pip install bacon', '')) == 'pip install --user bacon'
+    assert get_new_command(Command('pip install --user -r requirements.txt', '')) == 'sudo pip install -r requirements.txt'

tests/rules/test_pip_unknown_command.py

@@ -4,13 +4,23 @@ from thefuck.types import Command
 
 
 @pytest.fixture
-def pip_unknown_cmd():
-    return '''ERROR: unknown command "instatl" - maybe you meant "install"'''
+def pip_unknown_cmd_without_recommend():
+    return '''ERROR: unknown command "i"'''
 
 
 @pytest.fixture
-def pip_unknown_cmd_without_recommend():
-    return '''ERROR: unknown command "i"'''
+def broken():
+    return 'instatl'
+
+
+@pytest.fixture
+def suggested():
+    return 'install'
+
+
+@pytest.fixture
+def pip_unknown_cmd(broken, suggested):
+    return 'ERROR: unknown command "{}" - maybe you meant "{}"'.format(broken, suggested)
 
 
 def test_match(pip_unknown_cmd, pip_unknown_cmd_without_recommend):
@@ -19,6 +29,9 @@ def test_match(pip_unknown_cmd, pip_unknown_cmd_without_recommend):
                              pip_unknown_cmd_without_recommend))
 
 
-def test_get_new_command(pip_unknown_cmd):
-    assert get_new_command(Command('pip instatl',
-                                   pip_unknown_cmd)) == 'pip install'
+@pytest.mark.parametrize('script, broken, suggested, new_cmd', [
+    ('pip un+install thefuck', 'un+install', 'uninstall', 'pip uninstall thefuck'),
+    ('pip instatl', 'instatl', 'install', 'pip install')])
+def test_get_new_command(script, new_cmd, pip_unknown_cmd):
+    assert get_new_command(Command(script,
+                                   pip_unknown_cmd)) == new_cmd

tests/rules/test_python_module_error.py

@@ -0,0 +1,63 @@
+import pytest
+
+from thefuck.rules.python_module_error import get_new_command, match
+from thefuck.types import Command
+
+
+@pytest.fixture
+def module_error_output(filename, module_name):
+    return """Traceback (most recent call last):
+  File "{0}", line 1, in <module>
+    import {1}
+ModuleNotFoundError: No module named '{1}'""".format(
+        filename, module_name
+    )
+
+
+@pytest.mark.parametrize(
+    "test",
+    [
+        Command("python hello_world.py", "Hello World"),
+        Command(
+            "./hello_world.py",
+            """Traceback (most recent call last):
+  File "hello_world.py", line 1, in <module>
+    pritn("Hello World")
+NameError: name 'pritn' is not defined""",
+        ),
+    ],
+)
+def test_not_match(test):
+    assert not match(test)
+
+
+positive_tests = [
+    (
+        "python some_script.py",
+        "some_script.py",
+        "more_itertools",
+        "pip install more_itertools && python some_script.py",
+    ),
+    (
+        "./some_other_script.py",
+        "some_other_script.py",
+        "a_module",
+        "pip install a_module && ./some_other_script.py",
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    "script, filename, module_name, corrected_script", positive_tests
+)
+def test_match(script, filename, module_name, corrected_script, module_error_output):
+    assert match(Command(script, module_error_output))
+
+
+@pytest.mark.parametrize(
+    "script, filename, module_name, corrected_script", positive_tests
+)
+def test_get_new_command(
+    script, filename, module_name, corrected_script, module_error_output
+):
+    assert get_new_command(Command(script, module_error_output)) == corrected_script

tests/rules/test_remove_shell_prompt_literal.py

@@ -0,0 +1,38 @@
+import pytest
+from thefuck.rules.remove_shell_prompt_literal import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.fixture
+def output():
+    return "$: command not found"
+
+
+@pytest.mark.parametrize("script", ["$ cd newdir", " $ cd newdir"])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize(
+    "command",
+    [
+        Command("$", "$: command not found"),
+        Command(" $", "$: command not found"),
+        Command("$?", "127: command not found"),
+        Command(" $?", "127: command not found"),
+        Command("", ""),
+    ],
+)
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize(
+    "script, new_command",
+    [
+        ("$ cd newdir", "cd newdir"),
+        ("$ python3 -m virtualenv env", "python3 -m virtualenv env"),
+    ],
+)
+def test_get_new_command(script, new_command, output):
+    assert get_new_command(Command(script, output)) == new_command

tests/rules/test_switch_lang.py

@@ -1,13 +1,17 @@
 # -*- encoding: utf-8 -*-
 
 import pytest
+
 from thefuck.rules import switch_lang
 from thefuck.types import Command
 
 
 @pytest.mark.parametrize('command', [
     Command(u'фзе-пуе', 'command not found: фзе-пуе'),
-    Command(u'λσ', 'command not found: λσ')])
+    Command(u'λσ', 'command not found: λσ'),
+    Command(u'שפא-עקא', 'command not found: שפא-עקא'),
+    Command(u'ךד', 'command not found: ךד'),
+    Command(u'녀애 ㅣㄴ', 'command not found: 녀애 ㅣㄴ')])
 def test_match(command):
     assert switch_lang.match(command)
 
@@ -16,13 +20,20 @@ def test_match(command):
     Command(u'pat-get', 'command not found: pat-get'),
     Command(u'ls', 'command not found: ls'),
     Command(u'агсл', 'command not found: агсл'),
-    Command(u'фзе-пуе', 'some info')])
+    Command(u'фзе-пуе', 'some info'),
+    Command(u'שפא-עקא', 'some info'),
+    Command(u'녀애 ㅣㄴ', 'some info')])
 def test_not_match(command):
     assert not switch_lang.match(command)
 
 
 @pytest.mark.parametrize('command, new_command', [
     (Command(u'фзе-пуе штыефдд мшь', ''), 'apt-get install vim'),
-    (Command(u'λσ -λα', ''), 'ls -la')])
+    (Command(u'λσ -λα', ''), 'ls -la'),
+    (Command(u'שפא-עקא ןמדאשךך הןצ', ''), 'apt-get install vim'),
+    (Command(u'ךד -ךש', ''), 'ls -la'),
+    (Command(u'멧-ㅎㄷㅅ ㅑㅜㄴㅅ미ㅣ 퍄ㅡ', ''), 'apt-get install vim'),
+    (Command(u'ㅣㄴ -ㅣㅁ', ''), 'ls -la'),
+    (Command(u'ㅔㅁㅅ촤', ''), 'patchk'), ])
 def test_get_new_command(command, new_command):
     assert switch_lang.get_new_command(command) == new_command

tests/rules/test_terraform_init.py

@@ -0,0 +1,33 @@
+import pytest
+from thefuck.rules.terraform_init import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('script, output', [
+    ('terraform plan', 'Error: Initialization required. '
+                       'Please see the error message above.'),
+    ('terraform plan', 'This module is not yet installed. Run "terraform init" '
+                       'to install all modules required by this configuration.'),
+    ('terraform apply', 'Error: Initialization required. '
+                        'Please see the error message above.'),
+    ('terraform apply', 'This module is not yet installed. Run "terraform init" '
+                        'to install all modules required by this configuration.')])
+def test_match(script, output):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('terraform --version', 'Terraform v0.12.2'),
+    ('terraform plan', 'No changes. Infrastructure is up-to-date.'),
+    ('terraform apply', 'Apply complete! Resources: 0 added, 0 changed, 0 destroyed.'),
+])
+def test_not_match(script, output):
+    assert not match(Command(script, output=output))
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('terraform plan', ''), 'terraform init && terraform plan'),
+    (Command('terraform apply', ''), 'terraform init && terraform apply'),
+])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command

tests/rules/test_touch.py

@@ -3,25 +3,31 @@ from thefuck.rules.touch import match, get_new_command
 from thefuck.types import Command
 
 
-@pytest.fixture
-def output():
-    return "touch: cannot touch '/a/b/c':" \
-           " No such file or directory"
+def output(is_bsd):
+    if is_bsd:
+        return "touch: /a/b/c: No such file or directory"
+    return "touch: cannot touch '/a/b/c': No such file or directory"
 
 
-def test_match(output):
-    command = Command('touch /a/b/c', output)
+@pytest.mark.parametrize('script, is_bsd', [
+    ('touch /a/b/c', False),
+    ('touch /a/b/c', True)])
+def test_match(script, is_bsd):
+    command = Command(script, output(is_bsd))
     assert match(command)
 
 
 @pytest.mark.parametrize('command', [
     Command('touch /a/b/c', ''),
-    Command('ls /a/b/c', output())])
+    Command('ls /a/b/c', output(False))])
 def test_not_match(command):
     assert not match(command)
 
 
-def test_get_new_command(output):
-    command = Command('touch /a/b/c', output)
+@pytest.mark.parametrize('script, is_bsd', [
+    ('touch /a/b/c', False),
+    ('touch /a/b/c', True)])
+def test_get_new_command(script, is_bsd):
+    command = Command(script, output(is_bsd))
     fixed_command = get_new_command(command)
     assert fixed_command == 'mkdir -p /a/b && touch /a/b/c'

tests/rules/test_unsudo.py

@@ -0,0 +1,22 @@
+import pytest
+from thefuck.rules.unsudo import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('output', [
+    'you cannot perform this operation as root'])
+def test_match(output):
+    assert match(Command('sudo ls', output))
+
+
+def test_not_match():
+    assert not match(Command('', ''))
+    assert not match(Command('sudo ls', 'Permission denied'))
+    assert not match(Command('ls', 'you cannot perform this operation as root'))
+
+
+@pytest.mark.parametrize('before, after', [
+    ('sudo ls', 'ls'),
+    ('sudo pacaur -S helloworld', 'pacaur -S helloworld')])
+def test_get_new_command(before, after):
+    assert get_new_command(Command(before, '')) == after

tests/rules/test_yum_invalid_operation.py

@@ -0,0 +1,173 @@
+from io import BytesIO
+
+import pytest
+
+from thefuck.rules.yum_invalid_operation import match, get_new_command, _get_operations
+from thefuck.types import Command
+
+yum_help_text = '''Loaded plugins: extras_suggestions, langpacks, priorities, update-motd
+Usage: yum [options] COMMAND
+
+List of Commands:
+
+check          Check for problems in the rpmdb
+check-update   Check for available package updates
+clean          Remove cached data
+deplist        List a package's dependencies
+distribution-synchronization Synchronize installed packages to the latest available versions
+downgrade      downgrade a package
+erase          Remove a package or packages from your system
+fs             Acts on the filesystem data of the host, mainly for removing docs/lanuages for minimal hosts.
+fssnapshot     Creates filesystem snapshots, or lists/deletes current snapshots.
+groups         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
+langavailable  Check available languages
+langinfo       List languages information
+langinstall    Install appropriate language packs for a language
+langlist       List installed languages
+langremove     Remove installed language packs for a language
+list           List a package or groups of packages
+load-transaction load a saved transaction from filename
+makecache      Generate the metadata cache
+provides       Find what package provides the given value
+reinstall      reinstall a package
+repo-pkgs      Treat a repo. as a group of packages, so we can install/remove all of them
+repolist       Display the configured software repositories
+search         Search package details for the given string
+shell          Run an interactive yum shell
+swap           Simple way to swap packages, instead of using shell
+update         Update a package or packages on your system
+update-minimal Works like upgrade, but goes to the 'newest' package match which fixes a problem that affects your system
+updateinfo     Acts on repository update information
+upgrade        Update packages taking obsoletes into account
+version        Display a version for the machine and/or available repos.
+
+
+Options:
+  -h, --help            show this help message and exit
+  -t, --tolerant        be tolerant of errors
+  -C, --cacheonly       run entirely from system cache, don't update cache
+  -c [config file], --config=[config file]
+                        config file location
+  -R [minutes], --randomwait=[minutes]
+                        maximum command wait time
+  -d [debug level], --debuglevel=[debug level]
+                        debugging output level
+  --showduplicates      show duplicates, in repos, in list/search commands
+  -e [error level], --errorlevel=[error level]
+                        error output level
+  --rpmverbosity=[debug level name]
+                        debugging output level for rpm
+  -q, --quiet           quiet operation
+  -v, --verbose         verbose operation
+  -y, --assumeyes       answer yes for all questions
+  --assumeno            answer no for all questions
+  --version             show Yum version and exit
+  --installroot=[path]  set install root
+  --enablerepo=[repo]   enable one or more repositories (wildcards allowed)
+  --disablerepo=[repo]  disable one or more repositories (wildcards allowed)
+  -x [package], --exclude=[package]
+                        exclude package(s) by name or glob
+  --disableexcludes=[repo]
+                        disable exclude from main, for a repo or for
+                        everything
+  --disableincludes=[repo]
+                        disable includepkgs for a repo or for everything
+  --obsoletes           enable obsoletes processing during updates
+  --noplugins           disable Yum plugins
+  --nogpgcheck          disable gpg signature checking
+  --disableplugin=[plugin]
+                        disable plugins by name
+  --enableplugin=[plugin]
+                        enable plugins by name
+  --skip-broken         skip packages with depsolving problems
+  --color=COLOR         control whether color is used
+  --releasever=RELEASEVER
+                        set value of $releasever in yum config and repo files
+  --downloadonly        don't update, just download
+  --downloaddir=DLDIR   specifies an alternate directory to store packages
+  --setopt=SETOPTS      set arbitrary config and repo options
+  --bugfix              Include bugfix relevant packages, in updates
+  --security            Include security relevant packages, in updates
+  --advisory=ADVS, --advisories=ADVS
+                        Include packages needed to fix the given advisory, in
+                        updates
+  --bzs=BZS             Include packages needed to fix the given BZ, in
+                        updates
+  --cves=CVES           Include packages needed to fix the given CVE, in
+                        updates
+  --sec-severity=SEVS, --secseverity=SEVS
+                        Include security relevant packages matching the
+                        severity, in updates
+
+  Plugin Options:
+    --samearch-priorities
+                        Priority-exclude packages based on name + arch
+'''
+yum_unsuccessful_search_text = '''Warning: No matches found for: {}
+No matches found
+'''
+yum_successful_vim_search_text = '''================================================== N/S matched: vim ===================================================
+protobuf-vim.x86_64 : Vim syntax highlighting for Google Protocol Buffers descriptions
+vim-X11.x86_64 : The VIM version of the vi editor for the X Window System - GVim
+vim-common.x86_64 : The common files needed by any version of the VIM editor
+vim-enhanced.x86_64 : A version of the VIM editor which includes recent enhancements
+vim-filesystem.x86_64 : VIM filesystem layout
+vim-filesystem.noarch : VIM filesystem layout
+vim-minimal.x86_64 : A minimal version of the VIM editor
+
+  Name and summary matches only, use "search all" for everything.
+'''
+
+yum_invalid_op_text = '''Loaded plugins: extras_suggestions, langpacks, priorities, update-motd
+No such command: {}. Please use /usr/bin/yum --help
+'''
+
+yum_operations = [
+    'check', 'check-update', 'clean', 'deplist', 'distribution-synchronization', 'downgrade', 'erase', 'fs',
+    'fssnapshot', 'groups', 'help', 'history', 'info', 'install', 'langavailable', 'langinfo', 'langinstall',
+    'langlist', 'langremove', 'list', 'load-transaction', 'makecache', 'provides', 'reinstall', 'repo-pkgs', 'repolist',
+    'search', 'shell', 'swap', 'update', 'update-minimal', 'updateinfo', 'upgrade', 'version', ]
+
+
+@pytest.mark.parametrize('command', [
+    'saerch', 'uninstall',
+])
+def test_match(command):
+    assert match(Command('yum {}'.format(command), yum_invalid_op_text.format(command)))
+
+
+@pytest.mark.parametrize('command, output', [
+    ('vim', ''),
+    ('yum', yum_help_text,),
+    ('yum help', yum_help_text,),
+    ('yum search asdf', yum_unsuccessful_search_text.format('asdf'),),
+    ('yum search vim', yum_successful_vim_search_text)
+])
+def test_not_match(command, output):
+    assert not match(Command(command, output))
+
+
+@pytest.fixture
+def yum_help(mocker):
+    mock = mocker.patch('subprocess.Popen')
+    mock.return_value.stdout = BytesIO(bytes(yum_help_text.encode('utf-8')))
+    return mock
+
+
+@pytest.mark.usefixtures('no_memoize', 'yum_help')
+def test_get_operations():
+    assert _get_operations() == yum_operations
+
+
+@pytest.mark.usefixtures('no_memoize', 'yum_help')
+@pytest.mark.parametrize('script, output, result', [
+    ('yum uninstall', yum_invalid_op_text.format('uninstall'), 'yum remove',),
+    ('yum saerch asdf', yum_invalid_op_text.format('saerch'), 'yum search asdf',),
+    ('yum hlep', yum_invalid_op_text.format('hlep'), 'yum help',),
+])
+def test_get_new_command(script, output, result):
+    assert get_new_command(Command(script, output))[0] == result

tests/shells/test_bash.py

@@ -11,6 +11,11 @@ class TestBash(object):
     def shell(self):
         return Bash()
 
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.bash.Popen')
+        return mock
+
     @pytest.fixture(autouse=True)
     def shell_aliases(self):
         os.environ['TF_SHELL_ALIASES'] = (
@@ -51,6 +56,7 @@ class TestBash(object):
     def test_app_alias_variables_correctly_set(self, shell):
         alias = shell.app_alias('fuck')
         assert "fuck () {" in alias
+        assert 'TF_SHELL=bash' in alias
         assert "TF_ALIAS=fuck" in alias
         assert 'PYTHONIOENCODING=utf-8' in alias
         assert 'TF_SHELL_ALIASES=$(alias)' in alias
@@ -72,3 +78,13 @@ class TestBash(object):
                                                     config_exists):
         config_exists.return_value = False
         assert not shell.how_to_configure().can_configure_automatically
+
+    def test_info(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = [b'3.5.9']
+        assert shell.info() == 'Bash 3.5.9'
+
+    def test_get_version_error(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = OSError
+        with pytest.raises(OSError):
+            shell._get_version()
+        assert Popen.call_args[0][0] == ['bash', '-c', 'echo $BASH_VERSION']

tests/shells/test_fish.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
+from thefuck.const import ARGUMENT_PLACEHOLDER
 from thefuck.shells import Fish
 
 
@@ -13,9 +14,11 @@ class TestFish(object):
     @pytest.fixture(autouse=True)
     def Popen(self, mocker):
         mock = mocker.patch('thefuck.shells.fish.Popen')
-        mock.return_value.stdout.read.return_value = (
+        mock.return_value.stdout.read.side_effect = [(
             b'cd\nfish_config\nfuck\nfunced\nfuncsave\ngrep\nhistory\nll\nls\n'
-            b'man\nmath\npopd\npushd\nruby')
+            b'man\nmath\npopd\npushd\nruby'),
+            (b'alias fish_key_reader /usr/bin/fish_key_reader\nalias g git\n'
+             b'alias alias_with_equal_sign=echo\ninvalid_alias'), b'func1\nfunc2', b'']
         return mock
 
     @pytest.mark.parametrize('key, value', [
@@ -26,8 +29,9 @@ class TestFish(object):
         ('THEFUCK_OVERRIDDEN_ALIASES', '\ncut,\n\ngit,\tsed\r')])
     def test_get_overridden_aliases(self, shell, os_environ, key, value):
         os_environ[key] = value
-        assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep',
-                                                   'ls', 'man', 'open', 'sed'}
+        overridden = shell._get_overridden_aliases()
+        assert set(overridden) == {'cd', 'cut', 'git', 'grep',
+                                   'ls', 'man', 'open', 'sed'}
 
     @pytest.mark.parametrize('before, after', [
         ('cd', 'cd'),
@@ -42,7 +46,8 @@ class TestFish(object):
         ('open', 'open'),
         ('vim', 'vim'),
         ('ll', 'fish -ic "ll"'),
-        ('ls', 'ls')])  # Fish has no aliases but functions
+        ('ls', 'ls'),
+        ('g', 'git')])
     def test_from_shell(self, before, after, shell):
         assert shell.from_shell(before) == after
 
@@ -65,14 +70,20 @@ class TestFish(object):
                                        'math': 'math',
                                        'popd': 'popd',
                                        'pushd': 'pushd',
-                                       'ruby': 'ruby'}
+                                       'ruby': 'ruby',
+                                       'g': 'git',
+                                       'fish_key_reader': '/usr/bin/fish_key_reader',
+                                       'alias_with_equal_sign': 'echo'}
+        assert shell.get_aliases() == {'func1': 'func1', 'func2': 'func2'}
 
     def test_app_alias(self, shell):
         assert 'function fuck' in shell.app_alias('fuck')
         assert 'function FUCK' in shell.app_alias('FUCK')
         assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_SHELL=fish' in shell.app_alias('fuck')
         assert 'TF_ALIAS=fuck PYTHONIOENCODING' in shell.app_alias('fuck')
         assert 'PYTHONIOENCODING=utf-8 thefuck' in shell.app_alias('fuck')
+        assert ARGUMENT_PLACEHOLDER in shell.app_alias('fuck')
 
     def test_app_alias_alter_history(self, settings, shell):
         settings.alter_history = True
@@ -104,3 +115,18 @@ class TestFish(object):
                                                     config_exists):
         config_exists.return_value = False
         assert not shell.how_to_configure().can_configure_automatically
+
+    def test_get_version(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = [b'fish, version 3.5.9\n']
+        assert shell._get_version() == '3.5.9'
+        assert Popen.call_args[0][0] == ['fish', '--version']
+
+    @pytest.mark.parametrize('side_effect, exception', [
+        ([b'\n'], IndexError),
+        (OSError('file not found'), OSError),
+    ])
+    def test_get_version_error(self, side_effect, exception, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = side_effect
+        with pytest.raises(exception):
+            shell._get_version()
+        assert Popen.call_args[0][0] == ['fish', '--version']

tests/shells/test_generic.py

@@ -43,3 +43,14 @@ class TestGeneric(object):
 
     def test_how_to_configure(self, shell):
         assert shell.how_to_configure() is None
+
+    @pytest.mark.parametrize('side_effect, expected_info, warn', [
+        ([u'3.5.9'], u'Generic Shell 3.5.9', False),
+        ([OSError], u'Generic Shell', True),
+    ])
+    def test_info(self, side_effect, expected_info, warn, shell, mocker):
+        warn_mock = mocker.patch('thefuck.shells.generic.warn')
+        shell._get_version = mocker.Mock(side_effect=side_effect)
+        assert shell.info() == expected_info
+        assert warn_mock.called is warn
+        assert shell._get_version.called

tests/shells/test_powershell.py

@@ -10,6 +10,11 @@ class TestPowershell(object):
     def shell(self):
         return Powershell()
 
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.powershell.Popen')
+        return mock
+
     def test_and_(self, shell):
         assert shell.and_('ls', 'cd') == '(ls) -and (cd)'
 
@@ -20,3 +25,20 @@ class TestPowershell(object):
 
     def test_how_to_configure(self, shell):
         assert not shell.how_to_configure().can_configure_automatically
+
+    @pytest.mark.parametrize('side_effect, expected_version, call_args', [
+        ([b'''Major  Minor  Build  Revision
+-----  -----  -----  --------
+5      1      17763  316     \n'''], 'PowerShell 5.1.17763.316', ['powershell.exe']),
+        ([IOError, b'PowerShell 6.1.2\n'], 'PowerShell 6.1.2', ['powershell.exe', 'pwsh'])])
+    def test_info(self, side_effect, expected_version, call_args, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = side_effect
+        assert shell.info() == expected_version
+        assert Popen.call_count == len(call_args)
+        assert all([Popen.call_args_list[i][0][0][0] == call_arg for i, call_arg in enumerate(call_args)])
+
+    def test_get_version_error(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = RuntimeError
+        with pytest.raises(RuntimeError):
+            shell._get_version()
+        assert Popen.call_args[0][0] == ['powershell.exe', '$PSVersionTable.PSVersion']

tests/shells/test_tcsh.py

@@ -44,6 +44,7 @@ class TestTcsh(object):
                                        'll': 'ls -alF'}
 
     def test_app_alias(self, shell):
+        assert 'setenv TF_SHELL tcsh' in shell.app_alias('fuck')
         assert 'alias fuck' in shell.app_alias('fuck')
         assert 'alias FUCK' in shell.app_alias('FUCK')
         assert 'thefuck' in shell.app_alias('fuck')
@@ -60,3 +61,17 @@ class TestTcsh(object):
                                                     config_exists):
         config_exists.return_value = False
         assert not shell.how_to_configure().can_configure_automatically
+
+    def test_info(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = [
+            b'tcsh 6.20.00 (Astron) 2016-11-24 (unknown-unknown-bsd44) \n']
+        assert shell.info() == 'Tcsh 6.20.00'
+        assert Popen.call_args[0][0] == ['tcsh', '--version']
+
+    @pytest.mark.parametrize('side_effect, exception', [
+        ([b'\n'], IndexError), (OSError, OSError)])
+    def test_get_version_error(self, side_effect, exception, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = side_effect
+        with pytest.raises(exception):
+            shell._get_version()
+        assert Popen.call_args[0][0] == ['tcsh', '--version']

tests/shells/test_zsh.py

@@ -11,6 +11,11 @@ class TestZsh(object):
     def shell(self):
         return Zsh()
 
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.zsh.Popen')
+        return mock
+
     @pytest.fixture(autouse=True)
     def shell_aliases(self):
         os.environ['TF_SHELL_ALIASES'] = (
@@ -51,6 +56,7 @@ class TestZsh(object):
     def test_app_alias_variables_correctly_set(self, shell):
         alias = shell.app_alias('fuck')
         assert "fuck () {" in alias
+        assert 'TF_SHELL=zsh' in alias
         assert "TF_ALIAS=fuck" in alias
         assert 'PYTHONIOENCODING=utf-8' in alias
         assert 'TF_SHELL_ALIASES=$(alias)' in alias
@@ -67,3 +73,13 @@ class TestZsh(object):
                                                     config_exists):
         config_exists.return_value = False
         assert not shell.how_to_configure().can_configure_automatically
+
+    def test_info(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = [b'3.5.9']
+        assert shell.info() == 'ZSH 3.5.9'
+
+    def test_get_version_error(self, shell, Popen):
+        Popen.return_value.stdout.read.side_effect = OSError
+        with pytest.raises(OSError):
+            shell._get_version()
+        assert Popen.call_args[0][0] == ['zsh', '-c', 'echo $ZSH_VERSION']

tests/test_conf.py

@@ -43,7 +43,7 @@ class TestSettingsFromFile(object):
         assert settings.rules == const.DEFAULT_RULES + ['test']
 
 
-@pytest.mark.usefixture('load_source')
+@pytest.mark.usefixtures('load_source')
 class TestSettingsFromEnv(object):
     def test_from_env(self, os_environ, settings):
         os_environ.update({'THEFUCK_RULES': 'bash:lisp',
@@ -53,7 +53,9 @@ class TestSettingsFromEnv(object):
                            'THEFUCK_NO_COLORS': 'false',
                            'THEFUCK_PRIORITY': 'bash=10:lisp=wrong:vim=15',
                            'THEFUCK_WAIT_SLOW_COMMAND': '999',
-                           'THEFUCK_SLOW_COMMANDS': 'lein:react-native:./gradlew'})
+                           'THEFUCK_SLOW_COMMANDS': 'lein:react-native:./gradlew',
+                           'THEFUCK_NUM_CLOSE_MATCHES': '359',
+                           'THEFUCK_EXCLUDED_SEARCH_PATH_PREFIXES': '/media/:/mnt/'})
         settings.init()
         assert settings.rules == ['bash', 'lisp']
         assert settings.exclude_rules == ['git', 'vim']
@@ -63,6 +65,8 @@ class TestSettingsFromEnv(object):
         assert settings.priority == {'bash': 10, 'vim': 15}
         assert settings.wait_slow_command == 999
         assert settings.slow_commands == ['lein', 'react-native', './gradlew']
+        assert settings.num_close_matches == 359
+        assert settings.excluded_search_path_prefixes == ['/media/', '/mnt/']
 
     def test_from_env_with_DEFAULT(self, os_environ, settings):
         os_environ.update({'THEFUCK_RULES': 'DEFAULT_RULES:bash:lisp'})

tests/test_corrector.py

@@ -8,14 +8,15 @@ from thefuck.types import Command
 from thefuck.corrector import get_corrected_commands, organize_commands
 
 
-class TestGetRules(object):
-    @pytest.fixture
-    def glob(self, mocker):
-        results = {}
-        mocker.patch('thefuck.system.Path.glob',
-                     new_callable=lambda: lambda *_: results.pop('value', []))
-        return lambda value: results.update({'value': value})
+@pytest.fixture
+def glob(mocker):
+    results = {}
+    mocker.patch('thefuck.system.Path.glob',
+                 new_callable=lambda: lambda *_: results.pop('value', []))
+    return lambda value: results.update({'value': value})
 
+
+class TestGetRules(object):
     @pytest.fixture(autouse=True)
     def load_source(self, monkeypatch):
         monkeypatch.setattr('thefuck.types.load_source',
@@ -39,6 +40,14 @@ class TestGetRules(object):
         self._compare_names(rules, loaded_rules)
 
 
+def test_get_rules_rule_exception(mocker, glob):
+    load_source = mocker.patch('thefuck.types.load_source',
+                               side_effect=ImportError("No module named foo..."))
+    glob([Path('git.py')])
+    assert not corrector.get_rules()
+    load_source.assert_called_once_with('git', 'git.py')
+
+
 def test_get_corrected_commands(mocker):
     command = Command('test', 'test')
     rules = [Rule(match=lambda _: False),

tests/test_types.py

@@ -41,10 +41,16 @@ class TestCorrectedCommand(object):
         settings.update(override_settings)
         CorrectedCommand(script, None, 1000).run(Command(script, ''))
         out, _ = capsys.readouterr()
-        assert out[:-1] == printed
+        assert out == printed
 
 
 class TestRule(object):
+    def test_from_path_rule_exception(self, mocker):
+        load_source = mocker.patch('thefuck.types.load_source',
+                                   side_effect=ImportError("No module named foo..."))
+        assert Rule.from_path(Path('git.py')) is None
+        load_source.assert_called_once_with('git', 'git.py')
+
     def test_from_path(self, mocker):
         match = object()
         get_new_command = object()
@@ -60,20 +66,22 @@ class TestRule(object):
                 == Rule('bash', match, get_new_command, priority=900))
         load_source.assert_called_once_with('bash', rule_path)
 
-    @pytest.mark.parametrize('rules, exclude_rules, rule, is_enabled', [
-        (const.DEFAULT_RULES, [], Rule('git', enabled_by_default=True), True),
-        (const.DEFAULT_RULES, [], Rule('git', enabled_by_default=False), False),
-        ([], [], Rule('git', enabled_by_default=False), False),
-        ([], [], Rule('git', enabled_by_default=True), False),
-        (const.DEFAULT_RULES + ['git'], [], Rule('git', enabled_by_default=False), True),
-        (['git'], [], Rule('git', enabled_by_default=False), True),
-        (const.DEFAULT_RULES, ['git'], Rule('git', enabled_by_default=True), False),
-        (const.DEFAULT_RULES, ['git'], Rule('git', enabled_by_default=False), False),
-        ([], ['git'], Rule('git', enabled_by_default=True), False),
-        ([], ['git'], Rule('git', enabled_by_default=False), False)])
-    def test_is_enabled(self, settings, rules, exclude_rules, rule, is_enabled):
-        settings.update(rules=rules,
-                        exclude_rules=exclude_rules)
+    def test_from_path_excluded_rule(self, mocker, settings):
+        load_source = mocker.patch('thefuck.types.load_source')
+        settings.update(exclude_rules=['git'])
+        rule_path = os.path.join(os.sep, 'rules', 'git.py')
+        assert Rule.from_path(Path(rule_path)) is None
+        assert not load_source.called
+
+    @pytest.mark.parametrize('rules, rule, is_enabled', [
+        (const.DEFAULT_RULES, Rule('git', enabled_by_default=True), True),
+        (const.DEFAULT_RULES, Rule('git', enabled_by_default=False), False),
+        ([], Rule('git', enabled_by_default=False), False),
+        ([], Rule('git', enabled_by_default=True), False),
+        (const.DEFAULT_RULES + ['git'], Rule('git', enabled_by_default=False), True),
+        (['git'], Rule('git', enabled_by_default=False), True)])
+    def test_is_enabled(self, settings, rules, rule, is_enabled):
+        settings.update(rules=rules)
         assert rule.is_enabled == is_enabled
 
     def test_isnt_match(self):
@@ -131,6 +139,7 @@ class TestCommand(object):
                                       env=os_environ)
 
     @pytest.mark.parametrize('script, result', [
+        ([], None),
         ([''], None),
         (['', ''], None),
         (['ls', '-la'], 'ls -la'),

tests/test_utils.py

@@ -2,11 +2,11 @@
 
 import pytest
 import warnings
-from mock import Mock
+from mock import Mock, call, patch
 from thefuck.utils import default_settings, \
     memoize, get_closest, get_all_executables, replace_argument, \
     get_all_matched_commands, is_app, for_app, cache, \
-    get_valid_history_without_current, _cache
+    get_valid_history_without_current, _cache, get_close_matches
 from thefuck.types import Command
 
 
@@ -50,6 +50,18 @@ class TestGetClosest(object):
                            fallback_to_first=False) is None
 
 
+class TestGetCloseMatches(object):
+    @patch('thefuck.utils.difflib_get_close_matches')
+    def test_call_with_n(self, difflib_mock):
+        get_close_matches('', [], 1)
+        assert difflib_mock.call_args[0][2] == 1
+
+    @patch('thefuck.utils.difflib_get_close_matches')
+    def test_call_without_n(self, difflib_mock, settings):
+        get_close_matches('', [])
+        assert difflib_mock.call_args[0][2] == settings.get('num_close_matches')
+
+
 @pytest.fixture
 def get_aliases(mocker):
     mocker.patch('thefuck.shells.shell.get_aliases',
@@ -64,6 +76,38 @@ def test_get_all_executables():
     assert 'fuck' not in all_callables
 
 
+@pytest.fixture
+def os_environ_pathsep(monkeypatch, path, pathsep):
+    env = {'PATH': path}
+    monkeypatch.setattr('os.environ', env)
+    monkeypatch.setattr('os.pathsep', pathsep)
+    return env
+
+
+@pytest.mark.usefixtures('no_memoize', 'os_environ_pathsep')
+@pytest.mark.parametrize('path, pathsep', [
+    ('/foo:/bar:/baz:/foo/bar', ':'),
+    (r'C:\\foo;C:\\bar;C:\\baz;C:\\foo\\bar', ';')])
+def test_get_all_executables_pathsep(path, pathsep):
+    with patch('thefuck.utils.Path') as Path_mock:
+        get_all_executables()
+        Path_mock.assert_has_calls([call(p) for p in path.split(pathsep)], True)
+
+
+@pytest.mark.usefixtures('no_memoize', 'os_environ_pathsep')
+@pytest.mark.parametrize('path, pathsep, excluded', [
+    ('/foo:/bar:/baz:/foo/bar:/mnt/foo', ':', '/mnt/foo'),
+    (r'C:\\foo;C:\\bar;C:\\baz;C:\\foo\\bar;Z:\\foo', ';', r'Z:\\foo')])
+def test_get_all_executables_exclude_paths(path, pathsep, excluded, settings):
+    settings.init()
+    settings.excluded_search_path_prefixes = [excluded]
+    with patch('thefuck.utils.Path') as Path_mock:
+        get_all_executables()
+        path_list = path.split(pathsep)
+        assert call(path_list[-1]) not in Path_mock.mock_calls
+        assert all(call(p) in Path_mock.mock_calls for p in path_list[:-1])
+
+
 @pytest.mark.parametrize('args, result', [
     (('apt-get instol vim', 'instol', 'install'), 'apt-get install vim'),
     (('git brnch', 'brnch', 'branch'), 'git branch')])
@@ -195,9 +239,12 @@ class TestGetValidHistoryWithoutCurrent(object):
 
     @pytest.fixture(autouse=True)
     def history(self, mocker):
-        return mocker.patch('thefuck.shells.shell.get_history',
-                            return_value=['le cat', 'fuck', 'ls cat',
-                                          'diff x', 'nocommand x', u'café ô'])
+        mock = mocker.patch('thefuck.shells.shell.get_history')
+        #  Passing as an argument causes `UnicodeDecodeError`
+        #  with newer py.test and python 2.7
+        mock.return_value = ['le cat', 'fuck', 'ls cat',
+                             'diff x', 'nocommand x', u'café ô']
+        return mock
 
     @pytest.fixture(autouse=True)
     def alias(self, mocker):

thefuck/argument_parser.py

@@ -55,7 +55,7 @@ class Parser(object):
         """It's too dangerous to use `-y` and `-r` together."""
         group = self._parser.add_mutually_exclusive_group()
         group.add_argument(
-            '-y', '--yes',
+            '-y', '--yes', '--yeah', '--hard',
             action='store_true',
             help='execute fixed command without confirmation')
         group.add_argument(

thefuck/conf.py

@@ -95,12 +95,13 @@ class Settings(dict):
             return self._rules_from_env(val)
         elif attr == 'priority':
             return dict(self._priority_from_env(val))
-        elif attr in ('wait_command', 'history_limit', 'wait_slow_command'):
+        elif attr in ('wait_command', 'history_limit', 'wait_slow_command',
+                      'num_close_matches'):
             return int(val)
         elif attr in ('require_confirmation', 'no_colors', 'debug',
                       'alter_history', 'instant_mode'):
             return val.lower() == 'true'
-        elif attr == 'slow_commands':
+        elif attr in ('slow_commands', 'excluded_search_path_prefixes'):
             return val.split(':')
         else:
             return val

thefuck/const.py

@@ -42,7 +42,9 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                                       './gradlew', 'vagrant'],
                     'repeat': False,
                     'instant_mode': False,
-                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
+                    'num_close_matches': 3,
+                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'},
+                    'excluded_search_path_prefixes': []}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_EXCLUDE_RULES': 'exclude_rules',
@@ -56,7 +58,9 @@ ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_WAIT_SLOW_COMMAND': 'wait_slow_command',
                'THEFUCK_SLOW_COMMANDS': 'slow_commands',
                'THEFUCK_REPEAT': 'repeat',
-               'THEFUCK_INSTANT_MODE': 'instant_mode'}
+               'THEFUCK_INSTANT_MODE': 'instant_mode',
+               'THEFUCK_NUM_CLOSE_MATCHES': 'num_close_matches',
+               'THEFUCK_EXCLUDED_SEARCH_PATH_PREFIXES': 'excluded_search_path_prefixes'}
 
 SETTINGS_HEADER = u"""# The Fuck settings file
 #
@@ -76,8 +80,12 @@ CONFIGURATION_TIMEOUT = 60
 
 USER_COMMAND_MARK = u'\u200B' * 10
 
-LOG_SIZE = 1000
-
 LOG_SIZE_IN_BYTES = 1024 * 1024
 
+LOG_SIZE_TO_CLEAN = 10 * 1024
+
 DIFF_WITH_ALIAS = 0.5
+
+SHELL_LOGGER_SOCKET_ENV = 'SHELL_LOGGER_SOCKET'
+
+SHELL_LOGGER_LIMIT = 5

thefuck/corrector.py

@@ -1,3 +1,4 @@
+import sys
 from .conf import settings
 from .types import Rule
 from .system import Path
@@ -14,21 +15,37 @@ def get_loaded_rules(rules_paths):
     for path in rules_paths:
         if path.name != '__init__.py':
             rule = Rule.from_path(path)
-            if rule.is_enabled:
+            if rule and rule.is_enabled:
                 yield rule
 
 
+def get_rules_import_paths():
+    """Yields all rules import paths.
+
+    :rtype: Iterable[Path]
+
+    """
+    # Bundled rules:
+    yield Path(__file__).parent.joinpath('rules')
+    # Rules defined by user:
+    yield settings.user_dir.joinpath('rules')
+    # Packages with third-party rules:
+    for path in sys.path:
+        for contrib_module in Path(path).glob('thefuck_contrib_*'):
+            contrib_rules = contrib_module.joinpath('rules')
+            if contrib_rules.is_dir():
+                yield contrib_rules
+
+
 def get_rules():
     """Returns all enabled rules.
 
     :rtype: [Rule]
 
     """
-    bundled = Path(__file__).parent \
-        .joinpath('rules') \
-        .glob('*.py')
-    user = settings.user_dir.joinpath('rules').glob('*.py')
-    return sorted(get_loaded_rules(sorted(bundled) + sorted(user)),
+    paths = [rule_path for path in get_rules_import_paths()
+             for rule_path in sorted(path.glob('*.py'))]
+    return sorted(get_loaded_rules(paths),
                   key=lambda rule: rule.priority)
 
 
@@ -54,7 +71,7 @@ def organize_commands(corrected_commands):
         without_duplicates,
         key=lambda corrected_command: corrected_command.priority)
 
-    logs.debug('Corrected commands: '.format(
+    logs.debug(u'Corrected commands: {}'.format(
         ', '.join(u'{}'.format(cmd) for cmd in [first_command] + sorted_commands)))
 
     for command in sorted_commands:

thefuck/entrypoints/fix_command.py

@@ -23,6 +23,7 @@ def _get_raw_command(known_args):
             diff = SequenceMatcher(a=alias, b=command).ratio()
             if diff < const.DIFF_WITH_ALIAS or command in executables:
                 return [command]
+    return []
 
 
 def fix_command(known_args):

thefuck/entrypoints/main.py

@@ -8,9 +8,9 @@ import sys  # noqa: E402
 from .. import logs  # noqa: E402
 from ..argument_parser import Parser  # noqa: E402
 from ..utils import get_installation_info  # noqa: E402
+from ..shells import shell  # noqa: E402
 from .alias import print_alias  # noqa: E402
 from .fix_command import fix_command  # noqa: E402
-from .shell_logger import shell_logger  # noqa: E402
 
 
 def main():
@@ -21,12 +21,20 @@ def main():
         parser.print_help()
     elif known_args.version:
         logs.version(get_installation_info().version,
-                     sys.version.split()[0])
-    elif known_args.command or 'TF_HISTORY' in os.environ:
-        fix_command(known_args)
+                     sys.version.split()[0], shell.info())
+    # It's important to check if an alias is being requested before checking if
+    # `TF_HISTORY` is in `os.environ`, otherwise it might mess with subshells.
+    # Check https://github.com/nvbn/thefuck/issues/921 for reference
     elif known_args.alias:
         print_alias(known_args)
+    elif known_args.command or 'TF_HISTORY' in os.environ:
+        fix_command(known_args)
     elif known_args.shell_logger:
-        shell_logger(known_args.shell_logger)
+        try:
+            from .shell_logger import shell_logger  # noqa: E402
+        except ImportError:
+            logs.warn('Shell logger supports only Linux and macOS')
+        else:
+            shell_logger(known_args.shell_logger)
     else:
         parser.print_usage()

thefuck/entrypoints/not_configured.py

@@ -3,6 +3,7 @@ from ..system import init_output
 
 init_output()
 
+import getpass  # noqa: E402
 import os  # noqa: E402
 import json  # noqa: E402
 from tempfile import gettempdir  # noqa: E402
@@ -27,7 +28,9 @@ def _get_shell_pid():
 
 def _get_not_configured_usage_tracker_path():
     """Returns path of special file where we store latest shell pid."""
-    return Path(gettempdir()).joinpath('thefuck.last_not_configured_run')
+    return Path(gettempdir()).joinpath(u'thefuck.last_not_configured_run_{}'.format(
+        getpass.getuser(),
+    ))
 
 
 def _record_first_run():

thefuck/entrypoints/shell_logger.py

@@ -1,19 +1,26 @@
 import array
 import fcntl
 from functools import partial
+import mmap
 import os
 import pty
 import signal
 import sys
 import termios
 import tty
-from ..logs import warn
+from .. import logs, const
 
 
 def _read(f, fd):
     data = os.read(fd, 1024)
-    f.write(data)
-    f.flush()
+    try:
+        f.write(data)
+    except ValueError:
+        position = const.LOG_SIZE_IN_BYTES - const.LOG_SIZE_TO_CLEAN
+        f.move(0, const.LOG_SIZE_TO_CLEAN, position)
+        f.seek(position)
+        f.write(b'\x00' * const.LOG_SIZE_TO_CLEAN)
+        f.seek(position)
     return data
 
 
@@ -61,10 +68,12 @@ def shell_logger(output):
 
     """
     if not os.environ.get('SHELL'):
-        warn("Shell logger doesn't support your platform.")
+        logs.warn("Shell logger doesn't support your platform.")
         sys.exit(1)
 
-    with open(output, 'wb') as f:
-        return_code = _spawn(os.environ['SHELL'], partial(_read, f))
+    fd = os.open(output, os.O_CREAT | os.O_TRUNC | os.O_RDWR)
+    os.write(fd, b'\x00' * const.LOG_SIZE_IN_BYTES)
+    buffer = mmap.mmap(fd, const.LOG_SIZE_IN_BYTES, mmap.MAP_SHARED, mmap.PROT_WRITE)
+    return_code = _spawn(os.environ['SHELL'], partial(_read, buffer))
 
     sys.exit(return_code)

thefuck/logs.py

@@ -106,7 +106,7 @@ def how_to_configure_alias(configuration_details):
 
         if configuration_details.can_configure_automatically:
             print(
-                u"Or run {bold}fuck{reset} second time for configuring"
+                u"Or run {bold}fuck{reset} a second time to configure"
                 u" it automatically.".format(
                     bold=color(colorama.Style.BRIGHT),
                     reset=color(colorama.Style.RESET_ALL)))
@@ -134,7 +134,8 @@ def configured_successfully(configuration_details):
             reload=configuration_details.reload))
 
 
-def version(thefuck_version, python_version):
+def version(thefuck_version, python_version, shell_info):
     sys.stderr.write(
-        u'The Fuck {} using Python {}\n'.format(thefuck_version,
-                                                python_version))
+        u'The Fuck {} using Python {} and {}\n'.format(thefuck_version,
+                                                       python_version,
+                                                       shell_info))

thefuck/output_readers/__init__.py

@@ -1,5 +1,5 @@
 from ..conf import settings
-from . import read_log, rerun
+from . import read_log, rerun, shell_logger
 
 
 def get_output(script, expanded):
@@ -12,6 +12,8 @@ def get_output(script, expanded):
     :rtype: str
 
     """
+    if shell_logger.is_available():
+        return shell_logger.get_output(script)
     if settings.instant_mode:
         return read_log.get_output(script)
     else:

thefuck/output_readers/read_log.py

@@ -1,5 +1,7 @@
 import os
 import shlex
+import mmap
+import re
 try:
     from shutil import get_terminal_size
 except ImportError:
@@ -18,11 +20,6 @@ def _group_by_calls(log):
     script_line = None
     lines = []
     for line in log:
-        try:
-            line = line.decode()
-        except UnicodeDecodeError:
-            continue
-
         if const.USER_COMMAND_MARK in line or ps1_counter > 0:
             if script_line and ps1_counter == 0:
                 yield script_line, lines
@@ -53,13 +50,14 @@ def _get_script_group_lines(grouped, script):
 
 
 def _get_output_lines(script, log_file):
-    lines = log_file.readlines()[-const.LOG_SIZE:]
+    data = log_file.read().decode()
+    data = re.sub(r'\x00+$', '', data)
+    lines = data.split('\n')
     grouped = list(_group_by_calls(lines))
     script_lines = _get_script_group_lines(grouped, script)
-
     screen = pyte.Screen(get_terminal_size().columns, len(script_lines))
     stream = pyte.Stream(screen)
-    stream.feed(''.join(script_lines))
+    stream.feed('\n'.join(script_lines))
     return screen.display
 
 
@@ -91,10 +89,11 @@ def get_output(script):
         return None
 
     try:
-        with logs.debug_time(u'Read output from log'), \
-                open(os.environ['THEFUCK_OUTPUT_LOG'], 'rb') as log_file:
-            _skip_old_lines(log_file)
-            lines = _get_output_lines(script, log_file)
+        with logs.debug_time(u'Read output from log'):
+            fd = os.open(os.environ['THEFUCK_OUTPUT_LOG'], os.O_RDONLY)
+            buffer = mmap.mmap(fd, const.LOG_SIZE_IN_BYTES, mmap.MAP_SHARED, mmap.PROT_READ)
+            _skip_old_lines(buffer)
+            lines = _get_output_lines(script, buffer)
             output = '\n'.join(lines).strip()
             logs.debug(u'Received output: {}'.format(output))
             return output

thefuck/output_readers/rerun.py

@@ -1,11 +1,25 @@
 import os
 import shlex
 from subprocess import Popen, PIPE, STDOUT
-from psutil import Process, TimeoutExpired
+from psutil import AccessDenied, Process, TimeoutExpired
 from .. import logs
 from ..conf import settings
 
 
+def _kill_process(proc):
+    """Tries to kill the process otherwise just logs a debug message, the
+    process will be killed when thefuck terminates.
+
+    :type proc: Process
+
+    """
+    try:
+        proc.kill()
+    except AccessDenied:
+        logs.debug(u'Rerun: process PID {} ({}) could not be terminated'.format(
+            proc.pid, proc.exe()))
+
+
 def _wait_output(popen, is_slow):
     """Returns `True` if we can get output of the command in the
     `settings.wait_command` time.
@@ -23,8 +37,8 @@ def _wait_output(popen, is_slow):
         return True
     except TimeoutExpired:
         for child in proc.children(recursive=True):
-            child.kill()
-        proc.kill()
+            _kill_process(child)
+        _kill_process(proc)
         return False
 
 
@@ -39,8 +53,9 @@ def get_output(script, expanded):
     env = dict(os.environ)
     env.update(settings.env)
 
-    is_slow = shlex.split(expanded) in settings.slow_commands
-    with logs.debug_time(u'Call: {}; with env: {}; is slow: '.format(
+    split_expand = shlex.split(expanded)
+    is_slow = split_expand[0] in settings.slow_commands if split_expand else False
+    with logs.debug_time(u'Call: {}; with env: {}; is slow: {}'.format(
             script, env, is_slow)):
         result = Popen(expanded, shell=True, stdin=PIPE,
                        stdout=PIPE, stderr=STDOUT, env=env)

thefuck/output_readers/shell_logger.py

@@ -0,0 +1,60 @@
+import json
+import os
+import socket
+try:
+    from shutil import get_terminal_size
+except ImportError:
+    from backports.shutil_get_terminal_size import get_terminal_size
+import pyte
+from .. import const, logs
+
+
+def _get_socket_path():
+    return os.environ.get(const.SHELL_LOGGER_SOCKET_ENV)
+
+
+def is_available():
+    """Returns `True` if shell logger socket available.
+
+    :rtype: book
+
+    """
+    path = _get_socket_path()
+    if not path:
+        return False
+
+    return os.path.exists(path)
+
+
+def _get_last_n(n):
+    with socket.socket(socket.AF_UNIX) as client:
+        client.connect(_get_socket_path())
+        request = json.dumps({
+            "type": "list",
+            "count": n,
+        }) + '\n'
+        client.sendall(request.encode('utf-8'))
+        response = client.makefile().readline()
+        return json.loads(response)['commands']
+
+
+def _get_output_lines(output):
+    lines = output.split('\n')
+    screen = pyte.Screen(get_terminal_size().columns, len(lines))
+    stream = pyte.Stream(screen)
+    stream.feed('\n'.join(lines))
+    return screen.display
+
+
+def get_output(script):
+    """Gets command output from shell logger."""
+    with logs.debug_time(u'Read output from external shell logger'):
+        commands = _get_last_n(const.SHELL_LOGGER_LIMIT)
+        for command in commands:
+            if command['command'] == script:
+                lines = _get_output_lines(command['output'])
+                output = '\n'.join(lines).strip()
+                return output
+            else:
+                logs.warn("Output isn't available in shell logger")
+                return None

thefuck/rules/adb_unknown_command.py

@@ -0,0 +1,54 @@
+from thefuck.utils import is_app, get_closest, replace_argument
+
+
+_ADB_COMMANDS = (
+    'backup',
+    'bugreport',
+    'connect',
+    'devices',
+    'disable-verity',
+    'disconnect',
+    'enable-verity',
+    'emu',
+    'forward',
+    'get-devpath',
+    'get-serialno',
+    'get-state',
+    'install',
+    'install-multiple',
+    'jdwp',
+    'keygen',
+    'kill-server',
+    'logcat',
+    'pull',
+    'push',
+    'reboot',
+    'reconnect',
+    'restore',
+    'reverse',
+    'root',
+    'run-as',
+    'shell',
+    'sideload',
+    'start-server',
+    'sync',
+    'tcpip',
+    'uninstall',
+    'unroot',
+    'usb',
+    'wait-for',
+)
+
+
+def match(command):
+    return (is_app(command, 'adb')
+            and command.output.startswith('Android Debug Bridge version'))
+
+
+def get_new_command(command):
+    for idx, arg in enumerate(command.script_parts[1:]):
+        # allowed params to ADB are a/d/e/s/H/P/L where s, H, P and L take additional args
+        # for example 'adb -s 111 logcat' or 'adb -e logcat'
+        if not arg[0] == '-' and not command.script_parts[idx] in ('-s', '-H', '-P', '-L'):
+            adb_cmd = get_closest(arg, _ADB_COMMANDS)
+            return replace_argument(command.script, arg, adb_cmd)

thefuck/rules/apt_get.py

@@ -1,3 +1,4 @@
+from types import ModuleType
 from thefuck.specific.apt import apt_available
 from thefuck.utils import memoize, which
 from thefuck.shells import shell
@@ -5,8 +6,14 @@ from thefuck.shells import shell
 try:
     from CommandNotFound import CommandNotFound
 
-    command_not_found = CommandNotFound()
     enabled_by_default = apt_available
+
+    if isinstance(CommandNotFound, ModuleType):
+        # For ubuntu 18.04+
+        _get_packages = CommandNotFound.CommandNotFound().get_packages
+    else:
+        # For older versions
+        _get_packages = CommandNotFound().getPackages
 except ImportError:
     enabled_by_default = False
 
@@ -21,7 +28,7 @@ def _get_executable(command):
 @memoize
 def get_package(executable):
     try:
-        packages = command_not_found.getPackages(executable)
+        packages = _get_packages(executable)
         return packages[0][0]
     except IndexError:
         # IndexError is thrown when no matching package is found

thefuck/rules/apt_invalid_operation.py

@@ -6,8 +6,8 @@ from thefuck.utils import for_app, eager, replace_command
 enabled_by_default = apt_available
 
 
-@for_app('apt', 'apt-get', 'apt-cache')
 @sudo_support
+@for_app('apt', 'apt-get', 'apt-cache')
 def match(command):
     return 'E: Invalid operation' in command.output
 
@@ -34,7 +34,8 @@ def _parse_apt_get_and_cache_operations(help_text_lines):
                 return
 
             yield line.split()[0]
-        elif line.startswith('Commands:'):
+        elif line.startswith('Commands:') \
+                or line.startswith('Most used commands:'):
             is_commands_list = True
 
 
@@ -53,5 +54,10 @@ def _get_operations(app):
 @sudo_support
 def get_new_command(command):
     invalid_operation = command.output.split()[-1]
-    operations = _get_operations(command.script_parts[0])
-    return replace_command(command, invalid_operation, operations)
+
+    if invalid_operation == 'uninstall':
+        return [command.script.replace('uninstall', 'remove')]
+
+    else:
+        operations = _get_operations(command.script_parts[0])
+        return replace_command(command, invalid_operation, operations)

thefuck/rules/apt_list_upgradable.py

@@ -0,0 +1,16 @@
+from thefuck.specific.apt import apt_available
+from thefuck.specific.sudo import sudo_support
+from thefuck.utils import for_app
+
+enabled_by_default = apt_available
+
+
+@sudo_support
+@for_app('apt')
+def match(command):
+    return 'apt list --upgradable' in command.output
+
+
+@sudo_support
+def get_new_command(command):
+    return 'apt list --upgradable'

thefuck/rules/apt_upgrade.py

@@ -0,0 +1,16 @@
+from thefuck.specific.apt import apt_available
+from thefuck.specific.sudo import sudo_support
+from thefuck.utils import for_app
+
+enabled_by_default = apt_available
+
+
+@sudo_support
+@for_app('apt')
+def match(command):
+    return command.script == "apt list --upgradable" and len(command.output.strip().split('\n')) > 1
+
+
+@sudo_support
+def get_new_command(command):
+    return 'apt upgrade'

thefuck/rules/aws_cli.py

@@ -3,7 +3,7 @@ import re
 from thefuck.utils import for_app, replace_argument
 
 INVALID_CHOICE = "(?<=Invalid choice: ')(.*)(?=', maybe you meant:)"
-OPTIONS = "^\s*\*\s(.*)"
+OPTIONS = "^\\s*\\*\\s(.*)"
 
 
 @for_app('aws')

thefuck/rules/az_cli.py

@@ -0,0 +1,17 @@
+import re
+
+from thefuck.utils import for_app, replace_argument
+
+INVALID_CHOICE = "(?=az)(?:.*): '(.*)' is not in the '.*' command group."
+OPTIONS = "^The most similar choice to '.*' is:\n\\s*(.*)$"
+
+
+@for_app('az')
+def match(command):
+    return "is not in the" in command.output and "command group" in command.output
+
+
+def get_new_command(command):
+    mistake = re.search(INVALID_CHOICE, command.output).group(1)
+    options = re.findall(OPTIONS, command.output, flags=re.MULTILINE)
+    return [replace_argument(command.script, mistake, o) for o in options]

thefuck/rules/brew_install.py

@@ -15,12 +15,12 @@ def _get_formulas():
         for file_name in os.listdir(brew_formula_path):
             if file_name.endswith('.rb'):
                 yield file_name[:-3]
-    except:
+    except Exception:
         pass
 
 
 def _get_similar_formula(formula_name):
-    return get_closest(formula_name, _get_formulas(), 1, 0.85)
+    return get_closest(formula_name, _get_formulas(), cutoff=0.85)
 
 
 def match(command):

thefuck/rules/brew_reinstall.py

@@ -0,0 +1,19 @@
+import re
+from thefuck.utils import for_app
+
+
+warning_regex = re.compile(r'Warning: (?:.(?!is ))+ is already installed and '
+                           r'up-to-date')
+message_regex = re.compile(r'To reinstall (?:(?!, ).)+, run `brew reinstall '
+                           r'[^`]+`')
+
+
+@for_app('brew', at_least=2)
+def match(command):
+    return ('install' in command.script
+            and warning_regex.search(command.output)
+            and message_regex.search(command.output))
+
+
+def get_new_command(command):
+    return command.script.replace('install', 'reinstall')

thefuck/rules/brew_unknown_command.py

@@ -3,8 +3,8 @@ import re
 from thefuck.utils import get_closest, replace_command
 from thefuck.specific.brew import get_brew_path_prefix, brew_available
 
-BREW_CMD_PATH = '/Library/Homebrew/cmd'
-TAP_PATH = '/Library/Taps'
+BREW_CMD_PATH = '/Homebrew/Library/Homebrew/cmd'
+TAP_PATH = '/Homebrew/Library/Taps'
 TAP_CMD_PATH = '/%s/%s/cmd'
 
 enabled_by_default = brew_available
@@ -62,7 +62,7 @@ def _brew_commands():
     # Failback commands for testing (Based on Homebrew 0.9.5)
     return ['info', 'home', 'options', 'install', 'uninstall',
             'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
-            'doctor', 'create', 'edit']
+            'doctor', 'create', 'edit', 'cask']
 
 
 def match(command):

thefuck/rules/cat_dir.py

@@ -0,0 +1,14 @@
+import os
+from thefuck.utils import for_app
+
+
+@for_app('cat', at_least=1)
+def match(command):
+    return (
+        command.output.startswith('cat: ') and
+        os.path.isdir(command.script_parts[1])
+    )
+
+
+def get_new_command(command):
+    return command.script.replace('cat', 'ls', 1)

thefuck/rules/cd_correction.py

@@ -2,10 +2,9 @@
 
 import os
 import six
-from difflib import get_close_matches
 from thefuck.specific.sudo import sudo_support
 from thefuck.rules import cd_mkdir
-from thefuck.utils import for_app
+from thefuck.utils import for_app, get_close_matches
 
 __author__ = "mmussomele"
 
@@ -21,9 +20,12 @@ def _get_sub_dirs(parent):
 @for_app('cd')
 def match(command):
     """Match function copied from cd_mkdir.py"""
-    return (command.script.startswith('cd ')
-            and ('no such file or directory' in command.output.lower()
-                 or 'cd: can\'t cd to' in command.output.lower()))
+    return (
+        command.script.startswith('cd ') and any((
+            'no such file or directory' in command.output.lower(),
+            'cd: can\'t cd to' in command.output.lower(),
+            'does not exist' in command.output.lower()
+        )))
 
 
 @sudo_support
@@ -37,7 +39,11 @@ def get_new_command(command):
     dest = command.script_parts[1].split(os.sep)
     if dest[-1] == '':
         dest = dest[:-1]
-    if six.PY2:
+
+    if dest[0] == '':
+        cwd = os.sep
+        dest = dest[1:]
+    elif six.PY2:
         cwd = os.getcwdu()
     else:
         cwd = os.getcwd()

thefuck/rules/cd_cs.py

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+# Redirects cs to cd when there is a typo
+# Due to the proximity of the keys - d and s - this seems like a common typo
+# ~ > cs /etc/
+# cs: command not found
+# ~ > fuck
+# cd /etc/ [enter/↑/↓/ctrl+c]
+# /etc >
+
+
+def match(command):
+    if command.script_parts[0] == 'cs':
+        return True
+
+
+def get_new_command(command):
+    return 'cd' + ''.join(command.script[2:])
+
+
+priority = 900