add first test for conan dependency provider

Author: amhellmund

src/cpp_dev/conan/__init__.py

@@ -19,12 +19,17 @@
 # Public API                                                                ###
 ###############################################################################
 
-
+############################
+### Conan Config Install ###
+############################
 def conan_config_install(conan_config_dir: Path) -> None:
     """Run "conan config install"."""
     run_command("conan", "config", "install", str(conan_config_dir))
 
 
+##########################
+### Conan Remote Login ###
+##########################
 def conan_remote_login(remote: str, user: str, password: str) -> None:
     """Run "conan remote login"."""
     run_command_assert_success(
@@ -37,8 +42,9 @@ def conan_remote_login(remote: str, user: str, password: str) -> None:
         password,
     )
 
-class ConanRemoteListResult(RootModel):
-    root: Mapping[str, Mapping[str, dict]]
+### Conan List
+class ConanListResult(RootModel):
+    root: Mapping[str, Mapping[ConanPackageReference, dict]]
 
 def conan_list(remote: str, name: str) -> Mapping[ConanPackageReference, dict]:
     stdout, _ = run_command_assert_success(
@@ -48,8 +54,15 @@ def conan_list(remote: str, name: str) -> Mapping[ConanPackageReference, dict]:
         f"--remote={remote}",
         f"{name}/",
     )
-    return json.loads(stdout)[remote]
+    print(stdout)
+    parsed_data = ConanListResult.model_validate_json(stdout)
+    print(parsed_data)
+    return parsed_data.root[remote]
+
 
+###############################
+### Conan Graph Build-Order ###
+###############################
 class ConanPackageInfo(BaseModel):
     settings: Mapping[str, str] | None = None
 
@@ -78,6 +91,9 @@ def conan_graph_buildorder(conanfile_path: Path, profile: str) -> ConanGraphBuil
     return ConanGraphBuildOrder.model_validate_json(stdout)
 
 
+####################
+### Conan Create ###
+####################
 def conan_create(package_dir: Path, profile: str) -> None:
     """Run "conan create"."""
     run_command_assert_success(
@@ -87,6 +103,9 @@ def conan_create(package_dir: Path, profile: str) -> None:
         "-pr:a", profile,
     )
 
+####################
+### Conan Upload ###
+####################
 def conan_upload(ref: ConanPackageReference, remote: str) -> None:
     """Run "conan upload"."""
     run_command_assert_success(

src/cpp_dev/conan/package.py

@@ -34,7 +34,10 @@ def fetch_versions(self, repository: str, name: str) -> list[SemanticVersion]:
             return available_versions
 
     def collect_dependency_hull(self, deps: list[DependencySpecifier]) -> list[Dependency]:
-        ... # Implementation using Conan package manager
+        # with conan_env(get_conan_home_dir()):
+        #     with create_tmp_dir() as tmp_dir:
+        #     conanfile_path = create_conanfile(tmp_dir, package_refs)
+        ...
 
     def install_dependencies(self, deps: list[DependencySpecifier]) -> list[DependencySpecifier]:
         ... # Implementation using Conan package manager

src/cpp_dev/dependency/conan/command_wrapper.py

@@ -33,6 +33,8 @@ def validate_reference(self) -> ConanPackageReference:
         self._user = match.group("user")
         self._channel = match.group("channel") 
 
+        return self
+
     @property
     def name(self) -> str:
         return self._name

src/cpp_dev/dependency/conan/provider.py

@@ -19,6 +19,7 @@
                                                       conan_upload)
 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 .utils.env import ConanTestEnv, create_conan_env
 from .utils.server import ConanServer, launch_conan_server
@@ -68,22 +69,22 @@ class ConanTestEnvironment:
 
 @pytest.fixture
 def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[ConanTestEnvironment]:
-    with launch_conan_server(tmp_path / "server", unused_http_port) as conan_server:
-        with create_conan_env(tmp_path / "conan", conan_server.http_port) as conan_env:
-            conan_env.create_and_upload_package(ConanPackageReference("dep/1.0.0@official/cppdev"), [])
-            conan_env.create_and_upload_package(ConanPackageReference("cpd1/1.0.0@official/cppdev"), [])
-            conan_env.create_and_upload_package(ConanPackageReference("cpd/1.0.0@official/cppdev"), [ConanPackageReference("dep/1.0.0@official/cppdev")])
+    with launch_conan_server(tmp_path / "server", unused_http_port) as server:
+        with create_conan_env(tmp_path / "conan", server.http_port) as conan:
+            conan.create_and_upload_package(ConanPackageReference("dep/1.0.0@official/cppdev"), [])
+            conan.create_and_upload_package(ConanPackageReference("cpd1/1.0.0@official/cppdev"), [])
+            conan.create_and_upload_package(ConanPackageReference("cpd/1.0.0@official/cppdev"), [ConanPackageReference("dep/1.0.0@official/cppdev")])
             yield ConanTestEnvironment(
-                server=conan_server,
-                conan=conan_env
+                server=server,
+                conan=conan,
             )
 
 
 @pytest.mark.usefixtures("conan_test_environment")
 def test_conan_list() -> None:
     result = conan_list(CONAN_REMOTE, "cpd")
     assert len(result) == 1
-    assert "cpd/1.0.0@official/cppdev" in result
+    assert ConanPackageReference("cpd/1.0.0@official/cppdev") in result
 
 
 @pytest.mark.usefixtures("conan_test_environment")

src/cpp_dev/dependency/conan/types.py

@@ -22,14 +22,20 @@
 class ConanTestEnv:
     """A Conan environment for testing."""
 
-    def __init__(self, base_dir: Path, profile: str) -> None:
-        self._base_dir = base_dir / ".conan_test_env"
-        ensure_dir_exists(self._base_dir)
+    def __init__(self, conan_dir: Path, profile: str) -> None:
+        self._conan_dir = conan_dir
+        self._package_dir = conan_dir / ".conan_test_env"
+        ensure_dir_exists(self._package_dir)
         self._profile = profile
 
     def create_and_upload_package(self, ref: ConanPackageReference, dependencies: list[ConanPackageReference]) -> None:
         """Create and upload a Conan package for testing."""
-        _create_and_upload_conan_package(self._base_dir, ref, dependencies, self._profile)
+        _create_and_upload_conan_package(self._package_dir, ref, dependencies, self._profile)
+
+    @property
+    def conan_dir(self) -> Path:
+        """Return the base directory of the Conan environment."""
+        return self._conan_dir
 
     @property
     def profile(self) -> str: