packagedb-cli-commits March 2014

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

1 participants
188 discussions

[packagedb-cli/pkgdb2] Add create_collection method to create a collection via the API
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 03c11526ae8c0cf93ba034d0af0e14dea49684d3 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 11:34:57 2014 +0100 Add create_collection method to create a collection via the API pkgdb.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 344697d..107cb03 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -80,6 +80,46 @@ class PkgDB(object): self.username = username self.__logged = False + def create_collection( + self, clt_name, clt_version, clt_status, clt_branchname, + 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_git_branch_name: + :arg clt_kojiname: + + ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + + args = { + 'collection_name': clt_name, + 'collection_version': clt_version, + 'collection_status': clt_status, + 'collection_branchname': clt_branchname, + 'collection_distTag': clt_distTag, + 'collection_git_branch_name': clt_git_branch_name, + 'collection_kojiname': clt_kojiname, + } + + req = self.session.post( + '{0}/api/collection/new/'.format(self.url), data=args + ) + LOG.debug('Called: %s with arg %s', req.url, args) + + output = req.json() + + if req.status_code != 200: + LOG.debug('full output %s', output) + raise PkgDBException(output['error']) + + return output + def create_package( self, pkg_name, pkg_summary, pkg_description, pkg_review_url, pkg_status, pkg_shouldopen, pkg_collection, pkg_poc,

1 0

[packagedb-cli/pkgdb2] Add create_package method to create a package via the API
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 8877eeb3f78dc85de525afe0c14350a511f748fc Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 11:34:36 2014 +0100 Add create_package method to create a package via the API pkgdb.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 17d4370..344697d 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -80,6 +80,54 @@ class PkgDB(object): self.username = username self.__logged = False + def create_package( + self, pkg_name, pkg_summary, pkg_description, pkg_review_url, + pkg_status, pkg_shouldopen, pkg_collection, pkg_poc, + pkg_upstream_url, pkg_critpath=False): + ''' Create a new package. + + :arg pkg_name: + :arg pkg_summary: + :arg pkg_description: + :arg pkg_review_url: + :arg pkg_status: + :arg pkg_shouldopen: + :arg pkg_collection: + :arg pkg_poc: + :arg pkg_upstream_url: + :kwarg pkg_critpath: + + ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + + args = { + 'pkg_name': pkg_name, + 'pkg_summary': pkg_summary, + 'pkg_description': pkg_description, + 'pkg_review_url': pkg_review_url, + 'pkg_status': pkg_status, + 'pkg_shouldopen': pkg_shouldopen, + 'pkg_collection': pkg_collection, + 'pkg_poc': pkg_poc, + 'pkg_upstream_url': pkg_upstream_url, + } + if pkg_critpath: + args['pkg_critpath'] = pkg_critpath + + req = self.session.post( + '{0}/api/package/new/'.format(self.url), data=args + ) + LOG.debug('Called: %s with arg %s', req.url, args) + + output = req.json() + + if req.status_code != 200: + LOG.debug('full output %s', output) + raise PkgDBException(output['error']) + + return output + @property def logged(self): ''' Return whether the user if logged in or not. '''

1 0

[packagedb-cli/pkgdb2] Raise an exception if trying to run a method w/o being authenticated
by Pierre-YvesChibon 06 Mar '14

06 Mar '14

commit 4bb78e414784dd796959542c961ee06bf7be0304 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Thu Mar 6 11:23:09 2014 +0100 Raise an exception if trying to run a method w/o being authenticated pkgdb.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 00ff4ee..17d4370 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -35,6 +35,14 @@ class PkgDBException(Exception): pass +class PkgDBAuthException(Exception): + ''' Authentication exception raised when trying to call a method that + requires authentication while not being authenticated. + + ''' + pass + + def _parse_service_form(response): """ Retrieve the attributes from the html login form. @@ -245,6 +253,9 @@ class PkgDB(object): :arg branches: ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + if isinstance(packages, basestring): packages = [packages] if isinstance(branches, basestring): @@ -276,6 +287,9 @@ class PkgDB(object): :arg branches: ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + if isinstance(packages, basestring): packages = [packages] if isinstance(branches, basestring): @@ -308,6 +322,9 @@ class PkgDB(object): :arg poc: ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + if isinstance(packages, basestring): packages = [packages] if isinstance(branches, basestring): @@ -340,6 +357,9 @@ class PkgDB(object): :arg branches: ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + if isinstance(packages, basestring): packages = [packages] if isinstance(branches, basestring): @@ -374,6 +394,9 @@ class PkgDB(object): :arg user: ''' + if not self.logged: + raise PkgDBAuthException('Authentication required') + if isinstance(branches, basestring): branches = [branches] if isinstance(acls, basestring):

1 0

[packagedb-cli/pkgdb2] Small pep8 cleanup
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit c30c7f27434655d47fcc58ddc5fe22b7bb60051e Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 17:43:42 2014 +0100 Small pep8 cleanup pkgdb.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index a4c59bb..00ff4ee 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -104,7 +104,7 @@ class PkgDB(object): openid_url, data = _parse_service_form(response) if not motif.match(openid_url): raise FedoraServiceError( - 'Un-expected openid provider asked: %s' % openid_url) + 'Un-expected openid provider asked: %s' % openid_url) else: data = {} for r in response.history: @@ -190,7 +190,7 @@ 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, count=False): ''' Return the list of packages matching the provided criterias. :kwarg pattern: @@ -227,7 +227,6 @@ class PkgDB(object): return output - output = _get_pages(1) page = output['page']

1 0

[packagedb-cli/pkgdb2] Add a little more debuging output, it will be handy to know what has been called with what to debug
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 4c402809b7b0f7eb413415432d9c258efe7014a6 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 17:37:30 2014 +0100 Add a little more debuging output, it will be handy to know what has been called with what to debug pkgdb.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 099e07a..a4c59bb 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -138,7 +138,6 @@ class PkgDB(object): return output - def get_collections(self, pattern='*', status=None): ''' Return the list of collections matching the provided criterias. @@ -154,6 +153,7 @@ class PkgDB(object): req = self.session.get( '{0}/api/collections/'.format(self.url), params=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -179,6 +179,7 @@ class PkgDB(object): req = self.session.get( '{0}/api/package/'.format(self.url), params=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -216,6 +217,7 @@ class PkgDB(object): req = self.session.get( '{0}/api/packages/'.format(self.url), params=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -257,6 +259,7 @@ class PkgDB(object): req = self.session.post( '{0}/api/package/orphan/'.format(self.url), data=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -287,6 +290,7 @@ class PkgDB(object): req = self.session.post( '{0}/api/package/retire/'.format(self.url), data=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -319,6 +323,7 @@ class PkgDB(object): req = self.session.post( '{0}/api/package/unorphan/'.format(self.url), data=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -349,6 +354,7 @@ class PkgDB(object): req = self.session.post( '{0}/api/package/unretire/'.format(self.url), data=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json() @@ -385,6 +391,7 @@ class PkgDB(object): req = self.session.post( '{0}/api/package/acl/'.format(self.url), data=args ) + LOG.debug('Called: %s with arg %s', req.url, args) output = req.json()

1 0

[packagedb-cli/pkgdb2] Adjust the CLI to the API
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit cdfe84810de02b627d5077c7a69bbd9bc7daa74a Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 17:36:16 2014 +0100 Adjust the CLI to the API pkgdb2-cli | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index d8b396c..e1b4c5f 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -257,7 +257,7 @@ def setup_parser(): default=False, dest='eol', help="List all orphaned and eol'd packages") parser_list.add_argument( - '--user', dest='user', default=False, + '--user', dest='user', default=None, help="List all the packages of the user <user>") parser_list.add_argument( '--branch', dest='branch', default=None, @@ -444,7 +444,7 @@ def do_list(args): 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(args) + pattern = args.pattern if not pattern or args.all: pattern = '*' @@ -456,9 +456,9 @@ def do_list(args): output = pkgdbclient.get_packages( pattern=pattern, - branch=args.branch, + branches=args.branch, poc=args.user, - orphan=args.orphaned + orphaned=args.orphaned ) cnt = 0 for pkg in sorted(output['packages'], key = lambda pkg: (pkg['name'])):

1 0

[packagedb-cli/pkgdb2] Add support for the pagination of the api packages endpoint
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit ef98a5e0ff06129ef07dbb7a757b09da972f7e23 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 17:36:09 2014 +0100 Add support for the pagination of the api packages endpoint pkgdb.py | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 17 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 44bcc5b..099e07a 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -188,7 +188,8 @@ class PkgDB(object): return output - def get_packages(self, pattern='*', branch=None, poc=None, orphan=None): + def get_packages(self, pattern='*', branches=None, poc=None, status=None, + orphaned=False, acls=False, count=False): ''' Return the list of packages matching the provided criterias. :kwarg pattern: @@ -197,22 +198,41 @@ class PkgDB(object): :kwarg orphan: ''' - args = { - 'pattern': pattern, - 'branches': branch, - 'poc': poc, - 'orphan': orphan, - } - - req = self.session.get( - '{0}/api/packages/'.format(self.url), params=args - ) - - output = req.json() - - if req.status_code != 200: - LOG.debug('full output %s', output) - raise PkgDBException(output['error']) + def _get_pages(page): + args = { + 'pattern': pattern, + 'branches': branches, + 'poc': poc, + 'status': status, + 'page': page, + } + if count is True: + args['count'] = count + if acls is True: + args['acls'] = acls + if orphaned is True: + args['orphaned'] = orphaned + + req = self.session.get( + '{0}/api/packages/'.format(self.url), params=args + ) + + output = req.json() + + if req.status_code != 200: + LOG.debug('full output %s', output) + raise PkgDBException(output['error']) + + return output + + + output = _get_pages(1) + + page = output['page'] + total = output['pages_total'] + for i in range(2, total + 1): + data = _get_pages(i) + output['packages'].extend(output['packages']) return output

1 0

[packagedb-cli/pkgdb2] Move handling the logging level in the main
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 3ab8f389a17c4e9478994ea4abd0aa55ce1d3ade Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:56:50 2014 +0100 Move handling the logging level in the main pkgdb2-cli | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index c3447eb..d8b396c 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -43,12 +43,6 @@ RESET = "\033[0;0m" logging.basicConfig() pkgdblog = logging.getLogger("pkgdb") log = logging.getLogger("pkgdb-cli") -if '--debug' in sys.argv: - log.setLevel(logging.DEBUG) - pkgdblog.setLevel(logging.DEBUG) - #pkgdbclient.debug = True -elif '--verbose' in sys.argv: - log.setLevel(logging.INFO) if '--test' in sys.argv: print "Testing environment" @@ -635,6 +629,12 @@ def main(): BOLD = "" RESET = "" + if arg.debug: + log.setLevel(logging.DEBUG) + pkgdblog.setLevel(logging.DEBUG) + elif arg.verbose: + log.setLevel(logging.INFO) + arg.func(arg)

1 0

[packagedb-cli/pkgdb2] Typoes...
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 1c8ee15a54c038a2c135931aec1d8a2fe932bb2a Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:56:15 2014 +0100 Typoes... pkgdb.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index e83b889..44bcc5b 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -158,7 +158,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -183,7 +183,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -211,7 +211,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -241,7 +241,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -271,7 +271,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -303,7 +303,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -333,7 +333,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output @@ -369,7 +369,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: - LOG.debug('full output %s', outout) + LOG.debug('full output %s', output) raise PkgDBException(output['error']) return output

1 0

[packagedb-cli/pkgdb2] Instance the koji and bz client when we need them and rely on argparse for the nocolor option
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 63bc7da77cfe6c613a87edc042f2844409b8cb1b Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:54:07 2014 +0100 Instance the koji and bz client when we need them and rely on argparse for the nocolor option pkgdb2-cli | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index b738a4f..c3447eb 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -30,14 +30,14 @@ import fedora_cert import timeit version = '2.0' -kojiclient = koji.ClientSession( - 'http://koji.fedoraproject.org/kojihub', {}) +KOJI_HUB = 'http://koji.fedoraproject.org/kojihub' +RH_BZ_API = 'https://bugzilla.redhat.com/xmlrpc.cgi' + pkgdbclient = PkgDB('http://209.132.184.188/') fasclient = AccountSystem('https://admin.fedoraproject.org/accounts') -bzclient = RHBugzilla(url='https://bugzilla.redhat.com/xmlrpc.cgi') -bold = "\033[1m" -red = "\033[0;31m" -reset = "\033[0;0m" +BOLD = "\033[1m" +RED = "\033[0;31m" +RESET = "\033[0;0m" # Initial simple logging stuff logging.basicConfig() @@ -50,11 +50,6 @@ if '--debug' in sys.argv: elif '--verbose' in sys.argv: log.setLevel(logging.INFO) -if '--nocolor' in sys.argv: - red = "" - bold = "" - reset = "" - if '--test' in sys.argv: print "Testing environment" fasclient = AccountSystem( @@ -146,6 +141,8 @@ def _get_last_build(packagename, tag): list of available tag. """ log.debug("Search last build for {0} in {1}".format(packagename, tag)) + kojiclient = koji.ClientSession(KOJI_HUB, {}) + data = kojiclient.getLatestBuilds( tag, package=packagename) versions = [] @@ -381,6 +378,8 @@ def do_acl(args): 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': args.branch = None output = pkgdbclient.get_package(args.package, branch=args.branch) @@ -401,13 +400,13 @@ def do_acl(args): continue owner = pkg['point_of_contact'] if owner == 'orphan': - owner = red + owner + reset + owner = RED + owner + RESET # Retrieve ACL information print "\n{0}{1}{2}{3}Point of Contact:{4}{5}".rstrip().format( - red + bold, + RED + BOLD, pkg['collection']['branchname'], - reset, + RESET, " " * (8 - len(pkg['collection']['branchname'])), " " * 5, owner) @@ -629,6 +628,13 @@ def main(): parser = setup_parser() # Parse the commandline arg = parser.parse_args() + + if arg.nocolor: + global RED, BOLD, RESET + RED = "" + BOLD = "" + RESET = "" + arg.func(arg)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

packagedb-cli-commits March 2014