Bump to 1.44

Conflicts:
	README.md

README.md

@@ -155,6 +155,8 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `django_south_ghost` – adds `--delete-ghost-migrations` to failed because ghosts django south migration;
 * `django_south_merge` – adds `--merge` to inconsistent django south migration;
 * `fix_alt_space` – replaces Alt+Space with Space character;
+* `javac` – appends missing `.java` when compiling Java files;
+* `java` – removes `.java` extension when running Java programs;
 * `git_add` – fix *"Did you forget to 'git add'?"*;
 * `git_checkout` – creates the branch before checking-out;
 * `git_no_command` – fixes wrong git commands like `git brnch`;
@@ -170,6 +172,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `mkdir_p` – adds `-p` when you trying to create directory without parent;
 * `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;
 * `rm_dir` – adds `-rf` when you trying to remove directory;

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '1.43'
+VERSION = '1.44'
 
 
 setup(name='thefuck',

tests/rules/test_java.py

@@ -0,0 +1,17 @@
+import pytest
+from thefuck.rules.java import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+	Command(script='java foo.java'),
+	Command(script='java bar.java')])
+def test_match(command):
+	assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+	(Command('java foo.java'), 'java foo'),
+	(Command('java bar.java'), 'java bar')])
+def test_get_new_command(command, new_command):
+	assert get_new_command(command, None) == new_command

tests/rules/test_javac.py

@@ -0,0 +1,17 @@
+import pytest
+from thefuck.rules.javac import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+	Command(script='javac foo'), 
+	Command(script='javac bar')])
+def test_match(command):
+	assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+	(Command('javac foo'), 'javac foo.java'),
+	(Command('javac bar'), 'javac bar.java')])
+def test_get_new_command(command, new_command):
+	assert get_new_command(command, None) == new_command

tests/rules/test_man.py

@@ -2,6 +2,7 @@ import pytest
 from thefuck.rules.man import match, get_new_command
 from tests.utils import Command
 
+
 @pytest.mark.parametrize('command', [
     Command('man read'),
     Command('man 2 read'),
@@ -14,6 +15,13 @@ def test_match(command):
     assert match(command, None)
 
 
+@pytest.mark.parametrize('command', [
+    Command('man'),
+    Command('man ')])
+def test_not_match(command):
+    assert not match(command, None)
+
+
 @pytest.mark.parametrize('command, new_command', [
     (Command('man read'), 'man 3 read'),
     (Command('man 2 read'), 'man 3 read'),

tests/rules/test_open.py

@@ -0,0 +1,25 @@
+import pytest
+from thefuck.rules.open import match, get_new_command
+from tests.utils import Command
+
+
+@pytest.mark.parametrize('command', [
+	Command(script='open foo.com'), 
+	Command(script='open foo.ly'), 
+	Command(script='open foo.org'), 
+	Command(script='open foo.net'), 
+	Command(script='open foo.se'), 
+	Command(script='open foo.io')])
+def test_match(command):
+	assert match(command, None)
+
+
+@pytest.mark.parametrize('command, new_command', [
+	(Command('open foo.com'), 'open http://foo.com'),
+	(Command('open foo.ly'), 'open http://foo.ly'),
+	(Command('open foo.org'), 'open http://foo.org'),
+	(Command('open foo.net'), 'open http://foo.net'),
+	(Command('open foo.se'), 'open http://foo.se'),
+	(Command('open foo.io'), 'open http://foo.io')])
+def test_get_new_command(command, new_command):
+	assert get_new_command(command, None) == new_command

tests/test_shells.py

@@ -78,9 +78,22 @@ class TestFish(object):
     def shell(self):
         return shells.Fish()
 
+    @pytest.fixture(autouse=True)
+    def Popen(self, mocker):
+        mock = mocker.patch('thefuck.shells.Popen')
+        mock.return_value.stdout.read.return_value = (
+            b'fish_config\nfuck\nfunced\nfuncsave\ngrep\nhistory\nll\nmath')
+        return mock
+
     @pytest.mark.parametrize('before, after', [
         ('pwd', 'pwd'),
-        ('ll', 'll')])  # Fish has no aliases but functions
+        ('fuck', 'fish -ic "fuck"'),
+        ('find', 'find'),
+        ('funced', 'fish -ic "funced"'),
+        ('awk', 'awk'),
+        ('math "2 + 2"', r'fish -ic "math \"2 + 2\""'),
+        ('vim', 'vim'),
+        ('ll', 'fish -ic "ll"')])  # Fish has no aliases but functions
     def test_from_shell(self, before, after, shell):
         assert shell.from_shell(before) == after
 
@@ -98,7 +111,14 @@ class TestFish(object):
         assert shell.and_('foo', 'bar') == 'foo; and bar'
 
     def test_get_aliases(self, shell):
-        assert shell.get_aliases() == {}
+        assert shell.get_aliases() == {'fish_config': 'fish_config',
+                                       'fuck': 'fuck',
+                                       'funced': 'funced',
+                                       'funcsave': 'funcsave',
+                                       'grep': 'grep',
+                                       'history': 'history',
+                                       'll': 'll',
+                                       'math': 'math'}
 
 
 @pytest.mark.usefixtures('isfile')

tests/test_utils.py

@@ -1,6 +1,6 @@
 import pytest
 from mock import Mock
-from thefuck.utils import sudo_support, wrap_settings
+from thefuck.utils import sudo_support, wrap_settings, memoize
 from thefuck.types import Settings
 from tests.utils import Command
 
@@ -24,3 +24,11 @@ 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)
+
+
+def test_memoize():
+    fn = Mock(__name__='fn')
+    memoized = memoize(fn)
+    memoized()
+    memoized()
+    fn.assert_called_once_with()

thefuck/rules/java.py

@@ -0,0 +1,13 @@
+# Fixes common java command mistake
+# 
+# Example:
+# > java foo.java
+# Error: Could not find or load main class foo.java
+# 
+
+def match(command, settings):
+	return (command.script.startswith ('java ')
+		and command.script.endswith ('.java'))
+
+def get_new_command(command, settings):
+	return command.script[:-5]

thefuck/rules/javac.py

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

thefuck/rules/man.py

@@ -1,5 +1,5 @@
 def match(command, settings):
-    return command.script.startswith('man')
+    return command.script.strip().startswith('man ')
 
 
 def get_new_command(command, settings):

thefuck/rules/open.py

@@ -0,0 +1,24 @@
+# Opens URL's in the default web browser
+# 
+# Example:
+# > open github.com
+# The file ~/github.com does not exist.
+# Perhaps you meant 'http://github.com'?
+#
+# 
+
+def match(command, settings):
+	return (command.script.startswith ('open')
+			and (
+			# Wanted to use this:
+			# 'http' in command.stderr
+			'.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))
+
+def get_new_command(command, settings):
+	return 'open http://' + command.script[5:]

thefuck/rules/sudo.py

@@ -11,7 +11,8 @@ patterns = ['permission denied',
             'requested operation requires superuser privilege',
             'must be run as root',
             'must be superuser',
-            'Need to be root']
+            'Need to be root',
+            'you must be root to run this program.']
 
 
 def match(command, settings):

thefuck/shells.py

@@ -8,10 +8,11 @@ from subprocess import Popen, PIPE
 from time import time
 import os
 from psutil import Process
-from .utils import DEVNULL
+from .utils import DEVNULL, memoize
 
 
 class Generic(object):
+
     def get_aliases(self):
         return {}
 
@@ -61,8 +62,10 @@ class Bash(Generic):
             value = value[1:-1]
         return name, value
 
+    @memoize
     def get_aliases(self):
-        proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL, shell=True)
+        proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL,
+                     shell=True)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -91,6 +94,25 @@ class Fish(Generic):
                 "    end\n"
                 "end")
 
+    @memoize
+    def get_aliases(self):
+        proc = Popen('fish -ic functions', stdout=PIPE, stderr=DEVNULL,
+                     shell=True)
+        functions = proc.stdout.read().decode('utf-8').strip().split('\n')
+        return {function: function for function in functions}
+
+    def _expand_aliases(self, command_script):
+        aliases = self.get_aliases()
+        binary = command_script.split(' ')[0]
+        if binary in aliases:
+            return 'fish -ic "{}"'.format(command_script.replace('"', r'\"'))
+        else:
+            return command_script
+
+    def from_shell(self, command_script):
+        """Prepares command before running in app."""
+        return self._expand_aliases(command_script)
+
     def _get_history_file_name(self):
         return os.path.expanduser('~/.config/fish/fish_history')
 
@@ -111,8 +133,10 @@ class Zsh(Generic):
             value = value[1:-1]
         return name, value
 
+    @memoize
     def get_aliases(self):
-        proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL, shell=True)
+        proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL,
+                     shell=True)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')
@@ -134,8 +158,10 @@ class Tcsh(Generic):
         name, value = alias.split("\t", 1)
         return name, value
 
+    @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,
+                     shell=True)
         return dict(
             self._parse_alias(alias)
             for alias in proc.stdout.read().decode('utf-8').split('\n')

thefuck/utils.py

@@ -1,5 +1,6 @@
 from functools import wraps
 import os
+import pickle
 import six
 from .types import Command
 
@@ -62,3 +63,18 @@ def sudo_support(fn):
         else:
             return result
     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:
+            memo[key] = fn(*args, **kwargs)
+
+        return memo[key]
+
+    return wrapper