Bump to 2.1

New git rules

.travis.yml

@@ -4,6 +4,10 @@ python:
   - "3.3"
   - "2.7"
 install:
-  - python setup.py develop
   - pip install -r requirements.txt
-script: py.test -v
+  - python setup.py develop
+  - pip install coveralls
+script:
+  - export COVERAGE_PYTHON_VERSION=python-${TRAVIS_PYTHON_VERSION:0:1}
+  - coverage run --source=thefuck,tests -m py.test -v
+after_success: coveralls

README.md

@@ -1,12 +1,12 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck)
-
-**Aliases changed in 1.34.**
+# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg)](https://travis-ci.org/nvbn/thefuck) 
 
 Magnificent app which corrects your previous console command,
 inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320).
 
-Few examples:
+![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
+
+Few more examples:
 
 ```bash
 ➜ apt-get install vim
@@ -104,29 +104,12 @@ sudo pip install thefuck
 
 [Or using an OS package manager (OS X, Ubuntu, Arch).](https://github.com/nvbn/thefuck/wiki/Installation)
 
-And add to the `.bashrc` or `.bash_profile`(for OSX):
+You should place this command in your `.bash_profile`, `.bashrc`, `.zshrc` or other startup script:
 
 ```bash
-alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
+eval "$(thefuck-alias)"
 # You can use whatever you want as an alias, like for Mondays:
-alias FUCK='fuck'
-```
-
-Or in your `.zshrc`:
-
-```bash
-alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
-```
-
-If you are using `tcsh`:
-```tcsh
-alias fuck 'set fucked_cmd=`history -h 2 | head -n 1` && eval `thefuck ${fucked_cmd}`'
-```
-
-Alternatively, you can redirect the output of `thefuck-alias`:
-
-```bash
-thefuck-alias >> ~/.bashrc
+eval "$(thefuck-alias FUCK)"
 ```
 
 [Or in your shell config (Bash, Zsh, Fish, Powershell).](https://github.com/nvbn/thefuck/wiki/Shell-aliases)
@@ -141,6 +124,8 @@ To make them available immediately, run `source ~/.bashrc` (or your shell config
 sudo pip install thefuck --upgrade
 ```
 
+**Aliases changed in 1.34.**
+
 ## How it works
 
 The Fuck tries to match a rule for the previous command, creates a new command
@@ -159,12 +144,15 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `dry` – fix repetitions like "git git push";
 * `fix_alt_space` – replaces Alt+Space with Space character;
 * `git_add` – fix *"Did you forget to 'git add'?"*;
+* `git_branch_delete` – changes `git branch -d` to `git branch -D`;
 * `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch;
-* `git_checkout` – creates the branch before checking-out;
+* `git_checkout` – fixes branch name or creates new branch;
 * `git_diff_staged` – adds `--staged` to previous `git diff` with unexpected output;
 * `git_no_command` – fixes wrong git commands like `git brnch`;
 * `git_pull` – sets upstream before executing previous `git pull`;
+* `git_pull_clone` – clones instead of pulling when the repo does not exist;
 * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
+* `git_push_pull` – runs `git pull` when `push` was rejected;
 * `git_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;
@@ -201,7 +189,8 @@ Enabled by default only on specific platforms:
 * `apt_get` – installs app from apt if it not installed;
 * `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
+* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
+* `git_push_force` – adds `--force` to a `git push` (may conflict with `git_push_pull`);
 * `pacman` – installs app with `pacman` or `yaourt` if it is not installed.
 
 Bundled, but not enabled by default:
@@ -239,7 +228,7 @@ enabled_by_default = True
 def side_effect(command, settings):
     subprocess.call('chmod 777 .', shell=True)
 
-priority = 1000  # Lower first
+priority = 1000  # Lower first, default is 1000
 ```
 
 [More examples of rules](https://github.com/nvbn/thefuck/tree/master/thefuck/rules),
@@ -250,11 +239,11 @@ priority = 1000  # Lower first
 The Fuck has a few settings parameters which can be changed in `~/.thefuck/settings.py`:
 
 * `rules` – list of enabled rules, by default `thefuck.conf.DEFAULT_RULES`;
-* `require_confirmation` – requires confirmation before running new command, by default `False`;
+* `require_confirmation` – requires confirmation before running new command, by default `True`;
 * `wait_command` – max amount of time in seconds for getting previous command output;
 * `no_colors` – disable colored output;
 * `priority` – dict with rules priorities, rule with lower `priority` will be matched first;
-* `debug` – enabled debug output, by default `False`;
+* `debug` – enables debug output, by default `False`;
 
 Example of `settings.py`:
 

requirements.txt

@@ -2,3 +2,4 @@ pytest
 mock
 pytest-mock
 wheel
+setuptools>=17.1

setup.py

@@ -11,12 +11,10 @@ elif (3, 0) < sys.version_info < (3, 3):
           ' ({}.{} detected).'.format(*sys.version_info[:2]))
     sys.exit(-1)
 
-VERSION = '1.49'
+VERSION = '2.1'
 
 install_requires = ['psutil', 'colorama', 'six']
-
-if sys.version_info < (3, 4):
-    install_requires.append('pathlib')
+extras_require = {':python_version<"3.4"': ['pathlib']}
 
 setup(name='thefuck',
       version=VERSION,
@@ -30,6 +28,7 @@ setup(name='thefuck',
       include_package_data=True,
       zip_safe=False,
       install_requires=install_requires,
+      extras_require=extras_require,
       entry_points={'console_scripts': [
           'thefuck = thefuck.main:main',
-          'thefuck-alias = thefuck.shells:app_alias']})
+          'thefuck-alias = thefuck.main:print_alias']})

