x/python-cratonclient
Code Issues Proposed changes

Merge "Adds console script and fix command line parsing"

Browse Source
This commit is contained in:
Jenkins 2016-10-19 18:15:04 +00:00 committed by Gerrit Code Review
commit 5e9ee807dd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cratonclient/shell/main.py
View File

@ -117,26 +117,24 @@ class CratonShell(object):
) )
self.parser = subcommand_parser self.parser = subcommand_parser
if options.help or not argv: if options.help or ('help' in argv) or not argv:
parser.print_help() parser.print_help()
return 0 return 0
args = subcommand_parser.parse_args(argv) args = subcommand_parser.parse_args(argv)
session = craton.Session( session = craton.Session(
username=args.os_username, username=args.os_username,
token=args.os_password, token=args.os_password,
project_id=args.craton_project_id, project_id=args.craton_project_id,
) )
self.cc = client.Client(session, args.craton_url) self.cc = client.Client(session, args.craton_url)
args.func(self.cc, args) args.func(self.cc, args)
def main(): def main():
"""Main entry-point for cratonclient's CLI.""" """Main entry-point for cratonclient's CLI."""
try: try:
CratonShell().main(map(encodeutils.safe_decode, sys.argv[1:])) CratonShell().main([encodeutils.safe_decode(a) for a in sys.argv[1:]])
except Exception as e: except Exception as e:
print("ERROR: %s" % encodeutils.safe_encode(six.text_type(e)), print("ERROR: %s" % encodeutils.safe_encode(six.text_type(e)),
file=sys.stderr) file=sys.stderr)

6
setup.cfg
View File

@ -23,6 +23,10 @@ classifier =
packages = packages =
cratonclient cratonclient
[entry_points]
console_scripts =
craton = cratonclient.shell.main:main
[build_sphinx] [build_sphinx]
source-dir = doc/source source-dir = doc/source
build-dir = doc/build build-dir = doc/build
@ -43,4 +47,4 @@ input_file = cratonclient/locale/cratonclient.pot
[extract_messages] [extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = cratonclient/locale/cratonclient.pot output_file = cratonclient/locale/cratonclient.pot