Bump to 3.17

fix sudo.py for macport

README.md

@@ -429,9 +429,9 @@ 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-badge]:    https://travis-ci.org/nvbn/thefuck.svg?branch=master
 [travis-link]:     https://travis-ci.org/nvbn/thefuck
-[appveyor-badge]:  https://img.shields.io/appveyor/ci/nvbn/thefuck.svg?label=windows%20build
+[appveyor-badge]:  https://ci.appveyor.com/api/projects/status/1sskj4imj02um0gu/branch/master?svg=true
 [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

setup.py

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

tests/conftest.py

@@ -7,7 +7,7 @@ shells.shell = shells.Generic()
 
 
 def pytest_addoption(parser):
-    """Adds `--run-without-docker` argument."""
+    """Adds `--enable-functional` argument."""
     group = parser.getgroup("thefuck")
     group.addoption('--enable-functional', action="store_true", default=False,
                     help="Enable functional tests")

tests/rules/test_missing_space_before_subcommand.py

@@ -17,7 +17,7 @@ def test_match(script):
     assert match(Command(script))
 
 
-@pytest.mark.parametrize('script',  ['git branch' 'vimfile'])
+@pytest.mark.parametrize('script', ['git branch', 'vimfile'])
 def test_not_match(script):
     assert not match(Command(script))
 

tests/rules/test_yarn_command_not_found.py

@@ -106,6 +106,13 @@ def test_not_match(command):
 
 
 @pytest.mark.parametrize('command, result', [
-    (Command('yarn whyy webpack', stderr=stderr('whyy')), 'yarn why webpack')])
+    (Command('yarn whyy webpack', stderr=stderr('whyy')),
+     'yarn why webpack'),
+    (Command('yarn require lodash', stderr=stderr('require')),
+     'yarn add lodash')])
 def test_get_new_command(command, result):
-    assert get_new_command(command)[0] == result
+    fixed_command = get_new_command(command)
+    if isinstance(fixed_command, list):
+        fixed_command = fixed_command[0]
+
+    assert fixed_command == result

thefuck/logs.py

@@ -125,5 +125,5 @@ def configured_successfully(configuration_details):
 
 def version(thefuck_version, python_version):
     sys.stderr.write(
-        u'The Fuck {} using Python {}'.format(thefuck_version,
-                                              python_version))
+        u'The Fuck {} using Python {}\n'.format(thefuck_version,
+                                                python_version))

thefuck/rules/missing_space_before_subcommand.py

@@ -1,4 +1,4 @@
-from thefuck.utils import get_all_executables, memoize, which
+from thefuck.utils import get_all_executables, memoize
 
 
 @memoize

thefuck/rules/sudo.py

@@ -21,7 +21,8 @@ patterns = ['permission denied',
             'edspermissionerror',
             'you don\'t have write permissions',
             'use `sudo`',
-            'SudoRequiredError']
+            'SudoRequiredError',
+            'error: insufficient privileges']
 
 
 def match(command):

thefuck/rules/yarn_command_not_found.py

@@ -1,6 +1,6 @@
 import re
 from subprocess import Popen, PIPE
-from thefuck.utils import for_app, eager, replace_command
+from thefuck.utils import for_app, eager, replace_command, replace_argument
 
 regex = re.compile(r'error Command "(.*)" not found.')
 
@@ -10,6 +10,9 @@ def match(command):
     return regex.findall(command.stderr)
 
 
+npm_commands = {'require': 'add'}
+
+
 @eager
 def _get_all_tasks():
     proc = Popen(['yarn', '--help'], stdout=PIPE)
@@ -27,5 +30,9 @@ def _get_all_tasks():
 
 def get_new_command(command):
     misspelled_task = regex.findall(command.stderr)[0]
-    tasks = _get_all_tasks()
-    return replace_command(command, misspelled_task, tasks)
+    if misspelled_task in npm_commands:
+        yarn_command = npm_commands[misspelled_task]
+        return replace_argument(command.script, misspelled_task, yarn_command)
+    else:
+        tasks = _get_all_tasks()
+        return replace_command(command, misspelled_task, tasks)

thefuck/shells/bash.py

@@ -12,9 +12,9 @@ class Bash(Generic):
             function {name} () {{
                 TF_PREVIOUS=$(fc -ln -1);
                 TF_CMD=$(
-                    TF_ALIAS={name}
-                    TF_SHELL_ALIASES=$(alias)
-                    PYTHONIOENCODING=utf-8
+                    export TF_ALIAS={name}
+                    export TF_SHELL_ALIASES=$(alias)
+                    export PYTHONIOENCODING=utf-8
                     thefuck $TF_PREVIOUS {argument_placeholder} $@
                 ) && eval $TF_CMD;
                 {alter_history}

thefuck/ui.py

@@ -4,6 +4,7 @@ import sys
 from .conf import settings
 from .exceptions import NoRuleMatched
 from .system import get_key
+from .utils import get_alias
 from . import logs, const
 
 
@@ -69,7 +70,8 @@ def select_command(corrected_commands):
     try:
         selector = CommandSelector(corrected_commands)
     except NoRuleMatched:
-        logs.failed('No fucks given')
+        logs.failed('No fucks given' if get_alias() == 'fuck'
+                    else 'Nothing found')
         return
 
     if not settings.require_confirmation: