Skip to content

Separate CLI into parse and run to ensure easier testing #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timothycrosley merged 3 commits into from
Oct 18, 2016
Merged

Separate CLI into parse and run to ensure easier testing #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05ff044
Separate CLI into parse and run to ensure easier testing
Oct 18, 2016
1ca80c4
Fix inability to fully test no_https without API keys
Oct 18, 2016
fdbae1d
Fix exception variable
Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions domaintools/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
callable(getattr(API, api_call, None))))


def run(api=None, args=None):
"""Defines how to start the CLI for the DomainTools API"""
def parse(args=None):
"""Defines how to parse CLI arguments for the DomainTools API"""
parser = argparse.ArgumentParser(description='The DomainTools CLI API Client')
parser.add_argument('-u', '--username', dest='user', default='', help='API Username')
parser.add_argument('-k', '--key', dest='key', default='', help='API Key')
Expand Down Expand Up @@ -53,23 +53,13 @@ def run(api=None, args=None):
default=default, nargs='*')

arguments = vars(parser.parse_args(args) if args else parser.parse_args())
out_file = arguments.pop('out_file')
out_format = arguments.pop('format')

user, key = arguments.pop('user', None), arguments.pop('key', None)
if not user or not key:
if not arguments.get('user', None) or not arguments.get('key', None):
try:
with open(arguments.pop('credentials')) as credentials:
user, key = credentials.readline().strip(), credentials.readline().strip()
arguments['user'], arguments['key'] = credentials.readline().strip(), credentials.readline().strip()
except Exception:
sys.stderr.write('Credentials are required to perform API calls.\n')
sys.exit(1)

if not api: # pragma: no cover
api = API(user, key, https=arguments.pop('https'), verify_ssl=arguments.pop('verify_ssl'),
rate_limit=arguments.pop('rate_limit'))
pass

command = getattr(api, arguments.pop('api_call'))
for key, value in arguments.items():
if value in ('-', ['-']):
arguments[key] == (line.strip() for line in sys.stdin.readlines())
Expand All @@ -78,6 +68,19 @@ def run(api=None, args=None):
elif type(value) == list and len(value) == 1:
arguments[key] = value[0]

response = command(**arguments)
return (arguments.pop('out_file'), arguments.pop('format'), arguments)


def run(): # pragma: no cover
"""Defines how to start the CLI for the DomainTools API"""
out_file, out_format, arguments = parse()
user, key = arguments.pop('user', None), arguments.pop('key', None)
if not user or not key:
sys.stderr.write('Credentials are required to perform API calls.\n')
sys.exit(1)

api = API(user, key, https=arguments.pop('https'), verify_ssl=arguments.pop('verify_ssl'),
rate_limit=arguments.pop('rate_limit'))
response = getattr(api, arguments.pop('api_call'))(**arguments)
output = str(getattr(response, out_format) if out_format != 'list' else response.as_list())
out_file.write(output if output.endswith('\n') else output + '\n')
Loading