Bump to 3.31

NA: Fix possible changes in files outside of working directory (#1206 )
Add excluded_search_path_prefixes setting (#1165 )
2025-11-01 15:42:06 +00:00 · 2021-06-09 21:50:44 +02:00 · 2021-06-08 22:04:51 +02:00 · 2021-04-21 19:43:21 +02:00 · 2021-04-18 15:48:39 +02:00 · 2021-04-17 00:24:30 +02:00
105 changed files with 2171 additions and 325 deletions
--- a/.editorconfig
+++ b/.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
--- a/.github/workflows/test.yml
+++ b/.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
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,66 +0,0 @@
-language: python
-sudo: false
-matrix:
-  include:
-    - os: linux
-      dist: xenial
-      python: "nightly"
-    - os: linux
-      dist: xenial
-      python: "3.8-dev"
-    - os: linux
-      dist: xenial
-      python: "3.7-dev"
-    - os: linux
-      dist: xenial
-      python: "3.7"
-    - os: linux
-      dist: trusty
-      python: "3.6-dev"
-    - 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: "2.7"
-    - os: osx
-      language: generic
-  allow_failures:
-    - python: nightly
-    - python: 3.8-dev
-    - python: 3.7-dev
-    - python: 3.6-dev
-services:
-  - docker
-addons:
-  apt:
-    packages:
-      - python-commandnotfound
-      - python3-commandnotfound
-before_install:
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then rm -rf /usr/local/include/c++; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew upgrade python; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then pip3 install virtualenv; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then virtualenv venv -p python3; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then source venv/bin/activate; fi
-  - pip install -U pip
-  - pip install -U coveralls
-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.7 && $TRAVIS_OS_NAME != "osx" ]]; then $RUN_TESTS --enable-functional; fi
-  - if [[ $TRAVIS_PYTHON_VERSION != 3.7 || $TRAVIS_OS_NAME == "osx" ]]; then $RUN_TESTS; fi
-after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.7 && $TRAVIS_OS_NAME != "osx" ]]; then coveralls; fi
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,6 +26,8 @@ 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
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 =====================

-Copyright (c) 2015-2018 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
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 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)

 *The Fuck* is a magnificent app, inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320),
@@ -91,15 +91,30 @@ 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.4+)
 - pip
 - python-dev

+##### [Back to Contents](#contents)
+
 ## Installation

-On OS X, you can install *The Fuck* via [Homebrew][homebrew]:
+On OS X, you can install *The Fuck* via [Homebrew][homebrew] (or via [Linuxbrew][linuxbrew] on Linux):

 ```bash
 brew install thefuck
@@ -114,8 +129,7 @@ sudo pip3 install thefuck

 On FreeBSD, install *The Fuck* with the following commands:
 ```bash
-sudo portsnap fetch update
-cd /usr/ports/misc/thefuck && sudo make install clean
+pkg install thefuck
 ```

 On ChromeOS, install *The Fuck* using [chromebrew](https://github.com/skycocker/chromebrew) with the following command:
@@ -146,7 +160,7 @@ eval $(thefuck --alias FUCK)
 Changes are only available in a new shell session. To make changes immediately
 available, run `source ~/.bashrc` (or your shell config file like `.zshrc`).

-To run fixed commands without confirmation, use the `--yeah` option (or just `-y` for short):
+To run fixed commands without confirmation, use the `--yeah` option (or just `-y` for short, or `--hard` if you're especially frustrated):

 ```bash
 fuck --yeah
@@ -158,6 +172,8 @@ To fix commands recursively until succeeding, use the `-r` option:
 fuck -r
 ```

+##### [Back to Contents](#contents)
+
 ## Updating

 ```bash
@@ -180,17 +196,23 @@ following rules are enabled by default:
 * `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;
@@ -200,15 +222,20 @@ following rules are enabled by default:
 * `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`;
@@ -225,12 +252,13 @@ following rules are enabled by default:
 * `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`;
@@ -257,23 +285,27 @@ following rules are enabled by default:
 * `missing_space_before_subcommand` &ndash; fixes command with missing space like `npminstall`;
 * `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 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;
+* `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;
@@ -283,6 +315,7 @@ following rules are enabled by default:
 * `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;
@@ -298,6 +331,8 @@ following rules are enabled by default:
 * `yarn_command_replaced` &ndash; fixes replaced `yarn` commands;
 * `yarn_help` &ndash; makes it easier to open `yarn` documentation;

+##### [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`);
@@ -313,8 +348,11 @@ The following rules are enabled by default on specific platforms only:
 * `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`;

 The following commands are bundled with *The Fuck*, but are not enabled by
 default:
@@ -322,6 +360,8 @@ 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

 To add your own rule, create a file named `your-rule-name.py`
@@ -345,8 +385,8 @@ Your rule should not change `Command`.

 **Rules api changed in 3.0:** To access a rule's settings, import it with
 `from thefuck.conf import settings`
-  
-`settings` is a special object assembled from `~/.config/thefuck/settings.py`, 
+
+`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`:
@@ -375,12 +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

 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;
@@ -392,6 +434,7 @@ Several *The Fuck* parameters can be changed in the file `$XDG_CONFIG_HOME/thefu
 * `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;
 * `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 `[]`.

 An example of `settings.py`:

@@ -424,6 +467,7 @@ rule with lower `priority` will be matched first;
 * `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_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:

@@ -438,6 +482,8 @@ 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
@@ -457,6 +503,8 @@ thefuck_contrib_foo

 *The Fuck* will find rules located in the `rules` module.

+##### [Back to Contents](#contents)
+
 ## Experimental instant mode

 The default behavior of *The Fuck* requires time to re-run previous commands.
