packagedb-cli-commits March 2014

packagedb-cli-commits@lists.stg.fedorahosted.org

1 participants
188 discussions

[packagedb-cli/pkgdb2] pep8 fixes
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 59b43c27c2860de3d78c88bf3a6862529d42025e Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:35:53 2014 +0100 pep8 fixes pkgdb2.py | 3 ++- setup.py | 12 ++++++------ test.py | 40 ++++++++++++++++------------------------ 3 files changed, 24 insertions(+), 31 deletions(-) --- diff --git a/pkgdb2.py b/pkgdb2.py index 7b7edff..b7272b0 100644 --- a/pkgdb2.py +++ b/pkgdb2.py @@ -101,7 +101,8 @@ class PkgDB(object): from urlparse import urlparse, parse_qs fedora_openid_api = r'https://id.fedoraproject.org/api/v1/' - fedora_openid = r'^http(s)?:\/\/(|stg.|dev.)?id\.fedoraproject\.org(/)?' + fedora_openid = r'^http(s)?:\/\/(|stg.|dev.)?id\.fedoraproject'\ + '\.org(/)?' motif = re.compile(fedora_openid) # Log into the service diff --git a/setup.py b/setup.py index 9ca26c8..14c4815 100644 --- a/setup.py +++ b/setup.py @@ -6,12 +6,12 @@ Setup script from distutils.core import setup setup( - name = 'packagedb-cli', - description = 'A command line tool to access the Fedora Package Database.', - version = '1.6.0', - license = 'GPLv2+', - download_url = 'https://fedorahosted.org/releases/p/a/packagedb-cli/', - url = 'https://fedorahosted.org/packagedb-cli/', + name='packagedb-cli', + description='A command line tool to access the Fedora Package Database.', + version='1.6.0', + license='GPLv2+', + download_url='https://fedorahosted.org/releases/p/a/packagedb-cli/', + url='https://fedorahosted.org/packagedb-cli/', scripts=['pkgdb-cli'], author='Pierre-Yves Chibon', author_email='pingou(a)pingoured.fr', diff --git a/test.py b/test.py index b07d041..b431c82 100644 --- a/test.py +++ b/test.py @@ -9,14 +9,13 @@ import imp pkgdb = imp.load_source('pkgdb', 'pkgdb-cli') - class testPkgdDBCli(unittest.TestCase): def setUp(self): """ set up data used in the tests. setUp is called before each test function execution. """ - pkgdb.pkgdbclient = PackageDB('https://admin.stg.fedoraproject.org/pkgdb', - insecure=True) + pkgdb.pkgdbclient = PackageDB( + 'https://admin.stg.fedoraproject.org/pkgdb', insecure=True) pkgdb.log.setLevel(logging.DEBUG) print pkgdb.pkgdbclient.base_url @@ -31,29 +30,22 @@ class testPkgdDBCli(unittest.TestCase): pkgdb.get_packages('R-*', branch='devel') def testGetOrphanedPackages(self): - pkgdb.get_orphaned_packages('perl-*', eol=False, - name_only=False, - branch='all') - pkgdb.get_orphaned_packages('perl-*', eol=True, - name_only=True, - branch='all') - pkgdb.get_orphaned_packages('perl-*', eol=True, - name_only=True, - branch='devel') + pkgdb.get_orphaned_packages( + 'perl-*', eol=False, name_only=False, branch='all') + pkgdb.get_orphaned_packages( + 'perl-*', eol=True, name_only=True, branch='all') + pkgdb.get_orphaned_packages( + 'perl-*', eol=True, name_only=True, branch='devel') def testGetPackagerInfo(self): - pkgdb.get_packager_info('pingou', motif=None, - name_only=False, - branch='all') - pkgdb.get_packager_info('pingou', motif=None, - name_only=True, - branch='all') - pkgdb.get_packager_info('pingou', motif='R-*', - name_only=False, - branch='all') - pkgdb.get_packager_info('pingou', motif='R-*', - name_only=False, - branch='devel') + pkgdb.get_packager_info( + 'pingou', motif=None, name_only=False, branch='all') + pkgdb.get_packager_info( + 'pingou', motif=None, name_only=True, branch='all') + pkgdb.get_packager_info( + 'pingou', motif='R-*', name_only=False, branch='all') + pkgdb.get_packager_info( + 'pingou', motif='R-*', name_only=False, branch='devel') def testOrphanPackage(self): pkgdb.orphan_package('R-ROC', 'devel', False, None, None)