tests/rules/test_git_branch_delete.py

@@ -0,0 +1,22 @@
+import pytest
+from thefuck.rules.git_branch_delete import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.fixture
+def stderr():
+    return '''error: The branch 'branch' is not fully merged.
+If you are sure you want to delete it, run 'git branch -D branch'.
+
+'''
+
+
+def test_match(stderr):
+    assert match(Command('git branch -d branch', stderr=stderr), None)
+    assert not match(Command('git branch -d branch'), None)
+    assert not match(Command('ls', stderr=stderr), None)
+
+
+def test_get_new_command(stderr):
+    assert get_new_command(Command('git branch -d branch', stderr=stderr), None)\
+        == "git branch -D branch"

tests/rules/test_git_checkout.py

@@ -12,6 +12,11 @@ def did_not_match(target, did_you_forget=False):
     return error
 
 
+@pytest.fixture
+def get_branches(mocker):
+    return mocker.patch('thefuck.rules.git_checkout')
+
+
 @pytest.mark.parametrize('command', [
     Command(script='git checkout unknown', stderr=did_not_match('unknown')),
     Command(script='git commit unknown', stderr=did_not_match('unknown'))])
@@ -28,10 +33,19 @@ def test_not_match(command):
     assert not match(command, None)
 
 
-@pytest.mark.parametrize('command, new_command', [
-    (Command(script='git checkout unknown', stderr=did_not_match('unknown')),
+@pytest.mark.parametrize('branches, command, new_command', [
+    ([],
+     Command(script='git checkout unknown', stderr=did_not_match('unknown')),
      'git branch unknown && git checkout unknown'),
-    (Command('git commit unknown', stderr=did_not_match('unknown')),
-     'git branch unknown && git commit unknown')])
-def test_get_new_command(command, new_command):
+    ([],
+     Command('git commit unknown', stderr=did_not_match('unknown')),
+     'git branch unknown && git commit unknown'),
+    (['master'],
+     Command(script='git checkout amster', stderr=did_not_match('amster')),
+     'git checkout master'),
+    (['master'],
+     Command(script='git commit amster', stderr=did_not_match('amster')),
+     'git commit master')])
+def test_get_new_command(branches, command, new_command, get_branches):
+    get_branches.return_value = branches
     assert get_new_command(command, None) == new_command

tests/rules/test_git_diff_staged.py

@@ -3,15 +3,13 @@ from thefuck.rules.git_diff_staged import match, get_new_command
 from tests.utils import Command
 
 
-@pytest.mark.parametrize('command', [
-    Command(script='git diff'),
-    Command(script='git df'),
-    Command(script='git ds')])
+@pytest.mark.parametrize('command', [Command(script='git diff')])
 def test_match(command):
     assert match(command, None)
 
 
 @pytest.mark.parametrize('command', [
+    Command(script='git diff --staged'),
     Command(script='git tag'),
     Command(script='git branch'),
     Command(script='git log')])
@@ -20,8 +18,6 @@ def test_not_match(command):
 
 
 @pytest.mark.parametrize('command, new_command', [
-    (Command('git diff'), 'git diff --staged'),
-    (Command('git df'), 'git df --staged'),
-    (Command('git ds'), 'git ds --staged')])
+    (Command('git diff'), 'git diff --staged')])
 def test_get_new_command(command, new_command):
     assert get_new_command(command, None) == new_command

tests/rules/test_git_pull_clone.py

@@ -0,0 +1,21 @@
+import pytest
+from thefuck.rules.git_pull_clone import match, get_new_command
+from tests.utils import Command
+
+
+git_err = '''
+fatal: Not a git repository (or any parent up to mount point /home)
+Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git pull git@github.com:mcarton/thefuck.git', stderr=git_err)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git pull git@github.com:mcarton/thefuck.git', stderr=git_err), 'git clone git@github.com:mcarton/thefuck.git')])
+def test_get_new_command(command, output):
+    assert get_new_command(command, None) == output

tests/rules/test_git_push_force.py

@@ -0,0 +1,52 @@
+import pytest
+from thefuck.rules.git_push_force import match, get_new_command
+from tests.utils import Command
+
+
+git_err = '''
+To /tmp/foo
+ ! [rejected]        master -> master (non-fast-forward)
+ error: failed to push some refs to '/tmp/bar'
+ hint: Updates were rejected because the tip of your current branch is behind
+ hint: its remote counterpart. Integrate the remote changes (e.g.
+ hint: 'git pull ...') before pushing again.
+ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+'''
+
+git_uptodate = 'Everything up-to-date'
+git_ok = '''
+Counting objects: 3, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 282 bytes | 0 bytes/s, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To /tmp/bar
+   514eed3..f269c79  master -> master
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_err),
+    Command(script='git push nvbn', stderr=git_err),
+    Command(script='git push nvbn master', stderr=git_err)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_ok),
+    Command(script='git push', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate)])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git push', stderr=git_err), 'git push --force'),
+    (Command(script='git push nvbn', stderr=git_err), 'git push --force nvbn'),
+    (Command(script='git push nvbn master', stderr=git_err), 'git push --force nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command, None) == output

tests/rules/test_git_push_pull.py

@@ -0,0 +1,54 @@
+import pytest
+from thefuck.rules.git_push_pull import match, get_new_command
+from tests.utils import Command
+
+
+git_err = '''
+To /tmp/foo
+ ! [rejected]        master -> master (non-fast-forward)
+ error: failed to push some refs to '/tmp/bar'
+ hint: Updates were rejected because the tip of your current branch is behind
+ hint: its remote counterpart. Integrate the remote changes (e.g.
+ hint: 'git pull ...') before pushing again.
+ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+'''
+
+git_uptodate = 'Everything up-to-date'
+git_ok = '''
+Counting objects: 3, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 282 bytes | 0 bytes/s, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To /tmp/bar
+   514eed3..f269c79  master -> master
+'''
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_err),
+    Command(script='git push nvbn', stderr=git_err),
+    Command(script='git push nvbn master', stderr=git_err)])
+def test_match(command):
+    assert match(command, None)
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='git push', stderr=git_ok),
+    Command(script='git push', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate),
+    Command(script='git push nvbn', stderr=git_ok),
+    Command(script='git push nvbn master', stderr=git_uptodate)])
+def test_not_match(command):
+    assert not match(command, None)
+
+
+@pytest.mark.parametrize('command, output', [
+    (Command(script='git push', stderr=git_err), 'git pull && git push'),
+    (Command(script='git push nvbn', stderr=git_err),
+     'git pull nvbn && git push nvbn'),
+    (Command(script='git push nvbn master', stderr=git_err),
+     'git pull nvbn master && git push nvbn master')])
+def test_get_new_command(command, output):
+    assert get_new_command(command, None) == output

tests/rules/test_git_stash.py

@@ -3,22 +3,20 @@ from thefuck.rules.git_stash import match, get_new_command
 from tests.utils import Command
 
 
-@pytest.fixture
-def cherry_pick_error():
-    return ('error: Your local changes would be overwritten by cherry-pick.\n'
-            'hint: Commit your changes or stash them to proceed.\n'
-            'fatal: cherry-pick failed')
+cherry_pick_error = (
+        'error: Your local changes would be overwritten by cherry-pick.\n'
+        'hint: Commit your changes or stash them to proceed.\n'
+        'fatal: cherry-pick failed')
 
 
-@pytest.fixture
-def rebase_error():
-    return ('Cannot rebase: Your index contains uncommitted changes.\n'
-            'Please commit or stash them.')
+rebase_error = (
+        'Cannot rebase: Your index contains uncommitted changes.\n'
+        'Please commit or stash them.')
 
 
 @pytest.mark.parametrize('command', [
-    Command(script='git cherry-pick a1b2c3d', stderr=cherry_pick_error()),
-    Command(script='git rebase -i HEAD~7', stderr=rebase_error())])
+    Command(script='git cherry-pick a1b2c3d', stderr=cherry_pick_error),
+    Command(script='git rebase -i HEAD~7', stderr=rebase_error)])
 def test_match(command):
     assert match(command, None)
 

tests/rules/test_history.py

@@ -6,28 +6,35 @@ from tests.utils import Command
 @pytest.fixture
 def history(mocker):
     return mocker.patch('thefuck.rules.history.get_history',
-                        return_value=['ls cat', 'diff x', 'nocommand x'])
+                        return_value=['le cat', 'fuck', 'ls cat',
+                                      'diff x', 'nocommand x'])
+
+
+@pytest.fixture
+def alias(mocker):
+    return mocker.patch('thefuck.rules.history.thefuck_alias',
+                        return_value='fuck')
 
 
 @pytest.fixture
 def callables(mocker):
