From 419878f526c35a9caf5f4665693d9170b638081e Mon Sep 17 00:00:00 2001 From: nvbn Date: Sat, 25 Apr 2015 03:42:36 +0200 Subject: [PATCH] #118 Make `ls_lah` disabled by default --- README.md | 2 +- tests/rules/test_ls_lah.py | 10 +++++----- thefuck/rules/ls_lah.py | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 85cbdbb0..9f55b533 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,6 @@ using matched rule and run it. Rules enabled by default: * `git_no_command` – fixes wrong git commands like `git brnch`; * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`; * `has_exists_script` – prepends `./` when script/binary exists; -* `ls_lah` – adds -lah to ls; * `lein_not_task` – fixes wrong `lein` tasks like `lein rpl`; * `mkdir_p` – adds `-p` when you trying to create directory without parent; * `no_command` – fixes wrong console commands, for example `vom/vim`; @@ -170,6 +169,7 @@ using matched rule and run it. Rules enabled by default: Bundled, but not enabled by default: +* `ls_lah` – adds -lah to ls; * `rm_root` – adds `--no-preserve-root` to `rm -rf /` command. ## Creating your own rules diff --git a/tests/rules/test_ls_lah.py b/tests/rules/test_ls_lah.py index f7eb3ed1..c453f6e5 100644 --- a/tests/rules/test_ls_lah.py +++ b/tests/rules/test_ls_lah.py @@ -3,11 +3,11 @@ from thefuck.rules.ls_lah import match, get_new_command def test_match(): - assert match(Mock(script='ls file.py'), None) - assert match(Mock(script='ls /opt'), None) - assert not match(Mock(script='ls -lah /opt'), None) + assert match(Mock(script='ls file.py'), None) + assert match(Mock(script='ls /opt'), None) + assert not match(Mock(script='ls -lah /opt'), None) def test_get_new_command(): - assert get_new_command( Mock(script='ls file.py'), None) == 'ls -lah file.py' - assert get_new_command( Mock(script='ls'), None) == 'ls -lah' + assert get_new_command(Mock(script='ls file.py'), None) == 'ls -lah file.py' + assert get_new_command(Mock(script='ls'), None) == 'ls -lah' diff --git a/thefuck/rules/ls_lah.py b/thefuck/rules/ls_lah.py index 1de02831..50fe9f5e 100644 --- a/thefuck/rules/ls_lah.py +++ b/thefuck/rules/ls_lah.py @@ -1,5 +1,9 @@ +enabled_by_default = False + + def match(command, settings): - return ('ls' in command.script and not ('ls -' in command.script)) + return 'ls' in command.script and not ('ls -' in command.script) + def get_new_command(command, settings): command = command.script.split(' ')