1 0

[packagedb-cli/pkgdb2] Documentation and allow disabling iteration when the API paginates
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 77b3becd8d66ca290b0b6b9abba344b4645e2a3a Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:33:10 2014 +0100 Documentation and allow disabling iteration when the API paginates - Expand docstring where needed - Add support so one can get one specific page of the API when the API paginates pkgdb2.py | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) --- diff --git a/pkgdb2.py b/pkgdb2.py index fa56c2d..7b7edff 100644 --- a/pkgdb2.py +++ b/pkgdb2.py @@ -304,10 +304,14 @@ class PkgDB(object): return output - def get_packager_acls(self, username, page=1, count=False): + def get_packager_acls( + self, username, page=1, iterate=True, count=False): ''' Return the list of packagers matching the provided criterias. :arg username: + :kwarg page: + :kwarg iterate: + :kwarg count: :return: the json object returned by the API :rtype: dict :raise PkgDBException: if the API call does not return a http code @@ -342,10 +346,11 @@ class PkgDB(object): output = _get_pages(page) - total = output['page_total'] - for i in range(2, total + 1): - data = _get_pages(i) - output['packages'].extend(data['packages']) + if iterate: + total = output['page_total'] + for i in range(2, total + 1): + data = _get_pages(i) + output['packages'].extend(data['packages']) return output @@ -405,13 +410,19 @@ class PkgDB(object): return output def get_packages(self, pattern='*', branches=None, poc=None, status=None, - orphaned=False, acls=False, count=False): + orphaned=False, acls=False, page=1, iterate=True, + count=False): ''' Return the list of packages matching the provided criterias. :kwarg pattern: :kwarg branch: :kwarg poc: - :kwarg orphan: + :kwarg status: + :kwarg orphaned: + :kwarg acls: + :kwarg page: + :kwarg iterate: + :kwarg count: :return: the json object returned by the API :rtype: dict :raise PkgDBException: if the API call does not return a http code @@ -451,12 +462,13 @@ class PkgDB(object): return output - output = _get_pages(1) + output = _get_pages(page) - total = output['page_total'] - for i in range(2, total + 1): - data = _get_pages(i) - output['packages'].extend(data['packages']) + if iterate: + total = output['page_total'] + for i in range(2, total + 1): + data = _get_pages(i) + output['packages'].extend(data['packages']) return output

1 0

