diff --git a/setup.py b/setup.py index 1cfbcbc..c7775b9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup(name='thefuck', - version=1.7, + version=1.8, description="Magnificent app which corrects your previous console command", author='Vladimir Iakovlev', author_email='nvbn.rm@gmail.com', diff --git a/tests/test_main.py b/tests/test_main.py index c4db355..03b4601 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -4,21 +4,6 @@ from mock import patch, Mock from thefuck import main -def test_setup_user_dir(): - with patch('thefuck.main.Path.is_dir', return_value=False), \ - patch('thefuck.main.Path.mkdir') as mkdir, \ - patch('thefuck.main.Path.touch') as touch: - main.setup_user_dir() - assert mkdir.call_count == 2 - assert touch.call_count == 1 - with patch('thefuck.main.Path.is_dir', return_value=True), \ - patch('thefuck.main.Path.mkdir') as mkdir, \ - patch('thefuck.main.Path.touch') as touch: - main.setup_user_dir() - assert mkdir.call_count == 0 - assert touch.call_count == 0 - - def test_get_settings(): with patch('thefuck.main.load_source', return_value=Mock(rules=['bash'])): assert main.get_settings(Path('/')).rules == ['bash'] diff --git a/thefuck/main.py b/thefuck/main.py index dd09822..b2754b9 100644 --- a/thefuck/main.py +++ b/thefuck/main.py @@ -13,10 +13,10 @@ Rule = namedtuple('Rule', ('match', 'get_new_command')) def setup_user_dir(): """Returns user config dir, create it when it doesn't exists.""" user_dir = Path(expanduser('~/.thefuck')) - if not user_dir.is_dir(): - user_dir.mkdir() - user_dir.joinpath('rules').mkdir() - user_dir.joinpath('settings.py').touch() + rules_dir = user_dir.joinpath('rules') + if not rules_dir.is_dir(): + rules_dir.mkdir(parents=True) + user_dir.joinpath('settings.py').touch() return user_dir