Bump to 3.11

#534: Improve open rule

.travis.yml

@@ -1,28 +1,47 @@
 language: python
 sudo: false
-python:
-  - "3.5"
-  - "3.4"
-  - "3.3"
-  - "2.7"
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      python: "3.5"
+    - os: linux
+      dist: trusty
+      python: "3.4"
+    - os: linux
+      dist: trusty
+      python: "3.3"
+    - os: linux
+      dist: trusty
+      python: "2.7"
+    - os: osx
+      env: FORMULA="python"
+      language: generic
+    - os: osx
+      env: FORMULA="python3"
+      language: generic
+services:
+  - docker
 addons:
   apt:
-    sources:
-      - fish-shell/release-2
     packages:
-      - bash
-      - zsh
-      - fish
-      - tcsh
-      - pandoc
-      - git
-install:
+      - python-commandnotfound
+      - python3-commandnotfound
+before_install:
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update ; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew install $FORMULA; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then virtualenv venv -p $FORMULA; fi
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then source venv/bin/activate; fi
   - pip install -U pip
   - pip install -U coveralls
+install:
   - pip install -Ur requirements.txt
   - python setup.py develop
   - rm -rf build
 script:
   - export COVERAGE_PYTHON_VERSION=python-${TRAVIS_PYTHON_VERSION:0:1}
-  - coverage run --source=thefuck,tests -m py.test -v --capture=sys --run-without-docker --enable-functional
-after_success: coveralls
+  - export RUN_TESTS="coverage run --source=thefuck,tests -m py.test -v --capture=sys tests"
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.5 && $TRAVIS_OS_NAME != "osx" ]]; then $RUN_TESTS --enable-functional; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 3.5 || $TRAVIS_OS_NAME == "osx" ]]; then $RUN_TESTS; fi
+after_success:
+  - coveralls

README.md

@@ -1,10 +1,10 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg?branch=master)](https://travis-ci.org/nvbn/thefuck) 
+# The Fuck [![Version][version-badge]][version-link] [![Build Status][travis-badge]][travis-link] [![Windows Build Status][appveyor-badge]][appveyor-link] [![Coverage][coverage-badge]][coverage-link] [![MIT License][license-badge]](LICENSE.md)
 
 Magnificent app which corrects your previous console command,
 inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320).
 
-[![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
+[![gif with examples][examples-link]][examples-link]
 
 Few more examples:
 
@@ -52,7 +52,7 @@ Python 3.4.2 (default, Oct  8 2014, 13:08:17)
 git: 'brnch' is not a git command. See 'git --help'.
 
 Did you mean this?
-	branch
+    branch
 
 ➜ fuck
 git branch [enter/↑/↓/ctrl+c]
@@ -94,20 +94,26 @@ Reading package lists... Done
 - pip
 - python-dev
 
-## Installation [*experimental*]
+## Installation
+
+On OS X you can install `The Fuck` with [Homebrew][homebrew]:
 
-On Ubuntu and OS X you can install `The Fuck` with installation script:
- 
 ```bash
-wget -O - https://raw.githubusercontent.com/nvbn/thefuck/master/install.sh | sh - && $0
+brew install thefuck
 ```
 
-## Manual installation
+On Ubuntu you can install `The Fuck` with:
+ 
+```bash
+sudo apt update
+sudo apt install python3-dev python3-pip
+sudo -H pip3 install thefuck
+```
 
-Install `The Fuck` with `pip`:
+On other systems you can install `The Fuck` with `pip`:
 
 ```bash
-sudo pip install thefuck
+sudo -H pip install thefuck
 ```
 
 [Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
@@ -144,6 +150,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `cd_correction` – spellchecks and correct failed cd commands;
 * `cd_mkdir` – creates directories before cd'ing into them;
 * `cd_parent` – changes `cd..` to `cd ..`;
+* `chmod_x` – add execution bit;
 * `composer_not_command` – fixes composer command name;
 * `cp_omitting_directory` – adds `-a` when you `cp` directory;
 * `cpp11` – adds missing `-std=c++11` to `g++` or `clang++`;
@@ -153,10 +160,12 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `django_south_merge` – adds `--merge` to inconsistent django south migration;
 * `docker_not_command` – fixes wrong docker commands like `docker tags`;
 * `dry` – fixes repetitions like `git git push`;
+* `fab_command_not_found` – fix misspelled fabric commands;
 * `fix_alt_space` – replaces Alt+Space with Space character;
 * `fix_file` – opens a file with an error in your `$EDITOR`;
-* `git_add` – fixes *"Did you forget to 'git add'?"*;
+* `git_add` – fixes *"pathspec 'foo' did not match any file(s) known to git."*;
 * `git_branch_delete` – changes `git branch -d` to `git branch -D`;
+* `git_branch_exists` – offers `git branch -d foo`, `git branch -D foo` or `git checkout foo` when creating a branch that already exists;
 * `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch;
 * `git_checkout` – fixes branch name or creates new branch;
 * `git_diff_staged` – adds `--staged` to previous `git diff` with unexpected output;
@@ -167,12 +176,17 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_pull_clone` – clones instead of pulling when the repo does not exist;
 * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
 * `git_push_pull` – runs `git pull` when `push` was rejected;
+* `git_rebase_no_changes` – runs `git rebase --skip` instead of `git rebase --continue` when there are no changes;
+* `git_rm_recursive` – adds `-r` when you try to `rm` a directory;
 * `git_remote_seturl_add` – runs `git remote add` when `git remote set_url` on nonexistant remote;
 * `git_stash` – stashes you local modifications before rebasing or switching branch;
 * `git_two_dashes` – adds a missing dash to commands like `git commit -amend` or `git rebase -continue`;
 * `go_run` – appends `.go` extension when compiling/running Go programs;
+* `gradle_no_task` – fixes not found or ambiguous `gradle` task;
+* `gradle_wrapper` – replaces `gradle` with `./gradlew`;
 * `grep_arguments_order` – fixes grep arguments order for situations like `grep -lir . test`;
 * `grep_recursive` – adds `-r` when you trying to `grep` directory;
+* `grunt_task_not_found` – fixes misspelled `grunt` commands;
 * `gulp_not_task` – fixes misspelled `gulp` tasks;
 * `has_exists_script` – prepends `./` when script/binary exists;
 * `heroku_not_command` – fixes wrong `heroku` commands like `heroku log`;
@@ -181,6 +195,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `javac` – appends missing `.java` when compiling Java files;
 * `lein_not_task` – fixes wrong `lein` tasks like `lein rpl`;
 * `ln_no_hard_link` – catches hard link creation on directories, suggest symbolic link;
+* `ln_s_order` – fixes `ln -s` arguments order;
 * `ls_lah` – adds `-lah` to `ls`;
 * `man` – changes manual section;
 * `man_no_space` – fixes man commands without spaces, for example `mandiff`;
@@ -188,14 +203,18 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `mkdir_p` – adds `-p` when you trying to create directory without parent;
 * `mvn_no_command` – adds `clean package` to `mvn`;
 * `mvn_unknown_lifecycle_phase` – fixes misspelled lifecycle phases with `mvn`;
+* `npm_missing_script` &ndash; fixes `npm` custom script name in `npm run-script <script>`;
+* `npm_run_script` &ndash; adds missing `run-script` for custom `npm` scripts;
 * `npm_wrong_command` &ndash; fixes wrong npm commands like `npm urgrade`;
 * `no_command` &ndash; fixes wrong console commands, for example `vom/vim`;
 * `no_such_file` &ndash; creates missing directories with `mv` and `cp` commands;
-* `open` &ndash; prepends `http` to address passed to `open`;
+* `open` &ndash; either prepends `http://` to address passed to `open` or create a new file or directory and passes it to `open`;
 * `pip_unknown_command` &ndash; fixes wrong `pip` commands, for example `pip instatl/pip install`;
+* `port_already_in_use` &ndash; kills process that bound port;
 * `python_command` &ndash; prepends `python` when you trying to run not executable/without `./` python script;
 * `python_execute` &ndash; appends missing `.py` when executing Python files;
 * `quotation_marks` &ndash; fixes uneven usage of `'` and `"` when containing args';
+* `react_native_command_unrecognized` &ndash; fixes unrecognized `react-native` commands;
 * `rm_dir` &ndash; adds `-rf` when you trying to remove directory;
 * `sed_unterminated_s` &ndash; adds missing '/' to `sed`'s `s` commands;
 * `sl_ls` &ndash; changes `sl` to `ls`;
@@ -210,7 +229,8 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `tmux` &ndash; fixes `tmux` commands;
 * `unknown_command` &ndash; fixes hadoop hdfs-style "unknown command", for example adds missing '-' to the command on `hdfs dfs ls`;
 * `vagrant_up` &ndash; starts up the vagrant instance;
-* `whois` &ndash; fixes `whois` command.
+* `whois` &ndash; fixes `whois` command;
+* `workon_doesnt_exists` &ndash; fixes `virtualenvwrapper` env name os suggests to create new.
 
 Enabled by default only on specific platforms:
 
@@ -219,6 +239,7 @@ Enabled by default only on specific platforms:
 * `apt_invalid_operation` &ndash; fixes invalid `apt` and `apt-get` calls, like `apt-get isntall vim`;
 * `brew_install` &ndash; fixes formula name for `brew install`;
 * `brew_unknown_command` &ndash; fixes wrong brew commands, for example `brew docto/brew doctor`;
+* `brew_update_formula` &ndash; turns `brew update <formula>` into `brew upgrade <formula>`;
 * `brew_upgrade` &ndash; appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
 * `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`.
@@ -288,7 +309,9 @@ The Fuck has a few settings parameters which can be changed in `$XDG_CONFIG_HOME
 * `priority` &ndash; dict with rules priorities, rule with lower `priority` will be matched first;
 * `debug` &ndash; enables debug output, by default `False`;
 * `history_limit` &ndash; numeric value of how many history commands will be scanned, like `2000`;
-* `alter_history` &ndash; push fixed command to history, by default `True`.
+* `alter_history` &ndash; push fixed command to history, by default `True`;
+* `wait_slow_command` &ndash; max amount of time in seconds for getting previous command output if it in `slow_commands` list;
+* `slow_commands` &ndash; list of slow commands.
 
 Example of `settings.py`:
 
@@ -300,12 +323,15 @@ wait_command = 10
 no_colors = False
 priority = {'sudo': 100, 'no_command': 9999}
 debug = False
+history_limit = 9999
+wait_slow_command = 20
+slow_commands = ['react-native', 'gradle']
 ```
 
 Or via environment variables:
 
 * `THEFUCK_RULES` &ndash; list of enabled rules, like `DEFAULT_RULES:rm_root` or `sudo:no_command`;
-* `THEFUCK_EXCLUDE_RULES` &ndash; list of disabled rules, like `git_pull:git_push`; 
+* `THEFUCK_EXCLUDE_RULES` &ndash; list of disabled rules, like `git_pull:git_push`;
 * `THEFUCK_REQUIRE_CONFIRMATION` &ndash; require confirmation before running new command, `true/false`;
 * `THEFUCK_WAIT_COMMAND` &ndash; max amount of time in seconds for getting previous command output;
 * `THEFUCK_NO_COLORS` &ndash; disable colored output, `true/false`;
@@ -313,7 +339,9 @@ Or via environment variables:
 rule with lower `priority` will be matched first;
 * `THEFUCK_DEBUG` &ndash; enables debug output, `true/false`;
 * `THEFUCK_HISTORY_LIMIT` &ndash; how many history commands will be scanned, like `2000`;
-* `THEFUCK_ALTER_HISTORY` &ndash; push fixed command to history `true/false`.
+* `THEFUCK_ALTER_HISTORY` &ndash; push fixed command to history `true/false`;
+* `THEFUCK_WAIT_SLOW_COMMAND` &ndash; max amount of time in seconds for getting previous command output if it in `slow_commands` list;
+* `THEFUCK_SLOW_COMMANDS` &ndash; list of slow commands, like `lein:gradle`.
 
 For example:
 
@@ -357,3 +385,16 @@ sudo apt-get install pandoc
 
 ## License MIT
 Project License can be found [here](LICENSE.md).
+
+
+[version-badge]:   https://img.shields.io/pypi/v/thefuck.svg?label=version
+[version-link]:    https://pypi.python.org/pypi/thefuck/
+[travis-badge]:    https://img.shields.io/travis/nvbn/thefuck.svg
+[travis-link]:     https://travis-ci.org/nvbn/thefuck
+[appveyor-badge]:  https://img.shields.io/appveyor/ci/nvbn/thefuck.svg?label=windows%20build
+[appveyor-link]:   https://ci.appveyor.com/project/nvbn/thefuck
+[coverage-badge]:  https://img.shields.io/coveralls/nvbn/thefuck.svg
+[coverage-link]:   https://coveralls.io/github/nvbn/thefuck
+[license-badge]:   https://img.shields.io/badge/license-MIT-007EC7.svg
+[examples-link]:   https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif
+[homebrew]:        http://brew.sh/

appveyor.yml

@@ -0,0 +1,22 @@
+build: false
+
+environment:
+  matrix:
+    - PYTHON: "C:/Python27"
+    - PYTHON: "C:/Python33"
+    - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python35"
+
+init:
+  - "ECHO %PYTHON%"
+  - ps: "ls C:/Python*"
+
+install:
+  - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/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%/Scripts/py.test.exe -sv"

install.sh

@@ -1,61 +1,4 @@
 #!/bin/sh
 
-should_add_alias () {
-    [ -f $1 ] && ! grep -q thefuck $1
-}
-
-installed () {
-    hash $1 2>/dev/null
-}
-
-install_thefuck () {
-    # Install OS dependencies:
-    if installed apt-get; then
-        # Debian/Ubuntu:
-        sudo apt-get update -yy
-        sudo apt-get install -yy python-pip python-dev command-not-found python-gdbm
-
-        if [ -n "$(apt-cache search python-commandnotfound)" ]; then
-            # In case of different python versions:
-            sudo apt-get install -yy python-commandnotfound
-        fi
-    else
-        if installed brew; then
-            # OS X:
-            brew update
-            brew install python
-        else
-            # Generic way:
-            wget https://bootstrap.pypa.io/get-pip.py
-            sudo python get-pip.py
-            rm get-pip.py
-        fi
-    fi
-
-    # thefuck requires fresh versions of setuptools and pip:
-    sudo pip install -U pip setuptools
-    sudo pip install -U thefuck
-
-    # Setup aliases:
-    if should_add_alias ~/.bashrc; then
-        echo 'eval $(thefuck --alias)' >> ~/.bashrc
-    fi
-
-    if should_add_alias ~/.bash_profile; then
-        echo 'eval $(thefuck --alias)' >> ~/.bash_profile
-    fi
-
-    if should_add_alias ~/.zshrc; then
-        echo 'eval $(thefuck --alias)' >> ~/.zshrc
-    fi
-
-    if should_add_alias ~/.config/fish/config.fish; then
-        thefuck --alias >> ~/.config/fish/config.fish
-    fi
-
-    if should_add_alias ~/.tcshrc; then
-        echo 'eval `thefuck --alias`' >> ~/.tcshrc
-    fi
-}
-
-install_thefuck
+echo "Installation script is deprecated!"
+echo "For installation instruction please visit https://github.com/nvbn/thefuck"

setup.py

@@ -1,13 +1,16 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
-import pip
+import pkg_resources
 import sys
 import os
 
-if int(pip.__version__.split('.')[0]) < 6:
-    print('pip older than 6.0 not supported, please upgrade pip with:\n\n'
-          '    pip install -U pip')
-    sys.exit(-1)
+try:
+    if int(pkg_resources.get_distribution("pip").version.split('.')[0]) < 6:
+        print('pip older than 6.0 not supported, please upgrade pip with:\n\n'
+              '    pip install -U pip')
+        sys.exit(-1)
+except pkg_resources.DistributionNotFound:
+    pass
 
 if os.environ.get('CONVERT_README'):
     import pypandoc
@@ -26,10 +29,10 @@ elif (3, 0) < version < (3, 3):
           ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '3.6'
+VERSION = '3.11'
 
 install_requires = ['psutil', 'colorama', 'six', 'decorator']
-extras_require = {':python_version<"3.4"': ['pathlib'],
+extras_require = {':python_version<"3.4"': ['pathlib2'],
                   ":sys_platform=='win32'": ['win_unicode_console']}
 
 setup(name='thefuck',

tests/conftest.py

@@ -1,4 +1,7 @@
-from pathlib import Path
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
 import pytest
 from thefuck import shells
 from thefuck import conf, const

tests/functional/test_bash.py

@@ -19,10 +19,10 @@ containers = ((u'thefuck/ubuntu-python3-bash',
 
 
 @pytest.fixture(params=containers)
-def proc(request, spawnu, run_without_docker):
+def proc(request, spawnu, TIMEOUT):
     proc = spawnu(*request.param)
-    if not run_without_docker:
-        proc.sendline(u"pip install /src")
+    proc.sendline(u"pip install /src")
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
     proc.sendline(u"export PS1='$ '")
     proc.sendline(u'eval $(thefuck --alias)')
     proc.sendline(u'echo > $HISTFILE')
@@ -30,38 +30,29 @@ def proc(request, spawnu, run_without_docker):
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
-def test_with_confirmation(proc, TIMEOUT, run_without_docker):
+def test_with_confirmation(proc, TIMEOUT):
     with_confirmation(proc, TIMEOUT)
-    if not run_without_docker:
-        history_changed(proc, TIMEOUT, u'echo test')
+    history_changed(proc, TIMEOUT, u'echo test')
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
-def test_select_command_with_arrows(proc, TIMEOUT, run_without_docker):
+def test_select_command_with_arrows(proc, TIMEOUT):
     select_command_with_arrows(proc, TIMEOUT)
-    if not run_without_docker:
-        history_changed(proc, TIMEOUT, u'git help')
+    history_changed(proc, TIMEOUT, u'git help')
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
-def test_refuse_with_confirmation(proc, TIMEOUT, run_without_docker):
+def test_refuse_with_confirmation(proc, TIMEOUT):
     refuse_with_confirmation(proc, TIMEOUT)
-    if not run_without_docker:
-        history_not_changed(proc, TIMEOUT)
+    history_not_changed(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
-def test_without_confirmation(proc, TIMEOUT, run_without_docker):
+def test_without_confirmation(proc, TIMEOUT):
     without_confirmation(proc, TIMEOUT)
-    if not run_without_docker:
-        history_changed(proc, TIMEOUT, u'echo test')
+    history_changed(proc, TIMEOUT, u'echo test')
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_how_to_configure_alias(proc, TIMEOUT):
     how_to_configure(proc, TIMEOUT)

tests/functional/test_fish.py

@@ -20,34 +20,31 @@ containers = (('thefuck/ubuntu-python3-fish',
 
 
 @pytest.fixture(params=containers)
-def proc(request, spawnu):
+def proc(request, spawnu, TIMEOUT):
     proc = spawnu(*request.param)
     proc.sendline(u"pip install /src")
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
     proc.sendline(u'thefuck --alias > ~/.config/fish/config.fish')
     proc.sendline(u'fish')
     return proc
 
 
 @pytest.mark.functional
-@pytest.mark.skip_without_docker
 def test_with_confirmation(proc, TIMEOUT):
     with_confirmation(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.skip_without_docker
 def test_select_command_with_arrows(proc, TIMEOUT):
     select_command_with_arrows(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.skip_without_docker
 def test_refuse_with_confirmation(proc, TIMEOUT):
     refuse_with_confirmation(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.skip_without_docker
 def test_without_confirmation(proc, TIMEOUT):
     without_confirmation(proc, TIMEOUT)
 

tests/functional/test_install.py

@@ -1,25 +0,0 @@
-import pytest
-from thefuck.utils import get_installation_info
-
-envs = ((u'bash', 'thefuck/ubuntu-bash', u'''
-FROM ubuntu:latest
-RUN apt-get update
-RUN apt-get install -yy bash
-'''), (u'bash', 'thefuck/generic-bash', u'''
-FROM fedora:latest
-RUN dnf install -yy python-devel sudo wget gcc
-'''))
-
-
-@pytest.mark.functional
-@pytest.mark.skip_without_docker
-@pytest.mark.parametrize('shell, tag, dockerfile', envs)
-def test_installation(spawnu, shell, TIMEOUT, tag, dockerfile):
-    proc = spawnu(tag, dockerfile, shell)
-    proc.sendline(u'cat /src/install.sh | sh - && $0')
-    proc.sendline(u'thefuck --version')
-    version = get_installation_info().version
-    assert proc.expect([TIMEOUT, u'thefuck {}'.format(version)],
-                       timeout=600)
-    proc.sendline(u'fuck')
-    assert proc.expect([TIMEOUT, u'No fucks given'])

tests/functional/test_performance.py

@@ -40,7 +40,6 @@ def plot(proc, TIMEOUT):
 
 
 @pytest.mark.functional
-@pytest.mark.skip_without_docker
 @pytest.mark.benchmark(min_rounds=10)
 def test_performance(spawnu, TIMEOUT, benchmark):
     proc = spawnu(u'thefuck/ubuntu-python3-bash-performance',

tests/functional/test_tcsh.py

@@ -20,35 +20,32 @@ containers = (('thefuck/ubuntu-python3-tcsh',
 
 
 @pytest.fixture(params=containers)
-def proc(request, spawnu, run_without_docker):
+def proc(request, spawnu, TIMEOUT):
     proc = spawnu(*request.param)
-    if not run_without_docker:
-        proc.sendline(u'pip install /src')
+    proc.sendline(u'pip install /src')
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
     proc.sendline(u'tcsh')
+    proc.sendline(u'setenv PYTHONIOENCODING utf8')
     proc.sendline(u'eval `thefuck --alias`')
     return proc
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_with_confirmation(proc, TIMEOUT):
     with_confirmation(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_select_command_with_arrows(proc, TIMEOUT):
     select_command_with_arrows(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_refuse_with_confirmation(proc, TIMEOUT):
     refuse_with_confirmation(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_without_confirmation(proc, TIMEOUT):
     without_confirmation(proc, TIMEOUT)
 

tests/functional/test_zsh.py

@@ -21,10 +21,10 @@ containers = (('thefuck/ubuntu-python3-zsh',
 
 
 @pytest.fixture(params=containers)
-def proc(request, spawnu, run_without_docker):
+def proc(request, spawnu, TIMEOUT):
     proc = spawnu(*request.param)
-    if not run_without_docker:
-        proc.sendline(u'pip install /src')
+    proc.sendline(u'pip install /src')
+    assert proc.expect([TIMEOUT, u'Successfully installed'])
     proc.sendline(u'eval $(thefuck --alias)')
     proc.sendline(u'export HISTFILE=~/.zsh_history')
     proc.sendline(u'echo > $HISTFILE')
@@ -35,34 +35,29 @@ def proc(request, spawnu, run_without_docker):
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_with_confirmation(proc, TIMEOUT):
     with_confirmation(proc, TIMEOUT)
     history_changed(proc, TIMEOUT, u'echo test')
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_select_command_with_arrows(proc, TIMEOUT):
     select_command_with_arrows(proc, TIMEOUT)
     history_changed(proc, TIMEOUT, u'git help')
 
 
 @pytest.mark.functional
-@pytest.mark.skip_without_docker
 def test_refuse_with_confirmation(proc, TIMEOUT):
     refuse_with_confirmation(proc, TIMEOUT)
     history_not_changed(proc, TIMEOUT)
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_without_confirmation(proc, TIMEOUT):
     without_confirmation(proc, TIMEOUT)
     history_changed(proc, TIMEOUT, u'echo test')
 
 
 @pytest.mark.functional
-@pytest.mark.once_without_docker
 def test_how_to_configure_alias(proc, TIMEOUT):
     how_to_configure(proc, TIMEOUT)

tests/rules/test_apt_get.py

@@ -1,68 +1,41 @@
 import pytest
-from mock import Mock, patch
-from thefuck.rules import apt_get
 from thefuck.rules.apt_get import match, get_new_command
 from tests.utils import Command
 
 
-# python-commandnotfound is available in ubuntu 14.04+
-@pytest.mark.skipif(not getattr(apt_get, 'enabled_by_default', True),
-                    reason='Skip if python-commandnotfound is not available')
-@pytest.mark.parametrize('command', [
-    Command(script='vim', stderr='vim: command not found')])
-def test_match(command):
-    assert match(command)
-
-
-@pytest.mark.parametrize('command, return_value', [
+@pytest.mark.parametrize('command, packages', [
     (Command(script='vim', stderr='vim: command not found'),
      [('vim', 'main'), ('vim-tiny', 'main')]),
     (Command(script='sudo vim', stderr='vim: command not found'),
      [('vim', 'main'), ('vim-tiny', 'main')])])
-@patch('thefuck.rules.apt_get.CommandNotFound', create=True)
-@patch.multiple(apt_get, create=True, apt_get='apt_get')
-def test_match_mocked(cmdnf_mock, command, return_value):
-    get_packages = Mock(return_value=return_value)
-    cmdnf_mock.CommandNotFound.return_value = Mock(getPackages=get_packages)
+def test_match(mocker, command, packages):
+    mocker.patch('thefuck.rules.apt_get.which', return_value=None)
+    mock = mocker.patch('thefuck.rules.apt_get.command_not_found',
+                        create=True)
+    mock.getPackages.return_value = packages
+
     assert match(command)
-    assert cmdnf_mock.CommandNotFound.called
-    assert get_packages.called
 
 
-# python-commandnotfound is available in ubuntu 14.04+
-@pytest.mark.skipif(not getattr(apt_get, 'enabled_by_default', True),
-                    reason='Skip if python-commandnotfound is not available')
-@pytest.mark.parametrize('command', [
-    Command(script='a_bad_cmd', stderr='a_bad_cmd: command not found'),
-    Command(script='vim', stderr=''), Command()])
-def test_not_match(command):
+@pytest.mark.parametrize('command, packages, which', [
+    (Command(script='a_bad_cmd', stderr='a_bad_cmd: command not found'),
+     [], None),
+    (Command(script='vim', stderr=''), [], None),
+    (Command(), [], None),
+    (Command(script='vim', stderr='vim: command not found'),
+     ['vim'], '/usr/bin/vim'),
+    (Command(script='sudo vim', stderr='vim: command not found'),
+     ['vim'], '/usr/bin/vim')])
+def test_not_match(mocker, command, packages, which):
+    mocker.patch('thefuck.rules.apt_get.which', return_value=which)
+    mock = mocker.patch('thefuck.rules.apt_get.command_not_found',
+                        create=True)
+    mock.getPackages.return_value = packages
+
     assert not match(command)
 
 
-@pytest.mark.parametrize('command, return_value', [
-    (Command(script='a_bad_cmd', stderr='a_bad_cmd: command not found'), []),
-    (Command(script='vim', stderr=''), []), (Command(), [])])
-@patch('thefuck.rules.apt_get.CommandNotFound', create=True)
-@patch.multiple(apt_get, create=True, apt_get='apt_get')
-def test_not_match_mocked(cmdnf_mock, command, return_value):
-    get_packages = Mock(return_value=return_value)
-    cmdnf_mock.CommandNotFound.return_value = Mock(getPackages=get_packages)
-    assert not match(command)
-
-
-# python-commandnotfound is available in ubuntu 14.04+
-@pytest.mark.skipif(not getattr(apt_get, 'enabled_by_default', True),
-                    reason='Skip if python-commandnotfound is not available')
-@pytest.mark.parametrize('command, new_command', [
-    (Command('vim'), 'sudo apt-get install vim && vim'),
-    (Command('convert'), 'sudo apt-get install imagemagick && convert'),
-    (Command('sudo vim'), 'sudo apt-get install vim && sudo vim'),
-    (Command('sudo convert'), 'sudo apt-get install imagemagick && sudo convert')])
-def test_get_new_command(command, new_command):
-    assert get_new_command(command) == new_command
-
-
-@pytest.mark.parametrize('command, new_command, return_value', [
+@pytest.mark.parametrize('command, new_command, packages', [
     (Command('vim'), 'sudo apt-get install vim && vim',
      [('vim', 'main'), ('vim-tiny', 'main')]),
     (Command('convert'), 'sudo apt-get install imagemagick && convert',
@@ -73,9 +46,8 @@ def test_get_new_command(command, new_command):
     (Command('sudo convert'), 'sudo apt-get install imagemagick && sudo convert',
      [('imagemagick', 'main'),
       ('graphicsmagick-imagemagick-compat', 'universe')])])
-@patch('thefuck.rules.apt_get.CommandNotFound', create=True)
-@patch.multiple(apt_get, create=True, apt_get='apt_get')
-def test_get_new_command_mocked(cmdnf_mock, command, new_command, return_value):
-    get_packages = Mock(return_value=return_value)
-    cmdnf_mock.CommandNotFound.return_value = Mock(getPackages=get_packages)
+def test_get_new_command(mocker, command, new_command, packages):
+    mock = mocker.patch('thefuck.rules.apt_get.command_not_found',
+                        create=True)
+    mock.getPackages.return_value = packages
     assert get_new_command(command) == new_command

tests/rules/test_brew_update_formula.py

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

tests/rules/test_cargo_no_command.py

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

tests/rules/test_chmod_x.py

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

tests/rules/test_fab_command_not_found.py

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

tests/rules/test_git_add.py

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

tests/rules/test_git_branch_exists.py

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

tests/rules/test_git_push_pull.py

@@ -13,6 +13,17 @@ To /tmp/foo
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 '''
 
+git_err2 = '''
+To /tmp/foo
+ ! [rejected]        master -> master (non-fast-forward)
+ error: failed to push some refs to '/tmp/bar'
+hint: Updates were rejected because the remote contains work that you do
+hint: not have locally. This is usually caused by another repository pushing
+hint: to the same ref. You may want to first integrate the remote changes
+hint: (e.g., 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+'''
+
 git_uptodate = 'Everything up-to-date'
 git_ok = '''
 Counting objects: 3, done.
@@ -33,6 +44,14 @@ def test_match(command):
     assert match(command)
 
 
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_err2),
+    Command(script='git push nvbn', stderr=git_err2),
+    Command(script='git push nvbn master', stderr=git_err2)])
+def test_match(command):
+    assert match(command)
+
+
 @pytest.mark.parametrize('command', [
     Command(script='git push', stderr=git_ok),
     Command(script='git push', stderr=git_uptodate),
@@ -52,3 +71,13 @@ def test_not_match(command):
      'git pull nvbn master && git push nvbn master')])
 def test_get_new_command(command, output):
     assert get_new_command(command) == output
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git push', stderr=git_err2), 'git pull && git push'),
+    (Command(script='git push nvbn', stderr=git_err2),
+     'git pull nvbn && git push nvbn'),
+    (Command(script='git push nvbn master', stderr=git_err2),
+     'git pull nvbn master && git push nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command) == output

tests/rules/test_git_rebase_no_changes.py

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

tests/rules/test_git_rm_recursive.py

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

tests/rules/test_gradle_not_task.py

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

tests/rules/test_gradle_wrapper.py

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

tests/rules/test_grunt_task_not_found.py

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

tests/rules/test_ln_no_hard_link.py

@@ -20,7 +20,7 @@ def test_match(script, stderr):
     ("ln a b", "... hard link"),
     ("sudo ln a b", "... hard link"),
     ("a b", error)])
-def test_assert_not_match(script, stderr):
+def test_not_match(script, stderr):
     command = Command(script, stderr=stderr)
     assert not match(command)
 

tests/rules/test_ln_s_order.py

@@ -0,0 +1,41 @@
+import pytest
+from thefuck.rules.ln_s_order import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def file_exists(mocker):
+    return mocker.patch('os.path.exists', return_value=True)
+
+
+get_stderr = "ln: failed to create symbolic link '{}': File exists".format
+
+
+@pytest.mark.usefixtures('file_exists')
+@pytest.mark.parametrize('script', [
+    'ln -s dest source',
+    'ln dest -s source',
+    'ln dest source -s'])
+def test_match(script):
+    stderr = get_stderr('source')
+    assert match(Command(script, stderr=stderr))
+
+
+@pytest.mark.parametrize('script, stderr, exists', [
+    ('ln dest source', get_stderr('source'), True),
+    ('ls -s dest source', get_stderr('source'), True),
+    ('ln -s dest source', '', True),
+    ('ln -s dest source', get_stderr('source'), False)])
+def test_not_match(file_exists, script, stderr, exists):
+    file_exists.return_value = exists
+    assert not match(Command(script, stderr=stderr))
+
+
+@pytest.mark.usefixtures('file_exists')
+@pytest.mark.parametrize('script, result', [
+    ('ln -s dest source', 'ln -s source dest'),
+    ('ln dest -s source', 'ln -s source dest'),
+    ('ln dest source -s', 'ln source -s dest')])
+def test_match(script, result):
+    stderr = get_stderr('source')
+    assert get_new_command(Command(script, stderr=stderr)) == result

tests/rules/test_no_command.py

@@ -21,15 +21,20 @@ def history_without_current(mocker):
     ('vom file.py', 'vom: not found'),
     ('fucck', 'fucck: not found'),
     ('got commit', 'got: command not found')])
-def test_match(script, stderr):
+def test_match(mocker, script, stderr):
+    mocker.patch('thefuck.rules.no_command.which', return_value=None)
+
     assert match(Command(script, stderr=stderr))
 
 
 @pytest.mark.usefixtures('no_memoize')
-@pytest.mark.parametrize('script, stderr', [
-    ('qweqwe', 'qweqwe: not found'),
-    ('vom file.py', 'some text')])
-def test_not_match(script, stderr):
+@pytest.mark.parametrize('script, stderr, which', [
+    ('qweqwe', 'qweqwe: not found', None),
+    ('vom file.py', 'some text', None),
+    ('vim file.py', 'vim: not found', 'vim')])
+def test_not_match(mocker, script, stderr, which):
+    mocker.patch('thefuck.rules.no_command.which', return_value=which)
+
     assert not match(Command(script, stderr=stderr))
 
 

tests/rules/test_npm_missing_script.py

@@ -0,0 +1,69 @@
+import pytest
+from io import BytesIO
+from tests.utils import Command
+from thefuck.rules.npm_missing_script import match, get_new_command
+
+stderr = '''
+npm ERR! Linux 4.4.0-31-generic
+npm ERR! argv "/opt/node/bin/node" "/opt/node/bin/npm" "run" "dvelop"
+npm ERR! node v4.4.7
+npm ERR! npm  v2.15.8
+
+npm ERR! missing script: {}
+npm ERR!
+npm ERR! If you need help, you may report this error at:
+npm ERR!     <https://github.com/npm/npm/issues>
+
+npm ERR! Please include the following file with any support request:
+npm ERR!     /home/nvbn/exp/code_view/client_web/npm-debug.log
+'''.format
+
+run_script_stdout = b'''
+Lifecycle scripts included in code-view-web:
+  test
+    jest
+
+available via `npm run-script`:
+  build
+    cp node_modules/ace-builds/src-min/ -a resources/ace/ && webpack --progress --colors -p --config ./webpack.production.config.js
+  develop
+    cp node_modules/ace-builds/src/ -a resources/ace/ && webpack-dev-server --progress --colors
+  watch-test
+    jest --verbose --watch
+
+'''
+
+
+@pytest.fixture(autouse=True)
+def run_script(mocker):
+    patch = mocker.patch('thefuck.specific.npm.Popen')
+    patch.return_value.stdout = BytesIO(run_script_stdout)
+    return patch.return_value
+
+
+@pytest.mark.parametrize('command', [
+    Command('npm ru wach', stderr=stderr('wach')),
+    Command('npm run live-tes', stderr=stderr('live-tes')),
+    Command('npm run-script sahare', stderr=stderr('sahare'))])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('npm wach', stderr=stderr('wach')),
+    Command('vim live-tes', stderr=stderr('live-tes')),
+    Command('npm run-script sahare')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('script, stderr, result', [
+    ('npm ru wach-tests', stderr('wach-tests'), 'npm ru watch-test'),
+    ('npm -i run-script dvelop', stderr('dvelop'),
+     'npm -i run-script develop'),
+    ('npm -i run-script buld -X POST', stderr('buld'),
+     'npm -i run-script build -X POST')])
+def test_get_new_command(script, stderr, result):
+    command = Command(script, stderr=stderr)
+
+    assert get_new_command(command)[0] == result

tests/rules/test_npm_run_script.py

@@ -0,0 +1,84 @@
+import pytest
+from io import BytesIO
+from thefuck.rules.npm_run_script import match, get_new_command
+from tests.utils import Command
+
+stdout = '''
+Usage: npm <command>
+
+where <command> is one of:
+    access, add-user, adduser, apihelp, author, bin, bugs, c,
+    cache, completion, config, ddp, dedupe, deprecate, dist-tag,
+    dist-tags, docs, edit, explore, faq, find, find-dupes, get,
+    help, help-search, home, i, info, init, install, issues, la,
+    link, list, ll, ln, login, logout, ls, outdated, owner,
+    pack, ping, prefix, prune, publish, r, rb, rebuild, remove,
+    repo, restart, rm, root, run-script, s, se, search, set,
+    show, shrinkwrap, star, stars, start, stop, t, tag, team,
+    test, tst, un, uninstall, unlink, unpublish, unstar, up,
+    update, upgrade, v, version, view, whoami
+
+npm <cmd> -h     quick help on <cmd>
+npm -l           display full usage info
+npm faq          commonly asked questions
+npm help <term>  search for help on <term>
+npm help npm     involved overview
+
+Specify configs in the ini-formatted file:
+    /home/nvbn/.npmrc
+or on the command line via: npm <command> --key value
+Config info can be viewed via: npm help config
+
+'''
+
+run_script_stdout = b'''
+Lifecycle scripts included in code-view-web:
+  test
+    jest
+
+available via `npm run-script`:
+  build
+    cp node_modules/ace-builds/src-min/ -a resources/ace/ && webpack --progress --colors -p --config ./webpack.production.config.js
+  develop
+    cp node_modules/ace-builds/src/ -a resources/ace/ && webpack-dev-server --progress --colors
+  watch-test
+    jest --verbose --watch
+
+'''
+
+
+@pytest.fixture(autouse=True)
+def run_script(mocker):
+    patch = mocker.patch('thefuck.specific.npm.Popen')
+    patch.return_value.stdout = BytesIO(run_script_stdout)
+    return patch.return_value
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script', [
+    'npm watch-test', 'npm develop'])
+def test_match(script):
+    command = Command(script, stdout)
+    assert match(command)
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('command, run_script_out', [
+    (Command('npm test', 'TEST FAIL'), run_script_stdout),
+    (Command('npm watch-test', 'TEST FAIL'), run_script_stdout),
+    (Command('npm test', stdout), run_script_stdout),
+    (Command('vim watch-test', stdout), run_script_stdout)])
+def test_not_match(run_script, command, run_script_out):
+    run_script.stdout = BytesIO(run_script_out)
+    assert not match(command)
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, result', [
+    ('npm watch-test', 'npm run-script watch-test'),
+    ('npm -i develop', 'npm run-script -i develop'),
+    ('npm -i watch-script --path ..',
+     'npm run-script -i watch-script --path ..')])
+def test_get_new_command(script, result):
+    command = Command(script, stdout)
+    assert get_new_command(command) == result

tests/rules/test_open.py

@@ -1,31 +1,49 @@
 import pytest
-from thefuck.rules.open import match, get_new_command
+from thefuck.rules.open import is_arg_url, match, get_new_command
 from tests.utils import Command
 
 
-@pytest.mark.parametrize('command', [
-    Command(script='open foo.com'),
-    Command(script='open foo.ly'),
-    Command(script='open foo.org'),
-    Command(script='open foo.net'),
-    Command(script='open foo.se'),
-    Command(script='open foo.io'),
-    Command(script='xdg-open foo.com'),
-    Command(script='gnome-open foo.com'),
-    Command(script='kde-open foo.com')])
-def test_match(command):
-    assert match(command)
+@pytest.fixture
+def stderr(script):
+    return 'The file {} does not exist.\n'.format(script.split(' ', 1)[1])
 
 
-@pytest.mark.parametrize('command, new_command', [
-    (Command('open foo.com'), 'open http://foo.com'),
-    (Command('open foo.ly'), 'open http://foo.ly'),
-    (Command('open foo.org'), 'open http://foo.org'),
-    (Command('open foo.net'), 'open http://foo.net'),
-    (Command('open foo.se'), 'open http://foo.se'),
-    (Command('open foo.io'), 'open http://foo.io'),
-    (Command('xdg-open foo.io'), 'xdg-open http://foo.io'),
-    (Command('gnome-open foo.io'), 'gnome-open http://foo.io'),
-    (Command('kde-open foo.io'), 'kde-open http://foo.io')])
-def test_get_new_command(command, new_command):
-    assert get_new_command(command) == new_command
+@pytest.mark.parametrize('script', [
+    'open foo.com',
+    'open foo.edu',
+    'open foo.info',
+    'open foo.io',
+    'open foo.ly',
+    'open foo.me',
+    'open foo.net',
+    'open foo.org',
+    'open foo.se',
+    'open www.foo.ru'])
+def test_is_arg_url(script):
+    assert is_arg_url(Command(script))
+
+
+@pytest.mark.parametrize('script', ['open foo', 'open bar.txt', 'open egg.doc'])
+def test_not_is_arg_url(script):
+    assert not is_arg_url(Command(script))
+
+
+@pytest.mark.parametrize('script', [
+    'open foo.com',
+    'xdg-open foo.com',
+    'gnome-open foo.com',
+    'kde-open foo.com',
+    'open nonest'])
+def test_match(script, stderr):
+    assert match(Command(script, stderr=stderr))
+
+
+@pytest.mark.parametrize('script, new_command', [
+    ('open foo.io', ['open http://foo.io']),
+    ('xdg-open foo.io', ['xdg-open http://foo.io']),
+    ('gnome-open foo.io', ['gnome-open http://foo.io']),
+    ('kde-open foo.io', ['kde-open http://foo.io']),
+    ('open nonest', ['touch nonest && open nonest',
+                     'mkdir nonest && open nonest'])])
+def test_get_new_command(script, new_command, stderr):
+    assert get_new_command(Command(script, stderr=stderr)) == new_command

tests/rules/test_port_already_in_use.py

@@ -0,0 +1,101 @@
+from io import BytesIO
+
+import pytest
+from thefuck.rules.port_already_in_use import match, get_new_command
+from tests.utils import Command
+
+outputs = [
+    '''
+
+DE 70% 1/1 build modulesevents.js:141
+      throw er; // Unhandled 'error' event
+      ^
+
+Error: listen EADDRINUSE 127.0.0.1:8080
+    at Object.exports._errnoException (util.js:873:11)
+    at exports._exceptionWithHostPort (util.js:896:20)
+    at Server._listen2 (net.js:1250:14)
+    at listen (net.js:1286:10)
+    at net.js:1395:9
+    at GetAddrInfoReqWrap.asyncCallback [as callback] (dns.js:64:16)
+    at GetAddrInfoReqWrap.onlookup [as oncomplete] (dns.js:83:10)
+
+    ''',
+    '''
+[6:40:01 AM] <START> Building Dependency Graph
+[6:40:01 AM] <START> Crawling File System
+ ERROR  Packager can't listen on port 8080
+Most likely another process is already using this port
+Run the following command to find out which process:
+
+   lsof -n -i4TCP:8080
+
+You can either shut down the other process:
+
+   kill -9 <PID>
+
+or run packager on different port.
+
+    ''',
+    '''
+Traceback (most recent call last):
+  File "/usr/lib/python3.5/runpy.py", line 184, in _run_module_as_main
+    "__main__", mod_spec)
+  File "/usr/lib/python3.5/runpy.py", line 85, in _run_code
+    exec(code, run_globals)
+  File "/home/nvbn/exp/code_view/server/code_view/main.py", line 14, in <module>
+    web.run_app(app)
+  File "/home/nvbn/.virtualenvs/code_view/lib/python3.5/site-packages/aiohttp/web.py", line 310, in run_app
+    backlog=backlog))
+  File "/usr/lib/python3.5/asyncio/base_events.py", line 373, in run_until_complete
+    return future.result()
+  File "/usr/lib/python3.5/asyncio/futures.py", line 274, in result
+    raise self._exception
+  File "/usr/lib/python3.5/asyncio/tasks.py", line 240, in _step
+    result = coro.send(None)
+  File "/usr/lib/python3.5/asyncio/base_events.py", line 953, in create_server
+    % (sa, err.strerror.lower()))
+OSError: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8080): address already in use
+Task was destroyed but it is pending!
+task: <Task pending coro=<RedisProtocol._reader_coroutine() running at /home/nvbn/.virtualenvs/code_view/lib/python3.5/site-packages/asyncio_redis/protocol.py:921> wait_for=<Future pending cb=[Task._wakeup()]>>
+    '''
+]
+
+lsof_stdout = b'''COMMAND   PID USER   FD   TYPE DEVICE SIZE/OFF NODE NAME
+node    18233 nvbn   16u  IPv4 557134      0t0  TCP localhost:http-alt (LISTEN)
+'''
+
+
+@pytest.fixture(autouse=True)
+def lsof(mocker):
+    patch = mocker.patch('thefuck.rules.port_already_in_use.Popen')
+    patch.return_value.stdout = BytesIO(lsof_stdout)
+    return patch
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize(
+    'command',
+    [Command('./app', stdout=output) for output in outputs]
+    + [Command('./app', stderr=output) for output in outputs])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('command, lsof_output', [
+    (Command('./app'), lsof_stdout),
+    (Command('./app', stdout=outputs[1]), b''),
+    (Command('./app', stderr=outputs[2]), b'')])
+def test_not_match(lsof, command, lsof_output):
+    lsof.return_value.stdout = BytesIO(lsof_output)
+
+    assert not match(command)
+
+
+@pytest.mark.parametrize(
+    'command',
+    [Command('./app', stdout=output) for output in outputs]
+    + [Command('./app', stderr=output) for output in outputs])
+def test_get_new_command(command):
+    assert get_new_command(command) == 'kill 18233 && ./app'

tests/rules/test_react_native_command_unrecognized.py

@@ -0,0 +1,46 @@
+import pytest
+from thefuck.rules.react_native_command_unrecognized import match, \
+    get_new_command
+from tests.utils import Command
+
+stderr = 'Command `{}` unrecognized'.format
+
+stdout = '''
+Usage: react-native <command>
+
+Commands:
+  - start: starts the webserver
+  - bundle: builds the javascript bundle for offline use
+  - unbundle: builds javascript as "unbundle" for offline use
+  - new-library: generates a native library bridge
+  - android: generates an Android project for your app
+  - run-android: builds your app and starts it on a connected Android emulator or device
+  - log-android: print Android logs
+  - run-ios: builds your app and starts it on iOS simulator
+  - log-ios: print iOS logs
+  - upgrade: upgrade your app's template files to the latest version; run this after updating the react-native version in your package.json and running npm install
+  - link: link a library
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command('react-native star', stderr=stderr('star')),
+    Command('react-native android-logs', stderr=stderr('android-logs'))])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command', [
+    Command('gradle star', stderr=stderr('star')),
+    Command('react-native start')])
+def test_not_match(command):
+    assert not match(command)
+
+
+@pytest.mark.parametrize('command, result', [
+    (Command('react-native star', stdout, stderr('star')),
+     'react-native start'),
+    (Command('react-native logsandroid -f', stdout, stderr('logsandroid')),
+     'react-native log-android -f')])
+def test_get_new_command(command, result):
+    assert get_new_command(command)[0] == result

tests/rules/test_ssh_known_host.py

@@ -52,6 +52,7 @@ def test_match(ssh_error):
     assert not match(Command('ssh'))
 
 
+@pytest.mark.skipif(os.name == 'nt', reason='Skip if testing on Windows')
 def test_side_effect(ssh_error):
     errormsg, path, reset, known_hosts = ssh_error
     command = Command('ssh user@host', stderr=errormsg)

tests/rules/test_workon_doesnt_exists.py

@@ -0,0 +1,30 @@
+import pytest
+from thefuck.rules.workon_doesnt_exists import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture(autouse=True)
+def envs(mocker):
+    return mocker.patch(
+        'thefuck.rules.workon_doesnt_exists._get_all_environments',
+        return_value=['thefuck', 'code_view'])
+
+
+@pytest.mark.parametrize('script', [
+    'workon tehfuck', 'workon code-view', 'workon new-env'])
+def test_match(script):
+    assert match(Command(script))
+
+
+@pytest.mark.parametrize('script', [
+    'workon thefuck', 'workon code_view', 'work on tehfuck'])
+def test_not_match(script):
+    assert not match(Command(script))
+
+
+@pytest.mark.parametrize('script, result', [
+    ('workon tehfuck', 'workon thefuck'),
+    ('workon code-view', 'workon code_view'),
+    ('workon zzzz', 'mkvirtualenv zzzz')])
+def test_get_new_command(script, result):
+    assert get_new_command(Command(script))[0] == result

tests/shells/test_fish.py

@@ -19,14 +19,18 @@ class TestFish(object):
         return mock
 
     @pytest.fixture
-    def environ(self, monkeypatch):
-        data = {'TF_OVERRIDDEN_ALIASES': 'cd, ls, man, open'}
-        monkeypatch.setattr('thefuck.shells.fish.os.environ', data)
-        return data
+    def os_environ(self, monkeypatch, key, value):
+        monkeypatch.setattr('os.environ', {key: value})
 
-    @pytest.mark.usefixture('environ')
-    def test_get_overridden_aliases(self, shell, environ):
-        assert shell._get_overridden_aliases() == ['cd', 'ls', 'man', 'open']
+    @pytest.mark.parametrize('key, value', [
+        ('TF_OVERRIDDEN_ALIASES', 'cut,git,sed'),  # legacy
+        ('THEFUCK_OVERRIDDEN_ALIASES', 'cut,git,sed'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', 'cut, git, sed'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', ' cut,\tgit,sed\n'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', '\ncut,\n\ngit,\tsed\r')])
+    def test_get_overridden_aliases(self, shell, os_environ):
+        assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep',
+                                                   'ls', 'man', 'open', 'sed'}
 
     @pytest.mark.parametrize('before, after', [
         ('cd', 'cd'),
@@ -70,7 +74,24 @@ class TestFish(object):
         assert 'TF_ALIAS=fuck PYTHONIOENCODING' in shell.app_alias('fuck')
         assert 'PYTHONIOENCODING=utf-8 thefuck' in shell.app_alias('fuck')
 
+    def test_app_alias_alter_history(self, settings, shell):
+        settings.alter_history = True
+        assert 'history --delete' in shell.app_alias('FUCK')
+        assert 'history --merge' in shell.app_alias('FUCK')
+        settings.alter_history = False
+        assert 'history --delete' not in shell.app_alias('FUCK')
+        assert 'history --merge' not in shell.app_alias('FUCK')
+
     def test_get_history(self, history_lines, shell):
         history_lines(['- cmd: ls', '  when: 1432613911',
                        '- cmd: rm', '  when: 1432613916'])
         assert list(shell.get_history()) == ['ls', 'rm']
+
+    @pytest.mark.parametrize('entry, entry_utf8', [
+        ('ls', '- cmd: ls\n   when: 1430707243\n'),
+        (u'echo café', '- cmd: echo café\n   when: 1430707243\n')])
+    def test_put_to_history(self, entry, entry_utf8, builtins_open, mocker, shell):
+        mocker.patch('thefuck.shells.fish.time', return_value=1430707243.3517463)
+        shell.put_to_history(entry)
+        builtins_open.return_value.__enter__.return_value. \
+            write.assert_called_once_with(entry_utf8)

tests/shells/test_powershell.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+from thefuck.shells import Powershell
+
+
+@pytest.mark.usefixtures('isfile', 'no_memoize', 'no_cache')
+class TestPowershell(object):
+    @pytest.fixture
+    def shell(self):
+        return Powershell()
+
+    def test_and_(self, shell):
+        assert shell.and_('ls', 'cd') == '(ls) -and (cd)'
+
+    def test_app_alias(self, shell):
+        assert 'function fuck' in shell.app_alias('fuck')
+        assert 'function FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')

tests/specific/test_npm.py

@@ -0,0 +1,26 @@
+from io import BytesIO
+
+import pytest
+from thefuck.specific.npm import get_scripts
+
+run_script_stdout = b'''
+Lifecycle scripts included in code-view-web:
+  test
+    jest
+
+available via `npm run-script`:
+  build
+    cp node_modules/ace-builds/src-min/ -a resources/ace/ && webpack --progress --colors -p --config ./webpack.production.config.js
+  develop
+    cp node_modules/ace-builds/src/ -a resources/ace/ && webpack-dev-server --progress --colors
+  watch-test
+    jest --verbose --watch
+
+'''
+
+
+@pytest.mark.usefixtures('no_memoize')
+def test_get_scripts(mocker):
+    patch = mocker.patch('thefuck.specific.npm.Popen')
+    patch.return_value.stdout = BytesIO(run_script_stdout)
+    assert get_scripts() == ['build', 'develop', 'watch-test']

tests/test_conf.py

@@ -59,7 +59,9 @@ class TestSettingsFromEnv(object):
                         'THEFUCK_WAIT_COMMAND': '55',
                         'THEFUCK_REQUIRE_CONFIRMATION': 'true',
                         'THEFUCK_NO_COLORS': 'false',
-                        'THEFUCK_PRIORITY': 'bash=10:lisp=wrong:vim=15'})
+                        'THEFUCK_PRIORITY': 'bash=10:lisp=wrong:vim=15',
+                        'THEFUCK_WAIT_SLOW_COMMAND': '999',
+                        'THEFUCK_SLOW_COMMANDS': 'lein:react-native:./gradlew'})
         settings.init()
         assert settings.rules == ['bash', 'lisp']
         assert settings.exclude_rules == ['git', 'vim']
@@ -67,6 +69,8 @@ class TestSettingsFromEnv(object):
         assert settings.require_confirmation is True
         assert settings.no_colors is False
         assert settings.priority == {'bash': 10, 'vim': 15}
+        assert settings.wait_slow_command == 999
+        assert settings.slow_commands == ['lein', 'react-native', './gradlew']
 
     def test_from_env_with_DEFAULT(self, environ, settings):
         environ.update({'THEFUCK_RULES': 'DEFAULT_RULES:bash:lisp'})

tests/test_corrector.py

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from pathlib import PosixPath
+try:
+    from pathlib import Path
+    pathlib_name = 'pathlib'
+except ImportError:
+    from pathlib2 import Path
+    pathlib_name = 'pathlib2'
 from thefuck import corrector, const
 from tests.utils import Rule, Command, CorrectedCommand
 from thefuck.corrector import get_corrected_commands, organize_commands
@@ -11,7 +16,7 @@ class TestGetRules(object):
     @pytest.fixture
     def glob(self, mocker):
         results = {}
-        mocker.patch('pathlib.Path.glob',
+        mocker.patch(pathlib_name + '.Path.glob',
                      new_callable=lambda: lambda *_: results.pop('value', []))
         return lambda value: results.update({'value': value})
 
@@ -30,7 +35,7 @@ class TestGetRules(object):
         (['git.py', 'bash.py'], ['git'], ['git'], [])])
     def test_get_rules(self, glob, settings, paths, conf_rules, exclude_rules,
                        loaded_rules):
-        glob([PosixPath(path) for path in paths])
+        glob([Path(path) for path in paths])
         settings.update(rules=conf_rules,
                         priority={},
                         exclude_rules=exclude_rules)

tests/test_types.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
+import os
 from subprocess import PIPE
 from mock import Mock
-from pathlib import Path
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
 import pytest
 from tests.utils import CorrectedCommand, Rule, Command
 from thefuck import const
@@ -39,9 +43,10 @@ class TestRule(object):
                               enabled_by_default=True,
                               priority=900,
                               requires_output=True))
-        assert Rule.from_path(Path('/rules/bash.py')) \
+        rule_path = os.path.join(os.sep, 'rules', 'bash.py')
+        assert Rule.from_path(Path(rule_path)) \
                == Rule('bash', match, get_new_command, priority=900)
-        load_source.assert_called_once_with('bash', '/rules/bash.py')
+        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),
@@ -110,6 +115,7 @@ class TestCommand(object):
             'apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,
+                                      stdin=PIPE,
                                       stdout=PIPE,
                                       stderr=PIPE,
                                       env={})

tests/test_ui.py

@@ -25,15 +25,16 @@ def test_read_actions(patch_get_key):
         # Ignored:
         'x', 'y',
         # Up:
-        const.KEY_UP,
+        const.KEY_UP, 'k',
         # Down:
-        const.KEY_DOWN,
+        const.KEY_DOWN, 'j',
         # Ctrl+C:
-        const.KEY_CTRL_C])
-    assert list(islice(ui.read_actions(), 5)) \
+        const.KEY_CTRL_C, 'q'])
+    assert list(islice(ui.read_actions(), 8)) \
            == [const.ACTION_SELECT, const.ACTION_SELECT,
-               const.ACTION_PREVIOUS, const.ACTION_NEXT,
-               const.ACTION_ABORT]
+               const.ACTION_PREVIOUS, const.ACTION_PREVIOUS,
+               const.ACTION_NEXT, const.ACTION_NEXT,
+               const.ACTION_ABORT, const.ACTION_ABORT]
 
 
 def test_command_selector():

tests/test_utils.py

@@ -1,4 +1,7 @@
+# -*- coding: utf-8 -*-
+
 import pytest
+import warnings
 from mock import Mock
 import six
 from thefuck.utils import default_settings, \
@@ -199,7 +202,8 @@ class TestCompatibilityCall(object):
             assert settings == _settings
             return True
 
-        assert compatibility_call(match, Command())
+        with pytest.warns(UserWarning):
+            assert compatibility_call(match, Command())
 
     def test_get_new_command(self):
         def get_new_command(command):
@@ -214,7 +218,8 @@ class TestCompatibilityCall(object):
             assert settings == _settings
             return True
 
-        assert compatibility_call(get_new_command, Command())
+        with pytest.warns(UserWarning):
+            assert compatibility_call(get_new_command, Command())
 
     def test_side_effect(self):
         def side_effect(command, new_command):
@@ -229,15 +234,22 @@ class TestCompatibilityCall(object):
             assert settings == _settings
             return True
 
-        assert compatibility_call(side_effect, Command(), Command())
+        with pytest.warns(UserWarning):
+            assert compatibility_call(side_effect, Command(), Command())
 
 
 class TestGetValidHistoryWithoutCurrent(object):
+    @pytest.yield_fixture(autouse=True)
+    def fail_on_warning(self):
+        warnings.simplefilter('error')
+        yield
+        warnings.resetwarnings()
+
     @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'])
+                                          'diff x', 'nocommand x', u'café ô'])
 
     @pytest.fixture(autouse=True)
     def alias(self, mocker):
@@ -245,14 +257,22 @@ class TestGetValidHistoryWithoutCurrent(object):
                             return_value='fuck')
 
     @pytest.fixture(autouse=True)
-    def callables(self, mocker):
-        return mocker.patch('thefuck.utils.get_all_executables',
-                            return_value=['diff', 'ls'])
+    def bins(self, mocker, monkeypatch):
+        monkeypatch.setattr('thefuck.conf.os.environ', {'PATH': 'path'})
+        callables = list()
+        for name in ['diff', 'ls', 'café']:
+            bin_mock = mocker.Mock(name=name)
+            bin_mock.configure_mock(name=name, is_dir=lambda: False)
+            callables.append(bin_mock)
+        path_mock = mocker.Mock(iterdir=mocker.Mock(return_value=callables))
+        return mocker.patch('thefuck.utils.Path', return_value=path_mock)
 
     @pytest.mark.parametrize('script, result', [
-        ('le cat', ['ls cat', 'diff x']),
-        ('diff x', ['ls cat']),
-        ('fuck', ['ls cat', 'diff x'])])
+        ('le cat', ['ls cat', 'diff x', u'café ô']),
+        ('diff x', ['ls cat', u'café ô']),
+        ('fuck', ['ls cat', 'diff x', u'café ô']),
+        (u'cafe ô', ['ls cat', 'diff x', u'café ô']),
+    ])
     def test_get_valid_history_without_current(self, script, result):
         command = Command(script=script)
         assert get_valid_history_without_current(command) == result

thefuck/conf.py

@@ -1,7 +1,10 @@
 from imp import load_source
 import os
 import sys
-from pathlib import Path
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
 from six import text_type
 from . import const
 
@@ -89,13 +92,13 @@ class Settings(dict):
             return self._rules_from_env(val)
         elif attr == 'priority':
             return dict(self._priority_from_env(val))
-        elif attr == 'wait_command':
+        elif attr in ('wait_command', 'history_limit', 'wait_slow_command'):
             return int(val)
         elif attr in ('require_confirmation', 'no_colors', 'debug',
                       'alter_history'):
             return val.lower() == 'true'
-        elif attr == 'history_limit':
-            return int(val)
+        elif attr == 'slow_commands':
+            return val.split(':')
         else:
             return val
 

thefuck/const.py

@@ -31,6 +31,9 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                     'priority': {},
                     'history_limit': None,
                     'alter_history': True,
+                    'wait_slow_command': 15,
+                    'slow_commands': ['lein', 'react-native', 'gradle',
+                                      './gradlew'],
                     'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
@@ -41,7 +44,9 @@ ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_DEBUG': 'debug',
                'THEFUCK_PRIORITY': 'priority',
                'THEFUCK_HISTORY_LIMIT': 'history_limit',
-               'THEFUCK_ALTER_HISTORY': 'alter_history'}
+               'THEFUCK_ALTER_HISTORY': 'alter_history',
+               'THEFUCK_WAIT_SLOW_COMMAND': 'wait_slow_command',
+               'THEFUCK_SLOW_COMMANDS': 'slow_commands'}
 
 SETTINGS_HEADER = u"""# The Fuck settings file
 #

thefuck/corrector.py

@@ -1,4 +1,7 @@
-from pathlib import Path
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
 from .conf import settings
 from .types import Rule
 from . import logs

thefuck/main.py

@@ -33,6 +33,8 @@ def fix_command():
 
         if selected_command:
             selected_command.run(command)
+        else:
+            sys.exit(1)
 
 
 def print_alias(entry_point=True):

thefuck/rules/apt_get.py

@@ -1,32 +1,43 @@
 from thefuck.specific.apt import apt_available
-from thefuck.utils import memoize
+from thefuck.utils import memoize, which
 from thefuck.shells import shell
 
 try:
-    import CommandNotFound
+    from CommandNotFound import CommandNotFound
+
+    command_not_found = CommandNotFound()
     enabled_by_default = apt_available
 except ImportError:
     enabled_by_default = False
 
 
+def _get_executable(command):
+    if command.script_parts[0] == 'sudo':
+        return command.script_parts[1]
+    else:
+        return command.script_parts[0]
+
+
 @memoize
-def get_package(command):
+def get_package(executable):
     try:
-        c = CommandNotFound.CommandNotFound()
-        cmd = command.split(' ')
-        pkgs = c.getPackages(cmd[0] if cmd[0] != 'sudo' else cmd[1])
-        name, _ = pkgs[0]
-        return name
+        packages = command_not_found.getPackages(executable)
+        return packages[0][0]
     except IndexError:
         # IndexError is thrown when no matching package is found
         return None
 
 
 def match(command):
-    return 'not found' in command.stderr and get_package(command.script)
+    if 'not found' in command.stderr:
+        executable = _get_executable(command)
+        return not which(executable) and get_package(executable)
+    else:
+        return False
 
 
 def get_new_command(command):
-    name = get_package(command.script)
+    executable = _get_executable(command)
+    name = get_package(executable)
     formatme = shell.and_('sudo apt-get install {}', '{}')
     return formatme.format(name, command.script)

thefuck/rules/brew_unknown_command.py

@@ -15,7 +15,7 @@ def _get_brew_commands(brew_path_prefix):
     brew_cmd_path = brew_path_prefix + BREW_CMD_PATH
 
     return [name[:-3] for name in os.listdir(brew_cmd_path)
-            if name.endswith('.rb')]
+            if name.endswith(('.rb', '.sh'))]
 
 
 def _get_brew_tap_specific_commands(brew_path_prefix):

thefuck/rules/brew_update_formula.py

@@ -0,0 +1,12 @@
+from thefuck.utils import for_app
+
+
+@for_app('brew', at_least=2)
+def match(command):
+    return ('update' in command.script
+            and "Error: This command updates brew itself" in command.stderr
+            and "Use 'brew upgrade <formula>'" in command.stderr)
+
+
+def get_new_command(command):
+    return command.script.replace('update', 'upgrade')

thefuck/rules/cargo_no_command.py

@@ -4,7 +4,7 @@ from thefuck.utils import replace_argument, for_app
 
 @for_app('cargo', at_least=1)
 def match(command):
-    return ('No such subcommand' in command.stderr
+    return ('no such subcommand' in command.stderr.lower()
             and 'Did you mean' in command.stderr)
 
 

thefuck/rules/chmod_x.py

@@ -0,0 +1,15 @@
+import os
+from thefuck.shells import shell
+
+
+def match(command):
+    return (command.script.startswith('./')
+            and 'permission denied' in command.stderr.lower()
+            and os.path.exists(command.script_parts[0])
+            and not os.access(command.script_parts[0], os.X_OK))
+
+
+def get_new_command(command):
+    return shell.and_(
+        'chmod +x {}'.format(command.script_parts[0][2:]),
+        command.script)

thefuck/rules/fab_command_not_found.py

@@ -0,0 +1,37 @@
+from thefuck.utils import eager, get_closest, for_app
+
+
+@for_app('fab')
+def match(command):
+    return 'Warning: Command(s) not found:' in command.stderr
+
+
+# We need different behavior then in get_all_matched_commands.
+@eager
+def _get_between(content, start, end=None):
+    should_yield = False
+    for line in content.split('\n'):
+        if start in line:
+            should_yield = True
+            continue
+
+        if end and end in line:
+            return
+
+        if should_yield and line:
+            yield line.strip().split(' ')[0]
+
+
+def get_new_command(command):
+    not_found_commands = _get_between(
+        command.stderr, 'Warning: Command(s) not found:', 'Available commands:')
+    possible_commands = _get_between(
+        command.stdout, 'Available commands:')
+
+    script = command.script
+    for not_found in not_found_commands:
+        fix = get_closest(not_found, possible_commands)
+        script = script.replace(' {}'.format(not_found),
+                                ' {}'.format(fix))
+
+    return script

thefuck/rules/git_add.py

@@ -5,15 +5,14 @@ from thefuck.specific.git import git_support
 
 @git_support
 def match(command):
-    return ('did not match any file(s) known to git.' in command.stderr
-            and "Did you forget to 'git add'?" in command.stderr)
+    return 'did not match any file(s) known to git.' in command.stderr
 
 
 @git_support
 def get_new_command(command):
     missing_file = re.findall(
-            r"error: pathspec '([^']*)' "
-            r"did not match any file\(s\) known to git.", command.stderr)[0]
+        r"error: pathspec '([^']*)' "
+        r'did not match any file\(s\) known to git.', command.stderr)[0]
 
     formatme = shell.and_('git add -- {}', '{}')
     return formatme.format(missing_file, command.script)

thefuck/rules/git_branch_exists.py

@@ -0,0 +1,24 @@
+import re
+from thefuck.shells import shell
+from thefuck.specific.git import git_support
+from thefuck.utils import eager
+
+
+@git_support
+def match(command):
+    return ("fatal: A branch named '" in command.stderr
+            and " already exists." in command.stderr)
+
+
+@git_support
+@eager
+def get_new_command(command):
+    branch_name = re.findall(
+        r"fatal: A branch named '([^']*)' already exists.", command.stderr)[0]
+    new_command_templates = [['git branch -d {0}', 'git branch {0}'],
+                             ['git branch -d {0}', 'git checkout -b {0}'],
+                             ['git branch -D {0}', 'git branch {0}'],
+                             ['git branch -D {0}', 'git checkout -b {0}'],
+                             ['git checkout {0}']]
+    for new_command_template in new_command_templates:
+        yield shell.and_(*new_command_template).format(branch_name)

thefuck/rules/git_push_pull.py

@@ -5,10 +5,13 @@ from thefuck.specific.git import git_support
 
 @git_support
 def match(command):
-    return ('push' in command.script
-            and '! [rejected]' in command.stderr
-            and 'failed to push some refs to' in command.stderr
-            and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
+    return ('push' in command.script and
+            '! [rejected]' in command.stderr and
+            'failed to push some refs to' in command.stderr and
+            ('Updates were rejected because the tip of your'
+             ' current branch is behind' in command.stderr or
+             'Updates were rejected because the remote '
+             'contains work that you do' in command.stderr))
 
 
 @git_support

thefuck/rules/git_rebase_no_changes.py

@@ -0,0 +1,15 @@
+from thefuck.specific.git import git_support
+
+
+@git_support
+def match(command):
+    return ({'rebase', '--continue'}.issubset(command.script_parts) and
+            'No changes - did you forget to use \'git add\'?' in command.stdout)
+
+
+def get_new_command(command):
+    return 'git rebase --skip'
+
+
+enabled_by_default = True
+requires_output = True

thefuck/rules/git_rm_recursive.py

@@ -0,0 +1,15 @@
+from thefuck.specific.git import git_support
+
+
+@git_support
+def match(command):
+    return (' rm ' in command.script
+            and "fatal: not removing '" in command.stderr
+            and "' recursively without -r" in command.stderr)
+
+
+@git_support
+def get_new_command(command):
+    index = command.script_parts.index('rm') + 1
+    command.script_parts.insert(index, '-r')
+    return u' '.join(command.script_parts)

thefuck/rules/gradle_no_task.py

@@ -0,0 +1,34 @@
+import re
+from subprocess import Popen, PIPE
+from thefuck.utils import for_app, eager, replace_command
+
+regex = re.compile(r"Task '(.*)' (is ambiguous|not found)")
+
+
+@for_app('gradle', './gradlew')
+def match(command):
+    return regex.findall(command.stderr)
+
+
+@eager
+def _get_all_tasks(gradle):
+    proc = Popen([gradle, 'tasks'], stdout=PIPE)
+    should_yield = False
+    for line in proc.stdout.readlines():
+        line = line.decode().strip()
+        if line.startswith('----'):
+            should_yield = True
+            continue
+
+        if not line.strip():
+            should_yield = False
+            continue
+
+        if should_yield and not line.startswith('All tasks runnable from root project'):
+            yield line.split(' ')[0]
+
+
+def get_new_command(command):
+    wrong_task = regex.findall(command.stderr)[0][0]
+    all_tasks = _get_all_tasks(command.script_parts[0])
+    return replace_command(command, wrong_task, all_tasks)

thefuck/rules/gradle_wrapper.py

@@ -0,0 +1,13 @@
+import os
+from thefuck.utils import for_app, which
+
+
+@for_app('gradle')
+def match(command):
+    return (not which(command.script_parts[0])
+            and 'not found' in command.stderr
+            and os.path.isfile('gradlew'))
+
+
+def get_new_command(command):
+    return u'./gradlew {}'.format(' '.join(command.script_parts[1:]))

thefuck/rules/grunt_task_not_found.py

@@ -0,0 +1,36 @@
+import re
+from subprocess import Popen, PIPE
+from thefuck.utils import for_app, eager, get_closest
+
+regex = re.compile(r'Warning: Task "(.*)" not found.')
+
+
+@for_app('grunt')
+def match(command):
+    return regex.findall(command.stdout)
+
+
+@eager
+def _get_all_tasks():
+    proc = Popen(['grunt', '--help'], stdout=PIPE)
+    should_yield = False
+    for line in proc.stdout.readlines():
+        line = line.decode().strip()
+
+        if 'Available tasks' in line:
+            should_yield = True
+            continue
+
+        if should_yield and not line:
+            return
+
+        if '  ' in line:
+            yield line.split(' ')[0]
+
+
+def get_new_command(command):
+    misspelled_task = regex.findall(command.stdout)[0].split(':')[0]
+    tasks = _get_all_tasks()
+    fixed = get_closest(misspelled_task, tasks)
+    return command.script.replace(' {}'.format(misspelled_task),
+                                  ' {}'.format(fixed))

thefuck/rules/ln_no_hard_link.py

@@ -15,7 +15,7 @@ from thefuck.specific.sudo import sudo_support
 @sudo_support
 def match(command):
     return (command.stderr.endswith("hard link not allowed for directory") and
-            command.script.startswith("ln "))
+            command.script_parts[0] == 'ln')
 
 
 @sudo_support

thefuck/rules/ln_s_order.py

@@ -0,0 +1,26 @@
+import os
+from thefuck.specific.sudo import sudo_support
+
+
+def _get_destination(script_parts):
+    """When arguments order is wrong first argument will be destination."""
+    for part in script_parts:
+        if part not in {'ln', '-s', '--symbolic'} and os.path.exists(part):
+            return part
+
+
+@sudo_support
+def match(command):
+    return (command.script_parts[0] == 'ln'
+            and {'-s', '--symbolic'}.intersection(command.script_parts)
+            and 'File exists' in command.stderr
+            and _get_destination(command.script_parts))
+
+
+@sudo_support
+def get_new_command(command):
+    destination = _get_destination(command.script_parts)
+    parts = command.script_parts[:]
+    parts.remove(destination)
+    parts.append(destination)
+    return ' '.join(parts)

thefuck/rules/no_command.py

@@ -1,12 +1,12 @@
 from difflib import get_close_matches
 from thefuck.utils import get_all_executables, \
-    get_valid_history_without_current, get_closest
+    get_valid_history_without_current, get_closest, which
 from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
 def match(command):
-    return (command.script_parts
+    return (not which(command.script_parts[0])
             and 'not found' in command.stderr
             and bool(get_close_matches(command.script_parts[0],
                                        get_all_executables())))

thefuck/rules/npm_missing_script.py

@@ -0,0 +1,17 @@
+import re
+from thefuck.utils import for_app, replace_command
+from thefuck.specific.npm import get_scripts, npm_available
+
+enabled_by_default = npm_available
+
+
+@for_app('npm')
+def match(command):
+    return (any(part.startswith('ru') for part in command.script_parts)
+            and 'npm ERR! missing script: ' in command.stderr)
+
+
+def get_new_command(command):
+    misspelled_script = re.findall(
+        r'.*missing script: (.*)\n', command.stderr)[0]
+    return replace_command(command, misspelled_script, get_scripts())

thefuck/rules/npm_run_script.py

@@ -0,0 +1,17 @@
+from thefuck.specific.npm import npm_available, get_scripts
+from thefuck.utils import for_app
+
+enabled_by_default = npm_available
+
+
+@for_app('npm')
+def match(command):
+    return ('Usage: npm <command>' in command.stdout
+            and not any(part.startswith('ru') for part in command.script_parts)
+            and command.script_parts[1] in get_scripts())
+
+
+def get_new_command(command):
+    parts = command.script_parts[:]
+    parts.insert(1, 'run-script')
+    return ' '.join(parts)

thefuck/rules/npm_wrong_command.py

@@ -1,6 +1,9 @@
+from thefuck.specific.npm import npm_available
 from thefuck.utils import replace_argument, for_app, eager, get_closest
 from thefuck.specific.sudo import sudo_support
 
+enabled_by_default = npm_available
+
 
 def _get_wrong_command(script_parts):
     commands = [part for part in script_parts[1:] if not part.startswith('-')]

thefuck/rules/open.py

@@ -5,22 +5,36 @@
 # The file ~/github.com does not exist.
 # Perhaps you meant 'http://github.com'?
 #
-from thefuck.utils import for_app
+from thefuck.shells import shell
+from thefuck.utils import eager, for_app
+
+
+def is_arg_url(command):
+    return ('.com' in command.script or
+            '.edu' in command.script or
+            '.info' in command.script or
+            '.io' in command.script or
+            '.ly' in command.script or
+            '.me' in command.script or
+            '.net' in command.script or
+            '.org' in command.script or
+            '.se' in command.script or
+            'www.' in command.script)
 
 
 @for_app('open', 'xdg-open', 'gnome-open', 'kde-open')
 def match(command):
-    return ('.com' in command.script
-            or '.net' in command.script
-            or '.org' in command.script
-            or '.ly' in command.script
-            or '.io' in command.script
-            or '.se' in command.script
-            or '.edu' in command.script
-            or '.info' in command.script
-            or '.me' in command.script
-            or 'www.' in command.script)
+    return (is_arg_url(command) or
+            command.stderr.strip().startswith('The file ') and
+            command.stderr.strip().endswith(' does not exist.'))
 
 
+@eager
 def get_new_command(command):
-    return command.script.replace('open ', 'open http://')
+    stderr = command.stderr.strip()
+    if is_arg_url(command):
+        yield command.script.replace('open ', 'open http://')
+    elif stderr.startswith('The file ') and stderr.endswith(' does not exist.'):
+        arg = command.script.split(' ', 1)[1]
+        for option in ['touch', 'mkdir']:
+            yield shell.and_(u'{} {}'.format(option, arg), command.script)

thefuck/rules/pip_unknown_command.py

@@ -4,7 +4,7 @@ from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
-@for_app('pip')
+@for_app('pip', 'pip2', 'pip3')
 def match(command):
     return ('pip' in command.script and
             'unknown command' in command.stderr and

thefuck/rules/port_already_in_use.py

@@ -0,0 +1,41 @@
+import re
+from subprocess import Popen, PIPE
+from thefuck.utils import memoize, which
+from thefuck.shells import shell
+
+enabled_by_default = bool(which('lsof'))
+
+patterns = [r"bind on address \('.*', (?P<port>\d+)\)",
+            r'Unable to bind [^ ]*:(?P<port>\d+)',
+            r"can't listen on port (?P<port>\d+)",
+            r'listen EADDRINUSE [^ ]*:(?P<port>\d+)']
+
+
+@memoize
+def _get_pid_by_port(port):
+    proc = Popen(['lsof', '-i', ':{}'.format(port)], stdout=PIPE)
+    lines = proc.stdout.read().decode().split('\n')
+    if len(lines) > 1:
+        return lines[1].split()[1]
+    else:
+        return None
+
+
+@memoize
+def _get_used_port(command):
+    for pattern in patterns:
+        matched = (re.search(pattern, command.stderr)
+                   or re.search(pattern, command.stdout))
+        if matched:
+            return matched.group('port')
+
+
+def match(command):
+    port = _get_used_port(command)
+    return port and _get_pid_by_port(port)
+
+
+def get_new_command(command):
+    port = _get_used_port(command)
+    pid = _get_pid_by_port(port)
+    return shell.and_(u'kill {}'.format(pid), command.script)

thefuck/rules/react_native_command_unrecognized.py

@@ -0,0 +1,14 @@
+import re
+from thefuck.utils import for_app, replace_command
+
+
+@for_app('react-native')
+def match(command):
+    return re.match(r'Command `.*` unrecognized', command.stderr)
+
+
+def get_new_command(command):
+    misspelled_command = re.findall(r'Command `(.*)` unrecognized',
+                                    command.stderr)[0]
+    commands = re.findall(r'  - (.*): .*\n', command.stdout)
+    return replace_command(command, misspelled_command, commands)

thefuck/rules/workon_doesnt_exists.py

@@ -0,0 +1,36 @@
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
+
+from thefuck.utils import for_app, replace_command, eager, memoize
+
+
+@memoize
+@eager
+def _get_all_environments():
+    root = Path('~/.virtualenvs').expanduser()
+    if not root.is_dir():
+        return
+
+    for child in root.iterdir():
+        if child.is_dir():
+            yield child.name
+
+
+@for_app('workon')
+def match(command):
+    return (len(command.script_parts) >= 2
+            and command.script_parts[1] not in _get_all_environments())
+
+
+def get_new_command(command):
+    misspelled_env = command.script_parts[1]
+    create_new = u'mkvirtualenv {}'.format(misspelled_env)
+
+    available = _get_all_environments()
+    if available:
+        return replace_command(command, misspelled_env, available) \
+               + [create_new]
+    else:
+        return create_new

thefuck/shells/__init__.py

@@ -9,20 +9,36 @@ from .fish import Fish
 from .generic import Generic
 from .tcsh import Tcsh
 from .zsh import Zsh
+from .powershell import Powershell
 
 shells = {'bash': Bash,
           'fish': Fish,
           'zsh': Zsh,
           'csh': Tcsh,
-          'tcsh': Tcsh}
+          'tcsh': Tcsh,
+          'powershell': Powershell}
 
 
 def _get_shell():
-    try:
-        shell_name = Process(os.getpid()).parent().name()
-    except TypeError:
-        shell_name = Process(os.getpid()).parent.name
-    return shells.get(shell_name, Generic)()
+    proc = Process(os.getpid())
+
+    while proc is not None:
+        try:
+            name = proc.name()
+        except TypeError:
+            name = proc.name
+
+        name = os.path.splitext(name)[0]
+
+        if name in shells:
+            return shells[name]()
+
+        try:
+            proc = proc.parent()
+        except TypeError:
+            proc = proc.parent
+
+    return Generic()
 
 
 shell = _get_shell()

thefuck/shells/fish.py

@@ -1,30 +1,38 @@
 from subprocess import Popen, PIPE
 from time import time
 import os
+import sys
+import six
+from .. import logs
+from ..conf import settings
 from ..utils import DEVNULL, memoize, cache
 from .generic import Generic
 
 
 class Fish(Generic):
     def _get_overridden_aliases(self):
-        overridden_aliases = os.environ.get('TF_OVERRIDDEN_ALIASES', '').strip()
-        if overridden_aliases:
-            return [alias.strip() for alias in overridden_aliases.split(',')]
-        else:
-            return ['cd', 'grep', 'ls', 'man', 'open']
+        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
 
     def app_alias(self, fuck):
+        if settings.alter_history:
+            alter_history = ('    history --delete $fucked_up_command\n'
+                             '    history --merge ^ /dev/null\n')
+        else:
+            alter_history = ''
         # It is VERY important to have the variables declared WITHIN the alias
         return ('function {0} -d "Correct your previous console command"\n'
                 '  set -l fucked_up_command $history[1]\n'
                 '  env TF_ALIAS={0} PYTHONIOENCODING=utf-8'
                 ' thefuck $fucked_up_command | read -l unfucked_command\n'
                 '  if [ "$unfucked_command" != "" ]\n'
-                '    eval $unfucked_command\n'
-                '    history --delete $fucked_up_command\n'
-                '    history --merge ^ /dev/null\n'
+                '    eval $unfucked_command\n{1}'
                 '  end\n'
-                'end').format(fuck)
+                'end').format(fuck, alter_history)
 
     @memoize
     @cache('.config/fish/config.fish', '.config/fish/functions')
@@ -42,10 +50,6 @@ class Fish(Generic):
         else:
             return command_script
 
-    def from_shell(self, command_script):
-        """Prepares command before running in app."""
-        return self._expand_aliases(command_script)
-
     def _get_history_file_name(self):
         return os.path.expanduser('~/.config/fish/fish_history')
 
@@ -64,3 +68,20 @@ class Fish(Generic):
     def how_to_configure(self):
         return (r"eval (thefuck --alias | tr '\n' ';')",
                 '~/.config/fish/config.fish')
+
+    def put_to_history(self, command):
+        try:
+            return self._put_to_history(command)
+        except IOError:
+            logs.exception("Can't update history", sys.exc_info())
+
+    def _put_to_history(self, command_script):
+        """Puts command script to shell history."""
+        history_file_name = self._get_history_file_name()
+        if os.path.isfile(history_file_name):
+            with open(history_file_name, 'a') as history:
+                entry = self._get_history_line(command_script)
+                if six.PY2:
+                    history.write(entry.encode('utf-8'))
+                else:
+                    history.write(entry)

thefuck/shells/generic.py

@@ -81,3 +81,11 @@ class Generic(object):
 
     def _script_from_history(self, line):
         return line
+
+    def put_to_history(self, command):
+        """Adds fixed command to shell history.
+
+        In most of shells we change history on shell-level, but not
+        all shells support it (Fish).
+
+        """

thefuck/shells/powershell.py

@@ -0,0 +1,18 @@
+from .generic import Generic
+
+
+class Powershell(Generic):
+    def app_alias(self, fuck):
+        return 'function ' + fuck + ' { \n' \
+               '    $fuck = $(thefuck (Get-History -Count 1).CommandLine);\n' \
+               '    if (-not [string]::IsNullOrWhiteSpace($fuck)) {\n' \
+               '        if ($fuck.StartsWith("echo")) { $fuck = $fuck.Substring(5); }\n' \
+               '        else { iex "$fuck"; }\n' \
+               '    }\n' \
+               '}\n'
+
+    def and_(self, *commands):
+        return u' -and '.join('({0})'.format(c) for c in commands)
+
+    def how_to_configure(self):
+        return 'iex "thefuck --alias"', '$profile'

thefuck/specific/npm.py

@@ -0,0 +1,21 @@
+import re
+from subprocess import Popen, PIPE
+from thefuck.utils import memoize, eager, which
+
+npm_available = bool(which('npm'))
+
+
+@memoize
+@eager
+def get_scripts():
+    """Get custom npm scripts."""
+    proc = Popen(['npm', 'run-script'], stdout=PIPE)
+    should_yeild = False
+    for line in proc.stdout.readlines():
+        line = line.decode()
+        if 'available via `npm run-script`:' in line:
+            should_yeild = True
+            continue
+
+        if should_yeild and re.match(r'^  [^ ]+', line):
+            yield line.strip().split(' ')[0]

thefuck/system/win32.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import msvcrt
 import win_unicode_console
@@ -16,10 +17,11 @@ def get_key():
         ch = msvcrt.getch()  # second call returns the actual key code
 
     if ch == b'\x03':
-        raise const.KEY_CTRL_C
+        return const.KEY_CTRL_C
     if ch == b'H':
         return const.KEY_UP
     if ch == b'P':
         return const.KEY_DOWN
 
-    return ch.decode(sys.stdout.encoding)
+    encoding = sys.stdout.encoding or os.environ.get('PYTHONIOENCODING', 'utf-8')
+    return ch.decode(encoding)

thefuck/types.py

@@ -34,7 +34,7 @@ class Command(object):
                 self._script_parts = shell.split_command(self.script)
             except Exception:
                 logs.debug(u"Can't split command script {} because:\n {}".format(
-                        self, sys.exc_info()))
+                    self, sys.exc_info()))
                 self._script_parts = None
         return self._script_parts
 
@@ -47,7 +47,7 @@ class Command(object):
 
     def __repr__(self):
         return u'Command(script={}, stdout={}, stderr={})'.format(
-                self.script, self.stdout, self.stderr)
+            self.script, self.stdout, self.stderr)
 
     def update(self, **kwargs):
         """Returns new command with replaced fields.
@@ -61,7 +61,7 @@ class Command(object):
         return Command(**kwargs)
 
     @staticmethod
-    def _wait_output(popen):
+    def _wait_output(popen, is_slow):
         """Returns `True` if we can get output of the command in the
         `settings.wait_command` time.
 
@@ -73,7 +73,8 @@ class Command(object):
         """
         proc = Process(popen.pid)
         try:
-            proc.wait(settings.wait_command)
+            proc.wait(settings.wait_slow_command if is_slow
+                      else settings.wait_command)
             return True
         except TimeoutExpired:
             for child in proc.children(recursive=True):
@@ -113,9 +114,12 @@ class Command(object):
         env = dict(os.environ)
         env.update(settings.env)
 
-        with logs.debug_time(u'Call: {}; with env: {};'.format(script, env)):
-            result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env)
-            if cls._wait_output(result):
+        is_slow = script.split(' ')[0] in settings.slow_commands
+        with logs.debug_time(u'Call: {}; with env: {}; is slow: '.format(
+                script, env, is_slow)):
+            result = Popen(script, shell=True, stdin=PIPE,
+                           stdout=PIPE, stderr=PIPE, env=env)
+            if cls._wait_output(result, is_slow):
                 stdout = result.stdout.read().decode('utf-8')
                 stderr = result.stderr.read().decode('utf-8')
 
@@ -168,9 +172,9 @@ class Rule(object):
         return 'Rule(name={}, match={}, get_new_command={}, ' \
                'enabled_by_default={}, side_effect={}, ' \
                'priority={}, requires_output)'.format(
-                self.name, self.match, self.get_new_command,
-                self.enabled_by_default, self.side_effect,
-                self.priority, self.requires_output)
+            self.name, self.match, self.get_new_command,
+            self.enabled_by_default, self.side_effect,
+            self.priority, self.requires_output)
 
     @classmethod
     def from_path(cls, path):
@@ -270,7 +274,7 @@ class CorrectedCommand(object):
 
     def __repr__(self):
         return u'CorrectedCommand(script={}, side_effect={}, priority={})'.format(
-                self.script, self.side_effect, self.priority)
+            self.script, self.side_effect, self.priority)
 
     def run(self, old_cmd):
         """Runs command from rule for passed command.
@@ -280,6 +284,8 @@ class CorrectedCommand(object):
         """
         if self.side_effect:
             compatibility_call(self.side_effect, old_cmd, self.script)
+        if settings.alter_history:
+            shell.put_to_history(self.script)
         # This depends on correct setting of PYTHONIOENCODING by the alias:
         logs.debug(u'PYTHONIOENCODING: {}'.format(
             os.environ.get('PYTHONIOENCODING', '!!not-set!!')))

thefuck/ui.py

@@ -16,7 +16,7 @@ def read_actions():
             yield const.ACTION_PREVIOUS
         elif key in (const.KEY_DOWN, 'j'):
             yield const.ACTION_NEXT
-        elif key == const.KEY_CTRL_C:
+        elif key in (const.KEY_CTRL_C, 'q'):
             yield const.ACTION_ABORT
         elif key in ('\n', '\r'):
             yield const.ACTION_SELECT

thefuck/utils.py

@@ -10,7 +10,10 @@ from decorator import decorator
 from difflib import get_close_matches
 from functools import wraps
 from inspect import getargspec
-from pathlib import Path
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
 from warnings import warn
 
 DEVNULL = open(os.devnull, 'w')
@@ -110,7 +113,7 @@ def get_all_executables():
     tf_entry_points = get_installation_info().get_entry_map()\
                                              .get('console_scripts', {})\
                                              .keys()
-    bins = [exe.name
+    bins = [exe.name.decode('utf8') if six.PY2 else exe.name
             for path in os.environ.get('PATH', '').split(':')
             for exe in _safe(lambda: list(Path(path).iterdir()), [])
             if not _safe(exe.is_dir, True)