-    return mocker.patch('thefuck.rules.history.get_all_callables',
+    return mocker.patch('thefuck.rules.history.get_all_executables',
                         return_value=['diff', 'ls'])
 
 
-@pytest.mark.usefixtures('history', 'callables', 'no_memoize')
+@pytest.mark.usefixtures('history', 'callables', 'no_memoize', 'alias')
 @pytest.mark.parametrize('script', ['ls cet', 'daff x'])
 def test_match(script):
     assert match(Command(script=script), None)
 
 
-@pytest.mark.usefixtures('history', 'callables', 'no_memoize')
+@pytest.mark.usefixtures('history', 'callables', 'no_memoize', 'alias')
 @pytest.mark.parametrize('script', ['apt-get', 'nocommand y'])
 def test_not_match(script):
     assert not match(Command(script=script), None)
 
 
-@pytest.mark.usefixtures('history', 'callables', 'no_memoize')
+@pytest.mark.usefixtures('history', 'callables', 'no_memoize', 'alias')
 @pytest.mark.parametrize('script, result', [
     ('ls cet', 'ls cat'),
     ('daff x', 'diff x')])

tests/rules/test_no_command.py

@@ -1,29 +1,16 @@
 import pytest
-from thefuck.rules.no_command import match, get_new_command, get_all_callables
+from thefuck.rules.no_command import match, get_new_command
 from tests.utils import Command
 
 
 @pytest.fixture(autouse=True)
-def _safe(mocker):
-    mocker.patch('thefuck.rules.no_command._safe', return_value=[])
-
-
-@pytest.fixture(autouse=True)
-def get_aliases(mocker):
-    mocker.patch('thefuck.rules.no_command.get_aliases',
-                 return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+def get_all_executables(mocker):
+    mocker.patch('thefuck.rules.no_command.get_all_executables',
+                 return_value=['vim', 'apt-get', 'fsck'])
 
 
 @pytest.mark.usefixtures('no_memoize')
-def test_get_all_callables(*args):
-    all_callables = get_all_callables()
-    assert 'vim' in all_callables
-    assert 'fsck' in all_callables
-    assert 'fuck' not in all_callables
-
-
-@pytest.mark.usefixtures('no_memoize')
-def test_match(*args):
+def test_match():
     assert match(Command(stderr='vom: not found', script='vom file.py'), None)
     assert match(Command(stderr='fucck: not found', script='fucck'), None)
     assert not match(Command(stderr='qweqwe: not found', script='qweqwe'), None)
@@ -31,7 +18,7 @@ def test_match(*args):
 
 
 @pytest.mark.usefixtures('no_memoize')
-def test_get_new_command(*args):
+def test_get_new_command():
     assert get_new_command(
         Command(stderr='vom: not found',
                 script='vom file.py'),

tests/rules/test_switch_lang.py

@@ -15,6 +15,7 @@ def test_match(command):
 @pytest.mark.parametrize('command', [
     Command(stderr='command not found: pat-get', script=u'pat-get'),
     Command(stderr='command not found: ls', script=u'ls'),
+    Command(stderr='command not found: агсл', script=u'агсл'),
     Command(stderr='some info', script=u'фзе-пуе')])
 def test_not_match(command):
     assert not switch_lang.match(command, None)

tests/test_main.py

@@ -77,23 +77,23 @@ class TestGetCommand(object):
         monkeypatch.setattr('thefuck.shells.to_shell', lambda x: x)
 
     def test_get_command_calls(self, Popen):
-        assert main.get_command(Mock(),
+        assert main.get_command(Mock(env={}),
             ['thefuck', 'apt-get', 'search', 'vim']) \
                == Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,
                                       stdout=PIPE,
                                       stderr=PIPE,
-                                      env={'LANG': 'C'})
+                                      env={})
 
     @pytest.mark.parametrize('args, result', [
         (['thefuck', 'ls', '-la'], 'ls -la'),
         (['thefuck', 'ls'], 'ls')])
     def test_get_command_script(self, args, result):
         if result:
-            assert main.get_command(Mock(), args).script == result
+            assert main.get_command(Mock(env={}), args).script == result
         else:
-            assert main.get_command(Mock(), args) is None
+            assert main.get_command(Mock(env={}), args) is None
 
 
 class TestGetMatchedRule(object):

tests/test_shells.py

@@ -44,9 +44,10 @@ class TestGeneric(object):
         assert shell.get_aliases() == {}
 
     def test_app_alias(self, shell):
-        assert 'alias fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'alias fuck' in shell.app_alias('fuck')
+        assert 'alias FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
     def test_get_history(self, history_lines, shell):
         history_lines(['ls', 'rm'])
@@ -97,9 +98,10 @@ class TestBash(object):
                                        'll': 'ls -alF'}
 
     def test_app_alias(self, shell):
-        assert 'alias fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'alias fuck' in shell.app_alias('fuck')
+        assert 'alias FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
     def test_get_history(self, history_lines, shell):
         history_lines(['ls', 'rm'])
@@ -173,9 +175,10 @@ class TestFish(object):
                                        'ruby': 'ruby'}
 
     def test_app_alias(self, shell):
