Bump to 3.8

Treat overridden aliases in a better way

README.md

@@ -1,10 +1,10 @@
-# The Fuck [![Build Status](https://travis-ci.org/nvbn/thefuck.svg?branch=master)](https://travis-ci.org/nvbn/thefuck) 
+# The Fuck [![Version][version-badge]][version-link] [![Build Status][travis-badge]][travis-link] [![Windows Build Status][appveyor-badge]][appveyor-link] [![Coverage][coverage-badge]][coverage-link] [![MIT License][license-badge]](LICENSE.md)
 
 Magnificent app which corrects your previous console command,
 inspired by a [@liamosaur](https://twitter.com/liamosaur/)
 [tweet](https://twitter.com/liamosaur/status/506975850596536320).
 
-[![gif with examples](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)](https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif)
+[![gif with examples][examples-link]][examples-link]
 
 Few more examples:
 
@@ -52,7 +52,7 @@ Python 3.4.2 (default, Oct  8 2014, 13:08:17)
 git: 'brnch' is not a git command. See 'git --help'.
 
 Did you mean this?
-	branch
+    branch
 
 ➜ fuck
 git branch [enter/↑/↓/ctrl+c]
@@ -97,7 +97,7 @@ Reading package lists... Done
 ## Installation [*experimental*]
 
 On Ubuntu and OS X you can install `The Fuck` with installation script:
- 
+
 ```bash
 wget -O - https://raw.githubusercontent.com/nvbn/thefuck/master/install.sh | sh - && $0
 ```
@@ -157,6 +157,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `fix_file` – opens a file with an error in your `$EDITOR`;
 * `git_add` – fixes *"pathspec 'foo' did not match any file(s) known to git."*;
 * `git_branch_delete` – changes `git branch -d` to `git branch -D`;
+* `git_branch_exists` – offers `git branch -d foo`, `git branch -D foo` or `git checkout foo` when creating a branch that already exists;
 * `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch;
 * `git_checkout` – fixes branch name or creates new branch;
 * `git_diff_staged` – adds `--staged` to previous `git diff` with unexpected output;
@@ -306,7 +307,7 @@ debug = False
 Or via environment variables:
 
 * `THEFUCK_RULES` – list of enabled rules, like `DEFAULT_RULES:rm_root` or `sudo:no_command`;
-* `THEFUCK_EXCLUDE_RULES` – list of disabled rules, like `git_pull:git_push`; 
+* `THEFUCK_EXCLUDE_RULES` – list of disabled rules, like `git_pull:git_push`;
 * `THEFUCK_REQUIRE_CONFIRMATION` – require confirmation before running new command, `true/false`;
 * `THEFUCK_WAIT_COMMAND` – max amount of time in seconds for getting previous command output;
 * `THEFUCK_NO_COLORS` – disable colored output, `true/false`;
@@ -358,3 +359,15 @@ sudo apt-get install pandoc
 
 ## License MIT
 Project License can be found [here](LICENSE.md).
+
+
+[version-badge]:   https://img.shields.io/pypi/v/thefuck.svg?label=version
+[version-link]:    https://pypi.python.org/pypi/thefuck/
+[travis-badge]:    https://img.shields.io/travis/nvbn/thefuck.svg
+[travis-link]:     https://travis-ci.org/nvbn/thefuck
+[appveyor-badge]:  https://img.shields.io/appveyor/ci/nvbn/thefuck.svg?label=windows%20build
+[appveyor-link]:   https://ci.appveyor.com/project/nvbn/thefuck
+[coverage-badge]:  https://img.shields.io/coveralls/nvbn/thefuck.svg
+[coverage-link]:   https://coveralls.io/github/nvbn/thefuck
+[license-badge]:   https://img.shields.io/badge/license-MIT-007EC7.svg
+[examples-link]:   https://raw.githubusercontent.com/nvbn/thefuck/master/example.gif

appveyor.yml

@@ -0,0 +1,22 @@
+build: false
+
+environment:
+  matrix:
+    - PYTHON: "C:/Python27"
+    - PYTHON: "C:/Python33"
+    - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python35"
+
+init:
+  - "ECHO %PYTHON%"
+  - ps: "ls C:/Python*"
+
+install:
+  - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/get-pip.py')
+  - "%PYTHON%/python.exe C:/get-pip.py"
+  - "%PYTHON%/Scripts/pip.exe install -U setuptools"
+  - "%PYTHON%/python.exe setup.py develop"
+  - "%PYTHON%/Scripts/pip.exe install -U -r requirements.txt"
+
+test_script:
+  - "%PYTHON%/Scripts/py.test.exe -sv"

setup.py

@@ -26,7 +26,7 @@ elif (3, 0) < version < (3, 3):
           ' ({}.{} detected).'.format(*version))
     sys.exit(-1)
 
-VERSION = '3.7'
+VERSION = '3.8'
 
 install_requires = ['psutil', 'colorama', 'six', 'decorator']
 extras_require = {':python_version<"3.4"': ['pathlib'],

tests/rules/test_git_branch_exists.py

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

tests/rules/test_ssh_known_host.py

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

tests/shells/test_fish.py

@@ -19,14 +19,18 @@ class TestFish(object):
         return mock
 
     @pytest.fixture
-    def environ(self, monkeypatch):
-        data = {'TF_OVERRIDDEN_ALIASES': 'cd, ls, man, open'}
-        monkeypatch.setattr('thefuck.shells.fish.os.environ', data)
-        return data
+    def os_environ(self, monkeypatch, key, value):
+        monkeypatch.setattr('os.environ', {key: value})
 
-    @pytest.mark.usefixture('environ')
-    def test_get_overridden_aliases(self, shell, environ):
-        assert shell._get_overridden_aliases() == ['cd', 'ls', 'man', 'open']
+    @pytest.mark.parametrize('key, value', [
+        ('TF_OVERRIDDEN_ALIASES', 'cut,git,sed'),  # legacy
+        ('THEFUCK_OVERRIDDEN_ALIASES', 'cut,git,sed'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', 'cut, git, sed'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', ' cut,\tgit,sed\n'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', '\ncut,\n\ngit,\tsed\r')])
+    def test_get_overridden_aliases(self, shell, os_environ):
+        assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep',
+                                                   'ls', 'man', 'open', 'sed'}
 
     @pytest.mark.parametrize('before, after', [
         ('cd', 'cd'),

tests/test_corrector.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from pathlib import PosixPath
+from pathlib import Path
 from thefuck import corrector, const
 from tests.utils import Rule, Command, CorrectedCommand
 from thefuck.corrector import get_corrected_commands, organize_commands
@@ -30,7 +30,7 @@ class TestGetRules(object):
         (['git.py', 'bash.py'], ['git'], ['git'], [])])
     def test_get_rules(self, glob, settings, paths, conf_rules, exclude_rules,
                        loaded_rules):
-        glob([PosixPath(path) for path in paths])
+        glob([Path(path) for path in paths])
         settings.update(rules=conf_rules,
                         priority={},
                         exclude_rules=exclude_rules)

tests/test_types.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import os
 from subprocess import PIPE
 from mock import Mock
 from pathlib import Path
@@ -39,9 +40,10 @@ class TestRule(object):
                               enabled_by_default=True,
                               priority=900,
                               requires_output=True))
-        assert Rule.from_path(Path('/rules/bash.py')) \
+        rule_path = os.path.join(os.sep, 'rules', 'bash.py')
+        assert Rule.from_path(Path(rule_path)) \
                == Rule('bash', match, get_new_command, priority=900)
-        load_source.assert_called_once_with('bash', '/rules/bash.py')
+        load_source.assert_called_once_with('bash', rule_path)
 
     @pytest.mark.parametrize('rules, exclude_rules, rule, is_enabled', [
         (const.DEFAULT_RULES, [], Rule('git', enabled_by_default=True), True),

thefuck/rules/git_branch_exists.py

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

thefuck/shells/fish.py

@@ -7,11 +7,12 @@ from .generic import Generic
 
 class Fish(Generic):
     def _get_overridden_aliases(self):
-        overridden_aliases = os.environ.get('TF_OVERRIDDEN_ALIASES', '').strip()
-        if overridden_aliases:
-            return [alias.strip() for alias in overridden_aliases.split(',')]
-        else:
-            return ['cd', 'grep', 'ls', 'man', 'open']
+        overridden = os.environ.get('THEFUCK_OVERRIDDEN_ALIASES',
+                                    os.environ.get('TF_OVERRIDDEN_ALIASES', ''))
+        default = {'cd', 'grep', 'ls', 'man', 'open'}
+        for alias in overridden.split(','):
+            default.add(alias.strip())
+        return default
 
     def app_alias(self, fuck):
         # It is VERY important to have the variables declared WITHIN the alias