bin: Grab default cli url from bugzillarc

crobinso · crobinso · commit f0d78eca73c0 · 2017-03-29T16:55:10.000-04:00
bugzillarc can now have a value like: [DEFAULT] url=X And 'X' will be used as the default URL from the bugzilla command line tool Resolves: #27
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -35,7 +35,7 @@ import requests.exceptions
 
 import bugzilla
 
-default_bz = 'https://bugzilla.redhat.com/xmlrpc.cgi'
+DEFAULT_BZ = 'https://bugzilla.redhat.com/xmlrpc.cgi'
 
 _is_unittest = bool(os.getenv("__BUGZILLA_UNITTEST"))
 _is_unittest_debug = bool(os.getenv("__BUGZILLA_UNITTEST_DEBUG"))
@@ -91,6 +91,20 @@ def open_without_clobber(name, *args):
     return fobj
 
 
+def get_default_url():
+    """
+    Grab a default URL from bugzillarc [DEFAULT] url=X
+    """
+    from bugzilla.base import _open_bugzillarc
+    cfg = _open_bugzillarc()
+    if cfg:
+        cfgurl = cfg.defaults().get("url", None)
+        if cfgurl is not None:
+            log.debug("bugzillarc: found cli url=%s", cfgurl)
+            return cfgurl
+    return DEFAULT_BZ
+
+
 ##################
 # Option parsing #
 ##################
@@ -99,9 +113,11 @@ def _setup_root_parser():
     epilog = 'Try "bugzilla COMMAND --help" for command-specific help.'
     p = argparse.ArgumentParser(epilog=epilog)
 
+    default_url = get_default_url()
+
     # General bugzilla connection options
-    p.add_argument('--bugzilla', default=default_bz,
-            help="bugzilla XMLRPC URI. default: %s" % default_bz)
+    p.add_argument('--bugzilla', default=default_url,
+            help="bugzilla XMLRPC URI. default: %s" % default_url)
     p.add_argument("--nosslverify", dest="sslverify",
                  action="store_false", default=True,
                  help="Don't error on invalid bugzilla SSL certificate")
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -109,6 +109,28 @@ def _build_cookiejar(cookiefile):
                             cookiefile)
 
 
+_default_configpaths = [
+    '/etc/bugzillarc',
+    '~/.bugzillarc',
+    '~/.config/python-bugzilla/bugzillarc',
+]
+
+
+def _open_bugzillarc(configpaths=-1):
+    if configpaths == -1:
+        configpaths = _default_configpaths[:]
+
+    configpaths = [os.path.expanduser(p) for p in
+                   Bugzilla._listify(configpaths)]
+    cfg = SafeConfigParser()
+    read_files = cfg.read(configpaths)
+    if not read_files:
+        return
+
+    log.info("Found bugzillarc files: %s", read_files)
+    return cfg
+
+
 class _FieldAlias(object):
     """
     Track API attribute names that differ from what we expose in users.
@@ -220,6 +242,15 @@ def fix_url(url):
             url = url + '/xmlrpc.cgi'
         return url
 
+    @staticmethod
+    def _listify(val):
+        if val is None:
+            return val
+        if isinstance(val, list):
+            return val
+        return [val]
+
+
     def __init__(self, url=-1, user=None, password=None, cookiefile=-1,
                  sslverify=True, tokenfile=-1, use_creds=True, api_key=None):
         """
@@ -267,8 +298,7 @@ def __init__(self, url=-1, user=None, password=None, cookiefile=-1,
         self._field_aliases = []
         self._init_field_aliases()
 
-        self.configpath = ['/etc/bugzillarc', '~/.bugzillarc',
-                           '~/.config/python-bugzilla/bugzillarc']
+        self.configpath = _default_configpaths[:]
         if not use_creds:
             cookiefile = None
             tokenfile = None
@@ -360,13 +390,6 @@ def _check_version(self, major, minor):
             return True
         return False
 
-    def _listify(self, val):
-        if val is None:
-            return val
-        if isinstance(val, list):
-            return val
-        return [val]
-
     def _product_id_to_name(self, productid):
         '''Convert a product ID (int) to a product name (str).'''
         for p in self.products:
@@ -448,24 +471,16 @@ def readconfig(self, configpath=None):
           api_key = key
 
         The file can have multiple sections for different bugzilla instances.
-        You can also use the [DEFAULT] section to set defaults that apply to
-        any site without a specific section of its own.
+        A 'url' field in the [DEFAULT] section can be used to set a default
+        URL for the bugzilla command line tool.
 
         Be sure to set appropriate permissions on bugzillarc if you choose to
         store your password in it!
         """
-        if not configpath:
-            configpath = self.configpath
-
-        configpath = [os.path.expanduser(p) for p in
-                      self._listify(configpath)]
-        cfg = SafeConfigParser()
-        read_files = cfg.read(configpath)
-        if not read_files:
+        cfg = _open_bugzillarc(configpath or self.configpath)
+        if not cfg:
             return
 
-        log.info("Found bugzillarc files: %s", read_files)
-
         section = ""
         log.debug("bugzillarc: Searching for config section matching %s",
             self.url)