-        assert 'function fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'function fuck' in shell.app_alias('fuck')
+        assert 'function FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
 
 @pytest.mark.usefixtures('isfile')
@@ -222,9 +225,10 @@ class TestZsh(object):
             'll': 'ls -alF'}
 
     def test_app_alias(self, shell):
-        assert 'alias fuck' in shell.app_alias()
-        assert 'thefuck' in shell.app_alias()
-        assert 'TF_ALIAS' in shell.app_alias()
+        assert 'alias fuck' in shell.app_alias('fuck')
+        assert 'alias FUCK' in shell.app_alias('FUCK')
+        assert 'thefuck' in shell.app_alias('fuck')
+        assert 'TF_ALIAS' in shell.app_alias('fuck')
 
     def test_get_history(self, history_lines, shell):
         history_lines([': 1432613911:0;ls', ': 1432613916:0;rm'])

tests/test_utils.py

@@ -1,6 +1,7 @@
 import pytest
 from mock import Mock
-from thefuck.utils import sudo_support, wrap_settings, memoize, get_closest
+from thefuck.utils import git_support, sudo_support, wrap_settings,\
+    memoize, get_closest, get_all_executables
 from thefuck.types import Settings
 from tests.utils import Command
 
@@ -26,6 +27,15 @@ def test_sudo_support(return_value, command, called, 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
+
+
 def test_memoize():
     fn = Mock(__name__='fn')
     memoized = memoize(fn)
@@ -50,3 +60,21 @@ class TestGetClosest(object):
 
     def test_when_cant_match(self):
         assert 'status' == get_closest('st', ['status', 'reset'])
+
+    def test_without_fallback(self):
+        assert get_closest('st', ['status', 'reset'],
+                           fallback_to_first=False) is None
+
+
+@pytest.fixture
+def get_aliases(mocker):
+    mocker.patch('thefuck.shells.get_aliases',
+                 return_value=['vim', 'apt-get', 'fsck', 'fuck'])
+
+
+@pytest.mark.usefixtures('no_memoize', 'get_aliases')
+def test_get_all_callables():
+    all_callables = get_all_executables()
+    assert 'vim' in all_callables
+    assert 'fsck' in all_callables
+    assert 'fuck' not in all_callables

thefuck/conf.py

@@ -27,10 +27,11 @@ DEFAULT_PRIORITY = 1000
 
 DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                     'wait_command': 3,
-                    'require_confirmation': False,
+                    'require_confirmation': True,
                     'no_colors': False,
                     'debug': False,
-                    'priority': {}}
+                    'priority': {},
+                    'env': {'LANG': 'C', 'GIT_TRACE': '1'}}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_WAIT_COMMAND': 'wait_command',

thefuck/main.py

@@ -80,9 +80,13 @@ def get_command(settings, args):
         return
 
     script = shells.from_shell(script)
-    logs.debug('Call: {}'.format(script), settings)
-    result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
-                   env=dict(os.environ, LANG='C'))
+    logs.debug(u'Call: {}'.format(script), settings)
+
+    env = dict(os.environ)
+    env.update(settings.env)
+    logs.debug(u'Executing with env: {}'.format(env), settings)
+
+    result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE, env=env)
     if wait_output(settings, result):
         return types.Command(script, result.stdout.read().decode('utf-8'),
                              result.stderr.read().decode('utf-8'))
@@ -124,26 +128,35 @@ def run_rule(rule, command, settings):
         print(new_command)
 
 
+# Entry points:
+
 def main():
     colorama.init()
     user_dir = setup_user_dir()
     settings = conf.get_settings(user_dir)
-    logs.debug('Run with settings: {}'.format(pformat(settings)), settings)
+    logs.debug(u'Run with settings: {}'.format(pformat(settings)), settings)
 
     command = get_command(settings, sys.argv)
     if command:
-        logs.debug('Received stdout: {}'.format(command.stdout), settings)
-        logs.debug('Received stderr: {}'.format(command.stderr), settings)
+        logs.debug(u'Received stdout: {}'.format(command.stdout), settings)
+        logs.debug(u'Received stderr: {}'.format(command.stderr), settings)
 
         rules = get_rules(user_dir, settings)
         logs.debug(
-            'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
+            u'Loaded rules: {}'.format(', '.join(rule.name for rule in rules)),
             settings)
 
         matched_rule = get_matched_rule(command, rules, settings)
         if matched_rule:
-            logs.debug('Matched rule: {}'.format(matched_rule.name), settings)
+            logs.debug(u'Matched rule: {}'.format(matched_rule.name), settings)
             run_rule(matched_rule, command, settings)
             return
 
     logs.failed('No fuck given', settings)
