Fix bumping only on the first few matches

.pre-commit-config.yaml

@@ -5,6 +5,7 @@ repos:
     hooks:
       - id: check-vcs-permalinks
       - id: end-of-file-fixer
+        exclude: "tests/[test_*|data]/*"
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
       - id: debug-statements

commitizen/bump.py

@@ -186,21 +186,18 @@ def _bump_with_regex(version_file_contents, current_version, new_version, regex)
     for match in re.finditer(regex, version_file_contents, re.MULTILINE):
         left = version_file_contents[: match.end() + offset]
         right = version_file_contents[match.end() + offset :]
-        line_break = _get_line_break_position(right)
+
+        line_break = right.find("\n")
         middle = right[:line_break]
-        current_version_found_in_block = current_version in middle
-        offset += len(new_version) - len(current_version)
-        current_version_found |= current_version_found_in_block
         right = right[line_break:]
-        version_file_contents = (
-            left + middle.replace(current_version, new_version) + right
-        )
-    return current_version_found, version_file_contents
-
 
-def _get_line_break_position(text: str) -> int:
-    position = text.find("\n")
-    return max(position, 0)
+        if current_version in middle:
+            offset += len(new_version) - len(current_version)
+            current_version_found = True
+            version_file_contents = (
+                left + middle.replace(current_version, new_version) + right
+            )
+    return current_version_found, version_file_contents
 
 
 def _version_to_regex(version: str):

commitizen/config/toml_config.py

@@ -49,8 +49,8 @@ def _parse_setting(self, data: Union[bytes, str]):
         name = "cz_conventional_commits"
         ```
         """
-        doc = parse(data)
+        doc = parse(data)  # type: ignore
         try:
-            self.settings.update(doc["tool"]["commitizen"])
+            self.settings.update(doc["tool"]["commitizen"])  # type: ignore
         except exceptions.NonExistentKey:
             self.is_empty_config = True

pyproject.toml

@@ -70,6 +70,7 @@ isort = "^5.7.0"
 freezegun = "^0.3.15"
 pydocstyle = "^5.0.2"
 pre-commit = "^2.6.0"
+pytest-regressions = "^2.2.0"
 
 [tool.poetry.scripts]
 cz = "commitizen.cli:main"

tests/data/inconsistent_version.py

@@ -0,0 +1,4 @@
+__title__ = "requests"
+__description__ = "Python HTTP for Humans."
+__url__ = "http://python-requests.org"
+__version__ = "2.10.3"

tests/data/multiple_versions_to_update_pyproject.toml

@@ -0,0 +1,27 @@
+[[package]]
+name = "to-update-1"
+version = "1.2.9"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "to-update-2"
+version = "1.2.9"

tests/data/multiple_versions_to_update_pyproject_wo_eol.toml

@@ -0,0 +1,27 @@
+[[package]]
+name = "to-update-1"
+version = "1.2.9"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "not-to-update"
+version = "1.3.3"
+
+[[package]]
+name = "to-update-2"
+version = "1.2.9"

tests/data/repeated_version_number.json

@@ -0,0 +1,7 @@
+{
+  "name": "magictool",
+  "version": "1.2.3",
+  "dependencies": {
+      "lodash": "1.2.3"
+  }
+}

tests/data/sample_cargo.lock

@@ -0,0 +1,11 @@
+[[package]]
+name = "textwrap"
+version = "1.2.3"
+
+[[package]]
+name = "there-i-fixed-it"
+version = "1.2.3"
+
+[[package]]
+name = "other-project"
+version = "1.2.3"

tests/data/sample_docker_compose.yaml

@@ -0,0 +1,6 @@
+version: "3.3"
+
+services:
+  app:
+    image: my-repo/my-container:v1.2.3
+  command: my-command

tests/data/sample_pyproject.toml

@@ -0,0 +1,3 @@
+[tool.poetry]
+name = "commitizen"
+version = "1.2.3"

tests/data/sample_version.py

@@ -0,0 +1,4 @@
+__title__ = "requests"
+__description__ = "Python HTTP for Humans."
+__url__ = "http://python-requests.org"
+__version__ = "1.2.3"