@@ -476,6 +524,8 @@ For example:
 eval $(thefuck --alias --enable-experimental-instant-mode)
 ```

+##### [Back to Contents](#contents)
+
 ## Developing

 See [CONTRIBUTING.md](CONTRIBUTING.md)
@@ -486,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)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,24 +0,0 @@
-build: false
-
-environment:
-  matrix:
-    - PYTHON: "C:/Python27"
-    - PYTHON: "C:/Python34"
-    - PYTHON: "C:/Python35"
-    - PYTHON: "C:/Python36"
-    - PYTHON: "C:/Python37"
-
-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"
--- a/fastentrypoints.py
+++ b/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)
--- a/release.py
+++ b/release.py
@@ -32,5 +32,6 @@ call('git push --tags', shell=True)

 env = os.environ
 env['CONVERT_README'] = 'true'
+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)
--- a/setup.py
+++ b/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, 4):
-    print('thefuck requires Python version 3.4 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.28'
+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',
--- a/tests/conftest.py
+++ b/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')

--- a/tests/rules/test_apt_invalid_operation.py
+++ b/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)
--- a/tests/rules/test_apt_list_upgradable.py
+++ b/tests/rules/test_apt_list_upgradable.py
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 from thefuck.rules.apt_list_upgradable import get_new_command, match
 from thefuck.types import Command

-match_output = '''
+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]
@@ -17,6 +19,11 @@ 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]
@@ -48,8 +55,9 @@ All packages are up to date.
 '''


-def test_match():
-    assert match(Command('sudo apt update', match_output))
+@pytest.mark.parametrize('output', match_output)
+def test_match(output):
+    assert match(Command('sudo apt update', output))


@pytest.mark.parametrize('command', [
@@ -67,9 +75,10 @@ def test_not_match(command):
    assert not match(command)


-def test_get_new_command():
-    new_command = get_new_command(Command('sudo apt update', match_output))
+@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', match_output))
+    new_command = get_new_command(Command('apt update', output))
    assert new_command == 'apt list --upgradable'
--- a/tests/rules/test_cd_cs.py
+++ b/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/'
--- a/tests/rules/test_choco_install.py
+++ b/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)
--- a/tests/rules/test_conda_mistype.py
+++ b/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'])
--- a/tests/rules/test_cp_create_destination.py
+++ b/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
--- a/tests/rules/test_docker_image_being_used_by_container.py
+++ b/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
--- a/tests/rules/test_docker_login.py
+++ b/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'
--- a/tests/rules/test_docker_not_command.py
+++ b/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]
--- a/tests/rules/test_fix_file.py
+++ b/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))
--- a/tests/rules/test_git_branch_delete_checked_out.py
+++ b/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
--- a/tests/rules/test_git_checkout.py
+++ b/tests/rules/test_git_checkout.py
@@ -39,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',
@@ -51,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 checkout -b 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
--- a/tests/rules/test_git_clone_git_clone.py
+++ b/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'
--- a/tests/rules/test_git_commit_reset.py
+++ b/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~'
--- a/tests/rules/test_git_hook_bypass.py
+++ b/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
--- a/tests/rules/test_git_lfs_mistype.py
+++ b/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'])
--- a/tests/rules/test_go_unknown_command.py
+++ b/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'
--- a/tests/rules/test_nixos_cmd_not_found.py
+++ b/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
--- a/tests/rules/test_no_command.py
+++ b/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)
--- a/tests/rules/test_omnienv_no_such_command.py
+++ b/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))
--- a/tests/rules/test_pacman_invalid_option.py
+++ b/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())
--- a/tests/rules/test_pacman_not_found.py
+++ b/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'])])
--- a/tests/rules/test_pip_install.py
+++ b/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'
--- a/tests/rules/test_pip_unknown_command.py
+++ b/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
--- a/tests/rules/test_python_module_error.py
+++ b/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
--- a/tests/rules/test_remove_shell_prompt_literal.py
+++ b/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
--- a/tests/rules/test_switch_lang.py
+++ b/tests/rules/test_switch_lang.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-

 import pytest
+
 from thefuck.rules import switch_lang
 from thefuck.types import Command

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

@@ -19,7 +21,8 @@ def test_match(command):
    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)

@@ -28,6 +31,9 @@ def test_not_match(command):
    (Command(u'фзе-пуе штыефдд мшь', ''), 'apt-get install vim'),
    (Command(u'λσ -λα', ''), 'ls -la'),
    (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'ㅔㅁㅅ촤', ''), 'patchk'), ])
 def test_get_new_command(command, new_command):
    assert switch_lang.get_new_command(command) == new_command
--- a/tests/rules/test_terraform_init.py
+++ b/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
--- a/tests/rules/test_yum_invalid_operation.py
+++ b/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
--- a/tests/shells/test_bash.py
+++ b/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'] = (
@@ -74,7 +79,12 @@ class TestBash(object):
        config_exists.return_value = False
        assert not shell.how_to_configure().can_configure_automatically

-    def test_info(self, shell, mocker):
-        patch = mocker.patch('thefuck.shells.bash.Popen')
-        patch.return_value.stdout.read.side_effect = [b'3.5.9']
+    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']
--- a/tests/shells/test_fish.py
+++ b/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


@@ -28,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'),
@@ -81,6 +83,7 @@ class TestFish(object):
        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
@@ -113,6 +116,17 @@ class TestFish(object):
        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() == 'Fish Shell 3.5.9'
+    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']
--- a/tests/shells/test_generic.py
+++ b/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
--- a/tests/shells/test_powershell.py
+++ b/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']
--- a/tests/shells/test_tcsh.py
+++ b/tests/shells/test_tcsh.py
@@ -61,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']
--- a/tests/shells/test_zsh.py
+++ b/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'] = (
@@ -69,7 +74,12 @@ class TestZsh(object):
        config_exists.return_value = False
        assert not shell.how_to_configure().can_configure_automatically

-    def test_info(self, shell, mocker):
-        patch = mocker.patch('thefuck.shells.zsh.Popen')
-        patch.return_value.stdout.read.side_effect = [b'3.5.9']
+    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']
--- a/tests/test_conf.py
+++ b/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',
@@ -54,7 +54,8 @@ class TestSettingsFromEnv(object):
                           'THEFUCK_PRIORITY': 'bash=10:lisp=wrong:vim=15',
                           'THEFUCK_WAIT_SLOW_COMMAND': '999',
                           'THEFUCK_SLOW_COMMANDS': 'lein:react-native:./gradlew',
-                           'THEFUCK_NUM_CLOSE_MATCHES': '359'})
+                           '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']
@@ -65,6 +66,7 @@ class TestSettingsFromEnv(object):
        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'})
--- a/tests/test_corrector.py
+++ b/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),
--- a/tests/test_types.py
+++ b/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'),
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -2,7 +2,7 @@

 import pytest
 import warnings
-from mock import Mock, patch
+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, \
@@ -76,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')])
@@ -207,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):
--- a/thefuck/argument_parser.py
+++ b/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', '--yeah',
+            '-y', '--yes', '--yeah', '--hard',
            action='store_true',
            help='execute fixed command without confirmation')
        group.add_argument(
--- a/thefuck/conf.py
+++ b/thefuck/conf.py
@@ -101,7 +101,7 @@ class Settings(dict):
        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
--- a/thefuck/const.py
+++ b/thefuck/const.py
@@ -43,7 +43,8 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                    'repeat': False,
                    'instant_mode': False,
                    'num_close_matches': 3,
-                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
+                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'},
+                    'excluded_search_path_prefixes': []}

 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
               'THEFUCK_EXCLUDE_RULES': 'exclude_rules',
@@ -58,7 +59,8 @@ ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
               'THEFUCK_SLOW_COMMANDS': 'slow_commands',
               'THEFUCK_REPEAT': 'repeat',
               'THEFUCK_INSTANT_MODE': 'instant_mode',
-               'THEFUCK_NUM_CLOSE_MATCHES': 'num_close_matches'}
+               'THEFUCK_NUM_CLOSE_MATCHES': 'num_close_matches',
+               'THEFUCK_EXCLUDED_SEARCH_PATH_PREFIXES': 'excluded_search_path_prefixes'}

 SETTINGS_HEADER = u"""# The Fuck settings file
 #
--- a/thefuck/corrector.py
+++ b/thefuck/corrector.py
@@ -15,7 +15,7 @@ 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


@@ -71,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:
--- a/thefuck/entrypoints/fix_command.py
+++ b/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):
--- a/thefuck/entrypoints/main.py
+++ b/thefuck/entrypoints/main.py
@@ -22,10 +22,13 @@ def main():
    elif known_args.version:
        logs.version(get_installation_info().version,
                     sys.version.split()[0], shell.info())
-    elif known_args.command or 'TF_HISTORY' in os.environ:
-        fix_command(known_args)
+    # 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:
        try:
            from .shell_logger import shell_logger  # noqa: E402
--- a/thefuck/logs.py
+++ b/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)))
--- a/thefuck/output_readers/rerun.py
+++ b/thefuck/output_readers/rerun.py
@@ -53,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)
--- a/thefuck/rules/apt_invalid_operation.py
+++ b/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)
--- a/thefuck/rules/apt_list_upgradable.py
+++ b/thefuck/rules/apt_list_upgradable.py
@@ -8,7 +8,7 @@ enabled_by_default = apt_available
@sudo_support
@for_app('apt')
 def match(command):
-    return "Run 'apt list --upgradable' to see them." in command.output
+    return 'apt list --upgradable' in command.output


@sudo_support
--- a/thefuck/rules/brew_unknown_command.py
+++ b/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):
--- a/thefuck/rules/cd_cs.py
+++ b/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
--- a/thefuck/rules/choco_install.py
+++ b/thefuck/rules/choco_install.py
@@ -0,0 +1,25 @@
+from thefuck.utils import for_app, which
+
+
+@for_app("choco", "cinst")
+def match(command):
+    return ((command.script.startswith('choco install') or 'cinst' in command.script_parts)
+            and 'Installing the following packages' in command.output)
+
+
+def get_new_command(command):
+    # Find the argument that is the package name
+    for script_part in command.script_parts:
+        if (
+            script_part not in ["choco", "cinst", "install"]
+            # Need exact match (bc chocolatey is a package)
+            and not script_part.startswith('-')
+            # Leading hyphens are parameters; some packages contain them though
+            and '=' not in script_part and '/' not in script_part
+            # These are certainly parameters
+        ):
+            return command.script.replace(script_part, script_part + ".install")
+    return []
+
+
+enabled_by_default = bool(which("choco")) or bool(which("cinst"))
--- a/thefuck/rules/conda_mistype.py
+++ b/thefuck/rules/conda_mistype.py
@@ -0,0 +1,17 @@
+import re
+from thefuck.utils import replace_command, for_app
+
+
+@for_app("conda")
+def match(command):
+    """
+    Match a mistyped command
+    """
+    return "Did you mean 'conda" in command.output
+
+
+def get_new_command(command):
+    match = re.findall(r"'conda ([^']*)'", command.output)
+    broken_cmd = match[0]
+    correct_cmd = match[1]
+    return replace_command(command, broken_cmd, [correct_cmd])
--- a/thefuck/rules/cp_create_destination.py
+++ b/thefuck/rules/cp_create_destination.py
@@ -0,0 +1,15 @@
+from thefuck.shells import shell
+from thefuck.utils import for_app
+
+
+@for_app("cp", "mv")
+def match(command):
+    return (
+        "No such file or directory" in command.output
+        or command.output.startswith("cp: directory")
+        and command.output.rstrip().endswith("does not exist")
+    )
+
+
+def get_new_command(command):
+    return shell.and_(u"mkdir -p {}".format(command.script_parts[-1]), command.script)
--- a/thefuck/rules/dirty_untar.py
+++ b/thefuck/rules/dirty_untar.py
@@ -41,6 +41,10 @@ def get_new_command(command):
 def side_effect(old_cmd, command):
    with tarfile.TarFile(_tar_file(old_cmd.script_parts)[0]) as archive:
        for file in archive.getnames():
+            if not os.path.abspath(file).startswith(os.getcwd()):
+                # it's unsafe to overwrite files outside of the current directory
+                continue
+
            try:
                os.remove(file)
            except OSError:
--- a/thefuck/rules/dirty_unzip.py
+++ b/thefuck/rules/dirty_unzip.py
@@ -45,6 +45,10 @@ def get_new_command(command):
 def side_effect(old_cmd, command):
    with zipfile.ZipFile(_zip_file(old_cmd), 'r') as archive:
        for file in archive.namelist():
+            if not os.path.abspath(file).startswith(os.getcwd()):
+                # it's unsafe to overwrite files outside of the current directory
+                continue
+
            try:
                os.remove(file)
            except OSError:
--- a/thefuck/rules/dnf_no_such_command.py
+++ b/thefuck/rules/dnf_no_such_command.py
@@ -8,8 +8,8 @@ from thefuck.specific.dnf import dnf_available
 regex = re.compile(r'No such command: (.*)\.')


-@for_app('dnf')
@sudo_support
+@for_app('dnf')
 def match(command):
    return 'no such command' in command.output.lower()

--- a/thefuck/rules/docker_image_being_used_by_container.py
+++ b/thefuck/rules/docker_image_being_used_by_container.py
@@ -0,0 +1,20 @@
+from thefuck.utils import for_app
+from thefuck.shells import shell
+
+
+@for_app('docker')
+def match(command):
+    '''
+    Matches a command's output with docker's output
+    warning you that you need to remove a container before removing an image.
+    '''
+    return 'image is being used by running container' in command.output
+
+
+def get_new_command(command):
+    '''
+    Prepends docker container rm -f {container ID} to
+    the previous docker image rm {image ID} command
+    '''
+    container_id = command.output.strip().split(' ')
+    return shell.and_('docker container rm -f {}', '{}').format(container_id[-1], command.script)
--- a/thefuck/rules/docker_login.py
+++ b/thefuck/rules/docker_login.py
@@ -0,0 +1,12 @@
+from thefuck.utils import for_app
+
+
+@for_app('docker')
+def match(command):
+    return ('docker' in command.script
+            and "access denied" in command.output
+            and "may require 'docker login'" in command.output)
+
+
+def get_new_command(command):
+    return 'docker login && {}'.format(command.script)
--- a/thefuck/rules/docker_not_command.py
+++ b/thefuck/rules/docker_not_command.py
@@ -8,16 +8,30 @@ from thefuck.specific.sudo import sudo_support
@sudo_support
@for_app('docker')
 def match(command):
-    return 'is not a docker command' in command.output
+    return 'is not a docker command' in command.output or 'Usage:	docker' in command.output
+
+
+def _parse_commands(lines, starts_with):
+    lines = dropwhile(lambda line: not line.startswith(starts_with), lines)
+    lines = islice(lines, 1, None)
+    lines = list(takewhile(lambda line: line.strip(), lines))
+    return [line.strip().split(' ')[0] for line in lines]


 def get_docker_commands():
-    proc = subprocess.Popen('docker', stdout=subprocess.PIPE)
-    lines = [line.decode('utf-8') for line in proc.stdout.readlines()]
-    lines = dropwhile(lambda line: not line.startswith('Commands:'), lines)
-    lines = islice(lines, 1, None)
-    lines = list(takewhile(lambda line: line != '\n', lines))
-    return [line.strip().split(' ')[0] for line in lines]
+    proc = subprocess.Popen('docker', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    # Old version docker returns its output to stdout, while newer version returns to stderr.
+    lines = proc.stdout.readlines() or proc.stderr.readlines()
+    lines = [line.decode('utf-8') for line in lines]
+
+    # Only newer versions of docker have management commands in the help text.
+    if 'Management Commands:\n' in lines:
+        management_commands = _parse_commands(lines, 'Management Commands:')
+    else:
+        management_commands = []
+    regular_commands = _parse_commands(lines, 'Commands:')
+    return management_commands + regular_commands


 if which('docker'):
@@ -26,6 +40,10 @@ if which('docker'):

@sudo_support
 def get_new_command(command):
+    if 'Usage:' in command.output and len(command.script_parts) > 1:
+        management_subcommands = _parse_commands(command.output.split('\n'), 'Commands:')
+        return replace_command(command, command.script_parts[2], management_subcommands)
+
    wrong_command = re.findall(
        r"docker: '(\w+)' is not a docker command.", command.output)[0]
    return replace_command(command, wrong_command, get_docker_commands())
--- a/thefuck/rules/git_branch_delete_checked_out.py
+++ b/thefuck/rules/git_branch_delete_checked_out.py
@@ -0,0 +1,19 @@
+from thefuck.shells import shell
+from thefuck.specific.git import git_support
+from thefuck.utils import replace_argument
+
+
+@git_support
+def match(command):
+    return (
+        ("branch -d" in command.script or "branch -D" in command.script)
+        and "error: Cannot delete branch '" in command.output
+        and "' checked out at '" in command.output
+    )
+
+
+@git_support
+def get_new_command(command):
+    return shell.and_("git checkout master", "{}").format(
+        replace_argument(command.script, "-d", "-D")
+    )
--- a/thefuck/rules/git_checkout.py
+++ b/thefuck/rules/git_checkout.py
@@ -8,7 +8,7 @@ from thefuck.shells import shell

@git_support
 def match(command):
-    return ('did not match any file(s) known to git.' in command.output
+    return ('did not match any file(s) known to git' in command.output
            and "Did you forget to 'git add'?" not in command.output)


@@ -18,10 +18,12 @@ def get_branches():
        stdout=subprocess.PIPE)
    for line in proc.stdout.readlines():
        line = line.decode('utf-8')
+        if '->' in line:    # Remote HEAD like b'  remotes/origin/HEAD -> origin/master'
+            continue
        if line.startswith('*'):
            line = line.split(' ')[1]
-        if '/' in line:
-            line = line.split('/')[-1]
+        if line.strip().startswith('remotes/'):
+            line = '/'.join(line.split('/')[2:])
        yield line.strip()


@@ -29,13 +31,19 @@ def get_branches():
 def get_new_command(command):
    missing_file = re.findall(
        r"error: pathspec '([^']*)' "
-        r"did not match any file\(s\) known to git.", command.output)[0]
+        r"did not match any file\(s\) known to git", command.output)[0]
    closest_branch = utils.get_closest(missing_file, get_branches(),
                                       fallback_to_first=False)
+
+    new_commands = []
+
    if closest_branch:
-        return replace_argument(command.script, missing_file, closest_branch)
-    elif command.script_parts[1] == 'checkout':
-        return replace_argument(command.script, 'checkout', 'checkout -b')
-    else:
-        return shell.and_('git branch {}', '{}').format(
-            missing_file, command.script)
+        new_commands.append(replace_argument(command.script, missing_file, closest_branch))
+    if command.script_parts[1] == 'checkout':
+        new_commands.append(replace_argument(command.script, 'checkout', 'checkout -b'))
+
+    if not new_commands:
+        new_commands.append(shell.and_('git branch {}', '{}').format(
+            missing_file, command.script))
+
+    return new_commands
--- a/thefuck/rules/git_clone_git_clone.py
+++ b/thefuck/rules/git_clone_git_clone.py
@@ -0,0 +1,12 @@
+from thefuck.specific.git import git_support
+
+
+@git_support
+def match(command):
+    return (' git clone ' in command.script
+            and 'fatal: Too many arguments.' in command.output)
+
+
+@git_support
+def get_new_command(command):
+    return command.script.replace(' git clone ', ' ', 1)
--- a/thefuck/rules/git_commit_reset.py
+++ b/thefuck/rules/git_commit_reset.py
@@ -0,0 +1,11 @@
+from thefuck.specific.git import git_support
+
+
+@git_support
+def match(command):
+    return ('commit' in command.script_parts)
+
+
+@git_support
+def get_new_command(command):
+    return 'git reset HEAD~'
--- a/thefuck/rules/git_hook_bypass.py
+++ b/thefuck/rules/git_hook_bypass.py
@@ -0,0 +1,27 @@
+from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
+
+hooked_commands = ("am", "commit", "push")
+
+
+@git_support
+def match(command):
+    return any(
+        hooked_command in command.script_parts for hooked_command in hooked_commands
+    )
+
+
+@git_support
+def get_new_command(command):
+    hooked_command = next(
+        hooked_command
+        for hooked_command in hooked_commands
+        if hooked_command in command.script_parts
+    )
+    return replace_argument(
+        command.script, hooked_command, hooked_command + " --no-verify"
+    )
+
+
+priority = 900
+requires_output = False
--- a/thefuck/rules/git_lfs_mistype.py
+++ b/thefuck/rules/git_lfs_mistype.py
@@ -0,0 +1,18 @@
+import re
+from thefuck.utils import get_all_matched_commands, replace_command
+from thefuck.specific.git import git_support
+
+
+@git_support
+def match(command):
+    '''
+    Match a mistyped command
+    '''
+    return 'lfs' in command.script and 'Did you mean this?' in command.output
+
+
+@git_support
+def get_new_command(command):
+    broken_cmd = re.findall(r'Error: unknown command "([^"]*)" for "git-lfs"', command.output)[0]
+    matched = get_all_matched_commands(command.output, ['Did you mean', ' for usage.'])
+    return replace_command(command, broken_cmd, matched)
--- a/thefuck/rules/go_unknown_command.py
+++ b/thefuck/rules/go_unknown_command.py
@@ -0,0 +1,28 @@
+from itertools import dropwhile, islice, takewhile
+import subprocess
+
+from thefuck.utils import get_closest, replace_argument, for_app, which, cache
+
+
+def get_golang_commands():
+    proc = subprocess.Popen('go', stderr=subprocess.PIPE)
+    lines = [line.decode('utf-8').strip() for line in proc.stderr.readlines()]
+    lines = dropwhile(lambda line: line != 'The commands are:', lines)
+    lines = islice(lines, 2, None)
+    lines = takewhile(lambda line: line, lines)
+    return [line.split(' ')[0] for line in lines]
+
+
+if which('go'):
+    get_docker_commands = cache(which('go'))(get_golang_commands)
+
+
+@for_app('go')
+def match(command):
+    return 'unknown command' in command.output
+
+
+def get_new_command(command):
+    closest_subcommand = get_closest(command.script_parts[1], get_golang_commands())
+    return replace_argument(command.script, command.script_parts[1],
+                            closest_subcommand)
--- a/thefuck/rules/nixos_cmd_not_found.py
+++ b/thefuck/rules/nixos_cmd_not_found.py
@@ -0,0 +1,15 @@
+import re
+from thefuck.specific.nix import nix_available
+from thefuck.shells import shell
+
+regex = re.compile(r'nix-env -iA ([^\s]*)')
+enabled_by_default = nix_available
+
+
+def match(command):
+    return regex.findall(command.output)
+
+
+def get_new_command(command):
+    name = regex.findall(command.output)[0]
+    return shell.and_('nix-env -iA {}'.format(name), command.script)
--- a/thefuck/rules/no_command.py
+++ b/thefuck/rules/no_command.py
@@ -6,7 +6,8 @@ from thefuck.specific.sudo import sudo_support
@sudo_support
 def match(command):
    return (not which(command.script_parts[0])
-            and 'not found' in command.output
+            and ('not found' in command.output
+                 or 'is not recognized as' in command.output)
            and bool(get_close_matches(command.script_parts[0],
                                       get_all_executables())))

--- a/thefuck/rules/omnienv_no_such_command.py
+++ b/thefuck/rules/omnienv_no_such_command.py
@@ -0,0 +1,35 @@
+import re
+from thefuck.utils import (cache, for_app, replace_argument, replace_command,
+                           which)
+from subprocess import PIPE, Popen
+
+
+supported_apps = 'goenv', 'nodenv', 'pyenv', 'rbenv'
+enabled_by_default = any(which(a) for a in supported_apps)
+
+
+COMMON_TYPOS = {
+    'list': ['versions', 'install --list'],
+    'remove': ['uninstall'],
+}
+
+
+@for_app(*supported_apps, at_least=1)
+def match(command):
+    return 'env: no such command ' in command.output
+
+
+def get_app_commands(app):
+    proc = Popen([app, 'commands'], stdout=PIPE)
+    return [line.decode('utf-8').strip() for line in proc.stdout.readlines()]
+
+
+def get_new_command(command):
+    broken = re.findall(r"env: no such command ['`]([^']*)'", command.output)[0]
+    matched = [replace_argument(command.script, broken, common_typo)
+               for common_typo in COMMON_TYPOS.get(broken, [])]
+
+    app = command.script_parts[0]
+    app_commands = cache(which(app))(get_app_commands)(app)
+    matched.extend(replace_command(command, broken, app_commands))
+    return matched
--- a/thefuck/rules/pacman_invalid_option.py
+++ b/thefuck/rules/pacman_invalid_option.py
@@ -0,0 +1,20 @@
+from thefuck.specific.archlinux import archlinux_env
+from thefuck.specific.sudo import sudo_support
+from thefuck.utils import for_app
+import re
+
+
+@sudo_support
+@for_app("pacman")
+def match(command):
+    return command.output.startswith("error: invalid option '-") and any(
+        " -{}".format(option) in command.script for option in "surqfdvt"
+    )
+
+
+def get_new_command(command):
+    option = re.findall(r" -[dfqrstuv]", command.script)[0]
+    return re.sub(option, option.upper(), command.script)
+
+
+enabled_by_default = archlinux_env()
--- a/thefuck/rules/pacman_not_found.py
+++ b/thefuck/rules/pacman_not_found.py
@@ -1,9 +1,9 @@
 """ Fixes wrong package names with pacman or yaourt.

 For example the `llc` program is in package `llvm` so this:
-    yaourt -S llc
+    yay -S llc
 should be:
-    yaourt -S llvm
+    yay -S llvm
 """

 from thefuck.utils import replace_command
@@ -12,7 +12,7 @@ from thefuck.specific.archlinux import get_pkgfile, archlinux_env

 def match(command):
    return (command.script_parts
-            and (command.script_parts[0] in ('pacman', 'yaourt')
+            and (command.script_parts[0] in ('pacman', 'yay', 'yaourt')
                 or command.script_parts[0:2] == ['sudo', 'pacman'])
            and 'error: target not found:' in command.output)

--- a/thefuck/rules/pip_install.py
+++ b/thefuck/rules/pip_install.py
@@ -0,0 +1,15 @@
+from thefuck.utils import for_app
+from thefuck.specific.sudo import sudo_support
+
+
+@sudo_support
+@for_app('pip')
+def match(command):
+    return ('pip install' in command.script and 'Permission denied' in command.output)
+
+
+def get_new_command(command):
+    if '--user' not in command.script:  # add --user (attempt 1)
+        return command.script.replace(' install ', ' install --user ')
+
+    return 'sudo {}'.format(command.script.replace(' --user', ''))  # since --user didn't fix things, let's try sudo (attempt 2)
--- a/thefuck/rules/pip_unknown_command.py
+++ b/thefuck/rules/pip_unknown_command.py
@@ -12,8 +12,8 @@ def match(command):


 def get_new_command(command):
-    broken_cmd = re.findall(r'ERROR: unknown command \"([a-z]+)\"',
+    broken_cmd = re.findall(r'ERROR: unknown command "([^"]+)"',
                            command.output)[0]
-    new_cmd = re.findall(r'maybe you meant \"([a-z]+)\"', command.output)[0]
+    new_cmd = re.findall(r'maybe you meant "([^"]+)"', command.output)[0]

    return replace_argument(command.script, broken_cmd, new_cmd)
--- a/thefuck/rules/python_module_error.py
+++ b/thefuck/rules/python_module_error.py
@@ -0,0 +1,13 @@
+import re
+from thefuck.shells import shell
+
+MISSING_MODULE = r"ModuleNotFoundError: No module named '([^']+)'"
+
+
+def match(command):
+    return "ModuleNotFoundError: No module named '" in command.output
+
+
+def get_new_command(command):
+    missing_module = re.findall(MISSING_MODULE, command.output)[0]
+    return shell.and_("pip install {}".format(missing_module), command.script)
--- a/thefuck/rules/remove_shell_prompt_literal.py
+++ b/thefuck/rules/remove_shell_prompt_literal.py
@@ -0,0 +1,22 @@
+"""Fixes error for commands containing the shell prompt symbol '$'.
+
+This usually happens when commands are copied from documentations
+including them in their code blocks.
+
+Example:
+> $ git clone https://github.com/nvbn/thefuck.git
+bash: $: command not found...
+"""
+
+import re
+
+
+def match(command):
+    return (
+        "$: command not found" in command.output
+        and re.search(r"^[\s]*\$ [\S]+", command.script) is not None
+    )
+
+
+def get_new_command(command):
+    return command.script.replace("$", "", 1).strip()
--- a/thefuck/rules/sudo.py
+++ b/thefuck/rules/sudo.py
@@ -21,7 +21,7 @@ patterns = ['permission denied',
            'edspermissionerror',
            'you don\'t have write permissions',
            'use `sudo`',
-            'SudoRequiredError',
+            'sudorequirederror',
            'error: insufficient privileges']


--- a/thefuck/rules/switch_lang.py
+++ b/thefuck/rules/switch_lang.py
@@ -2,22 +2,56 @@
 from thefuck.utils import memoize, get_alias

 target_layout = '''qwertyuiop[]asdfghjkl;'zxcvbnm,./QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?'''
+# any new keyboard layout must be appended
+
+greek = u''';ςερτυθιοπ[]ασδφγηξκλ΄ζχψωβνμ,./:΅ΕΡΤΥΘΙΟΠ{}ΑΣΔΦΓΗΞΚΛ¨"ΖΧΨΩΒΝΜ<>?'''
+korean = u'''ㅂㅈㄷㄱㅅㅛㅕㅑㅐㅔ[]ㅁㄴㅇㄹㅎㅗㅓㅏㅣ;'ㅋㅌㅊㅍㅠㅜㅡ,./ㅃㅉㄸㄲㅆㅛㅕㅑㅒㅖ{}ㅁㄴㅇㄹㅎㅗㅓㅏㅣ:"ㅋㅌㅊㅍㅠㅜㅡ<>?'''

 source_layouts = [u'''йцукенгшщзхъфывапролджэячсмитьбю.ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,''',
                  u'''йцукенгшщзхїфівапролджєячсмитьбю.ЙЦУКЕНГШЩЗХЇФІВАПРОЛДЖЄЯЧСМИТЬБЮ,''',
                  u'''ضصثقفغعهخحجچشسیبلاتنمکگظطزرذدپو./ًٌٍَُِّْ][}{ؤئيإأآة»«:؛كٓژٰ‌ٔء><؟''',
-                  u''';ςερτυθιοπ[]ασδφγηξκλ΄ζχψωβνμ,./:΅ΕΡΤΥΘΙΟΠ{}ΑΣΔΦΓΗΞΚΛ¨"ΖΧΨΩΒΝΜ<>?''',
-                  u'''/'קראטוןםפ][שדגכעיחלךף,זסבהנמצתץ.QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?''']
+                  u'''/'קראטוןםפ][שדגכעיחלךף,זסבהנמצתץ.QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?''',
+                  greek,
+                  korean]
+
+source_to_target = {
+    greek: {u';': "q", u'ς': "w", u'ε': "e", u'ρ': "r", u'τ': "t", u'υ': "y",
+            u'θ': "u", u'ι': "i", u'ο': "o", u'π': "p", u'[': "[", u']': "]",
+            u'α': "a", u'σ': "s", u'δ': "d", u'φ': "f", u'γ': "g", u'η': "h",
+            u'ξ': "j", u'κ': "k", u'λ': "l", u'΄': "'", u'ζ': "z", u'χ': "x",
+            u'ψ': "c", u'ω': "v", u'β': "b", u'ν': "n", u'μ': "m", u',': ",",
+            u'.': ".", u'/': "/", u':': "Q", u'΅': "W", u'Ε': "E", u'Ρ': "R",
+            u'Τ': "T", u'Υ': "Y", u'Θ': "U", u'Ι': "I", u'Ο': "O", u'Π': "P",
+            u'{': "{", u'}': "}", u'Α': "A", u'Σ': "S", u'Δ': "D", u'Φ': "F",
+            u'Γ': "G", u'Η': "H", u'Ξ': "J", u'Κ': "K", u'Λ': "L", u'¨': ":",
+            u'"': '"', u'Ζ': "Z", u'Χ': "X", u'Ψ': "C", u'Ω': "V", u'Β': "B",
+            u'Ν': "N", u'Μ': "M", u'<': "<", u'>': ">", u'?': "?", u'ά': "a",
+            u'έ': "e", u'ύ': "y", u'ί': "i", u'ό': "o", u'ή': 'h', u'ώ': u"v",
+            u'Ά': "A", u'Έ': "E", u'Ύ': "Y", u'Ί': "I", u'Ό': "O", u'Ή': "H",
+            u'Ώ': "V"},
+}
+
+'''Lists used for decomposing korean letters.'''
+HEAD_LIST = [u'ㄱ', u'ㄲ', u'ㄴ', u'ㄷ', u'ㄸ', u'ㄹ', u'ㅁ', u'ㅂ', u'ㅃ', u'ㅅ', u'ㅆ',
+             u'ㅇ', u'ㅈ', u'ㅉ', u'ㅊ', u'ㅋ', u'ㅌ', u'ㅍ', u'ㅎ']
+BODY_LIST = [u'ㅏ', u'ㅐ', u'ㅑ', u'ㅒ', u'ㅓ', u'ㅔ', u'ㅕ', u'ㅖ', u'ㅗ', u'ㅘ', u'ㅙ',
+             u'ㅚ', u'ㅛ', u'ㅜ', u'ㅝ', u'ㅞ', u'ㅟ', u'ㅠ', u'ㅡ', u'ㅢ', u'ㅣ']
+TAIL_LIST = [u' ', u'ㄱ', u'ㄲ', u'ㄳ', u'ㄴ', u'ㄵ', u'ㄶ', u'ㄷ', u'ㄹ', u'ㄺ', u'ㄻ',
+             u'ㄼ', u'ㄽ', u'ㄾ', u'ㄿ', u'ㅀ', u'ㅁ', u'ㅂ', u'ㅄ', u'ㅅ', u'ㅆ', u'ㅇ', u'ㅈ',
+             u'ㅊ', u'ㅋ', u'ㅌ', u'ㅍ', u'ㅎ']
+DOUBLE_LIST = [u'ㅘ', u'ㅙ', u'ㅚ', u'ㅝ', u'ㅞ', u'ㅟ', u'ㅢ', u'ㄳ', u'ㄵ', u'ㄶ', u'ㄺ',
+               u'ㄻ', u'ㄼ', u'ㄽ', u'ㄾ', u'ㅀ', u'ㅄ']
+DOUBLE_MOD_LIST = [u'ㅗㅏ', u'ㅗㅐ', u'ㅗㅣ', u'ㅜㅓ', u'ㅜㅔ', u'ㅜㅣ', u'ㅡㅣ', u'ㄱㅅ',
+                   u'ㄴㅈ', u'ㄴㅎ', u'ㄹㄱ', u'ㄹㅁ', u'ㄹㅂ', u'ㄹㅅ', u'ㄹㅌ', u'ㄹㅎ', u'ㅂㅅ']


@memoize
 def _get_matched_layout(command):
    # don't use command.split_script here because a layout mismatch will likely
-    # result in a non-splitable sript as per shlex
+    # result in a non-splitable script as per shlex
    cmd = command.script.split(' ')
    for source_layout in source_layouts:
        is_all_match = True
-
        for cmd_part in cmd:
            if not all([ch in source_layout or ch in '-_' for ch in cmd_part]):
                is_all_match = False
@@ -30,22 +64,54 @@ def _get_matched_layout(command):
 def _switch(ch, layout):
    if ch in layout:
        return target_layout[layout.index(ch)]
-    else:
-        return ch
+    return ch


 def _switch_command(command, layout):
+    # Layouts with different amount of characters than English
+    if layout in source_to_target:
+        return ''.join(source_to_target[layout].get(ch, ch)
+                       for ch in command.script)
+
    return ''.join(_switch(ch, layout) for ch in command.script)


+def _decompose_korean(command):
+    def _change_double(ch):
+        if ch in DOUBLE_LIST:
+            return DOUBLE_MOD_LIST[DOUBLE_LIST.index(ch)]
+        return ch
+
+    hg_str = u''
+    for ch in command.script:
+        if u'가' <= ch <= u'힣':
+            ord_ch = ord(ch) - ord(u'가')
+            hd = ord_ch // 588
+            bd = (ord_ch - 588 * hd) // 28
+            tl = ord_ch - 588 * hd - 28 * bd
+            for ch in [HEAD_LIST[hd], BODY_LIST[bd], TAIL_LIST[tl]]:
+                if ch != ' ':
+                    hg_str += _change_double(ch)
+        else:
+            hg_str += _change_double(ch)
+    return hg_str
+
+
 def match(command):
    if 'not found' not in command.output:
        return False
+    if any(u'ㄱ' <= ch <= u'ㅎ' or u'ㅏ' <= ch <= u'ㅣ' or u'가' <= ch <= u'힣'
+            for ch in command.script):
+        return True
+
    matched_layout = _get_matched_layout(command)
    return (matched_layout and
            _switch_command(command, matched_layout) != get_alias())


 def get_new_command(command):
+    if any(u'ㄱ' <= ch <= u'ㅎ' or u'ㅏ' <= ch <= u'ㅣ' or u'가' <= ch <= u'힣'
+            for ch in command.script):
+        command.script = _decompose_korean(command)
    matched_layout = _get_matched_layout(command)
    return _switch_command(command, matched_layout)
--- a/thefuck/rules/terraform_init.py
+++ b/thefuck/rules/terraform_init.py
@@ -0,0 +1,13 @@
+from thefuck.shells import shell
+from thefuck.utils import for_app
+
+
+@for_app('terraform')
+def match(command):
+    return ('this module is not yet installed' in command.output.lower() or
+            'initialization required' in command.output.lower()
+            )
+
+
+def get_new_command(command):
+    return shell.and_('terraform init', command.script)
--- a/thefuck/rules/touch.py
+++ b/thefuck/rules/touch.py
@@ -9,6 +9,6 @@ def match(command):


 def get_new_command(command):
-    path = path = re.findall(
+    path = re.findall(
        r"touch: (?:cannot touch ')?(.+)/.+'?:", command.output)[0]
    return shell.and_(u'mkdir -p {}'.format(path), command.script)
--- a/thefuck/rules/yum_invalid_operation.py
+++ b/thefuck/rules/yum_invalid_operation.py
@@ -0,0 +1,39 @@
+import subprocess
+from itertools import dropwhile, islice, takewhile
+
+from thefuck.specific.sudo import sudo_support
+from thefuck.specific.yum import yum_available
+from thefuck.utils import for_app, replace_command, which, cache
+
+enabled_by_default = yum_available
+
+
+@sudo_support
+@for_app('yum')
+def match(command):
+    return 'No such command: ' in command.output
+
+
+def _get_operations():
+    proc = subprocess.Popen('yum', stdout=subprocess.PIPE)
+
+    lines = proc.stdout.readlines()
+    lines = [line.decode('utf-8') for line in lines]
+    lines = dropwhile(lambda line: not line.startswith("List of Commands:"), lines)
+    lines = islice(lines, 2, None)
+    lines = list(takewhile(lambda line: line.strip(), lines))
+    return [line.strip().split(' ')[0] for line in lines]
+
+
+if which('yum'):
+    _get_operations = cache(which('yum'))(_get_operations)
+
+
+@sudo_support
+def get_new_command(command):
+    invalid_operation = command.script_parts[1]
+
+    if invalid_operation == 'uninstall':
+        return [command.script.replace('uninstall', 'remove')]
+
+    return replace_command(command, invalid_operation, _get_operations())
--- a/thefuck/shells/bash.py
+++ b/thefuck/shells/bash.py
@@ -9,6 +9,8 @@ from .generic import Generic


 class Bash(Generic):
+    friendly_name = 'Bash'
+
    def app_alias(self, alias_name):
        # It is VERY important to have the variables declared WITHIN the function
        return '''
@@ -20,8 +22,8 @@ class Bash(Generic):
                export TF_HISTORY=$(fc -ln -10);
                export PYTHONIOENCODING=utf-8;
                TF_CMD=$(
-                    thefuck {argument_placeholder} $@
-                ) && eval $TF_CMD;
+                    thefuck {argument_placeholder} "$@"
+                ) && eval "$TF_CMD";
                unset TF_HISTORY;
                export PYTHONIOENCODING=$TF_PYTHONIOENCODING;
                {alter_history}
@@ -79,13 +81,12 @@ class Bash(Generic):
            config = 'bash config'

        return self._create_shell_configuration(
-            content=u'eval $(thefuck --alias)',
+            content=u'eval "$(thefuck --alias)"',
            path=config,
            reload=u'source {}'.format(config))

-    def info(self):
-        """Returns the name and version of the current shell"""
+    def _get_version(self):
+        """Returns the version of the current shell"""
        proc = Popen(['bash', '-c', 'echo $BASH_VERSION'],
                     stdout=PIPE, stderr=DEVNULL)
-        version = proc.stdout.read().decode('utf-8').strip()
-        return u'Bash {}'.format(version)
+        return proc.stdout.read().decode('utf-8').strip()
--- a/thefuck/shells/fish.py
+++ b/thefuck/shells/fish.py
@@ -5,6 +5,7 @@ import sys
 import six
 from .. import logs
 from ..conf import settings
+from ..const import ARGUMENT_PLACEHOLDER
 from ..utils import DEVNULL, cache
 from .generic import Generic

@@ -37,13 +38,15 @@ def _get_aliases(overridden):


 class Fish(Generic):
+    friendly_name = 'Fish Shell'
+
    def _get_overridden_aliases(self):
        overridden = os.environ.get('THEFUCK_OVERRIDDEN_ALIASES',
                                    os.environ.get('TF_OVERRIDDEN_ALIASES', ''))
        default = {'cd', 'grep', 'ls', 'man', 'open'}
        for alias in overridden.split(','):
            default.add(alias.strip())
-        return default
+        return sorted(default)

    def app_alias(self, alias_name):
        if settings.alter_history:
@@ -56,11 +59,11 @@ class Fish(Generic):
        return ('function {0} -d "Correct your previous console command"\n'
                '  set -l fucked_up_command $history[1]\n'
                '  env TF_SHELL=fish TF_ALIAS={0} PYTHONIOENCODING=utf-8'
-                ' thefuck $fucked_up_command | read -l unfucked_command\n'
+                ' thefuck $fucked_up_command {2} $argv | read -l unfucked_command\n'
                '  if [ "$unfucked_command" != "" ]\n'
                '    eval $unfucked_command\n{1}'
                '  end\n'
-                'end').format(alias_name, alter_history)
+                'end').format(alias_name, alter_history, ARGUMENT_PLACEHOLDER)

    def get_aliases(self):
        overridden = self._get_overridden_aliases()
@@ -103,12 +106,10 @@ class Fish(Generic):
            path='~/.config/fish/config.fish',
            reload='fish')

-    def info(self):
-        """Returns the name and version of the current shell"""
-        proc = Popen(['fish', '-c', 'echo $FISH_VERSION'],
-                     stdout=PIPE, stderr=DEVNULL)
-        version = proc.stdout.read().decode('utf-8').strip()
-        return u'Fish Shell {}'.format(version)
+    def _get_version(self):
+        """Returns the version of the current shell"""
+        proc = Popen(['fish', '--version'], stdout=PIPE, stderr=DEVNULL)
+        return proc.stdout.read().decode('utf-8').split()[-1]

    def put_to_history(self, command):
        try:
--- a/thefuck/shells/generic.py
+++ b/thefuck/shells/generic.py
@@ -14,6 +14,8 @@ ShellConfiguration = namedtuple('ShellConfiguration', (


 class Generic(object):
+    friendly_name = 'Generic Shell'
+
    def get_aliases(self):
        return {}

@@ -34,8 +36,8 @@ class Generic(object):
        return command_script

    def app_alias(self, alias_name):
-        return "alias {0}='eval $(TF_ALIAS={0} PYTHONIOENCODING=utf-8 " \
-               "thefuck $(fc -ln -1))'".format(alias_name)
+        return """alias {0}='eval "$(TF_ALIAS={0} PYTHONIOENCODING=utf-8 """ \
+               """thefuck "$(fc -ln -1)")"'""".format(alias_name)

    def instant_mode_alias(self, alias_name):
        warn("Instant mode not supported by your shell")
@@ -131,9 +133,18 @@ class Generic(object):
                'type', 'typeset', 'ulimit', 'umask', 'unalias', 'unset',
                'until', 'wait', 'while']

+    def _get_version(self):
+        """Returns the version of the current shell"""
+        return ''
+
    def info(self):
        """Returns the name and version of the current shell"""
-        return 'Generic Shell'
+        try:
+            version = self._get_version()
+        except Exception as e:
+            warn(u'Could not determine shell version: {}'.format(e))
+            version = ''
+        return u'{} {}'.format(self.friendly_name, version).rstrip()

    def _create_shell_configuration(self, content, path, reload):
        return ShellConfiguration(
--- a/thefuck/shells/powershell.py
+++ b/thefuck/shells/powershell.py
@@ -1,7 +1,11 @@
+from subprocess import Popen, PIPE
+from ..utils import DEVNULL
 from .generic import Generic, ShellConfiguration


 class Powershell(Generic):
+    friendly_name = 'PowerShell'
+
    def app_alias(self, alias_name):
        return 'function ' + alias_name + ' {\n' \
               '    $history = (Get-History -Count 1).CommandLine;\n' \
@@ -20,7 +24,20 @@ class Powershell(Generic):

    def how_to_configure(self):
        return ShellConfiguration(
-            content=u'iex "thefuck --alias"',
+            content=u'iex "$(thefuck --alias)"',
            path='$profile',
-            reload='& $profile',
+            reload='. $profile',
            can_configure_automatically=False)
+
+    def _get_version(self):
+        """Returns the version of the current shell"""
+        try:
+            proc = Popen(
+                ['powershell.exe', '$PSVersionTable.PSVersion'],
+                stdout=PIPE,
+                stderr=DEVNULL)
+            version = proc.stdout.read().decode('utf-8').rstrip().split('\n')
+            return '.'.join(version[-1].split())
+        except IOError:
+            proc = Popen(['pwsh', '--version'], stdout=PIPE, stderr=DEVNULL)
+            return proc.stdout.read().decode('utf-8').split()[-1]
--- a/thefuck/shells/tcsh.py
+++ b/thefuck/shells/tcsh.py
@@ -6,6 +6,8 @@ from .generic import Generic


 class Tcsh(Generic):
+    friendly_name = 'Tcsh'
+
    def app_alias(self, alias_name):
        return ("alias {0} 'setenv TF_SHELL tcsh && setenv TF_ALIAS {0} && "
                "set fucked_cmd=`history -h 2 | head -n 1` && "
@@ -35,3 +37,8 @@ class Tcsh(Generic):
            content=u'eval `thefuck --alias`',
            path='~/.tcshrc',
            reload='tcsh')
+
+    def _get_version(self):
+        """Returns the version of the current shell"""
+        proc = Popen(['tcsh', '--version'], stdout=PIPE, stderr=DEVNULL)
+        return proc.stdout.read().decode('utf-8').split()[1]
--- a/thefuck/shells/zsh.py
+++ b/thefuck/shells/zsh.py
@@ -10,6 +10,8 @@ from .generic import Generic


 class Zsh(Generic):
+    friendly_name = 'ZSH'
+
    def app_alias(self, alias_name):
        # It is VERY important to have the variables declared WITHIN the function
        return '''
@@ -87,9 +89,8 @@ class Zsh(Generic):
            path='~/.zshrc',
            reload='source ~/.zshrc')

-    def info(self):
-        """Returns the name and version of the current shell"""
+    def _get_version(self):
+        """Returns the version of the current shell"""
        proc = Popen(['zsh', '-c', 'echo $ZSH_VERSION'],
                     stdout=PIPE, stderr=DEVNULL)
-        version = proc.stdout.read().decode('utf-8').strip()
-        return u'ZSH {}'.format(version)
+        return proc.stdout.read().decode('utf-8').strip()
--- a/thefuck/specific/archlinux.py
+++ b/thefuck/specific/archlinux.py
@@ -32,7 +32,9 @@ def get_pkgfile(command):


 def archlinux_env():
-    if utils.which('yaourt'):
+    if utils.which('yay'):
+        pacman = 'yay'
+    elif utils.which('yaourt'):
        pacman = 'yaourt'
    elif utils.which('pacman'):
        pacman = 'sudo pacman'
--- a/thefuck/specific/nix.py
+++ b/thefuck/specific/nix.py
@@ -0,0 +1,3 @@
+from thefuck.utils import which
+
+nix_available = bool(which('nix'))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vladimir Iakovlev	0949d2e770	Bump to 3.31	2021-06-09 21:50:44 +02:00
Vladimir Iakovlev	e343c577cd	NA: Fix possible changes in files outside of working directory (#1206 )	2021-06-08 22:04:51 +02:00
Stuart Leeks	6da0bc557f	Add excluded_search_path_prefixes setting (#1165 ) 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>	2021-04-21 19:43:21 +02:00
Pablo Santiago Blum de Aguiar	1a595f1ba2	#N/A: Force decorator<5 for Python <= 2.7 For some reason, the index used by GH Actions is not considering the requesting Python version to decide which package version to deliver. This is unnecessary for the official index and will be removed once we drop support to Python 2.	2021-04-18 15:48:39 +02:00
godofhyperdeath	875d3f11cb	#N/A: Update license year to 2020-2021 (#1088 ) Co-authored-by: Pablo Aguiar <scorphus@gmail.com>	2021-04-17 00:24:30 +02:00
Sid Shardanand	4c7479b3ad	#N/A: Add `cd_cs` rule (#1167 ) * adding in files for the cd-cs feature * Updated thefuck/rules/cd_cs.py comments to be more verbose Thanks Scorphus! Co-authored-by: Pablo Aguiar <scorphus@gmail.com> * Updating the rules file to exclude the \xe2 character This character(–) has lead to the commit failing some of the tests. I am removing it from the code and we should see the tests pass now. * Setting the encoding in thefuck/rules/cd_cs.py Co-authored-by: Pablo Aguiar <scorphus@gmail.com> Co-authored-by: SID SHARDANAND <sshardan@deakin.edu.au> Co-authored-by: Pablo Aguiar <scorphus@gmail.com>	2021-03-22 20:55:45 +01:00
Divy Jain	5b612add74	#1154 : Fix badges in README (#1175 )	2021-03-13 14:24:53 +01:00
Pablo Santiago Blum de Aguiar	b9dd54c768	#1174 : Fix anchor references	2021-03-13 12:50:09 +01:00
Bhavishya Pandit	7af9f41d93	#N/A: Add a Contents section to README (#1174 ) * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md Co-authored-by: Pablo Aguiar <scorphus@gmail.com> Co-authored-by: Pablo Aguiar <scorphus@gmail.com>	2021-03-13 00:58:10 +01:00
Pablo Santiago Blum de Aguiar	c2cc95db88	#1117 : Mock Popen in go_unknown_command test Instead of ignoring it whenever `go` is unavailable	2021-02-22 22:54:45 +01:00
Georgios Kontosis	0e34c2343e	#/N/A: Extend pyenv rule to include goenv, nodenv and rbenv (#1100 ) Co-authored-by: Pablo Santiago Blum de Aguiar <scorphus@gmail.com> Co-authored-by: Divy Jain <dkj@somaiya.edu>	2021-02-11 12:48:20 +01:00
Connor Martin	fd90e69ceb	#N/A: Add conda rule (#1138 ) * add conda rules * revert * add conda * add to readme and flake * consistency with quotes and use for_app * Update thefuck/rules/conda_mistype.py Co-authored-by: Pablo Aguiar <scorphus@gmail.com>	2021-02-08 13:04:59 +01:00
Divy Jain	0c58317932	#N/A: Migrate CI pipeline to Github Actions (#1154 ) Co-authored-by: Pablo Santiago Blum de Aguiar <scorphus@gmail.com>	2021-01-21 14:34:01 +01:00
Divy Jain	62dddd5821	#1149 : Add python_module_error rule (#1151 )	2021-01-19 22:37:05 +01:00
Divy Jain	40dd65963d	#1141 : Fix crash on empty history (#1145 )	2020-11-18 10:43:11 +01:00
Kartik Soneji	836f6eeac5	Skip test instead of failing if go executable is not found. (#1117 )	2020-11-03 18:30:03 +01:00
Kartik Soneji	b4c75eebe6	Fix pytest warnings (#1116 ) * Add custom pytest mark. * Fix typo usefixture -> usefixtures.	2020-11-03 18:29:28 +01:00
Pablo Aguiar	22efa8f70e	#1113 : Do not load excluded rules (#1125 )	2020-11-03 18:27:09 +01:00
Pablo Aguiar	9d3bcad229	#1113 : Ignore a rule that fails to load (#1124 )	2020-11-03 18:26:13 +01:00
Divya Jain	c196e2901c	#509 : Fixed correction on windows machine running other shells (#1091 ) * Replaced print with sys.stdout.write * Fixed tests * Normalized line endings	2020-07-16 23:56:58 +02:00
Aditi Gupta	ca46956e20	#1066 - Fix rule for brew cask (#1111 ) * #1066: Add cask to list of fallback commands * #1066: Fix homebrew paths	2020-07-16 23:34:41 +02:00
Nyanotech	639e9bda7a	Add rule to remove a doubled-up "git clone" in a git clone command. (#1106 ) Some git hosts will copy the entire clone command, while others just copy the url, so typing "git clone ", then pasting a git url that already has a "git clone " on the front is a somewhat common issue.	2020-07-16 23:34:22 +02:00
Divya Jain	39753a004e	#1096 : Rule: Bypass failed git hook (#1097 ) * naive implementation * better implementation * remove redundant enabled_by_default Co-authored-by: Pablo Aguiar <scorphus@gmail.com> * add README entry * add tests Co-authored-by: Pablo Aguiar <scorphus@gmail.com>	2020-07-16 23:32:29 +02:00
Divya Jain	365db1ee41	#N/A: Refactor for better readability (#1094 ) * #N/A: Refactor for better readability * Change typename for test tuple * Rename variable	2020-06-14 16:20:40 +02:00
Divya Jain	81b39defe4	#N/A: Fix formatting (#1092 ) * Fixed corrector.py format string * Fixed types.py format string * Fixed tests/rules/test_fix_file.py formatting * Removed trailing whitespace * Fixed UnicodeEncodeError in python 2.7	2020-06-11 00:21:45 +02:00
Connor Martin	f82176802e	add git-lfs support (#1056 ) * add mistyping support for git lfs * add the rule * fix flake8 * flake8 * add to readme * use fixtures and regex * get rid of additional matched strings	2020-06-11 00:20:37 +02:00
Pablo Aguiar	6975d30818	#960 : Improve pacman_invalid_option rule (#1072 ) The rule now matches all possible lower case options and only those, not failing for those that cannot be fixed.	2020-04-06 21:46:40 +02:00
DragonGhost7	3c542a5b8c	Added pacman invalid option rule (#960 ) * Added pacman invalid option rule * Added test * flake8 fixes * Test changes * Test fix * Typo - again * Travis test fix * More Travis * Even more travis * I hope im right here * Update README.md Co-Authored-By: Pablo Aguiar <scorphus@gmail.com> * Update thefuck/rules/pacman_invalid_option.py Co-Authored-By: Pablo Aguiar <scorphus@gmail.com> Co-authored-by: Pablo Aguiar <scorphus@gmail.com>	2020-03-28 23:15:20 +01:00
Vladimir Iakovlev	d3a05426de	Bump to 3.30	2020-03-19 18:21:12 +01:00
Caplinja	88db57b4b1	#N/A: Add a new rule to create directory on cp or mv	2020-03-01 13:04:53 -06:00
Caplinja	444908ce1c	#1047 : Fix pip_unknown_command by using a less restrictive regex Fix #1047	2020-03-01 10:40:49 -06:00
David Hart	2ced7a7f33	Allow multiple returns from git_checkout (#1022 ) * Allow multiple returns from git_checkout * Remove multiple returns	2020-01-13 23:28:20 +01:00
David Hart	b28ece0f34	Apt-get help is now much more like apt (#1031 ) * Apt-get help is now much more like apt * Fix tests * Really fix the tests	2020-01-05 23:53:09 +01:00
Vladimir Iakovlev	eb60900330	#N/A: Unlink python 2 on travis-ci osx build (#1032 )	2020-01-05 23:51:19 +01:00
donniebreve	ed8aaa7f26	fixed grammar on how to configure message (#1029 )	2019-12-23 17:57:42 +01:00
Tim Gates	77992029b6	Fix simple typo: controle -> control (#1017 )	2019-12-16 22:10:45 +01:00
Eli Schiff	25c858c13e	removed useless redefined of path variable (#1023 )	2019-12-16 21:56:12 +01:00
Vladimir Iakovlev	60073bea78	N/A: Remove deprecated python 3.4 support + fix tests in 2.7 (#1025 ) * N/A: Remove deprecated python 3.4 support More details - https://www.python.org/downloads/release/python-3410/ * N/A: Remove Python 3.4 from appveyor config * N/A: Fix UnicodeDecodeError with Python 2.7 and newer versions of py.test	2019-12-16 21:55:19 +01:00
Philip Arola	d10fc80fa5	Add choco_install rule (#998 ) * Add choco_install rule Adds a rule to append '.install' to a chocolatey install command that failed because of a non-existent package. TODO: add support for other suffixes (.portable), find more parameter cases * Apply suggestions from code review Circling back to retest Co-Authored-By: Pablo Aguiar <scorphus@gmail.com> * Fixed errors from suggested changes * Added more test cases, refactored parsing * Reformat keyword detection if statement * Fixed flake errors * Added tests for match	2019-11-07 01:10:00 +01:00
boonwj	fdea32b47d	Fix typos in README.md (#997 ) * Fix typos in README.md * Fix another typo - lifecycle to life cycle	2019-11-02 19:07:32 +01:00
Simon Chan	9381cfefa5	fix: incorrect powershell alias instruction (#1004 ) * fix: incorrect powershell alias instruction * fix: use dot operator to reload powershell profile	2019-11-02 19:06:17 +01:00
boonwj	793510ad48	Add rule to remove leading shell prompt literal $ (#996 ) * Add rule to remove shell prompt literals $ Rule added to handle cases where the $ symbol is used in the command, this usually happens when the command is copy pasted from a documentation that includes the shell prompt symbol in the code blocks. * Change files using black and flake8 style check * Refactor tests and rule - Refactor test for cleaner test tables - Removed unnecessary requires_output=True option	2019-11-02 19:04:47 +01:00
Pablo Aguiar	d85099b8da	#N/A: Inform the correct path to `DEFAULT_RULES` (#993 )	2019-11-02 19:03:58 +01:00
Pablo Aguiar	ecee70f774	#N/A: Use Xenial on TravisCI (#989 ) This simplifies and reduces the size of `.travis.yml`.	2019-11-02 19:03:35 +01:00
Shawn McGraw	70b414aca2	Issue#965 - added venv instructions to CONTRIBUTING.md (#976 ) * Issue#965 - added venv instructions to CONTRIBUTING.md * Added link to official docs for venv [issue965]	2019-10-23 00:30:55 +02:00
Pablo Aguiar	80cfd6991d	#N/A: Add new `git_branch_delete_checked_out` rule (#985 )	2019-10-23 00:30:17 +02:00
ik1ne	0ccb34bde8	Support for yum invalid commands. (#968 ) * - Add skeleton code for yum_invalid_operation.py - Add test for rule/yum_invalid_operation * Add: mocker for subprocess.Popen. * Fix: invalid yum_operations. * Fix: Added missing fixtures. * Add: yum_invalid_operation implementation. * Add: enabled_by_default variable for rules/yum_invalid_operation. * Update Readme.	2019-10-19 15:05:22 +02:00
ik1ne	581a292797	Add support for switch_lang for Korean. (#981 ) * switch korean letters to english * revised according to recent changes * Fix typo in tests/test_switch_lang.py * Add a test case for coverage * Change: Moved decomposing logic which changes command.script to get_new_command instead of match. * Fix: changed unicode characters to unicode string for python2 compatibility. * Fix: Modified to change request. @ik1ne @yangkyeongmo	2019-10-19 15:03:21 +02:00
Eugene Duboviy	7a9d87f502	Add Python 3.8 version support (#983 ) * Update .travis.yml * Update tox.ini	2019-10-19 15:00:52 +02:00
Eli Schiff	4f165bf6df	removed extra whitespace (#967 )	2019-10-08 23:47:04 +02:00
Fabian van Dijk	6789701e23	Add fuck --hard as alternative to fuck --yeah (#963 ) * Add fuck --hard as alternative to fuck --yeah * Fix missing comma in thefuck/argument_parser.py Co-Authored-By: lomckee <cstutoringluke@gmail.com> * Update README on fuck --hard	2019-10-08 23:44:22 +02:00
RetekBacsi	64dd018c1a	Slow command timeout didn’t work (#961 ) * Slow command timeout didn’t work + Fixed debug message to include is_slow * Using only the first word of shlex.split when checking if command is slow. * Fixed index error when command is empty	2019-10-08 23:43:19 +02:00
thatneat	3bbd0e9463	Correct "apt uninstall" -> "apt remove" (#950 ) * Correct "apt uninstall" -> "apt remove" * remove unused import	2019-09-17 20:02:45 +02:00
Shaoyuan CHEN	c53676e42f	change sudo.py pattern to lowercase (#947 )	2019-09-02 19:17:48 +02:00
ik1ne	84c16fb69a	Change: rules_git_checkout handling branch names with slashes & Remote HEAD. (#944 ) * Add: Test for branch names with slashes & Remote HEAD. * - Add: Handling for removing remote HEAD. - Change: Improved handling for branches with slash in their names.	2019-09-02 19:16:40 +02:00
ik1ne	1683f45e94	Update docker commands. (#940 ) * Add: Tests for newer version docker support. * Add: Support for newer versions of docker (Modified rules.docker_not_command). * Fix: Updated disabling memoize. * Change: removed empty list check. * Fix: _parse_commands now uses line.strip() internally and ends_with arg now doesn't end with newline. * Change: Replaced disable_memoize in favor of no_memoize fixture. * Fix: removed unused import.	2019-08-21 20:35:55 +02:00
ik1ne	d88454a638	Add: rules/go_unknown_command for misspelled go commands. (#933 ) * - Add: rules/go_unknown_command for misspelled go commands. - Add: tests/test_go_unknown_command which tests match and mismatch case of rules/go_unknown_command. - Change: Added description of go_unknown_command to README.md. * Add: test_get_new_command for testing rules.go_unknown_command.test_get_new_command method. * Change: go_unknown_command.match now uses for_app decorator. * Add: get_golang_commands which dynamically gets golang possible commands. * Fix: cache proper function instead of its result.	2019-08-21 20:34:34 +02:00
Samuel Marks	8ef9634492	[.editorconfig] Init (#938 )	2019-08-19 21:47:15 +02:00
ik1ne	335ae40675	Fix: rules.git_checkout not working with git 2.22.0 (#934 ) * Change: remove period from git checkout error output. * Change: remove period from git checkout get_new_command.	2019-08-19 21:45:55 +02:00
tobixx	3bbe391391	Only consider raw command in output (#931 ) * Only consider raw command in output match ... else it will not work for localized messages. Example German output: ``` Führen Sie »apt list --upgradable« aus, um sie anzuzeigen. ``` * added german output test * make the linter happy	2019-08-19 21:39:14 +02:00
Connor Martin	01a5ba99d0	Docker remove container before remove image (#928 ) * add docker container removal * remove container before deleting image * update readme * clean up and add assert not test * test not docker command * use shell.and_ correctly	2019-07-10 20:34:20 +02:00
Mathieu Cantin	4c3a559124	Added rules to run terraform init before terraform plan or apply (#924 ) * Run terraform init to initialize terraform modules * Fix indent * Add unit tests for terraform_init.py	2019-06-26 20:02:01 +02:00
Pablo Aguiar	e047c1eb40	#921 : Try printing alias before trying to fix a command (#923 ) Fixes #921	2019-06-26 20:01:38 +02:00
Tycho Grouwstra	48e1e4217f	support nixos command-not-found, closes #912 (#922 )	2019-06-26 20:01:02 +02:00
Vladimir Iakovlev	59dc6cbf90	#N/A: Fix the release script	2019-05-27 18:32:48 +02:00
Vladimir Iakovlev	59e1f7b122	Bump to 3.29	2019-05-27 18:29:04 +02:00
Pablo Aguiar	ff2944086d	#N/A: Improve how version is fetched for all shells (#920 )	2019-05-27 18:24:55 +02:00
Pablo Aguiar	ba949f7fd9	#N/A: Add `pyenv_no_such_command` rule (#919 )	2019-05-27 18:23:45 +02:00
Pablo Aguiar	5efcf1019f	#N/A: Improve support to Windows in `no_command` rule (#918 ) Windows “not found” message is quite different from POSIX systems.	2019-05-27 18:23:06 +02:00
Ryan Delaney	70a13406f0	Fix a couple small shellcheck errors (#915 ) * Fix shellcheck SC2046 Further reading: https://github.com/koalaman/shellcheck/wiki/Sc2046 * Fix shellcheck 2068 Further reading: https://github.com/koalaman/shellcheck/wiki/Sc2068 * Fix syntax error from bad quoting I also used a docstring here because the escaping makes it harder for humans to parse	2019-05-22 20:22:09 +02:00
Jesus Cuesta	201c01fc74	Adding yay AUR manager to Arch Linux's commands since yaourt is unmaintained and has some security issues. (#907 )	2019-05-21 20:49:04 +02:00
Pablo Aguiar	78ef9eec88	#902 : Use `os.pathsep` to split PATH env var (#917 ) Fix #902	2019-05-21 20:47:47 +02:00
Pablo Aguiar	40ab4eb62d	#899 : Support `-y/--yeah` command line args in Fish Shell (#900 )	2019-04-24 18:17:52 +02:00
Nick "darkfiberiru" Wolff	55cb3546df	Pkg should be recommend on freebsd to install (#905 )	2019-04-24 18:17:01 +02:00
Inga Feick	82902fb50d	Add rule for pip_install permission fix (#895 ) * Add rule for pip_install permission fix * Fix whitespace * Switch quotation to single * remove 2nd else * E261 indent comment	2019-04-24 18:15:38 +02:00
Inga Feick	828ae537da	Docker login (#894 ) * Add docker_login rule * Add docker_login rule * Whitespace fix * Fix typo in test case * Fix typo in test case * Add test cases	2019-04-04 00:01:14 +02:00
Aiden Song	1208faaabb	#N/A: Add rule for `git commit` that reverts previous commit (#886 )	2019-02-25 23:24:16 +01:00
Pablo Santiago Blum de Aguiar	2d81166213	#N/A: Return an ordered list from set of overridden aliases This way it's ensured that whatever is used as cache key is always ordered. Sets are unordered collections.	2019-01-17 00:29:22 +01:00
Vladimir Iakovlev	8093f7cab8	Squashed commit of the following: commit b853385ea9b9409a29a30c7af4d47c9a500cd287 Author: Vladimir Iakovlev <nvbn.rm@gmail.com> Date: Tue Jan 15 00:54:01 2019 +0100 #864: Make the solution for Greek a bit more extensible commit 073ebceb594ad24972f7765b1f608de44c1cebf2 Merge: `b946b7d` `141462a` Author: Vladimir Iakovlev <nvbn.rm@gmail.com> Date: Tue Jan 15 00:46:09 2019 +0100 Merge branch 'master' of git://github.com/RealOgre/thefuck into RealOgre-master commit `141462a6fb` Author: RealOrge <45096491+RealOrge@users.noreply.github.com> Date: Thu Dec 13 16:47:43 2018 +0200 Update switch_lang.py commit `1f792853f2` Author: RealOrge <45096491+RealOrge@users.noreply.github.com> Date: Thu Dec 13 16:39:04 2018 +0200 Update switch_lang.py commit `e7dede53a1` Author: RealOrge <45096491+RealOrge@users.noreply.github.com> Date: Thu Dec 13 15:24:10 2018 +0200 Update switch_lang.py commit `4a0a973e62` Author: RealOrge <45096491+RealOrge@users.noreply.github.com> Date: Thu Dec 13 15:04:44 2018 +0200 Update switch_lang.py commit `80d6b8da4c` Author: RealOrge <45096491+RealOrge@users.noreply.github.com> Date: Thu Dec 13 14:25:15 2018 +0200 Update switch_lang.py commit `66b13c53b3` Author: RealOrge <45096491+RealOrge@users.noreply.github.com> Date: Thu Dec 13 11:44:48 2018 +0200 Update switch_lang.py	2019-01-15 00:54:48 +01:00
yangkyeongmo	b946b7d319	Comment correction on ui.py (#874 )	2019-01-15 00:36:05 +01:00
Vladimir Iakovlev	9354a977dd	#N/A: Fix tests with pytest 4	2019-01-15 00:35:28 +01:00
Mickaël Schoentgen	1eb4ccbcc9	Fix 2 DeprecationWarning: invlid escape sequence (#872 ) Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>	2019-01-06 15:44:09 +01:00
Pablo Santiago Blum de Aguiar	ce5feaebf7	#869 : Use `fish --version` instead of an interactive shell for info() This prevents initialisation and consequentially a recursive loop. Fix #869 Ref oh-my-fish/plugin-thefuck#11	2019-01-04 20:54:03 +01:00
Fábio Santos	ac343fb1bd	#868 : Point out you can use linuxbrew in README * Point out you can use linuxbrew * Change text and add link to linuxbrew * Change brew related URLs to HTTPS	2019-01-04 20:35:27 +01:00
Chris De Pasquale	7bc619385b	Fixed incorrect ordering of for_app and sudo_support causing apt_invalid_operation and dnf_no_such_command rules to fail (#861 )	2018-12-11 01:01:17 +01:00
Vladimir Iakovlev	d86dd5f179	#N/A: Clear `dist/` before uploading releases	2018-11-29 23:57:07 +01:00