intermediate state

Author: amhellmund

src/cpp_dev/dependency/conan/provider.py

@@ -10,11 +10,12 @@
 from pathlib import Path
 
 from cpp_dev.common.types import CppStandard
+from cpp_dev.common.utils import create_tmp_dir
 from cpp_dev.common.version import SemanticVersion
 from cpp_dev.dependency.conan.command_wrapper import conan_list
 from cpp_dev.dependency.conan.setup import CONAN_REMOTE
 from cpp_dev.dependency.conan.types import ConanPackageReference
-from cpp_dev.dependency.conan.utils import conan_env
+from cpp_dev.dependency.conan.utils import conan_env, create_conanfile
 from cpp_dev.dependency.provider import Dependency, DependencyProvider
 from cpp_dev.dependency.specifier import DependencySpecifier
 
@@ -34,7 +35,9 @@ def fetch_versions(self, repository: str, name: str) -> list[SemanticVersion]:
             return available_versions
 
     def collect_dependency_hull(self, deps: list[DependencySpecifier]) -> list[Dependency]:
-        # with conan_env(get_conan_home_dir()):
+        with conan_env(self._conan_home_dir):
+            with create_tmp_dir() as tmp_dir:
+                conanfile_path = create_conanfile(tmp_dir, deps)
         #     with create_tmp_dir() as tmp_dir:
         #     conanfile_path = create_conanfile(tmp_dir, package_refs)
         ...

src/cpp_dev/project/config.py

@@ -89,6 +89,21 @@ def update_dependencies(
     return updated_config
 
 
+def validate_dependencies(project_config: ProjectConfig) -> None:
+    """Check that a dependency identified by its name (without repository) exists only once.
+
+    Dependencies are in general identified by a name and their repository, e.g. official/cpd.
+    It is, however, possible to add a dependency with the same name from different repositories, e.g.
+    official/cpd and user/cpd. In this case, it is assumed that both dependencies are the same which
+    is not supported in C++ because it might lead to undefined behavior.
+    """
+    seen_names = set()
+    for dep in project_config.dependencies + project_config.dev_dependencies + project_config.cpd_dependencies:
+        if dep.name in seen_names:
+            raise ValueError(f"Dependency '{dep.name}' is defined multiple times.")
+        seen_names.add(dep.name)
+
+
 ###############################################################################
 # Implementation                                                            ###
 ###############################################################################

src/cpp_dev/project/core.py

@@ -7,11 +7,18 @@
 from textwrap import dedent
 
 from cpp_dev.common.version import SemanticVersionWithOptionalParts
-from cpp_dev.dependency.provider import DependencyProvider
+from cpp_dev.dependency.provider import Dependency, DependencyProvider
 from cpp_dev.dependency.specifier import DependencySpecifier
 from cpp_dev.dependency.types import DependencySpecifierParts, VersionSpecBound, VersionSpecBoundOperand
 
-from .config import DependencyType, ProjectConfig, create_project_config, load_project_config, update_dependencies
+from .config import (
+    DependencyType,
+    ProjectConfig,
+    create_project_config,
+    load_project_config,
+    store_project_config,
+    update_dependencies,
+)
 from .lockfile import create_initial_lock_file
 from .path_composition import compose_include_file, compose_source_file
 
@@ -37,6 +44,9 @@ def add_package_dependency(self, deps: list[DependencySpecifier], dep_type: Depe
         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)
+        dependency_hull = _obtain_dependency_hull(project_config, self._dependency_provider)
+
+        store_project_config(self.project_dir, project_config)
 
 
 def setup_project(
@@ -173,3 +183,10 @@ def _refine_package_dependencies(
             DependencySpecifier.from_parts(DependencySpecifierParts(repository, dep.name, version_spec))
         )
     return updated_deps
+
+
+def _obtain_dependency_hull(project_config: ProjectConfig, dep_provider: DependencyProvider) -> list[Dependency]:
+    """Obtain the dependency hull for the given project configuration."""
+    return dep_provider.collect_dependency_hull(
+        project_config.dependencies + project_config.dev_dependencies + project_config.cpd_dependencies
+    )

src/tests/cpp_dev/dependency/conan/test_provider.py

@@ -15,8 +15,6 @@
 from tests.cpp_dev.dependency.conan.utils.env import (ConanTestEnv,
                                                       ConanTestPackage,
                                                       create_conan_test_env)
-from tests.cpp_dev.dependency.conan.utils.server import (
-    ConanServer, launch_conan_test_server)
 
 
 @pytest.fixture

src/tests/cpp_dev/project/test_config.py

@@ -16,6 +16,7 @@
     create_project_config,
     load_project_config,
     update_dependencies,
+    validate_dependencies,
 )
 from cpp_dev.project.path_composition import compose_project_config_file
 
@@ -83,3 +84,34 @@ def test_update_dependencies(
         assert new_config.get_dependencies(unchanged_type) == project_setup.project_config.get_dependencies(
             unchanged_type
         )
+
+
+def test_validate_dependencies_valid() -> None:
+    valid_config = ProjectConfig(
+        name="test",
+        version=SemanticVersion("0.1.0"),
+        std="c++17",
+        author="author",
+        license="license",
+        description="description",
+        dependencies=[DependencySpecifier("dep1"), DependencySpecifier("dep2")],
+        dev_dependencies=[DependencySpecifier("dev1")],
+        cpd_dependencies=[DependencySpecifier("cpd1")],
+    )
+    validate_dependencies(valid_config)  # Should not raise an exception
+
+
+def test_validate_dependencies_invalid() -> None:
+    invalid_config = ProjectConfig(
+        name="test",
+        version=SemanticVersion("0.1.0"),
+        std="c++17",
+        author="author",
+        license="license",
+        description="description",
+        dependencies=[DependencySpecifier("dep1")],
+        dev_dependencies=[DependencySpecifier("dep1")],  # Duplicate dependency
+        cpd_dependencies=[DependencySpecifier("cpd1")],
+    )
+    with pytest.raises(ValueError, match="Dependency 'dep1' is defined multiple times."):
+        validate_dependencies(invalid_config)