+
+
+def print_alias():
+    alias = shells.thefuck_alias()
+    if len(sys.argv) > 1:
+        alias = sys.argv[1]
+    print(shells.app_alias(alias))

thefuck/rules/git_add.py

@@ -1,13 +1,15 @@
 import re
-from thefuck import shells
+from thefuck import utils, shells
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and '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
 def get_new_command(command, settings):
     missing_file = re.findall(
             r"error: pathspec '([^']*)' "

thefuck/rules/git_branch_delete.py

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

thefuck/rules/git_branch_list.py

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

thefuck/rules/git_checkout.py

@@ -1,17 +1,37 @@
 import re
-from thefuck import shells
+import subprocess
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
 
 
+def get_branches():
+    proc = subprocess.Popen(
+        ['git', 'branch', '-a', '--no-color', '--no-column'],
+        stdout=subprocess.PIPE)
+    for line in proc.stdout.readlines():
+        line = line.decode('utf-8')
+        if line.startswith('*'):
+            line = line.split(' ')[1]
+        if '/' in line:
+            line = line.split('/')[-1]
+        yield line.strip()
+
+
+@utils.git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
-            r"error: pathspec '([^']*)' "
-            "did not match any file\(s\) known to git.", command.stderr)[0]
-
-    formatme = shells.and_('git branch {}', '{}')
-    return formatme.format(missing_file, command.script)
+        r"error: pathspec '([^']*)' "
+        "did not match any file\(s\) known to git.", command.stderr)[0]
+    closest_branch = utils.get_closest(missing_file, get_branches(),
+                                       fallback_to_first=False)
+    if closest_branch:
+        return command.script.replace(missing_file, closest_branch, 1)
+    else:
+        return shells.and_('git branch {}', '{}').format(
+            missing_file, command.script)

thefuck/rules/git_diff_staged.py

@@ -1,6 +1,13 @@
+from thefuck import utils
+
+
+@utils.git_support
 def match(command, settings):
-    return command.script.startswith('git d')
+    return ('git' in command.script and
+            'diff' in command.script and
+            '--staged' not in command.script)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return '{} --staged'.format(command.script)

thefuck/rules/git_not_command.py

@@ -1,8 +1,8 @@
-from difflib import get_close_matches
 import re
-from thefuck.utils import get_closest
+from thefuck.utils import get_closest, git_support
 
 
+@git_support
 def match(command, settings):
     return ('git' in command.script
             and " is not a git command. See 'git --help'." in command.stderr
@@ -18,6 +18,7 @@ def _get_all_git_matched_commands(stderr):
             yield line.strip()
 
 
+@git_support
 def get_new_command(command, settings):
     broken_cmd = re.findall(r"git: '([^']*)' is not a git command",
                             command.stderr)[0]

thefuck/rules/git_pull.py

@@ -1,12 +1,14 @@
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'pull' in command.script
             and 'set-upstream' in command.stderr)
 
 
+@utils.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

