Add an option to specify the filename in info repo

Currently, we have hardcoded the name of the main file for inforepo to
`rdo.yml`. However, to extend the usage to other projects as NFV SIG
that may have a different filename for the initial file, as
`nfv.yml`[1], this patch is adding a parameter --info-file that defaults
to rdo.yml but can be set to other name files.

Also, this patch is replacing the usage of the old parse function
included in rdoinfo module in the rdoinfo repo by distroinfo.

Change-Id: Ic9432552956eb307100064afdbc257137e6bbed4

Author: amoralej

Diff for: graffiti/cli.py

@@ -172,6 +172,8 @@ def main():
     parser.add_argument('--centos-release', default='7',
                         choices=['7', '8', '8s'],
                         help='CentOS Release to check.')
+    parser.add_argument('--info-file', default='rdo.yml',
+                        help='Main info file. Default: rdo.yml')
     subparsers = parser.add_subparsers(dest='cmd')
 
     subparsers.add_parser('version', help='show version')  # NOQA
@@ -206,7 +208,7 @@ def main():
         sys.argv.append('--help')
     args = parser.parse_args(sys.argv[1:])
     config = parse_config_file(args.config_file, args.info_repo,
-                               args.centos_release)
+                               args.centos_release, args.info_file)
 
     if args.cmd == 'version':
         version_cmd()

Diff for: graffiti/config.py

@@ -1,29 +1,32 @@
 """graffiti.config handles config and command files parsing
 """
-import imp
 import os.path
 import yaml
 
+from distroinfo import info as dinfo
 
-def parse_config_file(filename, rdoinfo_path=None, centos_release='7'):
+
+def parse_config_file(filename, rdoinfo_path=None, centos_release='7',
+                      info_file='rdo.yml'):
     """Parse graffiti config file
     """
     with open(filename, 'rb') as cfg_file:
         data = yaml.load(cfg_file)
-        info = parse_config(data, rdoinfo_path, centos_release)
+        info = parse_config(data, rdoinfo_path, centos_release, info_file)
         return info
     return None
 
 
-def parse_config(data, rdoinfo_path=None, centos_release='7'):
+def parse_config(data, rdoinfo_path=None, centos_release='7',
+                 info_file='rdo.yml'):
     """Config file parser
     """
     info = {}
     if not rdoinfo_path:
         info['rdoinfo'] = parse_rdoinfo(data)
         rdoinfo_path = info['rdoinfo']['location']
-    info['releases'] = parse_releases(rdoinfo_path, centos_release)
-    info['releases_info'] = parse_releases_info(rdoinfo_path)
+    info['releases'] = parse_releases(rdoinfo_path, centos_release, info_file)
+    info['releases_info'] = parse_releases_info(rdoinfo_path, info_file)
     info['koji'] = parse_koji(data)
     info['tags_maps'] = data['tags_maps']
     return info
@@ -36,21 +39,11 @@ def parse_rdoinfo(data):
     return {'location': location}
 
 
-# Shamelessly taken from rdopkg code
-def _ensure_rdoinfo(path):
-    file, path, desc = imp.find_module('rdoinfo', [path])
-    rdoinfo = imp.load_module('rdoinfo', file, path, desc)
-    return rdoinfo
-
-
-def parse_releases(rdoinfo_path, centos_release='7'):
+def parse_releases(rdoinfo_path, centos_release='7', info_file='rdo.yml'):
     """Parse config release section to extract buildsys-tags
     """
-    rdoinfo_db = os.path.join(rdoinfo_path, 'rdo.yml')
-    rdoinfo = _ensure_rdoinfo(rdoinfo_path)
-    # FIXME: needs to unset include_fns as default in rdoinfo
-    # is a relative path
-    data = rdoinfo.parse_info_file(rdoinfo_db, include_fns=[])
+    data = dinfo.DistroInfo(info_files=info_file,
+                            local_info=rdoinfo_path).get_info()
     releases = data['releases']
     rel = {}
     dist_tag = "el{0}".format(centos_release)
@@ -66,12 +59,11 @@ def parse_releases(rdoinfo_path, centos_release='7'):
     return rel
 
 
-def parse_releases_info(rdoinfo_path):
+def parse_releases_info(rdoinfo_path, info_file='rdo.yml'):
     """Parse config release section
     """
-    rdoinfo_db = os.path.join(rdoinfo_path, 'rdo.yml')
-    rdoinfo = _ensure_rdoinfo(rdoinfo_path)
-    data = rdoinfo.parse_info_file(rdoinfo_db, include_fns=[])
+    data = dinfo.DistroInfo(info_files=info_file,
+                            local_info=rdoinfo_path).get_info()
     releases = data['releases']
     releases_info = {}
     for release in releases:

Diff for: graffiti/tests/fake_rdoinfo.py

@@ -1,7 +1,6 @@
 # Fake rdoinfo module for tests
 #
 
-import sys
 import yaml
 
 RDOINFO_SAMPLE = """releases:
@@ -79,9 +78,9 @@
 """
 
 
-def parse_info_file(rdoinfo_db, include_fns):
-    return yaml.load(RDOINFO_SAMPLE)
+class FakeRdoinfo(object):
+    def __init__(self, **kwargs):
+        pass
 
-
-def _ensure_rdoinfo(path):
-    return sys.modules[__name__]
+    def get_info(self, **kwargs):
+        return yaml.load(RDOINFO_SAMPLE)

Diff for: graffiti/tests/test_config.py

@@ -1,13 +1,12 @@
 from __future__ import print_function
+from fake_rdoinfo import FakeRdoinfo
 import os.path
 try:
     import unittest.mock as mock
 except Exception:
     import mock
 from graffiti.config import parse_config_file
 
-from fake_rdoinfo import _ensure_rdoinfo
-
 
 SAMPLE_CONFIG = """releases:
 rdoinfo:
@@ -37,8 +36,8 @@ def test_parse_config_file():
     # FIXME: the multiple context managers syntax does
     # not work encapsulated by parenthesis hence disable PEP8 checks
     with mock.patch('six.moves.builtins.open', m), \
-         mock.patch('graffiti.config._ensure_rdoinfo',
-                    side_effect=_ensure_rdoinfo):  # noqa
+        mock.patch('distroinfo.info.DistroInfo',
+                   FakeRdoinfo):
         info = parse_config_file('test')
         assert info['koji']['username'] == 'hguemar'
         assert info['koji']['url'] == 'https://cbs.centos.org/kojihub'

Diff for: requirements.txt

@@ -1,2 +1,3 @@
 PyYAML
+distroinfo
 six