specfile: fix improper naming: get_nvr, get_vr

Spec.get_nvr was in fact getting Version-Release. Change the name accordingly
and introduce new Spec.get_nvr to actually return Package-Name-Version.

Change-Id: If531f1e9e3a4235567dfda0c6a59abdffe370a6b

Author: Jakub Ruzicka

rdopkg/actions/distgit/actions.py

@@ -109,11 +109,11 @@ def _putv(title, val):
             'unknown'
 
     spec = specfile.Spec()
-    nvr = spec.get_nvr()
+    vr = spec.get_vr()
     patches_apply_method = spec.patches_apply_method()
     print
     _putv('Package:  ', package)
-    _putv('NVR:      ', nvr)
+    _putv('VR:       ', vr)
     _putv('Version:  ', version)
     _putv('Upstream: ', upstream_version)
     _putv('Tag style:', version_tag_style or 'X.Y.Z')
@@ -879,8 +879,8 @@ def make_srpm(package, dist=None, fedpkg=FEDPKG):
 def tag_patches_branch(package, local_patches_branch, patches_branch,
                        force=False, push=False):
     """ Tag the local_patches_branch with this package's NVR. """
-    nvr = specfile.Spec().get_nvr(epoch=False)
-    nvr_tag = package + '-' + nvr
+    vr = specfile.Spec().get_vr(epoch=False)
+    nvr_tag = package + '-' + vr
     tag_cmd = ['tag', nvr_tag, local_patches_branch]
     if force:
         tag_cmd.append('-f')

rdopkg/utils/specfile.py

@@ -472,8 +472,8 @@ def bump_release(self, milestone=None):
         release = ".".join(numlist)
         return self.set_release(release, milestone=milestone, postfix=postfix)
 
-    def get_nvr(self, epoch=None):
-        """get NVR string from .spec Version, Release and Epoch
+    def get_vr(self, epoch=None):
+        """get VR string from .spec Version, Release and Epoch
 
         epoch is None: prefix epoch if present (default)
         epoch is True: prefix epoch even if not present (0:)
@@ -499,12 +499,16 @@ def get_nvr(self, epoch=None):
             return '%s-%s' % (version, release)
         return version
 
+    def get_nvr(self, epoch=None):
+        """get NVR string from .spec Name, Version, Release and Epoch"""
+        return '%s-%s' % (self.get_tag('Name'), self.get_vr(epoch=epoch))
+
     def new_changelog_entry(self, user, email, changes=[]):
         changes_str = "\n".join(map(lambda x: "- %s" % x, changes)) + "\n"
         date = time.strftime('%a %b %d %Y')
         # TODO: detect if there is '-' in changelog entries and use it if so
-        nvr = self.get_nvr()
-        head = "* %s %s <%s> %s" % (date, user, email, nvr)
+        vr = self.get_vr()
+        head = "* %s %s <%s> %s" % (date, user, email, vr)
         entry = "%s\n%s\n" % (head, changes_str)
         self._txt = re.sub(r'(%changelog\n)', r'\g<1>%s' % entry, self.txt)
 

tests/test_spec.py

@@ -50,8 +50,8 @@ def test_release_parts():
     _assert_rparts('%{ver}', '', '', '%{ver}')
 
 
-def _assert_nvr(nvr, epoch_arg, result):
-    epoch, version, release = nvr
+def _assert_vr(vr, epoch_arg, result):
+    epoch, version, release = vr
 
     def _get_tag_mock(tag, default=None, expand_macros=False):
         if tag == 'Version':
@@ -63,25 +63,25 @@ def _get_tag_mock(tag, default=None, expand_macros=False):
                 return epoch
             raise exception.SpecFileParseError(
                 spec_fn='TESTING', error='Pretending Epoch tag not found')
-        return "MOCKED-OUT-NVR"
+        return "MOCKED-OUT-VR"
 
     def _expand_macro(macro):
         return macro
 
     spec = specfile.Spec()
     spec.get_tag = _get_tag_mock
     spec.expand_macro = _expand_macro
-    nvr = spec.get_nvr(epoch=epoch_arg)
-    assert nvr == result
+    vr = spec.get_vr(epoch=epoch_arg)
+    assert vr == result
 
 
-def test_get_nvr():
-    _assert_nvr((None, '1.2.3', '0.1'),         None,  '1.2.3-0.1')
-    _assert_nvr((None, '1.2.3', '666%{?dist}'), False, '1.2.3-666')
-    _assert_nvr((None, '1.2.3', ''),            True,  '0:1.2.3')
-    _assert_nvr((23, '1.2.3', ''),              None,  '23:1.2.3')
-    _assert_nvr((23, '1.2.3', '0.1'),           False, '1.2.3-0.1')
-    _assert_nvr((23, '1.2.3', '666%{?dist}'),   True,  '23:1.2.3-666')
+def test_get_vr():
+    _assert_vr((None, '1.2.3', '0.1'),         None,  '1.2.3-0.1')
+    _assert_vr((None, '1.2.3', '666%{?dist}'), False, '1.2.3-666')
+    _assert_vr((None, '1.2.3', ''),            True,  '0:1.2.3')
+    _assert_vr((23, '1.2.3', ''),              None,  '23:1.2.3')
+    _assert_vr((23, '1.2.3', '0.1'),           False, '1.2.3-0.1')
+    _assert_vr((23, '1.2.3', '666%{?dist}'),   True,  '23:1.2.3-666')
 
 
 def test_patches_base_add_patched(tmpdir):