[packagedb-cli/pkgdb2] Let's not expose the limit argument, we'll just use the default
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit db4918b468e6115bf77d0345e8c72899804a3d0c Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:28:10 2014 +0100 Let's not expose the limit argument, we'll just use the default pkgdb2.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) --- diff --git a/pkgdb2.py b/pkgdb2.py index 94e0788..fa56c2d 100644 --- a/pkgdb2.py +++ b/pkgdb2.py @@ -304,7 +304,7 @@ class PkgDB(object): return output - def get_packager_acls(self, username, page=1, limit=250, count=False): + def get_packager_acls(self, username, page=1, count=False): ''' Return the list of packagers matching the provided criterias. :arg username: @@ -323,7 +323,6 @@ class PkgDB(object): args = { 'username': username, 'page': page, - 'limit': limit, } if count is True: args['count'] = count

1 0

[packagedb-cli/pkgdb2] pylint fixes in the pkgdb2 module
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit afae9ab2624e981d73505df072694a85ca634b7f Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:27:09 2014 +0100 pylint fixes in the pkgdb2 module pkgdb2.py | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) --- diff --git a/pkgdb2.py b/pkgdb2.py index deb0abc..94e0788 100644 --- a/pkgdb2.py +++ b/pkgdb2.py @@ -16,7 +16,6 @@ # license. """ -import json import logging import requests @@ -25,7 +24,7 @@ logging.basicConfig() LOG = logging.getLogger("pkgdb") -PKGDB_URL = 'http://209.132.184.188' +PKGDB_URL = r'http://209.132.184.188' class PkgDBException(Exception): @@ -99,9 +98,10 @@ class PkgDB(object): production. ''' import re + from urlparse import urlparse, parse_qs - fedora_openid_api = 'https://id.fedoraproject.org/api/v1/' - fedora_openid = '^http(s)?:\/\/(|stg.|dev.)?id\.fedoraproject\.org(/)?' + fedora_openid_api = r'https://id.fedoraproject.org/api/v1/' + fedora_openid = r'^http(s)?:\/\/(|stg.|dev.)?id\.fedoraproject\.org(/)?' motif = re.compile(fedora_openid) # Log into the service @@ -112,18 +112,18 @@ class PkgDB(object): # requests.session should hold onto this for us.... openid_url, data = _parse_service_form(response) if not motif.match(openid_url): - raise FedoraServiceError( + raise PkgDBException( 'Un-expected openid provider asked: %s' % openid_url) else: data = {} - for r in response.history: - if motif.match(r.url): - parsed = parse_qs(urlparse(r.url).query) + for resp in response.history: + if motif.match(resp.url): + parsed = parse_qs(urlparse(resp.url).query) for key, value in parsed.items(): data[key] = value[0] break else: - raise FedoraServiceError( + raise PkgDBException( 'Unable to determine openid parameters from login: %r' % openid_url) @@ -151,14 +151,14 @@ class PkgDB(object): def create_collection( self, clt_name, clt_version, clt_status, clt_branchname, - clt_distTag, clt_git_branch_name, clt_kojiname): + clt_disttag, clt_git_branch_name, clt_kojiname): ''' Create a new collection. :arg clt_name: :arg clt_version: :arg clt_status: :arg clt_branchname: - :arg clt_distTag: + :arg clt_disttag: :arg clt_git_branch_name: :arg clt_kojiname: :return: the json object returned by the API @@ -175,7 +175,7 @@ class PkgDB(object): 'collection_version': clt_version, 'collection_status': clt_status, 'collection_branchname': clt_branchname, - 'collection_distTag': clt_distTag, + 'collection_distTag': clt_disttag, 'collection_git_branch_name': clt_git_branch_name, 'collection_kojiname': clt_kojiname, } @@ -315,6 +315,11 @@ class PkgDB(object): ''' def _get_pages(page): + ''' Retrieve a specified page of a packager's ACLs list. + + :arg page: the page number to retrieve + + ''' args = { 'username': username, 'page': page, @@ -336,13 +341,12 @@ class PkgDB(object): return output - output = _get_pages(1) + output = _get_pages(page) - page = output['page'] total = output['page_total'] for i in range(2, total + 1): data = _get_pages(i) - output['packages'].extend(output['packages']) + output['packages'].extend(data['packages']) return output @@ -416,6 +420,11 @@ class PkgDB(object): ''' def _get_pages(page): + ''' Retrieve a specified page of the packages list. + + :arg page: the page number to retrieve + + ''' args = { 'pattern': pattern, 'branches': branches, @@ -445,11 +454,10 @@ class PkgDB(object): output = _get_pages(1) - page = output['page'] total = output['page_total'] for i in range(2, total + 1): data = _get_pages(i) - output['packages'].extend(output['packages']) + output['packages'].extend(data['packages']) return output

1 0

[packagedb-cli/pkgdb2] Simplifies the returns
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 1057d1536aa471201a9aa5fb1dbf12538ed4d91b Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:20:54 2014 +0100 Simplifies the returns pkgdb2-cli | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index 52c55fd..279da68 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -647,37 +647,40 @@ def main(): 'https://admin.stg.fedoraproject.org/accounts', insecure=True) + return_code = 0 + try: arg.func(arg) except KeyboardInterrupt: print "\nInterrupted by user." - return 1 + return_code = 1 except ServerError, err: LOG.debug('ServerError') print '{0}'.format(err) - return 3 + return_code = 3 except ActionError, err: LOG.debug('ActionError') print '{0}'.format(err.message) - return 7 + return_code = 7 except AppError, err: LOG.debug('AppError') print '{0}: {1}'.format(err.name, err.message) - return 4 + return_code = 4 except PkgDBException, err: LOG.debug('PkgDBException') print '{0}'.format(err) - return 8 + return_code = 8 except ValueError, err: print 'Error: {0}'.format(err) print 'Did you log in?' - return 6 + return_code = 6 except Exception, err: print 'Error: {0}'.format(err) logging.exception("Generic error catched:") - return 5 + return_code = 5 + + return return_code if __name__ == '__main__': main() -

