#71 Don't fail on non-exists dir in $PATH

add persian language to switch lang rule

README.md

@@ -193,9 +193,7 @@ The Fuck has a few settings parameters, they can be changed in `~/.thefuck/setti
 
 * `rules` – list of enabled rules, by default all;
 * `require_confirmation` – require confirmation before running new command, by default `False`; 
-* `wait_command` – max amount of time in seconds for getting previous command output;
+* `wait_command` – max amount of time in seconds for getting previous command output.
-* `command_not_found` – path to `command_not_found` binary,
-by default `/usr/lib/command-not-found`.
 
 ## Developing
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 
 setup(name='thefuck',
-      version=1.17,
+      version="1.21",
       description="Magnificent app which corrects your previous console command",
       author='Vladimir Iakovlev',
       author_email='nvbn.rm@gmail.com',

tests/rules/test_no_command.py

@@ -1,62 +1,19 @@
-from subprocess import PIPE
 from mock import patch, Mock
-import pytest
 from thefuck.rules.no_command import match, get_new_command
-from thefuck.main import Command
 
 
-@pytest.fixture
+def test_match():
-def command_found():
+    with patch('thefuck.rules.no_command._get_all_bins',
-    return b'''No command 'aptget' found, did you mean:
+               return_value=['vim', 'apt-get']):
- Command 'apt-get' from package 'apt' (main)
+        assert match(Mock(stderr='vom: not found', script='vom file.py'), None)
-aptget: command not found
+        assert not match(Mock(stderr='qweqwe: not found', script='qweqwe'), None)
-'''
+        assert not match(Mock(stderr='some text', script='vom file.py'), None)
-
-@pytest.fixture
-def command_not_found():
-    return b'''No command 'vom' found, but there are 19 similar ones
-vom: command not found
-'''
 
 
-@pytest.fixture
+def test_get_new_command():
-def bins_exists(request):
+    with patch('thefuck.rules.no_command._get_all_bins',
-    p = patch('thefuck.rules.no_command.which',
+               return_value=['vim', 'apt-get']):
-              return_value=True)
+        assert get_new_command(
-    p.start()
+            Mock(stderr='vom: not found',
-    request.addfinalizer(p.stop)
+                 script='vom file.py'),
-
+            None) == 'vim file.py'
-
-@pytest.fixture
-def settings():
-    class _Settings(object):
-        pass
-    return _Settings
-
-
-@pytest.mark.usefixtures('bins_exists')
-def test_match(command_found, command_not_found, settings):
-    with patch('thefuck.rules.no_command.Popen') as Popen:
-        Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('aptget install vim', '', ''), settings)
-        Popen.assert_called_once_with('/usr/lib/command-not-found aptget',
-                                      shell=True, stderr=PIPE)
-        Popen.return_value.stderr.read.return_value = command_not_found
-        assert not match(Command('ls', '', ''), settings)
-
-    with patch('thefuck.rules.no_command.Popen') as Popen:
-        Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('sudo aptget install vim', '', ''),
-                     Mock(command_not_found='test'))
-        Popen.assert_called_once_with('test aptget',
-                                      shell=True, stderr=PIPE)
-
-
-@pytest.mark.usefixtures('bins_exists')
-def test_get_new_command(command_found):
-    with patch('thefuck.rules.no_command._get_output',
-               return_value=command_found.decode()):
-        assert get_new_command(Command('aptget install vim', '', ''), settings)\
-            == 'apt-get install vim'
-        assert get_new_command(Command('sudo aptget install vim', '', ''), settings) \
-            == 'sudo apt-get install vim'

tests/test_main.py

@@ -53,8 +53,8 @@ def test_get_command():
                   return_value=True):
         Popen.return_value.stdout.read.return_value = b'stdout'
         Popen.return_value.stderr.read.return_value = b'stderr'
-        assert main.get_command(Mock(), [b'thefuck', b'apt-get',
+        assert main.get_command(Mock(), ['thefuck', 'apt-get',
-                                         b'search', b'vim']) \
+                                         'search', 'vim']) \
                == main.Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,

thefuck/rules/no_command.py

@@ -1,30 +1,30 @@
-from subprocess import Popen, PIPE
+from difflib import get_close_matches
-import re
+import os
-from thefuck.utils import which, wrap_settings
+from pathlib import Path
 
 
-local_settings = {'command_not_found': '/usr/lib/command-not-found'}
+def _safe(fn, fallback):
+    try:
+        return fn()
+    except OSError:
+        return fallback
 
 
-def _get_output(command, settings):
+def _get_all_bins():
-    name = command.script.split(' ')[command.script.startswith('sudo')]
+    return [exe.name
-    check_script = u'{} {}'.format(settings.command_not_found, name)
+            for path in os.environ['PATH'].split(':')
-    result = Popen(check_script, shell=True, stderr=PIPE)
+            for exe in _safe(lambda: Path(path).iterdir(), [])
-    return result.stderr.read().decode('utf-8')
+            if not _safe(exe.is_dir, True)]
 
 
-@wrap_settings(local_settings)
 def match(command, settings):
-    if which(settings.command_not_found):
+    return 'not found' in command.stderr and \
-        output = _get_output(command, settings)
+           bool(get_close_matches(command.script.split(' ')[0],
-        return "No command" in output and "from package" in output
+                                  _get_all_bins()))
 
 
-@wrap_settings(local_settings)
 def get_new_command(command, settings):
-    output = _get_output(command, settings)
+    old_command = command.script.split(' ')[0]
-    broken_name = re.findall(r"No command '([^']*)' found",
+    new_command = get_close_matches(old_command,
-                             output)[0]
+                                    _get_all_bins())[0]
-    fixed_name = re.findall(r"Command '([^']*)' from package",
+    return ' '.join([new_command] + command.script.split(' ')[1:])
-                            output)[0]
-    return command.script.replace(broken_name, fixed_name, 1)

thefuck/rules/switch_lang.py

@@ -2,7 +2,8 @@
 
 target_layout = '''qwertyuiop[]asdfghjkl;'zxcvbnm,./QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?'''
 
-source_layouts = [u'''йцукенгшщзхъфывапролджэячсмитьбю.ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,''']
+source_layouts = [u'''йцукенгшщзхъфывапролджэячсмитьбю.ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,''',
+                  u'''ضصثقفغعهخحجچشسیبلاتنمکگظطزرذدپو./ًٌٍَُِّْ][}{ؤئيإأآة»«:؛كٓژٰ‌ٔء><؟''']
 
 
 def _get_matched_layout(command):