Bump to 2.9.1

Some README fixes

README.md

@@ -99,7 +99,7 @@ Reading package lists... Done
 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 -
+wget -O - https://raw.githubusercontent.com/nvbn/thefuck/master/install.sh | sh - && $0
 ```
 
 ## Manual installation
@@ -169,7 +169,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_stash` – stashes you local modifications before rebasing or switching branch;
 * `go_run` – appends `.go` extension when compiling/running Go programs
 * `grep_recursive` – adds `-r` when you trying to `grep` directory;
-* `gulp_not_task` – fixes misspelled gulp tasks;
+* `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`;
 * `history` – tries to replace command with most similar command from history;
@@ -181,13 +181,15 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `man_no_space` – fixes man commands without spaces, for example `mandiff`;
 * `mercurial` – fixes wrong `hg` commands;
 * `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`;
 * `no_command` – fixes wrong console commands, for example `vom/vim`;
 * `no_such_file` – creates missing directories with `mv` and `cp` commands;
 * `open` – prepends `http` to address passed to `open`;
 * `pip_unknown_command` – fixes wrong `pip` commands, for example `pip instatl/pip install`;
 * `python_command` – prepends `python` when you trying to run not executable/without `./` python script;
 * `python_execute` – appends missing `.py` when executing Python files;
-* `quotation_marks` – fixes uneven usage of `'` and `"` when containing args'
+* `quotation_marks` – fixes uneven usage of `'` and `"` when containing args';
 * `rm_dir` – adds `-rf` when you trying to remove directory;
 * `sed_unterminated_s` – adds missing '/' to `sed`'s `s` commands;
 * `sl_ls` – changes `sl` to `ls`;
@@ -199,18 +201,19 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `tsuru_login` – runs `tsuru login` if not authenticated or session expired;
 * `tsuru_not_command` – fixes wrong `tsuru` commands like `tsuru shell`;
 * `tmux` – fixes `tmux` commands;
-* `unknown_command` – fixes hadoop hdfs-style "unknown command" for example adds missing '-' to the command on `hdfs dfs ls`;
+* `unknown_command` – fixes hadoop hdfs-style "unknown command", for example adds missing '-' to the command on `hdfs dfs ls`;
 * `vagrant_up` – starts up the vagrant instance;
 * `whois` – fixes `whois` command.
 
 Enabled by default only on specific platforms:
 