1 0

[packagedb-cli/pkgdb2] Move the check for --test into the main method where it belongs
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 05a4ded6a0d4a648d94cd48f7448b42ad38cb287 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:19:04 2014 +0100 Move the check for --test into the main method where it belongs pkgdb2-cli | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index abc6ef7..52c55fd 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -22,7 +22,6 @@ import argparse import logging import getpass import koji -import sys import fedora_cert @@ -41,11 +40,6 @@ logging.basicConfig() PKGDBLOG = logging.getLogger("pkgdb") LOG = logging.getLogger("pkgdb-cli") -if '--test' in sys.argv: - print "Testing environment" - fasclient = AccountSystem( - 'https://admin.stg.fedoraproject.org/accounts', insecure=True) - ACTIONLIST = ['watchbugzilla', 'watchcommits', 'commit', 'approveacls'] @@ -646,6 +640,13 @@ def main(): elif arg.verbose: LOG.setLevel(logging.INFO) + if arg.test: + global fasclient + print "Testing environment" + fasclient = AccountSystem( + 'https://admin.stg.fedoraproject.org/accounts', + insecure=True) + try: arg.func(arg) except KeyboardInterrupt:

1 0

[packagedb-cli/pkgdb2] pylint fixes in pkgdb2-cli
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 400e7487ec8b1d63ff25a3ee855b7fd65f50e91e Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:17:26 2014 +0100 pylint fixes in pkgdb2-cli - Add missing docstrings - Remove un-used imports - Use more traditionnal __version__ - Fix variable name when they are constant - Fix one and two letter variable names pkgdb2-cli | 207 +++++++++++++++++++++++++++++++----------------------------- 1 files changed, 108 insertions(+), 99 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index 409046e..abc6ef7 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -15,8 +15,7 @@ # license. """ -from fedora.client import (AccountSystem, AppError, AuthError, - ServerError) +from fedora.client import (AccountSystem, AppError, ServerError) from bugzilla.rhbugzilla import RHBugzilla from pkgdb2 import PkgDB, PkgDBException import argparse @@ -24,12 +23,10 @@ import logging import getpass import koji import sys -import re import fedora_cert -import timeit -version = '2.0' +__version__ = '2.0' KOJI_HUB = 'http://koji.fedoraproject.org/kojihub' RH_BZ_API = 'https://bugzilla.redhat.com/xmlrpc.cgi' @@ -41,15 +38,15 @@ RESET = "\033[0;0m" # Initial simple logging stuff logging.basicConfig() -pkgdblog = logging.getLogger("pkgdb") -log = logging.getLogger("pkgdb-cli") +PKGDBLOG = logging.getLogger("pkgdb") +LOG = logging.getLogger("pkgdb-cli") if '--test' in sys.argv: print "Testing environment" fasclient = AccountSystem( 'https://admin.stg.fedoraproject.org/accounts', insecure=True) -actionlist = ['watchbugzilla', 'watchcommits', 'commit', 'approveacls'] +ACTIONLIST = ['watchbugzilla', 'watchcommits', 'commit', 'approveacls'] class ActionError(Exception): @@ -75,7 +72,7 @@ def __do_login(username=None, password=None): try: username = fedora_cert.read_user_cert() except: - log.debug('Could not read Fedora cert, using login name') + LOG.debug('Could not read Fedora cert, using login name') username = raw_input('FAS username: ') password = getpass.getpass('FAS password: ') pkgdbclient.username = username @@ -134,7 +131,7 @@ def _get_last_build(packagename, tag): :arg tag the tag used in koji. See `koji list-tags` for the complete list of available tag. """ - log.debug("Search last build for {0} in {1}".format(packagename, tag)) + LOG.debug("Search last build for {0} in {1}".format(packagename, tag)) kojiclient = koji.ClientSession(KOJI_HUB, {}) data = kojiclient.getLatestBuilds( @@ -170,7 +167,7 @@ def get_last_build(packagename, tag): :arg tag the name of the branch for which to retrieve the information. This name can be 'rawhide' or f-14... """ - log.debug("Retrieve the last for {0} in {1}".format(packagename, tag)) + LOG.debug("Retrieve the last for {0} in {1}".format(packagename, tag)) # Add build information from koji # for updates and updates-testing if tag == 'devel': @@ -179,18 +176,18 @@ def get_last_build(packagename, tag): tag = tag + "-updates" try: _get_last_build(packagename, tag) - except Exception, er: - print er + except Exception, err: + print err tag = tag + "-testing" try: _get_last_build(packagename, tag) - except Exception, er: - print er + except Exception, err: + print err else: try: _get_last_build(packagename, tag) - except Exception, er: - print er + except Exception, err: + print err def setup_parser(): @@ -213,7 +210,7 @@ def setup_parser(): parser.add_argument('--test', action='store_true', help="Uses a test instance instead of the real pkgdb.") parser.add_argument('--version', action='version', - version='pkgdb-cli %s' % (version)) + version='pkgdb-cli %s' % (__version__)) subparsers = parser.add_subparsers(title='actions') @@ -321,7 +318,7 @@ def setup_parser(): "action", help="Request (or obsolete a request) for specific ACL on this" " package (actions are '{0}', 'all')".format( - "', '".join(actionlist))) + "', '".join(ACTIONLIST))) parser_request.add_argument( 'branch', default='devel', nargs="?", help="Branch of the package for which the ACL is " @@ -337,7 +334,7 @@ def setup_parser(): "action", help="Request a specific ACL for this package " "(actions are: '{0}', 'all')".format( - "', '".join(actionlist))) + "', '".join(ACTIONLIST))) parser_update.add_argument( 'user', help="FAS username of the person who requested ACL " @@ -367,11 +364,11 @@ def setup_parser(): def do_acl(args): - """ Propagate the arguments to handle the ACL correctly. + """ Retrieves the ACLs of a package from pkgdb. """ - log.info("package : {0}".format(args.package)) - log.info("branch : {0}".format(args.branch)) - #log.info("approve : {0}".format(args.approve)) + LOG.info("package : {0}".format(args.package)) + LOG.info("branch : {0}".format(args.branch)) + #LOG.info("approve : {0}".format(args.approve)) bzclient = RHBugzilla(url=RH_BZ_API) if args.branch == 'all': @@ -383,7 +380,7 @@ def do_acl(args): print output['packages'][0]['package']['summary'] if args.extra: # print the number of opened bugs - log.debug("Query bugzilla") + LOG.debug("Query bugzilla") bugbz = bzclient.query( {'bug_status': ['NEW', 'ASSIGNED', 'NEEDINFO'], 'component': args.package}) @@ -436,14 +433,14 @@ def do_acl(args): def do_list(args): - """ Propagate the arguments to handle list correctly. + """ Retrieve the list of packages matching a pattern from pkgdb. """ - log.info("pattern : {0}".format(args.pattern)) - log.info("all : {0}".format(args.all)) - log.info("orphaned : {0}".format(args.orphaned)) - log.info("user : {0}".format(args.user)) - log.info("name only: {0}".format(args.name_only)) - log.info("branch : {0}".format(args.branch)) + LOG.info("pattern : {0}".format(args.pattern)) + LOG.info("all : {0}".format(args.all)) + LOG.info("orphaned : {0}".format(args.orphaned)) + LOG.info("user : {0}".format(args.user)) + LOG.info("name only: {0}".format(args.name_only)) + LOG.info("branch : {0}".format(args.branch)) pattern = args.pattern if not pattern or args.all: @@ -461,7 +458,7 @@ def do_list(args): orphaned=args.orphaned ) cnt = 0 - for pkg in sorted(output['packages'], key = lambda pkg: (pkg['name'])): + for pkg in sorted(output['packages'], key=lambda pkg: (pkg['name'])): out = " " + pkg['name'] + ' ' * (33 - len(pkg['name'])) + \ pkg['summary'] if args.name_only: @@ -474,11 +471,13 @@ def do_list(args): def do_orphan(args): - log.info("user : {0}".format(args.username)) - log.info("package : {0}".format(args.package)) - log.info("branch : {0}".format(args.branch)) - log.info("all : {0}".format(args.all)) - log.info("retire : {0}".format(args.retire)) + """ Orphan a package in pkgdb. + """ + LOG.info("user : {0}".format(args.username)) + LOG.info("package : {0}".format(args.package)) + LOG.info("branch : {0}".format(args.branch)) + LOG.info("all : {0}".format(args.all)) + LOG.info("retire : {0}".format(args.retire)) if args.all is True: pkgs = _get_user_packages(args.username) @@ -502,10 +501,12 @@ def do_orphan(args): def do_unorphan(args): - log.info("user : {0}".format(args.username)) - log.info("package : {0}".format(args.package)) - log.info("branch : {0}".format(args.branch)) - log.info("poc : {0}".format(args.poc)) + """ Unorphan a package in pkgdb. + """ + LOG.info("user : {0}".format(args.username)) + LOG.info("package : {0}".format(args.package)) + LOG.info("branch : {0}".format(args.branch)) + LOG.info("poc : {0}".format(args.poc)) if args.all is True: pkgs = _get_user_packages(args.username) else: @@ -518,7 +519,7 @@ def do_unorphan(args): __do_login(args.username) username = args.poc or args.username or pkgdbclient.username - log.info("new poc : {0}".format(username)) + LOG.info("new poc : {0}".format(username)) output = pkgdbclient.unorphan_packages(pkgs, branches, username) for msg in output.get('messages', []): @@ -526,18 +527,20 @@ def do_unorphan(args): def do_request(args): - log.info("user : {0}".format(args.username)) - log.info("package : {0}".format(args.package)) - log.info("branch : {0}".format(args.branch)) - log.info("acl : {0}".format(args.action)) - log.info("cancel : {0}".format(args.cancel)) + """ Request some ACLs in pkgdb. + """ + LOG.info("user : {0}".format(args.username)) + LOG.info("package : {0}".format(args.package)) + LOG.info("branch : {0}".format(args.branch)) + LOG.info("acl : {0}".format(args.action)) + LOG.info("cancel : {0}".format(args.cancel)) action = args.action if action == 'all': - action = actionlist - elif action not in actionlist: + action = ACTIONLIST + elif action not in ACTIONLIST: raise ActionError( 'Action "{0}" is not in the list: {1},all'.format( - action, ','.join(actionlist))) + action, ','.join(ACTIONLIST))) branch = args.branch if branch == 'all': @@ -548,7 +551,7 @@ def do_request(args): status = 'Obsolete' __do_login(args.username) - log.info("user : {0}".format(pkgdbclient.username)) + LOG.info("user : {0}".format(pkgdbclient.username)) output = pkgdbclient.update_acl( args.package, @@ -562,21 +565,23 @@ def do_request(args): def do_update(args): - log.info("user : {0}".format(args.username)) - log.info("package : {0}".format(args.package)) - log.info("acl : {0}".format(args.action)) - log.info("requester : {0}".format(args.user)) - log.info("branch : {0}".format(args.branch)) - log.info("approve : {0}".format(args.approve)) - log.info("deny : {0}".format(args.deny)) + """ Update (approve/deny) some ACLs request on pkgdb. + """ + LOG.info("user : {0}".format(args.username)) + LOG.info("package : {0}".format(args.package)) + LOG.info("acl : {0}".format(args.action)) + LOG.info("requester : {0}".format(args.user)) + LOG.info("branch : {0}".format(args.branch)) + LOG.info("approve : {0}".format(args.approve)) + LOG.info("deny : {0}".format(args.deny)) action = args.action if action == 'all': - action = actionlist - elif action not in actionlist: + action = ACTIONLIST + elif action not in ACTIONLIST: raise ActionError( 'Action "{0}" is not in the list: {1},all'.format( - action, ','.join(actionlist))) + action, ','.join(ACTIONLIST))) branch = args.branch if branch == 'all': @@ -599,8 +604,10 @@ def do_update(args): def do_branch(args): - log.info("all : {0}".format(args.all)) - log.info("List all active branches") + """ List all the active branches in pkgdb. + """ + LOG.info("all : {0}".format(args.all)) + LOG.info("List all active branches") if args.all: branches = pkgdbclient.get_collections() else: @@ -621,7 +628,11 @@ def main(): # Set up parser for global args parser = setup_parser() # Parse the commandline - arg = parser.parse_args() + try: + arg = parser.parse_args() + except argparse.ArgumentTypeError, err: + print "\nError: {0}".format(err) + return 2 if arg.nocolor: global RED, BOLD, RESET @@ -630,44 +641,42 @@ def main(): RESET = "" if arg.debug: - log.setLevel(logging.DEBUG) - pkgdblog.setLevel(logging.DEBUG) + LOG.setLevel(logging.DEBUG) + PKGDBLOG.setLevel(logging.DEBUG) elif arg.verbose: - log.setLevel(logging.INFO) - - arg.func(arg) + LOG.setLevel(logging.INFO) - -if __name__ == '__main__': try: - main() + arg.func(arg) except KeyboardInterrupt: print "\nInterrupted by user." - sys.exit(1) - except argparse.ArgumentTypeError, e: - print "\nError: {0}".format(e) - sys.exit(2) - except ServerError, e: - log.debug('ServerError') - print '{0}'.format(e) - sys.exit(3) - except ActionError, e: - log.debug('ActionError') - print '{0}'.format(e.message) - sys.exit(7) - except AppError, e: - log.debug('AppError') - print '{0}: {1}'.format(e.name, e.message) - sys.exit(4) - except PkgDBException, e: - log.debug('PkgDBException') - print '{0}'.format(e) - sys.exit(8) - except ValueError, e: - print 'Error: {0}'.format(e) + return 1 + except ServerError, err: + LOG.debug('ServerError') + print '{0}'.format(err) + return 3 + except ActionError, err: + LOG.debug('ActionError') + print '{0}'.format(err.message) + return 7 + except AppError, err: + LOG.debug('AppError') + print '{0}: {1}'.format(err.name, err.message) + return 4 + except PkgDBException, err: + LOG.debug('PkgDBException') + print '{0}'.format(err) + return 8 + except ValueError, err: + print 'Error: {0}'.format(err) print 'Did you log in?' - sys.exit(6) - except Exception, e: - print 'Error: {0}'.format(e) + return 6 + except Exception, err: + print 'Error: {0}'.format(err) logging.exception("Generic error catched:") - sys.exit(5) + return 5 + + +if __name__ == '__main__': + main() +

