refine structure

Author: amhellmund

src/cpp_dev/project/core.py

@@ -6,9 +6,12 @@
 from pathlib import Path
 from textwrap import dedent
 
+from cpp_dev.common.version import SemanticVersionWithOptionalParts
 from cpp_dev.dependency.provider import DependencyProvider
+from cpp_dev.dependency.specifier import DependencySpecifier
+from cpp_dev.dependency.types import DependencySpecifierParts, VersionSpecBound, VersionSpecBoundOperand
 
-from .config import ProjectConfig, create_project_config
+from .config import DependencyType, ProjectConfig, create_project_config, load_project_config, update_dependencies
 from .lockfile import create_initial_lock_file
 from .path_composition import compose_include_file, compose_source_file
 
@@ -29,6 +32,12 @@ def project_dir(self) -> Path:
         """Return the path to the project directory."""
         return self._project_dir
 
+    def add_package_dependency(self, deps: list[DependencySpecifier], dep_type: DependencyType) -> None:
+        """Add package dependencies to the project for the given type."""
+        refined_deps = _refine_package_dependencies(self._dependency_provider, deps)
+        project_config = load_project_config(self.project_dir)
+        update_dependencies(project_config, refined_deps, dep_type)
+
 
 def setup_project(
     project_config: ProjectConfig,
@@ -124,3 +133,38 @@ def _create_library_test_file(project_dir: Path, name: str) -> None:
 def _add_default_cpd_dependencies(project_dir: Path) -> None:
     # add_package_dependency(project_dir, [PackageDependency("llvm"), PackageDependency("gtest")], "cpd")  # noqa: ERA001
     ...
+
+
+DEFAULT_REPOSITORY = "official"
+
+
+def _refine_package_dependencies(
+    dep_provider: DependencyProvider, deps: list[DependencySpecifier]
+) -> list[DependencySpecifier]:
+    """Refine the package dependencies in case of defaults were chosen.
+
+    The refinement includes (in order):
+        o Default repository "official"
+        o Latest resolved version in case of "latest"
+
+    This step is performed to assure that package dependencies with "latest" do not get an older version
+    than the latest one at the time of resolution. This is important in case a versions gets removed.
+    """
+    updated_deps = []
+    for dep in deps:
+        repository = dep.repository if dep.repository is not None else DEFAULT_REPOSITORY
+        version_spec = dep.version_spec
+        if dep.version_spec == "latest":
+            available_versions = dep_provider.fetch_versions(repository, dep.name)
+            if len(available_versions) == 0:
+                raise ValueError(f"No available versions for package {dep.name} at repository {dep.repository}.")
+            version_spec = [
+                VersionSpecBound(
+                    operand=VersionSpecBoundOperand.GREATER_THAN_OR_EQUAL,
+                    version=SemanticVersionWithOptionalParts.from_semantic_version(available_versions[0]),
+                )
+            ]
+        updated_deps.append(
+            DependencySpecifier.from_parts(DependencySpecifierParts(repository, dep.name, version_spec))
+        )
+    return updated_deps

src/cpp_dev/project/dependency/utils.py

@@ -4,14 +4,18 @@
 # For a copy, see <https://opensource.org/license/bsd-3-clause>.
 
 
+from collections.abc import Mapping
 from pathlib import Path
+from unittest.mock import patch
 
 import pytest
 
 from cpp_dev.common.version import SemanticVersion
+from cpp_dev.dependency.conan.types import ConanPackageReference
 from cpp_dev.dependency.provider import Dependency, DependencyIdentifier, DependencyProvider
+from cpp_dev.dependency.specifier import DependencySpecifier
 from cpp_dev.project.config import ProjectConfig, load_project_config
-from cpp_dev.project.core import setup_project
+from cpp_dev.project.core import _refine_package_dependencies, setup_project
 from cpp_dev.project.lockfile import load_lock_file
 from cpp_dev.project.path_composition import compose_project_config_file, compose_project_lock_file
 from tests.cpp_dev.project.utils.artificial_dependency_provider import ArtificialDependencyProvider
@@ -61,3 +65,37 @@ def test_setup_project(tmp_path: Path, dep_provider: DependencyProvider) -> None
     assert (project.project_dir / "include" / project_config.name / f"{project_config.name}.hpp").exists()
     assert (project.project_dir / "src" / f"{project_config.name}.cpp").exists()
     assert (project.project_dir / "src" / f"{project_config.name}.test.cpp").exists()
+
+
+def conan_list_side_effect(_remote: str, name: str) -> Mapping[ConanPackageReference, dict]:
+    if name == "cpd":
+        return {
+            ConanPackageReference("cpd/1.0.0@official/cppdev"): {},
+            ConanPackageReference("cpd/2.0.0@official/cppdev"): {},
+        }
+    if name == "cpd2":
+        return {
+            ConanPackageReference("cpd2/3.0.0@official/cppdev"): {},
+            ConanPackageReference("cpd2/3.0.0@official/cppdev"): {},
+        }
+    if name == "other":
+        return {
+            ConanPackageReference("other/2.0.0@custom/cppdev"): {},
+        }
+    return {}
+
+
+def test_refine_package_dependencies(dep_provider: DependencyProvider) -> None:
+    refined_deps = _refine_package_dependencies(
+        dep_provider,
+        [
+            DependencySpecifier("llvm"),
+            DependencySpecifier("official/llvm[latest]"),
+            DependencySpecifier("gtest[3.0.0]"),
+        ],
+    )
+    assert refined_deps == [
+        DependencySpecifier("official/llvm[>=1.0.0]"),
+        DependencySpecifier("official/llvm[>=1.0.0]"),
+        DependencySpecifier("official/gtest[3.0.0]"),
+    ]