-* `apt_get` – installs app from apt if it not installed;
+* `apt_get` – installs app from apt if it not installed (requires `python-commandnotfound` / `python3-commandnotfound`);
+* `apt_get_search` – changes trying to search using `apt-get` with searching using `apt-cache`;
 * `brew_install` – fixes formula name for `brew install`;
 * `brew_unknown_command` – fixes wrong brew commands, for example `brew docto/brew doctor`;
 * `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
-* `pacman` – installs app with `pacman` if it is not installed (uses `yaourt` if available).
-* `pacman_not_found` – fix package name with `pacman` or `yaourt`;
+* `pacman` – installs app with `pacman` if it is not installed (uses `yaourt` if available);
+* `pacman_not_found` – fixes package name with `pacman` or `yaourt`.
 
 Bundled, but not enabled by default:
 

install.sh

@@ -1,11 +1,29 @@
 #!/bin/sh
 
+should_add_alias () {
+    [ -f $1 ] && ! grep -q thefuck $1
+}
+
 # Install os dependencies:
 if [ -f $(which apt-get) ]; then
-    sudo apt-get install python-pip
+    # Debian/ubuntu:
+    sudo apt-get update -yy
+    sudo apt-get install -yy python-pip python-dev command-not-found
+
+    if [[ -n $(apt-cache search python-commandnotfound) ]]; then
+        # In case of different python versions:
+        sudo apt-get install -yy python-commandnotfound
+    fi
 else
     if [ -f $(which brew) ]; then
+        # OS X:
+        brew update
         brew install python
+    else
+        # Genreic way:
+        wget https://bootstrap.pypa.io/get-pip.py
+        sudo python get-pip.py
+        rm get-pip.py
     fi
 fi
 
@@ -14,22 +32,22 @@ sudo pip install -U pip setuptools
 sudo pip install -U thefuck
 
 # Setup aliases:
-if [ -f ~/.bashrc ]; then
+if should_add_alias ~/.bashrc; then
     echo 'eval $(thefuck --alias)' >> ~/.bashrc
 fi
 
-if [ -f ~/.bash_profile ]; then
+if should_add_alias ~/.bash_profile; then
     echo 'eval $(thefuck --alias)' >> ~/.bash_profile
 fi
 
-if [ -f ~/.zshrc ]; then
+if should_add_alias ~/.zshrc; then
     echo 'eval $(thefuck --alias)' >> ~/.zshrc
 fi
 
-if [ -f ~/.config/fish/config.fish ]; then
+if should_add_alias ~/.config/fish/config.fish; then
     thefuck --alias >> ~/.config/fish/config.fish
 fi
 
-if [ -f ~/.tcshrc ]; then
+if should_add_alias ~/.tcshrc; then
     echo 'eval `thefuck --alias`' >> ~/.tcshrc
 fi

requirements.txt

@@ -5,3 +5,4 @@ wheel
 setuptools>=17.1
 pexpect
 pypandoc
+pytest-benchmark

setup.py

@@ -20,9 +20,9 @@ elif (3, 0) < version < (3, 3):
           ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '2.8'
+VERSION = '2.9.1'
 
-install_requires = ['psutil', 'colorama', 'six']
+install_requires = ['psutil', 'colorama', 'six', 'decorator']
 extras_require = {':python_version<"3.4"': ['pathlib']}
 
 setup(name='thefuck',

tests/conftest.py

@@ -1,6 +1,17 @@
 import pytest
+from mock import Mock
 
 
 @pytest.fixture
 def no_memoize(monkeypatch):
     monkeypatch.setattr('thefuck.utils.memoize.disabled', True)
+
+
+@pytest.fixture
+def settings():
+    return Mock(debug=False, no_colors=True)
+
+
+@pytest.fixture(autouse=True)
+def no_cache(monkeypatch):
+    monkeypatch.setattr('thefuck.utils.cache.disabled', True)

tests/functional/plots.py

@@ -1,4 +1,3 @@
-from time import sleep
 from pexpect import TIMEOUT
 
 

tests/functional/test_bash.py

@@ -24,7 +24,7 @@ def proc(request):
     tag, dockerfile = request.param
     proc = spawn(request, tag, dockerfile, u'bash')
     proc.sendline(u"export PS1='$ '")
-    proc.sendline(u'eval $(thefuck-alias)')
+    proc.sendline(u'eval $(thefuck --alias)')
     proc.sendline(u'echo > $HISTFILE')
     return proc
 

tests/functional/test_fish.py

@@ -24,7 +24,7 @@ RUN apt-get install -yy fish
 def proc(request):
     tag, dockerfile = request.param
     proc = spawn(request, tag, dockerfile, u'fish')
-    proc.sendline(u'thefuck-alias > ~/.config/fish/config.fish')
+    proc.sendline(u'thefuck --alias > ~/.config/fish/config.fish')
     proc.sendline(u'fish')
     return proc
 

tests/functional/test_install.py

@@ -0,0 +1,25 @@
+import pytest
+from pexpect import TIMEOUT
+from tests.functional.utils import spawn, functional, bare
+
+envs = ((u'bash', 'ubuntu-bash', u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy bash
+'''), (u'bash', 'generic-bash', u'''
+FROM fedora:latest
+RUN dnf install -yy python-devel sudo which gcc
+'''))
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason="Can't be tested in bare run")
+@pytest.mark.parametrize('shell, tag, dockerfile', envs)
+def test_installation(request, shell, tag, dockerfile):
+    proc = spawn(request, tag, dockerfile, shell, install=False)
+    proc.sendline(u'cat /src/install.sh | sh - && $0')
+    proc.sendline(u'thefuck --version')
+    assert proc.expect([TIMEOUT, u'The Fuck'], timeout=600)
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'No fucks given'])

tests/functional/test_performance.py

@@ -0,0 +1,56 @@
+from pexpect import TIMEOUT
+import pytest
+import time
+from tests.functional.utils import spawn, functional, bare
+
+dockerfile = u'''
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -yy python3 python3-pip python3-dev git
+RUN pip3 install -U setuptools
+RUN ln -s /usr/bin/pip3 /usr/bin/pip
+RUN adduser --disabled-password --gecos '' test
+ENV SEED "{seed}"
+COPY thefuck /src
+WORKDIR /src
+RUN pip install .
+USER test
+RUN echo 'eval $(thefuck --alias)' > /home/test/.bashrc
+RUN echo > /home/test/.bash_history
+RUN git config --global user.email "you@example.com"
+RUN git config --global user.name "Your Name"
+'''.format(seed=time.time())
+
+
+@pytest.fixture
+def proc(request):
+    return spawn(request, 'ubuntu-python3-bash-performance',
+                 dockerfile, u'bash', install=False, copy_src=True)
+
+
+def plot(proc):
+    proc.sendline(u'cd /home/test/')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'No fucks given'])
+    proc.sendline(u'git init')
+    proc.sendline(u'git add .')
+    proc.sendline(u'git commit -a -m init')
+    proc.sendline(u'git brnch')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'git branch'])
+    proc.send('\n')
+    assert proc.expect([TIMEOUT, u'master'])
+    proc.sendline(u'echo test')
+    proc.sendline(u'echo tst')
+    proc.sendline(u'fuck')
+    assert proc.expect([TIMEOUT, u'echo test'])
+    proc.send('\n')
+    assert proc.expect([TIMEOUT, u'test'])
+
+
+@functional
+@pytest.mark.skipif(
+    bool(bare), reason='Would lie on a bare run')
+@pytest.mark.benchmark(min_rounds=10)
+def test_performance(proc, benchmark):
+    assert benchmark(plot, proc) is None

tests/functional/test_tcsh.py

@@ -25,7 +25,7 @@ def proc(request):
     tag, dockerfile = request.param
     proc = spawn(request, tag, dockerfile, u'tcsh')
     proc.sendline(u'tcsh')
-    proc.sendline(u'eval `thefuck-alias`')
+    proc.sendline(u'eval `thefuck --alias`')
     return proc
 
 

tests/functional/test_zsh.py

@@ -24,7 +24,7 @@ RUN apt-get install -yy zsh
 def proc(request):
     tag, dockerfile = request.param
     proc = spawn(request, tag, dockerfile, u'zsh')
-    proc.sendline(u'eval $(thefuck-alias)')
+    proc.sendline(u'eval $(thefuck --alias)')
     proc.sendline(u'export HISTFILE=~/.zsh_history')
     proc.sendline(u'echo > $HISTFILE')
     proc.sendline(u'export SAVEHIST=100')

tests/functional/utils.py

@@ -1,3 +1,4 @@
+import pytest
 import os
 import subprocess
 import shutil
@@ -5,39 +6,50 @@ from tempfile import mkdtemp
 from pathlib import Path
 import sys
 import pexpect
-import pytest
+from tests.utils import root
+
 
-root = str(Path(__file__).parent.parent.parent.resolve())
 bare = os.environ.get('BARE')
 enabled = os.environ.get('FUNCTIONAL')
 
 
-def build_container(tag, dockerfile):
+def build_container(tag, dockerfile, copy_src=False):
     tmpdir = mkdtemp()
     try:
-        with Path(tmpdir).joinpath('Dockerfile').open('w') as file:
+        if copy_src:
+            subprocess.call(['cp', '-a', str(root), tmpdir])
+        dockerfile_path = Path(tmpdir).joinpath('Dockerfile')
+        with dockerfile_path.open('w') as file:
             file.write(dockerfile)
-        if subprocess.call(['docker', 'build', '--tag={}'.format(tag), tmpdir],
-                           cwd=root) != 0:
+        if subprocess.call(['docker', 'build', '--tag={}'.format(tag), tmpdir]) != 0:
             raise Exception("Can't build a container")
     finally:
         shutil.rmtree(tmpdir)
 
 
-def spawn(request, tag, dockerfile, cmd):
+def spawn(request, tag, dockerfile, cmd, install=True, copy_src=False):
     if bare:
         proc = pexpect.spawnu(cmd)
     else:
         tag = 'thefuck/{}'.format(tag)
-        build_container(tag, dockerfile)
-        proc = pexpect.spawnu('docker run --volume {}:/src --tty=true '
+        build_container(tag, dockerfile, copy_src)
+        proc = pexpect.spawnu('docker run --rm=true --volume {}:/src --tty=true '
                               '--interactive=true {} {}'.format(root, tag, cmd))
-        proc.sendline('pip install /src')
+        if install:
+            proc.sendline('pip install /src')
+
     proc.sendline('cd /')
 
     proc.logfile = sys.stdout
 
-    request.addfinalizer(proc.terminate)
+    def _finalizer():
+        proc.terminate()
+        if not bare:
+            container_id = subprocess.check_output(['docker', 'ps']) \
+                                     .decode('utf-8').split('\n')[-2].split()[0]
+            subprocess.check_call(['docker', 'kill', container_id])
+
+    request.addfinalizer(_finalizer)
     return proc
 
 

tests/rules/test_apt_get_search.py

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

tests/rules/test_brew_install.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.brew_install import match, get_new_command
-from thefuck.rules.brew_install import brew_formulas
+from thefuck.rules.brew_install import _get_formulas
 from tests.utils import Command
 
 
@@ -20,9 +20,7 @@ def brew_already_installed():
 
 
 def _is_not_okay_to_test():
-    if 'elasticsearch' not in brew_formulas:
-        return True
-    return False
+    return 'elasticsearch' not in _get_formulas()
 
 
 @pytest.mark.skipif(_is_not_okay_to_test(),

tests/rules/test_brew_unknown_command.py

@@ -1,6 +1,6 @@
 import pytest
 from thefuck.rules.brew_unknown_command import match, get_new_command
-from thefuck.rules.brew_unknown_command import brew_commands
+from thefuck.rules.brew_unknown_command import _brew_commands
 from tests.utils import Command
 
 
@@ -16,7 +16,7 @@ def brew_unknown_cmd2():
 
 def test_match(brew_unknown_cmd):
     assert match(Command('brew inst', stderr=brew_unknown_cmd), None)
-    for command in brew_commands:
+    for command in _brew_commands():
         assert not match(Command('brew ' + command), None)
 
 
@@ -24,5 +24,6 @@ def test_get_new_command(brew_unknown_cmd, brew_unknown_cmd2):
     assert get_new_command(Command('brew inst', stderr=brew_unknown_cmd),
                            None) == ['brew list', 'brew install', 'brew uninstall']
 
-    assert get_new_command(Command('brew instaa', stderr=brew_unknown_cmd2),
-                           None) == ['brew install', 'brew uninstall', 'brew list']
+    cmds = get_new_command(Command('brew instaa', stderr=brew_unknown_cmd2), None)
+    assert 'brew install' in cmds
+    assert 'brew uninstall' in cmds

tests/rules/test_lein_not_task.py

@@ -1,6 +1,6 @@
 import pytest
-from mock import Mock
 from thefuck.rules.lein_not_task import match, get_new_command
+from tests.utils import Command
 
 
 @pytest.fixture
@@ -14,10 +14,10 @@ Did you mean this?
 
 
 def test_match(is_not_task):
-    assert match(Mock(script='lein rpl', stderr=is_not_task), None)
-    assert not match(Mock(script='ls', stderr=is_not_task), None)
+    assert match(Command(script='lein rpl', stderr=is_not_task), None)
+    assert not match(Command(script='ls', stderr=is_not_task), None)
 
 
 def test_get_new_command(is_not_task):
-    assert get_new_command(Mock(script='lein rpl --help', stderr=is_not_task),
+    assert get_new_command(Command(script='lein rpl --help', stderr=is_not_task),
                            None) == ['lein repl --help', 'lein jar --help']

tests/rules/test_ls_lah.py

@@ -1,16 +1,16 @@
-from mock import patch, Mock
 from thefuck.rules.ls_lah import match, get_new_command
+from tests.utils import Command
 
 
 def test_match():
-    assert match(Mock(script='ls'), None)
-    assert match(Mock(script='ls file.py'), None)
-    assert match(Mock(script='ls /opt'), None)
-    assert not match(Mock(script='ls -lah /opt'), None)
-    assert not match(Mock(script='pacman -S binutils'), None)
-    assert not match(Mock(script='lsof'), None)
+    assert match(Command(script='ls'), None)
+    assert match(Command(script='ls file.py'), None)
+    assert match(Command(script='ls /opt'), None)
+    assert not match(Command(script='ls -lah /opt'), None)
+    assert not match(Command(script='pacman -S binutils'), None)
+    assert not match(Command(script='lsof'), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Mock(script='ls file.py'), None) == 'ls -lah file.py'
-    assert get_new_command(Mock(script='ls'), None) == 'ls -lah'
+    assert get_new_command(Command(script='ls file.py'), None) == 'ls -lah file.py'
+    assert get_new_command(Command(script='ls'), None) == 'ls -lah'

tests/rules/test_mvn_no_command.py

@@ -0,0 +1,40 @@
+import pytest
+from thefuck.rules.mvn_no_command import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn clean', stdout="""
+[INFO] Scanning for projects...[INFO]                                                                         
+[INFO] ------------------------------------------------------------------------
+[INFO] Building test 0.2
+[INFO] ------------------------------------------------------------------------
+[INFO] 
+[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ test ---
+[INFO] Deleting /home/mlk/code/test/target
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 0.477s
+[INFO] Finished at: Wed Aug 26 13:05:47 BST 2015
+[INFO] Final Memory: 6M/240M
+[INFO] ------------------------------------------------------------------------
+"""),
+    Command(script='mvn --help'),
+    Command(script='mvn -v')
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(script='mvn', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean package', 'mvn clean install']),
+    (Command(script='mvn -N', stdout='[ERROR] No goals have been specified for this build. You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn -N clean package', 'mvn -N clean install'])])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_mvn_unknown_lifecycle_phase.py

@@ -0,0 +1,40 @@
+import pytest
+from thefuck.rules.mvn_unknown_lifecycle_phase import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn cle', stdout='[ERROR] Unknown lifecycle phase "cle". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]')])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='mvn clean', stdout="""
+[INFO] Scanning for projects...[INFO]                                                                         
+[INFO] ------------------------------------------------------------------------
+[INFO] Building test 0.2
+[INFO] ------------------------------------------------------------------------
+[INFO] 
+[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ test ---
+[INFO] Deleting /home/mlk/code/test/target
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 0.477s
+[INFO] Finished at: Wed Aug 26 13:05:47 BST 2015
+[INFO] Final Memory: 6M/240M
+[INFO] ------------------------------------------------------------------------
+"""),
+    Command(script='mvn --help'),
+    Command(script='mvn -v')
+])
+def test_not_match(command):
+    assert not match(command, None)
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command(script='mvn cle', stdout='[ERROR] Unknown lifecycle phase "cle". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean', 'mvn compile']),
+    (Command(script='mvn claen package', stdout='[ERROR] Unknown lifecycle phase "claen". You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: validate, initialize, generate-sources, process-sources, generate-resources, process-resources, compile, process-classes, generate-test-sources, process-test-sources, generate-test-resources, process-test-resources, test-compile, process-test-classes, test, prepare-package, package, pre-integration-test, integration-test, post-integration-test, verify, install, deploy, pre-clean, clean, post-clean, pre-site, site, post-site, site-deploy. -> [Help 1]'), ['mvn clean package'])])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command, None) == new_command
+

tests/rules/test_pacman.py

@@ -29,7 +29,7 @@ def test_match(command):
 @pytest.mark.parametrize('command, return_value', [
     (Command(script='vim', stderr='vim: command not found'), PKGFILE_OUTPUT_VIM),
     (Command(script='sudo vim', stderr='sudo: vim: command not found'), PKGFILE_OUTPUT_VIM)])
-@patch('thefuck.archlinux.subprocess')
+@patch('thefuck.specific.archlinux.subprocess')
 @patch.multiple(pacman, create=True, pacman=pacman_cmd)
 def test_match_mocked(subp_mock, command, return_value):
     subp_mock.check_output.return_value = return_value
@@ -75,7 +75,7 @@ def test_get_new_command(command, new_command, mocker):
     (Command('convert'), ['{} -S extra/imagemagick && convert'.format(pacman_cmd)], PKGFILE_OUTPUT_CONVERT),
     (Command('sudo'), ['{} -S core/sudo && sudo'.format(pacman_cmd)], PKGFILE_OUTPUT_SUDO),
     (Command('sudo convert'), ['{} -S extra/imagemagick && sudo convert'.format(pacman_cmd)], PKGFILE_OUTPUT_CONVERT)])
-@patch('thefuck.archlinux.subprocess')
+@patch('thefuck.specific.archlinux.subprocess')
 @patch.multiple(pacman, create=True, pacman=pacman_cmd)
 def test_get_new_command_mocked(subp_mock, command, new_command, return_value):
     subp_mock.check_output.return_value = return_value

tests/rules/test_pacman_not_found.py

@@ -22,7 +22,7 @@ def test_match(command):
     Command(script='yaourt -S llc', stderr='error: target not found: llc'),
     Command(script='pacman llc', stderr='error: target not found: llc'),
     Command(script='sudo pacman llc', stderr='error: target not found: llc')])
-@patch('thefuck.archlinux.subprocess')
+@patch('thefuck.specific.archlinux.subprocess')
 def test_match_mocked(subp_mock, command):
     subp_mock.check_output.return_value = PKGFILE_OUTPUT_LLC
     assert match(command, None)
@@ -42,7 +42,7 @@ def test_get_new_command(command, fixed):
     (Command(script='yaourt -S llc', stderr='error: target not found: llc'), ['yaourt -S extra/llvm', 'yaourt -S extra/llvm35']),
     (Command(script='pacman -S llc', stderr='error: target not found: llc'), ['pacman -S extra/llvm', 'pacman -S extra/llvm35']),
     (Command(script='sudo pacman -S llc', stderr='error: target not found: llc'), ['sudo pacman -S extra/llvm', 'sudo pacman -S extra/llvm35'])])
-@patch('thefuck.archlinux.subprocess')
+@patch('thefuck.specific.archlinux.subprocess')
 def test_get_new_command_mocked(subp_mock, command, fixed):
     subp_mock.check_output.return_value = PKGFILE_OUTPUT_LLC
     assert get_new_command(command, None) == fixed

tests/specific/test_git.py

@@ -0,0 +1,29 @@
+import pytest
+from thefuck.specific.git import git_support
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('called, command, stderr', [
+    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
+    ('git com file', 'git commit --verbose file',
+     "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
+def test_git_support(called, command, stderr):
+    @git_support
+    def fn(command, settings): return command.script
+
+    assert fn(Command(script=called, stderr=stderr), None) == command
+
+
+@pytest.mark.parametrize('command, is_git', [
+    ('git pull', True),
+    ('hub pull', True),
+    ('git push --set-upstream origin foo', True),
+    ('hub push --set-upstream origin foo', True),
+    ('ls', False),
+    ('cat git', False),
+    ('cat hub', False)])
+def test_git_support_match(command, is_git):
+    @git_support
+    def fn(command, settings): return True
+
+    assert fn(Command(script=command), None) == is_git

tests/specific/test_sudo.py

@@ -0,0 +1,20 @@
+import pytest
+from mock import Mock
+from thefuck.specific.sudo import sudo_support
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('return_value, command, called, result', [
+    ('ls -lah', 'sudo ls', 'ls', 'sudo ls -lah'),
+    ('ls -lah', 'ls', 'ls', 'ls -lah'),
+    (['ls -lah'], 'sudo ls', 'ls', ['sudo ls -lah']),
+    (True, 'sudo ls', 'ls', True),
+    (True, 'ls', 'ls', True),
+    (False, 'sudo ls', 'ls', False),
+    (False, 'ls', 'ls', False)])
+def test_sudo_support(return_value, command, called, result):
+    def fn(command, settings):
+        assert command == Command(called)
+        return return_value
+
+    assert sudo_support(fn)(Command(command), None) == result

tests/test_corrector.py

@@ -3,7 +3,7 @@ from pathlib import PosixPath, Path
 from mock import Mock
 from thefuck import corrector, conf, types
 from tests.utils import Rule, Command, CorrectedCommand
-from thefuck.corrector import make_corrected_commands, get_corrected_commands, remove_duplicates
+from thefuck.corrector import make_corrected_commands, get_corrected_commands
 
 
 def test_load_rule(mocker):
@@ -41,49 +41,37 @@ class TestGetRules(object):
             rules)
 
 
-class TestGetMatchedRules(object):
-    def test_no_match(self):
-        assert list(corrector.get_matched_rules(
-            Command('ls'), [Rule('', lambda *_: False)],
-            Mock(no_colors=True))) == []
+class TestIsRuleMatch(object):
+    def test_no_match(self, settings):
+        assert not corrector.is_rule_match(
+            Command('ls'), Rule('', lambda *_: False), settings)
 
-    def test_match(self):
+    def test_match(self, settings):
         rule = Rule('', lambda x, _: x.script == 'cd ..')
-        assert list(corrector.get_matched_rules(
-            Command('cd ..'), [rule], Mock(no_colors=True))) == [rule]
+        assert corrector.is_rule_match(Command('cd ..'), rule, settings)
 
-    def test_when_rule_failed(self, capsys):
-        all(corrector.get_matched_rules(
-            Command('ls'), [Rule('test', Mock(side_effect=OSError('Denied')),
-                                 requires_output=False)],
-            Mock(no_colors=True, debug=False)))
+    def test_when_rule_failed(self, capsys, settings):
+        rule = Rule('test', Mock(side_effect=OSError('Denied')),
+                    requires_output=False)
+        assert not corrector.is_rule_match(
+            Command('ls'), rule, settings)
         assert capsys.readouterr()[1].split('\n')[0] == '[WARN] Rule test:'
 
 
-class TestGetCorrectedCommands(object):
+class TestMakeCorrectedCommands(object):
     def test_with_rule_returns_list(self):
         rule = Rule(get_new_command=lambda x, _: [x.script + '!', x.script + '@'],
                     priority=100)
-        assert list(make_corrected_commands(Command(script='test'), [rule], None)) \
+        assert list(make_corrected_commands(Command(script='test'), rule, None)) \
                == [CorrectedCommand(script='test!', priority=100),
                    CorrectedCommand(script='test@', priority=200)]
 
     def test_with_rule_returns_command(self):
         rule = Rule(get_new_command=lambda x, _: x.script + '!',
                     priority=100)
-        assert list(make_corrected_commands(Command(script='test'), [rule], None)) \
+        assert list(make_corrected_commands(Command(script='test'), rule, None)) \
                == [CorrectedCommand(script='test!', priority=100)]
 
-
-def test_remove_duplicates():
-    side_effect = lambda *_: None
-    assert set(remove_duplicates([CorrectedCommand('ls', priority=100),
-                                  CorrectedCommand('ls', priority=200),
-                                  CorrectedCommand('ls', side_effect, 300)])) \
-           == {CorrectedCommand('ls', priority=100),
-               CorrectedCommand('ls', side_effect, 300)}
-
-
 def test_get_corrected_commands(mocker):
     command = Command('test', 'test', 'test')
     rules = [Rule(match=lambda *_: False),
@@ -94,4 +82,4 @@ def test_get_corrected_commands(mocker):
                   priority=60)]
     mocker.patch('thefuck.corrector.get_rules', return_value=rules)
     assert [cmd.script for cmd in get_corrected_commands(command, None, Mock(debug=False))] \
-           == ['test@', 'test!', 'test;']
+           == ['test!', 'test@', 'test;']

tests/test_readme.py

@@ -1,12 +1,11 @@
-from pathlib import Path
+from tests.utils import root
 
 
 def test_readme():
-    project_root = Path(__file__).parent.parent
-    with project_root.joinpath('README.md').open() as f:
+    with root.joinpath('README.md').open() as f:
         readme = f.read()
 
-        bundled = project_root \
+        bundled = root \
             .joinpath('thefuck') \
             .joinpath('rules') \
             .glob('*.py')

tests/test_types.py

@@ -1,5 +1,6 @@
-from thefuck.types import RulesNamesList, Settings
-from tests.utils import Rule
+from thefuck.types import RulesNamesList, Settings, \
+    SortedCorrectedCommandsSequence
+from tests.utils import Rule, CorrectedCommand
 
 
 def test_rules_names_list():
@@ -15,3 +16,47 @@ def test_update_settings():
     assert new_settings.key == 'val'
     assert new_settings.unset == 'unset-value'
     assert settings.key == 'val'
+
+
+class TestSortedCorrectedCommandsSequence(object):
+    def test_realises_generator_only_on_demand(self, settings):
+        should_realise = False
+
+        def gen():
+            yield CorrectedCommand('git commit')
+            yield CorrectedCommand('git branch', priority=200)
+            assert should_realise
+            yield CorrectedCommand('git checkout', priority=100)
+
+        commands = SortedCorrectedCommandsSequence(gen(), settings)
+        assert commands[0] == CorrectedCommand('git commit')
+        should_realise = True
+        assert commands[1] == CorrectedCommand('git checkout', priority=100)
+        assert commands[2] == CorrectedCommand('git branch', priority=200)
+
+    def test_remove_duplicates(self, settings):
+        side_effect = lambda *_: None
+        seq = SortedCorrectedCommandsSequence(
+            iter([CorrectedCommand('ls', priority=100),
+                  CorrectedCommand('ls', priority=200),
+                  CorrectedCommand('ls', side_effect, 300)]),
+            settings)
+        assert set(seq) == {CorrectedCommand('ls', priority=100),
+                            CorrectedCommand('ls', side_effect, 300)}
+
+    def test_with_blank(self, settings):
+        seq = SortedCorrectedCommandsSequence(iter([]), settings)
+        assert list(seq) == []
+
+
+class TestCorrectedCommand(object):
+
+    def test_equality(self):
+        assert CorrectedCommand('ls', None, 100) == \
+               CorrectedCommand('ls', None, 200)
+        assert CorrectedCommand('ls', None, 100) != \
+               CorrectedCommand('ls', lambda *_: _, 100)
+
+    def test_hashable(self):
+        assert {CorrectedCommand('ls', None, 100),
+                CorrectedCommand('ls', None, 200)} == {CorrectedCommand('ls')}

tests/test_ui.py

@@ -4,7 +4,7 @@ from mock import Mock
 import pytest
 from itertools import islice
 from thefuck import ui
-from thefuck.types import CorrectedCommand
+from thefuck.types import CorrectedCommand, SortedCorrectedCommandsSequence
 
 
 @pytest.fixture
@@ -58,14 +58,18 @@ def test_command_selector():
 
 class TestSelectCommand(object):
     @pytest.fixture
-    def commands_with_side_effect(self):
-        return [CorrectedCommand('ls', lambda *_: None, 100),
-                CorrectedCommand('cd', lambda *_: None, 100)]
+    def commands_with_side_effect(self, settings):
+        return SortedCorrectedCommandsSequence(
+            iter([CorrectedCommand('ls', lambda *_: None, 100),
+                  CorrectedCommand('cd', lambda *_: None, 100)]),
+            settings)
 
     @pytest.fixture
-    def commands(self):
-        return [CorrectedCommand('ls', None, 100),
-                CorrectedCommand('cd', None, 100)]
+    def commands(self, settings):
+        return SortedCorrectedCommandsSequence(
+            iter([CorrectedCommand('ls', None, 100),
+                  CorrectedCommand('cd', None, 100)]),
+            settings)
 
     def test_without_commands(self, capsys):
         assert ui.select_command([], Mock(debug=False, no_color=True)) is None
@@ -92,13 +96,6 @@ class TestSelectCommand(object):
                                       require_confirmation=True)) == commands[0]
         assert capsys.readouterr() == ('', u'\x1b[1K\rls [enter/↑/↓/ctrl+c]\n')
 
-    def test_with_confirmation_one_match(self, capsys, patch_getch, commands):
-        patch_getch(['\n'])
-        assert ui.select_command((commands[0],),
-                                 Mock(debug=False, no_color=True,
-                                      require_confirmation=True)) == commands[0]
-        assert capsys.readouterr() == ('', u'\x1b[1K\rls [enter/ctrl+c]\n')
-
     def test_with_confirmation_abort(self, capsys, patch_getch, commands):
         patch_getch([KeyboardInterrupt])
         assert ui.select_command(commands,

tests/test_utils.py

@@ -1,8 +1,9 @@
 import pytest
 from mock import Mock
-from thefuck.utils import git_support, sudo_support, wrap_settings,\
+import six
+from thefuck.utils import wrap_settings, \
     memoize, get_closest, get_all_executables, replace_argument, \
-    get_all_matched_commands
+    get_all_matched_commands, is_app, for_app, cache
 from thefuck.types import Settings
 from tests.utils import Command
 
@@ -16,43 +17,6 @@ def test_wrap_settings(override, old, new):
     assert wrap_settings(override)(fn)(None, Settings(old)) == new
 
 
-@pytest.mark.parametrize('return_value, command, called, result', [
-    ('ls -lah', 'sudo ls', 'ls', 'sudo ls -lah'),
-    ('ls -lah', 'ls', 'ls', 'ls -lah'),
-    (['ls -lah'], 'sudo ls', 'ls', ['sudo ls -lah']),
-    (True, 'sudo ls', 'ls', True),
-    (True, 'ls', 'ls', True),
-    (False, 'sudo ls', 'ls', False),
-    (False, 'ls', 'ls', False)])
-def test_sudo_support(return_value, command, called, result):
-    fn = Mock(return_value=return_value, __name__='')
-    assert sudo_support(fn)(Command(command), None) == result
-    fn.assert_called_once_with(Command(called), None)
-
-
-@pytest.mark.parametrize('called, command, stderr', [
-    ('git co', 'git checkout', "19:22:36.299340 git.c:282   trace: alias expansion: co => 'checkout'"),
-    ('git com file', 'git commit --verbose file', "19:23:25.470911 git.c:282   trace: alias expansion: com => 'commit' '--verbose'")])
-def test_git_support(called, command, stderr):
-    @git_support
-    def fn(command, settings): return command.script
-    assert fn(Command(script=called, stderr=stderr), None) == command
-
-
-@pytest.mark.parametrize('command, is_git', [
-    ('git pull', True),
-    ('hub pull', True),
-    ('git push --set-upstream origin foo', True),
-    ('hub push --set-upstream origin foo', True),
-    ('ls', False),
-    ('cat git', False),
-    ('cat hub', False)])
-def test_git_support_match(command, is_git):
-    @git_support
-    def fn(command, settings): return True
-    assert fn(Command(script=command), None) == is_git
-
-
 def test_memoize():
     fn = Mock(__name__='fn')
     memoized = memoize(fn)
@@ -71,7 +35,6 @@ def test_no_memoize():
 
 
 class TestGetClosest(object):
-
     def test_when_can_match(self):
         assert 'branch' == get_closest('brnch', ['branch', 'status'])
 
@@ -131,3 +94,89 @@ def test_replace_argument(args, result):
                             'service-status', 'service-unbind'])])
 def test_get_all_matched_commands(stderr, result):
     assert list(get_all_matched_commands(stderr)) == result
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, names, result', [
+    ('git diff', ['git', 'hub'], True),
+    ('hub diff', ['git', 'hub'], True),
+    ('hg diff', ['git', 'hub'], False)])
+def test_is_app(script, names, result):
+    assert is_app(Command(script), *names) == result
+
+
+@pytest.mark.usefixtures('no_memoize')
+@pytest.mark.parametrize('script, names, result', [
+    ('git diff', ['git', 'hub'], True),
+    ('hub diff', ['git', 'hub'], True),
+    ('hg diff', ['git', 'hub'], False)])
+def test_for_app(script, names, result):
+    @for_app(*names)
+    def match(command, settings):
+        return True
+
+    assert match(Command(script), None) == result
+
+
+class TestCache(object):
+    @pytest.fixture(autouse=True)
+    def enable_cache(self, monkeypatch):
+        monkeypatch.setattr('thefuck.utils.cache.disabled', False)
+
+    @pytest.fixture
+    def shelve(self, mocker):
+        value = {}
+
+        class _Shelve(object):
+            def __init__(self, path):
+                pass
+
+            def __setitem__(self, k, v):
+                value[k] = v
+
+            def __getitem__(self, k):
+                return value[k]
+
+            def get(self, k, v=None):
+                return value.get(k, v)
+
+            def close(self):
+                return
+
+        mocker.patch('thefuck.utils.shelve.open', new_callable=lambda: _Shelve)
+        return value
+
+    @pytest.fixture(autouse=True)
+    def mtime(self, mocker):
+        mocker.patch('thefuck.utils.os.path.getmtime', return_value=0)
+
+    @pytest.fixture
+    def fn(self):
+        @cache('~/.bashrc')
+        def fn():
+            return 'test'
+
+        return fn
+
+    @pytest.fixture
+    def key(self):
+        if six.PY3:
+            return 'tests.test_utils.<function TestCache.fn.<locals>.fn '
+        else:
+            return 'tests.test_utils.<function fn '
+
+    def test_with_blank_cache(self, shelve, fn, key):
+        assert shelve == {}
+        assert fn() == 'test'
+        assert shelve == {key: {'etag': '0', 'value': 'test'}}
+
+    def test_with_filled_cache(self, shelve, fn, key):
+        cache_value = {key: {'etag': '0', 'value': 'new-value'}}
+        shelve.update(cache_value)
+        assert fn() == 'new-value'
+        assert shelve == cache_value
+
+    def test_when_etag_changed(self, shelve, fn, key):
+        shelve.update({key: {'etag': '-1', 'value': 'old-value'}})
+        assert fn() == 'test'
+        assert shelve == {key: {'etag': '0', 'value': 'test'}}

tests/utils.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from thefuck import types
 from thefuck.conf import DEFAULT_PRIORITY
 
@@ -19,3 +20,6 @@ def Rule(name='', match=lambda *_: True,
 
 def CorrectedCommand(script='', side_effect=None, priority=DEFAULT_PRIORITY):
     return types.CorrectedCommand(script, side_effect, priority)
+
+
+root = Path(__file__).parent.parent.resolve()

thefuck/corrector.py

@@ -2,14 +2,14 @@ import sys
 from imp import load_source
 from pathlib import Path
 from . import conf, types, logs
-from .utils import eager
 
 
 def load_rule(rule, settings):
     """Imports rule module and returns it."""
     name = rule.name[:-3]
-    rule_module = load_source(name, str(rule))
-    priority = getattr(rule_module, 'priority', conf.DEFAULT_PRIORITY)
+    with logs.debug_time(u'Importing rule: {};'.format(name), settings):
+        rule_module = load_source(name, str(rule))
+        priority = getattr(rule_module, 'priority', conf.DEFAULT_PRIORITY)
     return types.Rule(name, rule_module.match,
                       rule_module.get_new_command,
                       getattr(rule_module, 'enabled_by_default', True),
@@ -27,61 +27,45 @@ def get_loaded_rules(rules, settings):
                 yield loaded_rule
 
 
-@eager
 def get_rules(user_dir, settings):
     """Returns all enabled rules."""
     bundled = Path(__file__).parent \
         .joinpath('rules') \
         .glob('*.py')
     user = user_dir.joinpath('rules').glob('*.py')
-    return get_loaded_rules(sorted(bundled) + sorted(user), settings)
+    return sorted(get_loaded_rules(sorted(bundled) + sorted(user), settings),
+                  key=lambda rule: rule.priority)
 
 
-@eager
-def get_matched_rules(command, rules, settings):
+def is_rule_match(command, rule, settings):
     """Returns first matched rule for command."""
     script_only = command.stdout is None and command.stderr is None
 
-    for rule in rules:
-        if script_only and rule.requires_output:
-            continue
+    if script_only and rule.requires_output:
+        return False
 
-        try:
-            with logs.debug_time(u'Trying rule: {};'.format(rule.name),
-                                 settings):
-                if rule.match(command, settings):
-                    yield rule
-        except Exception:
-            logs.rule_failed(rule, sys.exc_info(), settings)
+    try:
+        with logs.debug_time(u'Trying rule: {};'.format(rule.name),
+                             settings):
+            if rule.match(command, settings):
+                return True
+    except Exception:
+        logs.rule_failed(rule, sys.exc_info(), settings)
 
 
-def make_corrected_commands(command, rules, settings):
-    for rule in rules:
-        new_commands = rule.get_new_command(command, settings)
-        if not isinstance(new_commands, list):
-            new_commands = [new_commands]
-        for n, new_command in enumerate(new_commands):
-            yield types.CorrectedCommand(script=new_command,
-                                         side_effect=rule.side_effect,
-                                         priority=(n + 1) * rule.priority)
-
-
-def remove_duplicates(corrected_commands):
-    commands = {(command.script, command.side_effect): command
-                for command in sorted(corrected_commands,
-                                      key=lambda command: -command.priority)}
-    return commands.values()
+def make_corrected_commands(command, rule, settings):
+    new_commands = rule.get_new_command(command, settings)
+    if not isinstance(new_commands, list):
+        new_commands = (new_commands,)
+    for n, new_command in enumerate(new_commands):
+        yield types.CorrectedCommand(script=new_command,
+                                     side_effect=rule.side_effect,
+                                     priority=(n + 1) * rule.priority)
 
 
 def get_corrected_commands(command, user_dir, settings):
-    rules = get_rules(user_dir, settings)
-    logs.debug(
-        u'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
-        settings)
-    matched = get_matched_rules(command, rules, settings)
-    logs.debug(
-        u'Matched rules: {}'.format(', '.join(rule.name for rule in matched)),
-        settings)
-    corrected_commands = make_corrected_commands(command, matched, settings)
-    return sorted(remove_duplicates(corrected_commands),
-                  key=lambda corrected_command: corrected_command.priority)
+    corrected_commands = (
+        corrected for rule in get_rules(user_dir, settings)
+        if is_rule_match(command, rule, settings)
+        for corrected in make_corrected_commands(command, rule, settings))
+    return types.SortedCorrectedCommandsSequence(corrected_commands, settings)

thefuck/logs.py

@@ -45,15 +45,11 @@ def show_corrected_command(corrected_command, settings):
         reset=color(colorama.Style.RESET_ALL, settings)))
 
 
-def confirm_text(corrected_command, multiple_cmds, settings):
-    if multiple_cmds:
-        arrows = '{blue}↑{reset}/{blue}↓{reset}/'
-    else:
-        arrows = ''
-
+def confirm_text(corrected_command, settings):
     sys.stderr.write(
         ('{clear}{bold}{script}{reset}{side_effect} '
-         '[{green}enter{reset}/' + arrows + '{red}ctrl+c{reset}]').format(
+         '[{green}enter{reset}/{blue}↑{reset}/{blue}↓{reset}'
+         '/{red}ctrl+c{reset}]').format(
             script=corrected_command.script,
             side_effect=' (+side effect)' if corrected_command.side_effect else '',
             clear='\033[1K\r',

thefuck/main.py

@@ -117,7 +117,7 @@ def print_alias(entry_point=True):
 
 
 def main():
-    parser = ArgumentParser(prog='The Fuck')
+    parser = ArgumentParser(prog='thefuck')
     parser.add_argument('-v', '--version',
                         action='version',
                         version='%(prog)s {}'.format(

thefuck/rules/apt_get_search.py

@@ -0,0 +1,11 @@
+import re
+from thefuck.utils import for_app
+
+
+@for_app('apt-get')
+def match(command, settings):
+    return command.script.startswith('apt-get search')
+
+
+def get_new_command(command, settings):
+    return re.sub(r'^apt-get', 'apt-cache', command.script)

thefuck/rules/brew_install.py

@@ -1,38 +1,38 @@
 import os
 import re
-from subprocess import check_output
-from thefuck.utils import get_closest, replace_argument
+from thefuck.utils import get_closest, replace_argument, which
+from thefuck.specific.brew import get_brew_path_prefix
 
-# Formulars are base on each local system's status
 
-brew_formulas = []
-try:
-    brew_path_prefix = check_output(['brew', '--prefix'],
-                                    universal_newlines=True).strip()
-    brew_formula_path = brew_path_prefix + '/Library/Formula'
+enabled_by_default = bool(which('brew'))
 
-    for file_name in os.listdir(brew_formula_path):
-        if file_name.endswith('.rb'):
-            brew_formulas.append(file_name.replace('.rb', ''))
-except:
-    pass
+
+def _get_formulas():
+    # Formulas are based on each local system's status
+    try:
+        brew_path_prefix = get_brew_path_prefix()
+        brew_formula_path = brew_path_prefix + '/Library/Formula'
+
+        for file_name in os.listdir(brew_formula_path):
+            if file_name.endswith('.rb'):
+                yield file_name[:-3]
+    except:
+        pass
 
 
 def _get_similar_formula(formula_name):
-    return get_closest(formula_name, brew_formulas, 1, 0.85)
+    return get_closest(formula_name, _get_formulas(), 1, 0.85)
 
 
 def match(command, settings):
     is_proper_command = ('brew install' in command.script and
                          'No available formula' in command.stderr)
 
-    has_possible_formulas = False
     if is_proper_command:
         formula = re.findall(r'Error: No available formula for ([a-z]+)',
                              command.stderr)[0]
-        has_possible_formulas = bool(_get_similar_formula(formula))
-
-    return has_possible_formulas
+        return bool(_get_similar_formula(formula))
+    return False
 
 
 def get_new_command(command, settings):

thefuck/rules/brew_unknown_command.py

@@ -1,30 +1,19 @@
 import os
 import re
-import subprocess
 from thefuck.utils import get_closest, replace_command
+from thefuck.specific.brew import get_brew_path_prefix
 
 BREW_CMD_PATH = '/Library/Homebrew/cmd'
 TAP_PATH = '/Library/Taps'
 TAP_CMD_PATH = '/%s/%s/cmd'
 
 
-def _get_brew_path_prefix():
-    """To get brew path"""
-    try:
-        return subprocess.check_output(['brew', '--prefix'],
-                                       universal_newlines=True).strip()
-    except:
-        return None
-
-
 def _get_brew_commands(brew_path_prefix):
     """To get brew default commands on local environment"""
     brew_cmd_path = brew_path_prefix + BREW_CMD_PATH
 
-    commands = [name.replace('.rb', '') for name in os.listdir(brew_cmd_path)
-                if name.endswith('.rb')]
-
-    return commands
+    return [name[:-3] for name in os.listdir(brew_cmd_path)
+            if name.endswith('.rb')]
 
 
 def _get_brew_tap_specific_commands(brew_path_prefix):
@@ -51,10 +40,7 @@ def _get_brew_tap_specific_commands(brew_path_prefix):
 
 
 def _is_brew_tap_cmd_naming(name):
-    if name.startswith('brew-') and name.endswith('.rb'):
-        return True
-
-    return False
+    return name.startswith('brew-') and name.endswith('.rb')
 
 
 def _get_directory_names_only(path):
@@ -62,35 +48,33 @@ def _get_directory_names_only(path):
             if os.path.isdir(os.path.join(path, d))]
 
 
-brew_path_prefix = _get_brew_path_prefix()
+def _brew_commands():
+    brew_path_prefix = get_brew_path_prefix()
+    if brew_path_prefix:
+        try:
+            return _get_brew_commands(brew_path_prefix) \
+                 + _get_brew_tap_specific_commands(brew_path_prefix)
+        except OSError:
+            pass
 
-# Failback commands for testing (Based on Homebrew 0.9.5)
-brew_commands = ['info', 'home', 'options', 'install', 'uninstall',
-                 'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
-                 'doctor', 'create', 'edit']
-
-if brew_path_prefix:
-    try:
-        brew_commands = _get_brew_commands(brew_path_prefix) \
-                        + _get_brew_tap_specific_commands(brew_path_prefix)
-    except OSError:
-        pass
+    # Failback commands for testing (Based on Homebrew 0.9.5)
+    return ['info', 'home', 'options', 'install', 'uninstall',
+            'search', 'list', 'update', 'upgrade', 'pin', 'unpin',
+            'doctor', 'create', 'edit']
 
 
 def match(command, settings):
     is_proper_command = ('brew' in command.script and
                          'Unknown command' in command.stderr)
 
-    has_possible_commands = False
     if is_proper_command:
         broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                                 command.stderr)[0]
-        has_possible_commands = bool(get_closest(broken_cmd, brew_commands))
-
-    return has_possible_commands
+        return bool(get_closest(broken_cmd, _brew_commands()))
+    return False
 
 
 def get_new_command(command, settings):
     broken_cmd = re.findall(r'Error: Unknown command: ([a-z]+)',
                             command.stderr)[0]
-    return replace_command(command, broken_cmd, brew_commands)
+    return replace_command(command, broken_cmd, _brew_commands())

thefuck/rules/cargo_no_command.py

@@ -1,10 +1,10 @@
 import re
-from thefuck.utils import replace_argument
+from thefuck.utils import replace_argument, for_app
 
 
+@for_app('cargo')
 def match(command, settings):
-    return ('cargo' in command.script
-            and 'No such subcommand' in command.stderr
+    return ('No such subcommand' in command.stderr
             and 'Did you mean' in command.stderr)
 
 

thefuck/rules/cd_correction.py

@@ -2,8 +2,9 @@
 
 import os
 from difflib import get_close_matches
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 from thefuck.rules import cd_mkdir
+from thefuck.utils import for_app
 
 __author__ = "mmussomele"
 
@@ -16,6 +17,7 @@ def _get_sub_dirs(parent):
 
 
 @sudo_support
+@for_app('cd')
 def match(command, settings):
     """Match function copied from cd_mkdir.py"""
     return (command.script.startswith('cd ')

thefuck/rules/cd_mkdir.py

@@ -1,13 +1,14 @@
 import re
 from thefuck import shells
-from thefuck.utils import sudo_support
+from thefuck.utils import for_app
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
+@for_app('cd')
 def match(command, settings):
-    return (command.script.startswith('cd ')
-        and ('no such file or directory' in command.stderr.lower()
-            or 'cd: can\'t cd to' in command.stderr.lower()))
+    return (('no such file or directory' in command.stderr.lower()
+             or 'cd: can\'t cd to' in command.stderr.lower()))
 
 
 @sudo_support

thefuck/rules/composer_not_command.py

@@ -1,11 +1,11 @@
 import re
-from thefuck.utils import replace_argument
+from thefuck.utils import replace_argument, for_app
 
 
+@for_app('composer')
 def match(command, settings):
-    return ('composer' in command.script
-            and ('did you mean this?' in command.stderr.lower()
-                 or 'did you mean one of these?' in command.stderr.lower()))
+    return (('did you mean this?' in command.stderr.lower()
+             or 'did you mean one of these?' in command.stderr.lower()))
 
 
 def get_new_command(command, settings):

thefuck/rules/cp_omitting_directory.py

@@ -1,12 +1,13 @@
 import re
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
+from thefuck.utils import for_app
 
 
 @sudo_support
+@for_app('cp')
 def match(command, settings):
     stderr = command.stderr.lower()
-    return command.script.startswith('cp ') \
-        and ('omitting directory' in stderr or 'is a directory' in stderr)
+    return 'omitting directory' in stderr or 'is a directory' in stderr
 
 
 @sudo_support

thefuck/rules/cpp11.py

@@ -1,8 +1,11 @@
+from thefuck.utils import for_app
+
+
+@for_app(['g++', 'clang++'])
 def match(command, settings):
-    return (('g++' in command.script or 'clang++' in command.script) and
-            ('This file requires compiler and library support for the '
-             'ISO C++ 2011 standard.' in command.stderr or
-             '-Wc++11-extensions' in command.stderr))
+    return ('This file requires compiler and library support for the '
+            'ISO C++ 2011 standard.' in command.stderr or
+            '-Wc++11-extensions' in command.stderr)
 
 
 def get_new_command(command, settings):

thefuck/rules/dirty_untar.py

@@ -1,6 +1,7 @@
-from thefuck import shells
 import os
 import tarfile
+from thefuck import shells
+from thefuck.utils import for_app
 
 
 def _is_tar_extract(cmd):
@@ -20,19 +21,19 @@ def _tar_file(cmd):
     for c in cmd.split():
         for ext in tar_extensions:
             if c.endswith(ext):
-                return (c, c[0:len(c)-len(ext)])
+                return (c, c[0:len(c) - len(ext)])
 
 
+@for_app('tar')
 def match(command, settings):
-    return (command.script.startswith('tar')
-            and '-C' not in command.script
+    return ('-C' not in command.script
             and _is_tar_extract(command.script)
             and _tar_file(command.script) is not None)
 
 
 def get_new_command(command, settings):
     return shells.and_('mkdir -p {dir}', '{cmd} -C {dir}') \
-                 .format(dir=_tar_file(command.script)[1], cmd=command.script)
+        .format(dir=_tar_file(command.script)[1], cmd=command.script)
 
 
 def side_effect(old_cmd, command, settings):

thefuck/rules/dirty_unzip.py

@@ -1,5 +1,6 @@
 import os
 import zipfile
+from thefuck.utils import for_app
 
 
 def _is_bad_zip(file):
@@ -20,9 +21,9 @@ def _zip_file(command):
                 return '{}.zip'.format(c)
 
 
+@for_app('unzip')
 def match(command, settings):
-    return (command.script.startswith('unzip')
-            and '-d' not in command.script
+    return ('-d' not in command.script
             and _is_bad_zip(_zip_file(command)))
 
 

thefuck/rules/docker_not_command.py

@@ -1,13 +1,14 @@
 from itertools import dropwhile, takewhile, islice
 import re
 import subprocess
-from thefuck.utils import sudo_support, replace_command
+from thefuck.utils import replace_command, for_app
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
+@for_app('docker')
 def match(command, settings):
-    return command.script.startswith('docker') \
-           and 'is not a docker command' in command.stderr
+    return 'is not a docker command' in command.stderr
 
 
 def get_docker_commands():

thefuck/rules/fix_alt_space.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 import re
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support

thefuck/rules/fix_file.py

@@ -35,17 +35,17 @@ patterns = (
 
 # for the sake of readability do not use named groups above
 def _make_pattern(pattern):
-    pattern = pattern.replace('{file}', '(?P<file>[^:\n]+)')
-    pattern = pattern.replace('{line}', '(?P<line>[0-9]+)')
-    pattern = pattern.replace('{col}',  '(?P<col>[0-9]+)')
+    pattern = pattern.replace('{file}', '(?P<file>[^:\n]+)') \
+                     .replace('{line}', '(?P<line>[0-9]+)') \
+                     .replace('{col}',  '(?P<col>[0-9]+)')
     return re.compile(pattern, re.MULTILINE)
-patterns = [_make_pattern(p) for p in patterns]
+patterns = [_make_pattern(p).search for p in patterns]
 
 
 @memoize
 def _search(stderr):
     for pattern in patterns:
-        m = re.search(pattern, stderr)
+        m = pattern(stderr)
         if m and os.path.isfile(m.group('file')):
             return m
 

thefuck/rules/git_add.py

@@ -1,14 +1,15 @@
 import re
-from thefuck import utils, shells
+from thefuck import shells
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
             r"error: pathspec '([^']*)' "

thefuck/rules/git_branch_delete.py

@@ -1,13 +1,13 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('branch -d' in command.script
             and 'If you are sure you want to delete it' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, '-d', '-D')

thefuck/rules/git_branch_list.py

@@ -1,12 +1,13 @@
-from thefuck import utils, shells
+from thefuck import shells
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     # catches "git branch list" in place of "git branch"
     return command.script.split()[1:] == 'branch list'.split()
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return shells.and_('git branch --delete list', 'git branch')

thefuck/rules/git_checkout.py

@@ -2,9 +2,10 @@ import re
 import subprocess
 from thefuck import shells, utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
@@ -23,7 +24,7 @@ def get_branches():
         yield line.strip()
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
         r"error: pathspec '([^']*)' "

thefuck/rules/git_diff_staged.py

@@ -1,13 +1,13 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('diff' in command.script and
             '--staged' not in command.script)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, 'diff', 'diff --staged')

thefuck/rules/git_fix_stash.py

@@ -1,8 +1,9 @@
 from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return (command.script.split()[1] == 'stash'
             and 'usage:' in command.stderr)
@@ -19,7 +20,7 @@ stash_commands = (
     'show')
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     stash_cmd = command.script.split()[2]
     fixed = utils.get_closest(stash_cmd, stash_commands, fallback_to_first=False)

thefuck/rules/git_not_command.py

@@ -1,6 +1,6 @@
 import re
-from thefuck.utils import (git_support,
-                           get_all_matched_commands, replace_command)
+from thefuck.utils import get_all_matched_commands, replace_command
+from thefuck.specific.git import git_support
 
 
 @git_support

thefuck/rules/git_pull.py

@@ -1,13 +1,14 @@
-from thefuck import shells, utils
+from thefuck import shells
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('pull' in command.script
             and 'set-upstream' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     line = command.stderr.split('\n')[-3].strip()
     branch = line.split(' ')[-1]

thefuck/rules/git_pull_clone.py

@@ -1,13 +1,13 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('fatal: Not a git repository' in command.stderr
             and "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, 'pull', 'clone')

thefuck/rules/git_push.py

@@ -1,12 +1,12 @@
-from thefuck import utils
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('push' in command.script
             and 'set-upstream' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return command.stderr.split('\n')[-3].strip()

thefuck/rules/git_push_force.py

@@ -1,8 +1,8 @@
-from thefuck import utils
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('push' in command.script
             and '! [rejected]' in command.stderr
@@ -10,7 +10,7 @@ def match(command, settings):
             and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return replace_argument(command.script, 'push', 'push --force')
 

thefuck/rules/git_push_pull.py

@@ -1,8 +1,9 @@
-from thefuck import utils, shells
+from thefuck import shells
 from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     return ('push' in command.script
             and '! [rejected]' in command.stderr
@@ -10,7 +11,7 @@ def match(command, settings):
             and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     return shells.and_(replace_argument(command.script, 'push', 'pull'),
                        command.script)

thefuck/rules/git_stash.py

@@ -1,14 +1,15 @@
-from thefuck import shells, utils
+from thefuck import shells
+from thefuck.specific.git import git_support
 
 
-@utils.git_support
+@git_support
 def match(command, settings):
     # catches "Please commit or stash them" and "Please, commit your changes or
     # stash them before you can switch branches."
     return 'or stash them' in command.stderr
 
 
-@utils.git_support
+@git_support
 def get_new_command(command, settings):
     formatme = shells.and_('git stash', '{}')
     return formatme.format(command.script)

thefuck/rules/go_run.py

@@ -1,3 +1,4 @@
+from thefuck.utils import for_app
 # Appends .go when compiling go files
 #
 # Example:
@@ -5,6 +6,7 @@
 # error: go run: no go files listed
 
 
+@for_app('go')
 def match(command, settings):
     return (command.script.startswith('go run ')
             and not command.script.endswith('.go'))

thefuck/rules/grep_recursive.py

@@ -1,6 +1,9 @@
+from thefuck.utils import for_app
+
+
+@for_app('grep')
 def match(command, settings):
-    return (command.script.startswith('grep')
-            and 'is a directory' in command.stderr.lower())
+    return 'is a directory' in command.stderr.lower()
 
 
 def get_new_command(command, settings):

thefuck/rules/gulp_not_task.py

@@ -1,11 +1,11 @@
 import re
 import subprocess
-from thefuck.utils import replace_command
+from thefuck.utils import replace_command, for_app
 
 
+@for_app('gulp')
 def match(command, script):
-    return command.script.startswith('gulp')\
-        and 'is not in your gulpfile' in command.stdout
+    return 'is not in your gulpfile' in command.stdout
 
 
 def get_gulp_tasks():

thefuck/rules/has_exists_script.py

@@ -1,5 +1,5 @@
 import os
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support

thefuck/rules/heroku_not_command.py

@@ -1,10 +1,10 @@
 import re
-from thefuck.utils import replace_command
+from thefuck.utils import replace_command, for_app
 
 
+@for_app('heroku')
 def match(command, settings):
-    return command.script.startswith('heroku') and \
-           'is not a heroku command' in command.stderr and \
+    return 'is not a heroku command' in command.stderr and \
            'Perhaps you meant' in command.stderr
 
 

thefuck/rules/java.py

@@ -1,13 +1,16 @@
-# Fixes common java command mistake
-#
-# Example:
-# > java foo.java
-# Error: Could not find or load main class foo.java
+"""Fixes common java command mistake
+
+Example:
+> java foo.java
+Error: Could not find or load main class foo.java
+
+"""
+from thefuck.utils import for_app
 
 
+@for_app('java')
 def match(command, settings):
-    return (command.script.startswith('java ')
-            and command.script.endswith('.java'))
+    return command.script.endswith('.java')
 
 
 def get_new_command(command, settings):

thefuck/rules/javac.py

@@ -1,14 +1,17 @@
-# Appends .java when compiling java files
-#
-# Example:
-# > javac foo
-# error: Class names, 'foo', are only accepted if annotation
-# processing is explicitly requested
+"""Appends .java when compiling java files
+
+Example:
+ > javac foo
+ error: Class names, 'foo', are only accepted if annotation
+ processing is explicitly requested
+
+"""
+from thefuck.utils import for_app
 
 
+@for_app('javac')
 def match(command, settings):
-    return (command.script.startswith('javac ')
-            and not command.script.endswith('.java'))
+    return not command.script.endswith('.java')
 
 
 def get_new_command(command, settings):

thefuck/rules/lein_not_task.py

@@ -1,9 +1,10 @@
 import re
-from thefuck.utils import sudo_support,\
-    replace_command, get_all_matched_commands
+from thefuck.utils import replace_command, get_all_matched_commands, for_app
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support
+@for_app('lein')
 def match(command, settings):
     return (command.script.startswith('lein')
             and "is not a task. See 'lein help'" in command.stderr

thefuck/rules/ls_lah.py

@@ -1,7 +1,9 @@
+from thefuck.utils import for_app
+
+
+@for_app('ls')
 def match(command, settings):
-    return (command.script == 'ls'
-            or command.script.startswith('ls ')
-            and 'ls -' not in command.script)
+    return 'ls -' not in command.script
 
 
 def get_new_command(command, settings):

thefuck/rules/mercurial.py

@@ -1,5 +1,5 @@
 import re
-from thefuck.utils import get_closest
+from thefuck.utils import get_closest, for_app
 
 
 def extract_possibilities(command):
@@ -12,14 +12,12 @@ def extract_possibilities(command):
     return possib
 
 
+@for_app('hg')
 def match(command, settings):
-    return (command.script.startswith('hg ')
-            and ('hg: unknown command' in command.stderr
-                 and '(did you mean one of ' in command.stderr
-                 or "hg: command '" in command.stderr
-                 and "' is ambiguous:" in command.stderr
-                 )
-            )
+    return ('hg: unknown command' in command.stderr
+            and '(did you mean one of ' in command.stderr
+            or "hg: command '" in command.stderr
+            and "' is ambiguous:" in command.stderr)
 
 
 def get_new_command(command, settings):

thefuck/rules/mkdir_p.py

@@ -1,5 +1,5 @@
 import re
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support

thefuck/rules/mvn_no_command.py

@@ -0,0 +1,11 @@
+from thefuck.utils import for_app
+
+
+@for_app('mvn')
+def match(command, settings):
+    return 'No goals have been specified for this build' in command.stdout
+
+
+def get_new_command(command, settings):
+    return [command.script + ' clean package',
+            command.script + ' clean install']

thefuck/rules/mvn_unknown_lifecycle_phase.py

@@ -0,0 +1,32 @@
+from thefuck.utils import replace_command, for_app
+from difflib import get_close_matches
+import re
+
+
+def _get_failed_lifecycle(command):
+    return re.search(r'\[ERROR\] Unknown lifecycle phase "(.+)"',
+                     command.stdout)
+
+
+def _getavailable_lifecycles(command):
+    return re.search(
+        r'Available lifecycle phases are: (.+) -> \[Help 1\]', command.stdout)
+
+
+@for_app('mvn')
+def match(command, settings):
+    failed_lifecycle = _get_failed_lifecycle(command)
+    available_lifecycles = _getavailable_lifecycles(command)
+    return available_lifecycles and failed_lifecycle
+
+
+def get_new_command(command, settings):
+    failed_lifecycle = _get_failed_lifecycle(command)
+    available_lifecycles = _getavailable_lifecycles(command)
+    if available_lifecycles and failed_lifecycle:
+        selected_lifecycle = get_close_matches(
+            failed_lifecycle.group(1), available_lifecycles.group(1).split(", "),
+            3, 0.6)
+        return replace_command(command, failed_lifecycle.group(1), selected_lifecycle)
+    else:
+        return []

thefuck/rules/no_command.py

@@ -1,5 +1,6 @@
 from difflib import get_close_matches
-from thefuck.utils import sudo_support, get_all_executables
+from thefuck.utils import get_all_executables
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support

thefuck/rules/open.py

@@ -5,21 +5,21 @@
 # The file ~/github.com does not exist.
 # Perhaps you meant 'http://github.com'?
 #
+from thefuck.utils import for_app
 
 
+@for_app('open', 'xdg-open', 'gnome-open', 'kde-open')
 def match(command, settings):
-    return (command.script.startswith(('open', 'xdg-open', 'gnome-open', 'kde-open'))
-            and (
-                '.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 ('.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)
 
 
 def get_new_command(command, settings):

thefuck/rules/pacman.py

@@ -1,4 +1,4 @@
-from thefuck.archlinux import archlinux_env, get_pkgfile
+from thefuck.specific.archlinux import get_pkgfile, archlinux_env
 from thefuck import shells
 
 

thefuck/rules/pacman_not_found.py

@@ -7,7 +7,7 @@ should be:
 """
 
 from thefuck.utils import replace_command
-from thefuck.archlinux import archlinux_env, get_pkgfile
+from thefuck.specific.archlinux import get_pkgfile, archlinux_env
 
 
 def match(command, settings):

thefuck/rules/pip_unknown_command.py

@@ -1,7 +1,10 @@
 import re
-from thefuck.utils import replace_argument
+from thefuck.utils import replace_argument, for_app
+from thefuck.specific.sudo import sudo_support
 
 
+@sudo_support
+@for_app('pip')
 def match(command, settings):
     return ('pip' in command.script and
             'unknown command' in command.stderr and

thefuck/rules/python_command.py

@@ -1,4 +1,4 @@
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 # add 'python' suffix to the command if
 #  1) The script does not have execute permission or
 #  2) is interpreted as shell script

thefuck/rules/python_execute.py

@@ -3,11 +3,12 @@
 # Example:
 # > python foo
 # error: python: can't open file 'foo': [Errno 2] No such file or directory
+from thefuck.utils import for_app
 
 
+@for_app('python')
 def match(command, settings):
-    return (command.script.startswith('python ')
-            and not command.script.endswith('.py'))
+    return not command.script.endswith('.py')
 
 
 def get_new_command(command, settings):

thefuck/rules/rm_dir.py

@@ -1,5 +1,5 @@
 import re
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
 
 
 @sudo_support

thefuck/rules/rm_root.py

@@ -1,5 +1,4 @@
-from thefuck.utils import sudo_support
-
+from thefuck.specific.sudo import sudo_support
 
 enabled_by_default = False
 

thefuck/rules/sed_unterminated_s.py

@@ -1,10 +1,10 @@
 import shlex
-from thefuck.utils import quote
+from thefuck.utils import quote, for_app
 
 
+@for_app('sed')
 def match(command, settings):
-    return ('sed' in command.script
-            and "unterminated `s' command" in command.stderr)
+    return "unterminated `s' command" in command.stderr
 
 
 def get_new_command(command, settings):

thefuck/rules/ssh_known_hosts.py

@@ -1,25 +1,23 @@
 import re
+from thefuck.utils import for_app
 
-patterns = [
-    r'WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!',
-    r'WARNING: POSSIBLE DNS SPOOFING DETECTED!',
-    r"Warning: the \S+ host key for '([^']+)' differs from the key for the IP address '([^']+)'",
-]
-offending_pattern = re.compile(
-    r'(?:Offending (?:key for IP|\S+ key)|Matching host key) in ([^:]+):(\d+)',
-    re.MULTILINE)
-
-commands = ['ssh', 'scp']
+commands = ('ssh', 'scp')
 
 
+@for_app(*commands)
 def match(command, settings):
     if not command.script:
         return False
-    if not command.script.split()[0] in commands:
+    if not command.script.startswith(commands):
         return False
-    if not any([re.findall(pattern, command.stderr) for pattern in patterns]):
-        return False
-    return True
+
+    patterns = (
+        r'WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!',
+        r'WARNING: POSSIBLE DNS SPOOFING DETECTED!',
+        r"Warning: the \S+ host key for '([^']+)' differs from the key for the IP address '([^']+)'",
+    )
+
+    return any(re.findall(pattern, command.stderr) for pattern in patterns)
 
 
 def get_new_command(command, settings):