1 0

[packagedb-cli/pkgdb2] Rename the module pkgdb2 and fix the import in the cli
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit f2481901030aa3bcd1731130fc76dca47583c5b2 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:07:00 2014 +0100 Rename the module pkgdb2 and fix the import in the cli pkgdb2-cli | 2 +- pkgdb.py => pkgdb2.py | 0 2 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index e1b4c5f..409046e 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -18,7 +18,7 @@ from fedora.client import (AccountSystem, AppError, AuthError, ServerError) from bugzilla.rhbugzilla import RHBugzilla -from pkgdb import PkgDB, PkgDBException +from pkgdb2 import PkgDB, PkgDBException import argparse import logging import getpass diff --git a/pkgdb.py b/pkgdb2.py similarity index 100% rename from pkgdb.py rename to pkgdb2.py

1 0

[packagedb-cli/pkgdb2] Add documentation about the object returned and its type
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 728d6fba53ba4f26a25a1b0f4bb3988bca0e3433 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:04:40 2014 +0100 Add documentation about the object returned and its type pkgdb.py | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index a8845fc..deb0abc 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -161,6 +161,8 @@ class PkgDB(object): :arg clt_distTag: :arg clt_git_branch_name: :arg clt_kojiname: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -207,6 +209,8 @@ class PkgDB(object): :arg pkg_poc: :arg pkg_upstream_url: :kwarg pkg_critpath: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -246,6 +250,8 @@ class PkgDB(object): :kward pattern: :kward status: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -274,6 +280,8 @@ class PkgDB(object): :arg pkg_name: :kwarg branch: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -300,6 +308,8 @@ class PkgDB(object): ''' Return the list of packagers matching the provided criterias. :arg username: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -341,6 +351,8 @@ class PkgDB(object): active branch for which he/she is the point of contact. :arg username: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -366,6 +378,8 @@ class PkgDB(object): ''' Return the list of packagers matching the provided criterias. :kwarg pattern: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -395,6 +409,8 @@ class PkgDB(object): :kwarg branch: :kwarg poc: :kwarg orphan: + :return: the json object returned by the API + :rtype: dict :raise PkgDBException: if the API call does not return a http code 200. @@ -443,6 +459,8 @@ class PkgDB(object): :arg packages: :arg branches: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code @@ -481,6 +499,8 @@ class PkgDB(object): :arg packages: :arg branches: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code @@ -520,6 +540,8 @@ class PkgDB(object): :arg packages: :arg branches: :arg poc: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code @@ -559,6 +581,8 @@ class PkgDB(object): :arg packages: :arg branches: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code @@ -600,6 +624,8 @@ class PkgDB(object): :arg acls: :arg status: :arg user: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code @@ -640,6 +666,8 @@ class PkgDB(object): :arg clt_branchname: :arg clt_status: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code @@ -676,6 +704,8 @@ class PkgDB(object): :arg packages: :arg branches: :arg new_poc: + :return: the json object returned by the API + :rtype: dict :raise PkgDBAuthException: if this method is called while the client is not authenticated. :raise PkgDBException: if the API call does not return a http code

