Fix; don't introduce newlines when merging duplicate changes sections. (#7)

Author: mdwint

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## 0.3.3 - 2022-08-10
+
+### Fixed
+
+- Don't introduce newlines when merging duplicate changes sections.
+
+
 ## 0.3.2 - 2022-08-05
 
 ### Fixed

ocdc/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.3.3"

ocdc/ast.py

@@ -24,7 +24,7 @@ class Changes(BaseModel):
 
     def merge(self, other: "Changes") -> None:
         self.items.extend(other.items)
-        self.footer += "\n" + other.footer
+        self.footer = f"{self.footer}\n{other.footer}".strip()
 
 
 class Version(BaseModel):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ocdc"
-version = "0.3.2"
+version = "0.3.3"
 description = 'A changelog formatter for "people", neat freaks, and sloppy typists.'
 authors = ["Matteo De Wint <[email protected]>"]
 packages = [{ include = "ocdc" }]

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.2
+current_version = 0.3.3
 commit = True
 
 [flake8]

tests/data/duplicate_changes_sections.ast.json

@@ -2,6 +2,53 @@
   "title": "Changelog",
   "intro": "All notable changes to this project will be documented in this file.\n\nThe format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),\nand this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).",
   "versions": [
+    {
+      "number": "0.3.0",
+      "date": "2022-08-10",
+      "changes": {
+        "Added": {
+          "items": [
+            {
+              "text": "Initial version."
+            },
+            {
+              "text": "Another added item."
+            }
+          ],
+          "footer": "[one]: http://example.com/one"
+        },
+        "Changed": {
+          "items": [
+            {
+              "text": "Something changed."
+            }
+          ]
+        }
+      }
+    },
+    {
+      "number": "0.2.0",
+      "date": "2022-08-10",
+      "changes": {
+        "Added": {
+          "items": [
+            {
+              "text": "Initial version."
+            },
+            {
+              "text": "Another added item."
+            }
+          ]
+        },
+        "Changed": {
+          "items": [
+            {
+              "text": "Something changed."
+            }
+          ]
+        }
+      }
+    },
     {
       "number": "0.1.0",
       "date": "2022-07-31",

tests/data/duplicate_changes_sections.in.md

@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.3.0 - 2022-08-10
+
+### Added
+
+- Initial version.
+
+### Changed
+
+- Something changed.
+
+### Added
+
+- Another added item.
+
+[one]: http://example.com/one
+
+## 0.2.0 - 2022-08-10
+
+### Added
+
+- Initial version.
+
+### Changed
+
+- Something changed.
+
+### Added
+
+- Another added item.
+
 ## 0.1.0 - 2022-07-31
 
 ### Added

tests/data/duplicate_changes_sections.out.md

@@ -6,6 +6,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## 0.3.0 - 2022-08-10
+
+### Added
+
+- Initial version.
+- Another added item.
+
+[one]: http://example.com/one
+
+### Changed
+
+- Something changed.
+
+
+## 0.2.0 - 2022-08-10
+
+### Added
+
+- Initial version.
+- Another added item.
+
+### Changed
+
+- Something changed.
+
+
 ## 0.1.0 - 2022-07-31
 
 ### Added