Improve %changelog handling

- Handle %changelog case insensitively, allows %changeLog and variants.
- Don't throw ValueError exception when %changelog isn't found.
- Throw new MultipleChangelog exception on multiple changelogs.
- Provide unit tests for above cases.

Fixes: #126
Fixes: #127

Change-Id: Ic8fbf7e436413f9e7525f866bc0853488dbee387

Author: ssbarnea

rdopkg/exception.py

@@ -40,6 +40,10 @@ class IncompleteChangelog(RdopkgException):
     msg_fmt = "Description of changes is missing in %%changelog."
 
 
+class MultipleChangelog(RdopkgException):
+    msg_fmt = "Multiple %%changelog sections found. Expected only one."
+
+
 class MultipleSpecFilesFound(RdopkgException):
     msg_fmt = "Multiple .spec files found. Expected only one."
 

rdopkg/utils/specfile.py

@@ -594,8 +594,12 @@ def get_source_fns(self):
         return map(os.path.basename, self.get_source_urls())
 
     def get_last_changelog_entry(self, strip=False):
-        _, changelog = self.txt.split("%changelog\n")
-        changelog = changelog.strip()
+        changelog = ''
+        r = re.split("%changelog\n", self.txt, flags=re.I)
+        if len(r) > 2:
+            raise exception.MultipleChangelog()
+        if len(r) == 2:
+            changelog = r[1].strip()
         entries = re.split(r'\n\n+', changelog)
         entry = entries[0]
         lines = entry.split("\n")

tests/test_common.py

@@ -5,6 +5,7 @@
 
 from rdopkg.utils.cmd import git
 from rdopkg.utils.specfile import Spec
+from rdopkg import exception
 
 
 ASSETS_DIR = 'tests/assets'
@@ -124,10 +125,14 @@ def assert_spec_version(version, release_parts, milestone):
 
 def norm_changelog(count=1):
     spec = Spec()
-    txt, chl = spec.txt.split('%changelog\n')
+    r = re.compile(r"%changelog\n", flags=re.I).split(spec.txt)
+    if len(r) > 2:
+        raise exception.MultipleChangelog()
+    txt, chl = r
     chl, n = re.subn(r'^\* .+\s(\d\S*)$',
                      '* DATE AUTHOR \g<1>',
-                     chl, count=count,
+                     chl,
+                     count=count,
                      flags=re.M)
     spec._txt = txt + '%changelog\n' + chl
     spec.save()

tests/test_findpkg_integration.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Integration tests for findpkg
 
 set -e

tests/test_spec.py

@@ -316,3 +316,32 @@ def test_get_magic_comment_minimal_6():
 def test_get_magic_comment_minimal_7():
     spec = specfile.Spec(txt='# foo=\n')
     assert '' == spec.get_magic_comment('foo')
+
+
+def test_get_last_changelog_entry_0():
+    txt = 'Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=1.2.3\n#\nPatch0=foo.patch\n'  # noqa
+    spec = specfile.Spec(txt=txt)
+    r = spec.get_last_changelog_entry()
+    assert ('', []) == r
+
+
+def test_get_last_changelog_entry_1():
+    txt = 'Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=1.2.3\n#\nPatch0=foo.patch\n'  # noqa
+    spec = specfile.Spec(txt=txt + '%changelog\nfoo')
+    r = spec.get_last_changelog_entry()
+    assert ('foo', []) == r
+
+
+def test_get_last_changelog_entry_1_case_insensitive():
+    txt = 'Version: 1.2.3\n\n# patches_ignore=DROP-IN-RPM\n# patches_base=1.2.3\n#\nPatch0=foo.patch\n'  # noqa
+    spec = specfile.Spec(txt=txt + '%ChangeLog\nfoo')
+    r = spec.get_last_changelog_entry()
+    assert ('foo', []) == r
+
+
+def test_get_last_changelog_entry_multiple_sections():
+    with pytest.raises(exception.MultipleChangelog):
+        txt = 'Version: 1.2.3\n\n'
+        spec = specfile.Spec(txt=txt + '%changelog\n* 2017-01-01\n- foo1\n\n%changelog\nbar\n')  # noqa
+        r = spec.get_last_changelog_entry()
+        assert False, r