@@ -0,0 +1,14 @@
+import re
+from thefuck import utils, shells
+
+
+@utils.git_support
+def match(command, settings):
+    return ('git pull' in command.script
+            and '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
+def get_new_command(command, settings):
+    return command.script.replace(' pull ', ' clone ')

thefuck/rules/git_push.py

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

thefuck/rules/git_push_force.py

@@ -0,0 +1,18 @@
+from thefuck import utils
+
+
+@utils.git_support
+def match(command, settings):
+    return ('git' in command.script
+            and 'push' in command.script
+            and '! [rejected]' in command.stderr
+            and 'failed to push some refs to' in command.stderr
+            and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
+
+
+@utils.git_support
+def get_new_command(command, settings):
+    return command.script.replace('push', 'push --force')
+
+
+enabled_by_default = False

thefuck/rules/git_push_pull.py

@@ -0,0 +1,17 @@
+from thefuck import utils
+from thefuck.shells import and_
+
+
+@utils.git_support
+def match(command, settings):
+    return ('git' in command.script
+            and 'push' in command.script
+            and '! [rejected]' in command.stderr
+            and 'failed to push some refs to' in command.stderr
+            and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)
+
+
+@utils.git_support
+def get_new_command(command, settings):
+    return and_(command.script.replace('push', 'pull'),
+                command.script)

thefuck/rules/git_stash.py

@@ -1,12 +1,14 @@
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.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 'git' in command.script and 'or stash them' in command.stderr
 
 
+@utils.git_support
 def get_new_command(command, settings):
     formatme = shells.and_('git stash', '{}')
     return formatme.format(command.script)

thefuck/rules/history.py

@@ -1,16 +1,27 @@
 from difflib import get_close_matches
-from thefuck.shells import get_history
-from thefuck.utils import get_closest, memoize
-from thefuck.rules.no_command import get_all_callables
+from thefuck.shells import get_history, thefuck_alias
+from thefuck.utils import get_closest, memoize, get_all_executables
+
+
+def _not_corrected(history, tf_alias):
+    """Returns all lines from history except that comes before `fuck`."""
+    previous = None
+    for line in history:
+        if previous is not None and line != tf_alias:
+            yield previous
+        previous = line
+    if history:
+        yield history[-1]
 
 
 @memoize
 def _history_of_exists_without_current(command):
-    callables = get_all_callables()
-    return [line for line in get_history()
-            if line != command.script
-            and line.split(' ')[0] in callables]
-
+    history = get_history()
+    tf_alias = thefuck_alias()
+    executables = get_all_executables()
+    return [line for line in _not_corrected(history, tf_alias)
+            if not line.startswith(tf_alias) and not line == command.script
+            and line.split(' ')[0] in executables]
 
 def match(command, settings):
     return len(get_close_matches(command.script,
@@ -21,4 +32,5 @@ def get_new_command(command, settings):
     return get_closest(command.script,
                        _history_of_exists_without_current(command))
 
+
 priority = 9999

thefuck/rules/no_command.py

@@ -1,39 +1,19 @@
 from difflib import get_close_matches
-import os
-from pathlib import Path
-from thefuck.utils import sudo_support, memoize
-from thefuck.shells import thefuck_alias, get_aliases
-
-
-def _safe(fn, fallback):
-    try:
-        return fn()
-    except OSError:
-        return fallback
-
-
-@memoize
-def get_all_callables():
-    tf_alias = thefuck_alias()
-    return [exe.name
-            for path in os.environ.get('PATH', '').split(':')
-            for exe in _safe(lambda: list(Path(path).iterdir()), [])
-            if not _safe(exe.is_dir, True)] + [
-                alias for alias in get_aliases() if alias != tf_alias]
+from thefuck.utils import sudo_support, get_all_executables
 
 
 @sudo_support
 def match(command, settings):
     return 'not found' in command.stderr and \
            bool(get_close_matches(command.script.split(' ')[0],
-                                  get_all_callables()))
+                                  get_all_executables()))
 
 
 @sudo_support
 def get_new_command(command, settings):
     old_command = command.script.split(' ')[0]
     new_command = get_close_matches(old_command,
-                                    get_all_callables())[0]
+                                    get_all_executables())[0]
     return ' '.join([new_command] + command.script.split(' ')[1:])
 
 

thefuck/rules/switch_lang.py

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+from thefuck.shells import thefuck_alias
+from thefuck.utils import memoize
 
 target_layout = '''qwertyuiop[]asdfghjkl;'zxcvbnm,./QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?'''
 
@@ -7,6 +9,7 @@ source_layouts = [u'''йцукенгшщзхъфывапролджэячсмит
                   u''';ςερτυθιοπ[]ασδφγηξκλ΄ζχψωβνμ,./:΅ΕΡΤΥΘΙΟΠ{}ΑΣΔΦΓΗΞΚΛ¨"ΖΧΨΩΒΝΜ<>?''']
 
 
+@memoize
 def _get_matched_layout(command):
     for source_layout in source_layouts:
         if all([ch in source_layout or ch in '-_'
@@ -14,10 +17,6 @@ def _get_matched_layout(command):
             return source_layout
 
 
-def match(command, settings):
-    return 'not found' in command.stderr and _get_matched_layout(command)
-
-
 def _switch(ch, layout):
     if ch in layout:
         return target_layout[layout.index(ch)]
@@ -25,7 +24,18 @@ def _switch(ch, layout):
         return ch
 
 
+def _switch_command(command, layout):
+    return ''.join(_switch(ch, layout) for ch in command.script)
+
+
+def match(command, settings):
+    if 'not found' not in command.stderr:
+        return False
+    matched_layout = _get_matched_layout(command)
+    return matched_layout and \
+           _switch_command(command, matched_layout) != thefuck_alias()
+
+
 def get_new_command(command, settings):
     matched_layout = _get_matched_layout(command)
-    return ''.join(_switch(ch, matched_layout) for ch in command.script)
-
+    return _switch_command(command, matched_layout)

thefuck/shells.py

@@ -4,12 +4,11 @@ methods.
 
 """
 from collections import defaultdict
+from psutil import Process
 from subprocess import Popen, PIPE
 from time import time
-import os
 import io
-from psutil import Process
-import six
+import os
 from .utils import DEVNULL, memoize
 
 
@@ -34,8 +33,8 @@ class Generic(object):
         """Prepares command for running in shell."""
         return command_script
 
-    def app_alias(self):
-        return "\nalias fuck='TF_ALIAS=fuck eval $(thefuck $(fc -ln -1))'\n"
+    def app_alias(self, fuck):
+        return "alias {0}='TF_ALIAS={0} eval $(thefuck $(fc -ln -1))'".format(fuck)
 
     def _get_history_file_name(self):
         return ''
@@ -75,9 +74,9 @@ class Generic(object):
 
 
 class Bash(Generic):
-    def app_alias(self):
-        return "\nTF_ALIAS=fuck alias fuck='eval $(thefuck $(fc -ln -1));" \
-               " history -r'\n"
+    def app_alias(self, fuck):
+        return "TF_ALIAS={0} alias {0}='eval $(thefuck $(fc -ln -1));" \
+               " history -r'".format(fuck)
 
     def _parse_alias(self, alias):
         name, value = alias.replace('alias ', '', 1).split('=', 1)
@@ -114,9 +113,9 @@ class Fish(Generic):
         else:
             return ['cd', 'grep', 'ls', 'man', 'open']
 
-    def app_alias(self):
-        return ("set TF_ALIAS fuck\n"
-                "function fuck -d 'Correct your previous console command'\n"
+    def app_alias(self, fuck):
+        return ("set TF_ALIAS {0}\n"
+                "function {0} -d 'Correct your previous console command'\n"
                 "    set -l exit_code $status\n"
                 "    set -l eval_script"
                 " (mktemp 2>/dev/null ; or mktemp -t 'thefuck')\n"
@@ -127,7 +126,7 @@ class Fish(Generic):
                 "    if test $exit_code -ne 0\n"
                 "        history --delete $fucked_up_commandd\n"
                 "    end\n"
-                "end")
+                "end").format(fuck)
 
     def get_aliases(self):
         overridden = self._get_overridden_aliases()
@@ -159,10 +158,10 @@ class Fish(Generic):
 
 
 class Zsh(Generic):
-    def app_alias(self):
-        return "\nTF_ALIAS=fuck" \
-               " alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1));" \
-               " fc -R'\n"
+    def app_alias(self, fuck):
+        return "TF_ALIAS={0}" \
+               " alias {0}='eval $(thefuck $(fc -ln -1 | tail -n 1));" \
+               " fc -R'".format(fuck)
 
     def _parse_alias(self, alias):
         name, value = alias.split('=', 1)
@@ -193,8 +192,10 @@ class Zsh(Generic):
 
 
 class Tcsh(Generic):
-    def app_alias(self):
-        return "\nalias fuck 'setenv TF_ALIAS fuck && set fucked_cmd=`history -h 2 | head -n 1` && eval `thefuck ${fucked_cmd}`'\n"
+    def app_alias(self, fuck):
+        return ("alias {0} 'setenv TF_ALIAS {0} && "
+                "set fucked_cmd=`history -h 2 | head -n 1` && "
+                "eval `thefuck ${fucked_cmd}`'").format(fuck)
 
     def _parse_alias(self, alias):
         name, value = alias.split("\t", 1)
@@ -240,8 +241,8 @@ def to_shell(command):
     return _get_shell().to_shell(command)
 
 
-def app_alias():
-    print(_get_shell().app_alias())
+def app_alias(alias):
+    return _get_shell().app_alias(alias)
 
 
 def thefuck_alias():

thefuck/utils.py

@@ -1,7 +1,10 @@
 from difflib import get_close_matches
 from functools import wraps
+from pathlib import Path
+from shlex import split
 import os
 import pickle
+import re
 import six
 from .types import Command
 
@@ -9,11 +12,9 @@ from .types import Command
 DEVNULL = open(os.devnull, 'w')
 
 if six.PY2:
-    import pipes
-    quote = pipes.quote
+    from pipes import quote
 else:
-    import shlex
-    quote = shlex.quote
+    from shlex import quote
 
 
 def which(program):
@@ -73,6 +74,30 @@ def sudo_support(fn):
     return wrapper
 
 
+def git_support(fn):
+    """Resolve git aliases."""
+    @wraps(fn)
+    def wrapper(command, settings):
+        if (command.script.startswith('git') and
+                '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 = {}
@@ -89,10 +114,29 @@ def memoize(fn):
 memoize.disabled = False
 
 
-def get_closest(word, possibilities, n=3, cutoff=0.6):
+def get_closest(word, possibilities, n=3, cutoff=0.6, fallback_to_first=True):
     """Returns closest match or just first from possibilities."""
     possibilities = list(possibilities)
     try:
         return get_close_matches(word, possibilities, n, cutoff)[0]
     except IndexError:
-        return possibilities[0]
+        if fallback_to_first:
+            return possibilities[0]
+
+
+@memoize
+def get_all_executables():
+    from thefuck.shells import thefuck_alias, get_aliases
+
+    def _safe(fn, fallback):
+        try:
+            return fn()
+        except OSError:
+            return fallback
+
+    tf_alias = thefuck_alias()
+    return [exe.name
+            for path in os.environ.get('PATH', '').split(':')
+            for exe in _safe(lambda: list(Path(path).iterdir()), [])
+            if not _safe(exe.is_dir, True)] + [
+                alias for alias in get_aliases() if alias != tf_alias]