fix: cargo workspaces

Author: vemilano

commitizen/providers/cargo_provider.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import glob
 from pathlib import Path
 
 import tomlkit
@@ -22,8 +23,10 @@ def lock_file(self) -> Path:
         return Path() / self.lock_filename
 
     def get(self, document: tomlkit.TOMLDocument) -> str:
+        # If there is a root package, change its version (but not the workspace version)
         try:
             return document["package"]["version"]  # type: ignore[index,return-value]
+        # Else, bump the workspace version
         except tomlkit.exceptions.NonExistentKey:
             ...
         return document["workspace"]["package"]["version"]  # type: ignore[index,return-value]
@@ -43,15 +46,39 @@ def set_version(self, version: str) -> None:
 
     def set_lock_version(self, version: str) -> None:
         cargo_toml_content = tomlkit.parse(self.file.read_text())
+        cargo_lock_content = tomlkit.parse(self.lock_file.read_text())
+        packages: tomlkit.items.AoT = cargo_lock_content["package"]  # type: ignore[assignment]
         try:
             package_name = cargo_toml_content["package"]["name"]  # type: ignore[index]
+            for i, package in enumerate(packages):
+                if package["name"] == package_name:
+                    cargo_lock_content["package"][i]["version"] = version  # type: ignore[index]
+                    break
         except tomlkit.exceptions.NonExistentKey:
-            package_name = cargo_toml_content["workspace"]["package"]["name"]  # type: ignore[index]
+            workspace_members = (
+                cargo_toml_content.get("workspace", {})
+                .get("package", {})
+                .get("members", [])
+            )
+            members_inheriting = []
+
+            for member in workspace_members:
+                matched_paths = glob.glob(member, recursive=True)
+                for path in matched_paths:
+                    cargo_file = Path(path) / "Cargo.toml"
+                    cargo_toml_content = tomlkit.parse(cargo_file.read_text())
+                    try:
+                        version_workspace = cargo_toml_content["package"]["version"][  # type: ignore[index]
+                            "workspace"
+                        ]
+                        if version_workspace is True:
+                            package_name = cargo_toml_content["package"]["name"]  # type: ignore[index]
+                            members_inheriting.append(package_name)
+                    except tomlkit.exceptions.NonExistentKey:
+                        continue
+
+            for i, package in enumerate(packages):
+                if package["name"] in members_inheriting:
+                    cargo_lock_content["package"][i]["version"] = version  # type: ignore[index]
 
-        cargo_lock_content = tomlkit.parse(self.lock_file.read_text())
-        packages: tomlkit.items.AoT = cargo_lock_content["package"]  # type: ignore[assignment]
-        for i, package in enumerate(packages):
-            if package["name"] == package_name:
-                cargo_lock_content["package"][i]["version"] = version  # type: ignore[index]
-                break
         self.lock_file.write_text(tomlkit.dumps(cargo_lock_content))

tests/providers/test_cargo_provider.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 from pathlib import Path
 from textwrap import dedent
 
@@ -23,13 +24,19 @@
 
 CARGO_WORKSPACE_TOML = """\
 [workspace.package]
-name = "whatever"
+members = ["whatever"]
 version = "0.1.0"
 """
 
+CARGO_WORKSPACE_MEMBER_TOML = """\
+[package]
+name = "whatever"
+version.workspace = true
+"""
+
 CARGO_WORKSPACE_TOML_EXPECTED = """\
 [workspace.package]
-name = "whatever"
+members = ["whatever"]
 version = "42.1"
 """
 
@@ -115,6 +122,11 @@ def test_cargo_provider_with_lock(
     file = chdir / filename
     file.write_text(dedent(toml_content))
 
+    member_folder = chdir / "whatever"
+    os.mkdir(member_folder)
+    member_file = member_folder / "Cargo.toml"
+    member_file.write_text(dedent(CARGO_WORKSPACE_MEMBER_TOML))
+
     lock_filename = CargoProvider.lock_filename
     lock_file = chdir / lock_filename
     lock_file.write_text(dedent(lock_content))