python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-25 00:37:31 +02:00
Code Issues Releases Activity

remove bail if a, h, or v in magic_options to keep from confusing behavior

Browse Source
This commit is contained in:
Kelly Brazil
2022-10-11 17:18:55 -07:00
parent 3916623c46
commit 097d013447
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jc/cli.py
View File

@ -399,12 +399,6 @@ class JcCli():
else: else:
break break
# if -a, -h, or -v found in options, then clear options and bail out
bail_opts = ('a', 'h', 'v')
if len({*bail_opts} & {*self.magic_options}):
self.magic_options = []
return
# all options popped and no command found - for case like 'jc -x' # all options popped and no command found - for case like 'jc -x'
if len(args_given) == 0: if len(args_given) == 0:
self.magic_options = [] self.magic_options = []

7
tests/test_jc_cli.py
View File

@ -22,12 +22,13 @@ class MyTests(unittest.TestCase):
'jc -prd airport -I': ('--airport', ['p', 'r', 'd'], ['airport', '-I']), 'jc -prd airport -I': ('--airport', ['p', 'r', 'd'], ['airport', '-I']),
'jc -p nonexistent command': (None, ['p'], ['nonexistent', 'command']), 'jc -p nonexistent command': (None, ['p'], ['nonexistent', 'command']),
'jc -ap': (None, [], None), 'jc -ap': (None, [], None),
'jc -a arp -a': (None, [], None), 'jc -a arp -a': ('--arp', ['a'], ['arp', '-a']),
'jc -v': (None, [], None), 'jc -v': (None, [], None),
'jc -h': (None, [], None), 'jc -h': (None, [], None),
'jc -h --arp': (None, [], None), 'jc -h --arp': (None, [], None),
'jc -h arp': (None, [], None), 'jc -h arp': ('--arp', ['h'], ['arp']),
'jc -h arp -a': (None, [], None), 'jc -h arp -a': ('--arp', ['h'], ['arp', '-a']),
'jc -v arp -a': ('--arp', ['v'], ['arp', '-a']),
'jc --pretty dig': ('--dig', ['p'], ['dig']), 'jc --pretty dig': ('--dig', ['p'], ['dig']),
'jc --pretty --monochrome --quiet --raw dig': ('--dig', ['p', 'm', 'q', 'r'], ['dig']), 'jc --pretty --monochrome --quiet --raw dig': ('--dig', ['p', 'm', 'q', 'r'], ['dig']),
'jc --about --yaml-out': (None, [], None) 'jc --about --yaml-out': (None, [], None)