1 0

[packagedb-cli/pkgdb2] Add documentation about the exceptions raised by the methods
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit ebb03c6e8f936b4a5bbe05bddb3b7cc214ec2a5a Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 12:01:58 2014 +0100 Add documentation about the exceptions raised by the methods pkgdb.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 604005a..a8845fc 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -161,6 +161,8 @@ class PkgDB(object): :arg clt_distTag: :arg clt_git_branch_name: :arg clt_kojiname: + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -205,6 +207,8 @@ class PkgDB(object): :arg pkg_poc: :arg pkg_upstream_url: :kwarg pkg_critpath: + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -242,6 +246,8 @@ class PkgDB(object): :kward pattern: :kward status: + :raise PkgDBException: if the API call does not return a http code + 200. ''' args = { @@ -268,6 +274,8 @@ class PkgDB(object): :arg pkg_name: :kwarg branch: + :raise PkgDBException: if the API call does not return a http code + 200. ''' args = { @@ -292,6 +300,8 @@ class PkgDB(object): ''' Return the list of packagers matching the provided criterias. :arg username: + :raise PkgDBException: if the API call does not return a http code + 200. ''' def _get_pages(page): @@ -331,6 +341,8 @@ class PkgDB(object): active branch for which he/she is the point of contact. :arg username: + :raise PkgDBException: if the API call does not return a http code + 200. ''' args = { @@ -354,6 +366,8 @@ class PkgDB(object): ''' Return the list of packagers matching the provided criterias. :kwarg pattern: + :raise PkgDBException: if the API call does not return a http code + 200. ''' args = { @@ -381,6 +395,8 @@ class PkgDB(object): :kwarg branch: :kwarg poc: :kwarg orphan: + :raise PkgDBException: if the API call does not return a http code + 200. ''' def _get_pages(page): @@ -427,6 +443,10 @@ class PkgDB(object): :arg packages: :arg branches: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -461,6 +481,10 @@ class PkgDB(object): :arg packages: :arg branches: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -496,6 +520,10 @@ class PkgDB(object): :arg packages: :arg branches: :arg poc: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -531,6 +559,10 @@ class PkgDB(object): :arg packages: :arg branches: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -568,6 +600,10 @@ class PkgDB(object): :arg acls: :arg status: :arg user: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -604,6 +640,10 @@ class PkgDB(object): :arg clt_branchname: :arg clt_status: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged: @@ -636,6 +676,10 @@ class PkgDB(object): :arg packages: :arg branches: :arg new_poc: + :raise PkgDBAuthException: if this method is called while the + client is not authenticated. + :raise PkgDBException: if the API call does not return a http code + 200. ''' if not self.logged:

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

packagedb-cli-commits March 2014