Adds option to recognize mutual options -R, -r

derphilipp · Jan 8, 2016 · a544bdf · a544bdf
1 parent f353b5f
commit a544bdf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pwgrep/command_parser.py b/pwgrep/command_parser.py
@@ -12,15 +12,18 @@ class CommandParser(object):
     def __init__(self, args):
         self._parser = argparse.ArgumentParser(prog='pwgrep', add_help=False)
 
-        self._parser.add_argument(
+        recursion_group = self._parser.add_mutually_exclusive_group()
+
+        recursion_group.add_argument(
             '-R', '--dereference-recursive',
             action='store_true',
             help=command_parser_text.DEREFERENCE_RECURSIVE
         )
-        self._parser.add_argument(
+        recursion_group.add_argument(
             '-r', '--recursive',
             action='store_true',
             help=command_parser_text.RECURSIVE)
+
         self._parser.add_argument(
             '-h', '--no-filename',
             action='store_true',

diff --git a/tests/system_test.py b/tests/system_test.py
@@ -164,9 +164,10 @@ def test_color_auto_color():
     helper_test_match(SIMPLEDIR, '--color=auto Zen *', expected_stdout, '', 0)
 
 
+# Wrong options
 def test_color_wrong_option():
     # argparse exits with exit code 2 ('incorrect usage')
-    expected_stderr = """usage: pwgrep [-R] [-r] [-h] [-i] [-v] [-o] [--color [COLOR]] [--version]
+    expected_stderr = """usage: pwgrep [-R | -r] [-h] [-i] [-v] [-o] [--color [COLOR]] [--version]
               [--help]
               PATTERN [PATH [PATH ...]]
 pwgrep: error: argument --color: unrecognized is not a valid color option
@@ -175,6 +176,15 @@ def test_color_wrong_option():
                       '', expected_stderr, 2)
 
 
+def test_regex_wrong_option():
+    expected_stderr = """usage: pwgrep [-R | -r] [-h] [-i] [-v] [-o] [--color [COLOR]] [--version]
+              [--help]
+              PATTERN [PATH [PATH ...]]
+pwgrep: error: argument -r/--recursive: not allowed with argument -R/--dereference-recursive
+"""
+    helper_test_match(SIMPLEDIR, '-R -r Hello .', '', expected_stderr, 2)
+
+
 # stdin
 def test_stdin_l():
     stdin = b"""Hello

diff --git a/tox.ini b/tox.ini
@@ -14,6 +14,8 @@ passenv =
     *
 usedevelop = true
 
+commands =
+    py.test {posargs}
 
 [testenv:coverage]
 basepython = python2.7