@@ -27,6 +25,9 @@ def get_new_command(command, settings):
 
 
 def side_effect(old_cmd, command, settings):
+    offending_pattern = re.compile(
+        r'(?:Offending (?:key for IP|\S+ key)|Matching host key) in ([^:]+):(\d+)',
+        re.MULTILINE)
     offending = offending_pattern.findall(old_cmd.stderr)
     for filepath, lineno in offending:
         with open(filepath, 'r') as fh:

thefuck/rules/systemctl.py

@@ -1,16 +1,17 @@
 """
 The confusion in systemctl's param order is massive.
 """
-from thefuck.utils import sudo_support
+from thefuck.specific.sudo import sudo_support
+from thefuck.utils import for_app
 
 
 @sudo_support
+@for_app('systemctl')
 def match(command, settings):
     # Catches 'Unknown operation 'service'.' when executing systemctl with
     # misordered arguments
     cmd = command.script.split()
-    return ('systemctl' in command.script and
-            'Unknown operation \'' in command.stderr and
+    return ('Unknown operation \'' in command.stderr and
             len(cmd) - cmd.index('systemctl') == 3)
 
 

thefuck/rules/tmux.py

@@ -1,10 +1,10 @@
-from thefuck.utils import replace_command
 import re
+from thefuck.utils import replace_command, for_app
 
 
+@for_app('tmux')
 def match(command, settings):
-    return ('tmux' in command.script
-            and 'ambiguous command:' in command.stderr
+    return ('ambiguous command:' in command.stderr
             and 'could be:' in command.stderr)
 
 

thefuck/rules/tsuru_login.py

@@ -1,9 +1,10 @@
 from thefuck import shells
+from thefuck.utils import for_app
 
 
+@for_app('tsuru')
 def match(command, settings):
-    return (command.script.startswith('tsuru')
-            and 'not authenticated' in command.stderr
+    return ('not authenticated' in command.stderr
             and 'session has expired' in command.stderr)
 
 

thefuck/rules/tsuru_not_command.py

@@ -1,10 +1,10 @@
 import re
-from thefuck.utils import get_all_matched_commands, replace_command
+from thefuck.utils import get_all_matched_commands, replace_command, for_app
 
 
+@for_app('tsuru')
 def match(command, settings):
-    return (command.script.startswith('tsuru ')
-            and ' is not a tsuru command. See "tsuru help".' in command.stderr
+    return (' is not a tsuru command. See "tsuru help".' in command.stderr
             and '\nDid you mean?\n\t' in command.stderr)
 
 

thefuck/rules/unknown_command.py

@@ -1,5 +1,5 @@
 import re
-from thefuck.utils import (replace_command, get_all_matched_commands)
+from thefuck.utils import replace_command
 
 def match(command, settings):
     return (re.search(r"([^:]*): Unknown command.*", command.stderr) != None

thefuck/rules/vagrant_up.py

@@ -1,8 +1,10 @@
 from thefuck import shells
+from thefuck.utils import for_app
 
 
+@for_app('vagrant')
 def match(command, settings):
-    return command.script.startswith('vagrant ') and 'run `vagrant up`' in command.stderr.lower()
+    return 'run `vagrant up`' in command.stderr.lower()
 
 
 def get_new_command(command, settings):

thefuck/shells.py

@@ -9,7 +9,7 @@ from subprocess import Popen, PIPE
 from time import time
 import io
 import os
-from .utils import DEVNULL, memoize
+from .utils import DEVNULL, memoize, cache
 
 
 class Generic(object):
@@ -85,9 +85,9 @@ class Bash(Generic):
         return name, value
 
     @memoize
+    @cache('.bashrc', '.bash_profile')
     def get_aliases(self):
-        proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL,
-                     shell=True)
+        proc = Popen(['bash', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -131,8 +131,7 @@ class Fish(Generic):
     @memoize
     def get_aliases(self):
         overridden = self._get_overridden_aliases()
-        proc = Popen('fish -ic functions', stdout=PIPE, stderr=DEVNULL,
-                     shell=True)
+        proc = Popen(['fish', '-ic', 'functions'], stdout=PIPE, stderr=DEVNULL)
         functions = proc.stdout.read().decode('utf-8').strip().split('\n')
         return {func: func for func in functions if func not in overridden}
 
@@ -171,9 +170,9 @@ class Zsh(Generic):
         return name, value
 
     @memoize
+    @cache('.zshrc')
     def get_aliases(self):
-        proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL,
-                     shell=True)
+        proc = Popen(['zsh', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -205,8 +204,7 @@ class Tcsh(Generic):
 
     @memoize
     def get_aliases(self):
-        proc = Popen('tcsh -ic alias', stdout=PIPE, stderr=DEVNULL,
-                     shell=True)
+        proc = Popen(['tcsh', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')

thefuck/specific/archlinux.py

@@ -1,9 +1,9 @@
 """ This file provide some utility functions for Arch Linux specific rules."""
-import thefuck.utils
 import subprocess
+from .. import utils
 
 
-@thefuck.utils.memoize
+@utils.memoize
 def get_pkgfile(command):
     """ Gets the packages that provide the given command using `pkgfile`.
 
@@ -20,7 +20,7 @@ def get_pkgfile(command):
 
         packages = subprocess.check_output(
             ['pkgfile', '-b', '-v', command],
-            universal_newlines=True, stderr=thefuck.utils.DEVNULL
+            universal_newlines=True, stderr=utils.DEVNULL
         ).splitlines()
 
         return [package.split()[0] for package in packages]
@@ -29,13 +29,13 @@ def get_pkgfile(command):
 
 
 def archlinux_env():
-    if thefuck.utils.which('yaourt'):
+    if utils.which('yaourt'):
         pacman = 'yaourt'
-    elif thefuck.utils.which('pacman'):
+    elif utils.which('pacman'):
         pacman = 'sudo pacman'
     else:
         return False, None
 
-    enabled_by_default = thefuck.utils.which('pkgfile')
+    enabled_by_default = utils.which('pkgfile')
 
     return enabled_by_default, pacman

thefuck/specific/brew.py

@@ -0,0 +1,15 @@
+import subprocess
+from ..utils import memoize, which
+
+
+enabled_by_default = bool(which('brew'))
+
+
+@memoize
+def get_brew_path_prefix():
+    """To get brew path"""
+    try:
+        return subprocess.check_output(['brew', '--prefix'],
+                                       universal_newlines=True).strip()
+    except:
+        return None

thefuck/specific/git.py

@@ -0,0 +1,32 @@
+import re
+from shlex import split
+from decorator import decorator
+from ..types import Command
+from ..utils import quote, is_app
+
+
+@decorator
+def git_support(fn, command, settings):
+    """Resolves git aliases and supports testing for both git and hub."""
+    # supports GitHub's `hub` command
+    # which is recommended to be used with `alias git=hub`
+    # but at this point, shell aliases have already been resolved
+    if not is_app(command, 'git', 'hub'):
+        return False
+
+    # perform git aliases expansion
+    if 'trace: alias expansion:' in command.stderr:
+        search = re.search("trace: alias expansion: ([^ ]*) => ([^\n]*)",
+                           command.stderr)
+        alias = search.group(1)
+
+        # by default git quotes everything, for example:
+        #     'commit' '--amend'
+        # which is surprising and does not allow to easily test for
+        # eg. 'git commit'
+        expansion = ' '.join(map(quote, split(search.group(2))))
+        new_script = command.script.replace(alias, expansion)
+
+        command = Command._replace(command, script=new_script)
+
+    return fn(command, settings)

thefuck/specific/sudo.py

@@ -0,0 +1,22 @@
+import six
+from decorator import decorator
+from ..types import Command
+
+
+@decorator
+def sudo_support(fn, command, settings):
+    """Removes sudo before calling fn and adds it after."""
+    if not command.script.startswith('sudo '):
+        return fn(command, settings)
+
+    result = fn(Command(command.script[5:],
+                        command.stdout,
+                        command.stderr),
+                settings)
+
+    if result and isinstance(result, six.string_types):
+        return u'sudo {}'.format(result)
+    elif isinstance(result, list):
+        return [u'sudo {}'.format(x) for x in result]
+    else:
+        return result

thefuck/types.py

@@ -1,14 +1,34 @@
 from collections import namedtuple
-
+from traceback import format_stack
+from .logs import debug
 
 Command = namedtuple('Command', ('script', 'stdout', 'stderr'))
 
-CorrectedCommand = namedtuple('CorrectedCommand', ('script', 'side_effect', 'priority'))
-
 Rule = namedtuple('Rule', ('name', 'match', 'get_new_command',
                            'enabled_by_default', 'side_effect',
                            'priority', 'requires_output'))
 
+class CorrectedCommand(object):
+    def __init__(self, script, side_effect, priority):
+        self.script = script
+        self.side_effect = side_effect
+        self.priority = priority
+
+    def __eq__(self, other):
+        """Ignores `priority` field."""
+        if isinstance(other, CorrectedCommand):
+            return (other.script, other.side_effect) ==\
+                   (self.script, self.side_effect)
+        else:
+            return False
+
+    def __hash__(self):
+        return (self.script, self.side_effect).__hash__()
+
+    def __repr__(self):
+        return 'CorrectedCommand(script={}, side_effect={}, priority={})'.format(
+            self.script, self.side_effect, self.priority)
+
 
 class RulesNamesList(list):
     """Wrapper a top of list for storing rules names."""
@@ -18,7 +38,6 @@ class RulesNamesList(list):
 
 
 class Settings(dict):
-
     def __getattr__(self, item):
         return self.get(item)
 
@@ -29,3 +48,61 @@ class Settings(dict):
         conf = dict(kwargs)
         conf.update(self)
         return Settings(conf)
+
+
+class SortedCorrectedCommandsSequence(object):
+    """List-like collection/wrapper around generator, that:
+
+    - immediately gives access to the first commands through [];
+    - realises generator and sorts commands on first access to other
+      commands through [], or when len called.
+
+    """
+
+    def __init__(self, commands, settings):
+        self._settings = settings
+        self._commands = commands
+        self._cached = self._realise_first()
+        self._realised = False
+
+    def _realise_first(self):
+        try:
+            return [next(self._commands)]
+        except StopIteration:
+            return []
+
+    def _remove_duplicates(self, corrected_commands):
+        """Removes low-priority duplicates."""
+        commands = {command
+                    for command in sorted(corrected_commands,
+                                          key=lambda command: -command.priority)
+                    if command.script != self._cached[0]}
+        return commands
+
+    def _realise(self):
+        """Realises generator, removes duplicates and sorts commands."""
+        if self._cached:
+            commands = self._remove_duplicates(self._commands)
+            self._cached = [self._cached[0]] + sorted(
+                commands, key=lambda corrected_command: corrected_command.priority)
+        self._realised = True
+        debug('SortedCommandsSequence was realised with: {}, after: {}'.format(
+            self._cached, '\n'.join(format_stack())), self._settings)
+
+    def __getitem__(self, item):
+        if item != 0 and not self._realised:
+            self._realise()
+        return self._cached[item]
+
+    def __bool__(self):
+        return bool(self._cached)
+
+    def __len__(self):
+        if not self._realised:
+            self._realise()
+        return len(self._cached)
+
+    def __iter__(self):
+        if not self._realised:
+            self._realise()
+        return iter(self._cached)

thefuck/ui.py

@@ -88,9 +88,7 @@ def select_command(corrected_commands, settings):
         logs.show_corrected_command(selector.value, settings)
         return selector.value
 
-    multiple_cmds = len(corrected_commands) > 1
-
-    selector.on_change(lambda val: logs.confirm_text(val, multiple_cmds, settings))
+    selector.on_change(lambda val: logs.confirm_text(val, settings))
     for action in read_actions():
         if action == SELECT:
             sys.stderr.write('\n')

thefuck/utils.py

@@ -1,11 +1,15 @@
-from .types import Command
 from difflib import get_close_matches
 from functools import wraps
-from pathlib import Path
-from shlex import split
+import shelve
+from decorator import decorator
+from contextlib import closing
+import tempfile
+
 import os
 import pickle
 import re
+
+from pathlib import Path
 import six
 
 
@@ -17,6 +21,23 @@ else:
     from shlex import quote
 
 
+def memoize(fn):
+    """Caches previous calls to the function."""
+    memo = {}
+
+    @wraps(fn)
+    def wrapper(*args, **kwargs):
+        key = pickle.dumps((args, kwargs))
+        if key not in memo or memoize.disabled:
+            memo[key] = fn(*args, **kwargs)
+
+        return memo[key]
+
+    return wrapper
+memoize.disabled = False
+
+
+@memoize
 def which(program):
     """Returns `program` path or `None`."""
 
@@ -47,81 +68,9 @@ def wrap_settings(params):
             print(settings.apt)
 
     """
-    def decorator(fn):
-        @wraps(fn)
-        def wrapper(command, settings):
-            return fn(command, settings.update(**params))
-        return wrapper
-    return decorator
-
-
-def sudo_support(fn):
-    """Removes sudo before calling fn and adds it after."""
-    @wraps(fn)
-    def wrapper(command, settings):
-        if not command.script.startswith('sudo '):
-            return fn(command, settings)
-
-        result = fn(Command(command.script[5:],
-                            command.stdout,
-                            command.stderr),
-                    settings)
-
-        if result and isinstance(result, six.string_types):
-            return u'sudo {}'.format(result)
-        elif isinstance(result, list):
-            return [u'sudo {}'.format(x) for x in result]
-        else:
-            return result
-    return wrapper
-
-
-def git_support(fn):
-    """Resolves git aliases and supports testing for both git and hub."""
-    @wraps(fn)
-    def wrapper(command, settings):
-        # supports GitHub's `hub` command
-        # which is recommended to be used with `alias git=hub`
-        # but at this point, shell aliases have already been resolved
-        is_git_cmd = command.script.startswith(('git', 'hub'))
-
-        if not is_git_cmd:
-            return False
-
-        # perform git aliases expansion
-        if 'trace: alias expansion:' in command.stderr:
-            search = re.search("trace: alias expansion: ([^ ]*) => ([^\n]*)",
-                               command.stderr)
-            alias = search.group(1)
-
-            # by default git quotes everything, for example:
-            #     'commit' '--amend'
-            # which is surprising and does not allow to easily test for
-            # eg. 'git commit'
-            expansion = ' '.join(map(quote, split(search.group(2))))
-            new_script = command.script.replace(alias, expansion)
-
-            command = Command._replace(command, script=new_script)
-
-        return fn(command, settings)
-
-    return wrapper
-
-
-def memoize(fn):
-    """Caches previous calls to the function."""
-    memo = {}
-
-    @wraps(fn)
-    def wrapper(*args, **kwargs):
-        key = pickle.dumps((args, kwargs))
-        if key not in memo or memoize.disabled:
-            memo[key] = fn(*args, **kwargs)
-
-        return memo[key]
-
-    return wrapper
-memoize.disabled = False
+    def _wrap_settings(fn, command, settings):
+        return fn(command, settings.update(**params))
+    return decorator(_wrap_settings)
 
 
 def get_closest(word, possibilities, n=3, cutoff=0.6, fallback_to_first=True):
@@ -163,11 +112,9 @@ def replace_argument(script, from_, to):
             u' {} '.format(from_), u' {} '.format(to), 1)
 
 
-def eager(fn):
-    @wraps(fn)
-    def wrapper(*args, **kwargs):
-        return list(fn(*args, **kwargs))
-    return wrapper
+@decorator
+def eager(fn, *args, **kwargs):
+    return list(fn(*args, **kwargs))
 
 
 @eager
@@ -185,3 +132,63 @@ def replace_command(command, broken, matched):
     new_cmds = get_close_matches(broken, matched, cutoff=0.1)
     return [replace_argument(command.script, broken, new_cmd.strip())
             for new_cmd in new_cmds]
+
+
+@memoize
+def is_app(command, *app_names):
+    """Returns `True` if command is call to one of passed app names."""
+    for name in app_names:
+        if command.script == name \
+                or command.script.startswith(u'{} '.format(name)):
+            return True
+    return False
+
+
+def for_app(*app_names):
+    """Specifies that matching script is for on of app names."""
+    def _for_app(fn, command, settings):
+        if is_app(command, *app_names):
+            return fn(command, settings)
+        else:
+            return False
+
+    return decorator(_for_app)
+
+
+def cache(*depends_on):
+    """Caches function result in temporary file.
+
+    Cache will be expired when modification date of files from `depends_on`
+    will be changed.
+
+    Function wrapped in `cache` should be arguments agnostic.
+
+    """
+    def _get_mtime(name):
+        path = os.path.join(os.path.expanduser('~'), name)
+        try:
+            return str(os.path.getmtime(path))
+        except OSError:
+            return '0'
+
+    @decorator
+    def _cache(fn, *args, **kwargs):
+        if cache.disabled:
+            return fn(*args, **kwargs)
+
+        cache_path = os.path.join(tempfile.gettempdir(), '.thefuck-cache')
+        # A bit obscure, but simplest way to generate unique key for
+        # functions and methods in python 2 and 3:
+        key = '{}.{}'.format(fn.__module__, repr(fn).split('at')[0])
+
+        etag = '.'.join(_get_mtime(name) for name in depends_on)
+
+        with closing(shelve.open(cache_path)) as db:
+            if db.get(key, {}).get('etag') == etag:
+                return db[key]['value']
+            else:
+                value = fn(*args, **kwargs)
+                db[key] = {'etag': etag, 'value': value}
+                return value
+    return _cache
+cache.disabled = False