Update CMake Example Tests

Behemyth · Behemyth · commit 5f7fbd722380 · 2025-04-17T07:58:19.000-04:00
diff --git a/cppython/plugins/cmake/builder.py b/cppython/plugins/cmake/builder.py
@@ -109,7 +109,7 @@ def write_root_presets(preset_file: Path, cppython_preset_file: Path) -> None:
         else:
             # If the file doesn't exist, we need to default it for the user
 
-            # Forward the tool's build directory
+            # TODO: Forward the tool's build directory
             default_configure_preset = ConfigurePreset(name='default', inherits='cppython', binaryDir='build')
             root_preset = CMakePresets(configurePresets=[default_configure_preset])
 
diff --git a/cppython/plugins/cmake/resolution.py b/cppython/plugins/cmake/resolution.py
@@ -20,8 +20,10 @@ def resolve_cmake_data(data: dict[str, Any], core_data: CorePluginData) -> CMake
 
     root_directory = core_data.project_data.project_root.absolute()
 
-    modified_preset_dir = parsed_data.preset_file
-    if not modified_preset_dir.is_absolute():
-        modified_preset_dir = root_directory / modified_preset_dir
+    modified_preset_file = parsed_data.preset_file
+    if not modified_preset_file.is_absolute():
+        modified_preset_file = root_directory / modified_preset_file
 
-    return CMakeData(preset_file=modified_preset_dir, configuration_name=parsed_data.configuration_name)
+    
+
+    return CMakeData(preset_file=modified_preset_file, configuration_name=parsed_data.configuration_name)
diff --git a/cppython/plugins/conan/builder.py b/cppython/plugins/conan/builder.py
@@ -20,10 +20,10 @@ def __init__(self, dependencies: list[ConanDependency]) -> None:
     def _create_requires_assignment(self) -> cst.Assign:
         """Create a `requires` assignment statement."""
         return cst.Assign(
-            targets=[cst.AssignTarget(cst.Name('requires'))],
-            value=cst.List([
-                cst.Element(cst.SimpleString(f'"{dependency.requires()}"')) for dependency in self.dependencies
-            ]),
+            targets=[cst.AssignTarget(cst.Name(value='requires'))],
+            value=cst.List(
+                [cst.Element(cst.SimpleString(f'"{dependency.requires()}"')) for dependency in self.dependencies]
+            ),
         )
 
     def leave_ClassDef(self, original_node: cst.ClassDef, updated_node: cst.ClassDef) -> cst.BaseStatement:
@@ -56,24 +56,23 @@ def _update_requires(self, updated_node: cst.ClassDef) -> cst.ClassDef:
         for body_statement_line in updated_node.body.body:
             if not isinstance(body_statement_line, cst.SimpleStatementLine):
                 continue
-
-            assignment_statement = body_statement_line.body[0]
-            if not isinstance(assignment_statement, cst.Assign):
-                continue
-
-            for target in assignment_statement.targets:
-                if not isinstance(target.target, cst.Name) or target.target.value != 'requires':
+            for assignment_statement in body_statement_line.body:
+                if not isinstance(assignment_statement, cst.Assign):
                     continue
-
-                return self._replace_requires(updated_node, body_statement_line, assignment_statement)
+                for target in assignment_statement.targets:
+                    if not isinstance(target.target, cst.Name) or target.target.value != 'requires':
+                        continue
+                    # Replace only the assignment within the SimpleStatementLine
+                    return self._replace_requires(updated_node, body_statement_line, assignment_statement)
 
         # Find the last attribute assignment before methods
         last_attribute = None
         for body_statement_line in updated_node.body.body:
             if not isinstance(body_statement_line, cst.SimpleStatementLine):
                 break
-            assignment_statement = body_statement_line.body[0]
-            if not isinstance(assignment_statement, cst.Assign):
+            if not body_statement_line.body:
+                break
+            if not isinstance(body_statement_line.body[0], cst.Assign):
                 break
             last_attribute = body_statement_line
 
@@ -89,29 +88,27 @@ def _update_requires(self, updated_node: cst.ClassDef) -> cst.ClassDef:
             new_body.insert(index + 1, new_statement)
         else:
             new_body = [new_statement] + list(updated_node.body.body)
-
         return updated_node.with_changes(body=updated_node.body.with_changes(body=new_body))
 
     def _replace_requires(
         self, updated_node: cst.ClassDef, body_statement_line: cst.SimpleStatementLine, assignment_statement: cst.Assign
     ) -> cst.ClassDef:
-        """Replace the existing 'requires' assignment with a new one.
+        """Replace the existing 'requires' assignment with a new one, preserving other statements on the same line."""
+        new_value = cst.List(
+            [cst.Element(cst.SimpleString(f'"{dependency.requires()}"')) for dependency in self.dependencies]
+        )
+        new_assignment = assignment_statement.with_changes(value=new_value)
 
-        Args:
-            updated_node (cst.ClassDef): The class definition to update.
-            body_statement_line (cst.SimpleStatementLine): The body item containing the assignment.
-            assignment_statement (cst.Assign): The existing assignment statement.
+        # Replace only the relevant assignment in the SimpleStatementLine
+        new_body = [
+            new_assignment if statement is assignment_statement else statement for statement in body_statement_line.body
+        ]
+        new_statement_line = body_statement_line.with_changes(body=new_body)
 
-        Returns:
-            cst.ClassDef: The updated class definition.
-        """
-        new_value = cst.List([
-            cst.Element(cst.SimpleString(f'"{dependency.requires()}"')) for dependency in self.dependencies
-        ])
-        new_assignment = assignment_statement.with_changes(value=new_value)
+        # Replace the statement line in the class body
         return updated_node.with_changes(
             body=updated_node.body.with_changes(
-                body=[new_assignment if item is body_statement_line else item for item in updated_node.body.body]
+                body=[new_statement_line if item is body_statement_line else item for item in updated_node.body.body]
             )
         )
 
diff --git a/examples/conan_cmake/inject/pyproject.toml b/examples/conan_cmake/inject/pyproject.toml
@@ -3,13 +3,13 @@ description = "A simple project showing how to use conan with CPPython"
 name = "cppython-conan-cmake-simple"
 version = "1.0.0"
 
-license = {text = "MIT"}
+license = { text = "MIT" }
 
-authors = [{name = "Synodic Software", email = "contact@synodic.software"}]
+authors = [{ name = "Synodic Software", email = "contact@synodic.software" }]
 
 requires-python = ">=3.13"
 
-dependencies = ["cppython[conan, cmake]>=0.1.0"]
+dependencies = ["cppython[conan, cmake, git]>=0.9.0"]
 
 [tool.cppython]
 generator-name = "cmake"
diff --git a/examples/conan_cmake/simple/pyproject.toml b/examples/conan_cmake/simple/pyproject.toml
@@ -3,13 +3,14 @@ description = "A simple project showing how to use conan with CPPython"
 name = "cppython-conan-cmake-simple"
 version = "1.0.0"
 
-license = {text = "MIT"}
+license = { text = "MIT" }
 
-authors = [{name = "Synodic Software", email = "contact@synodic.software"}]
+authors = [{ name = "Synodic Software", email = "contact@synodic.software" }]
 
 requires-python = ">=3.13"
 
-dependencies = ["cppython[conan, cmake]>=0.1.0"]
+dependencies = ["cppython[conan, cmake, git]>=0.9.0"]
+
 
 [tool.cppython]
 generator-name = "cmake"
diff --git a/examples/vcpkg_cmake/simple/pyproject.toml b/examples/vcpkg_cmake/simple/pyproject.toml
@@ -3,13 +3,14 @@ description = "A simple project showing how to use vcpkg with CPPython"
 name = "cppython-vcpkg-cmake-simple"
 version = "1.0.0"
 
-license = {text = "MIT"}
+license = { text = "MIT" }
 
-authors = [{name = "Synodic Software", email = "contact@synodic.software"}]
+authors = [{ name = "Synodic Software", email = "contact@synodic.software" }]
 
 requires-python = ">=3.13"
 
-dependencies = ["cppython[vcpkg, cmake]>=0.1.0"]
+dependencies = ["cppython[vcpkg, cmake, git]>=0.9.0"]
+
 
 [tool.cppython]
 generator-name = "cmake"
diff --git a/pyproject.toml b/pyproject.toml
@@ -100,7 +100,8 @@ skip_empty = true
 plugins = ["-e file:///${PROJECT_ROOT}"]
 
 [tool.pdm.options]
-update = ["--update-all", "--unconstrained"]
+install = ["-G:all"]
+update = ["--update-all"]
 
 [tool.pdm.version]
 source = "scm"
diff --git a/tests/fixtures/cli.py b/tests/fixtures/cli.py
@@ -1,5 +1,8 @@
 """Fixtures for interfacing with the CLI."""
 
+import os
+import platform
+
 import pytest
 from typer.testing import CliRunner
 
@@ -13,3 +16,25 @@ def fixture_typer_runner() -> CliRunner:
     runner = CliRunner()
 
     return runner
+
+
+@pytest.fixture(
+    name='fresh_environment',
+    scope='session',
+)
+def fixture_fresh_environment(request: pytest.FixtureRequest) -> dict[str, str]:
+    """Create a fresh environment for subprocess calls."""
+    # Start with a minimal environment
+    new_env = {}
+
+    # Copy only variables you need
+    if platform.system() == 'Windows':
+        new_env['SystemRoot'] = os.environ['SystemRoot']  # noqa: SIM112
+
+    # Provide a PATH that doesn't contain venv references
+    new_env['PATH'] = os.environ['PATH']
+
+    # Set the Cppython root directory
+    new_env['CPPYTHON_ROOT'] = str(request.config.rootpath.resolve())
+
+    return new_env
diff --git a/tests/integration/examples/test_conan_cmake.py b/tests/integration/examples/test_conan_cmake.py
@@ -9,8 +9,6 @@
 
 from typer.testing import CliRunner
 
-from cppython.console.entry import app
-
 pytest_plugins = ['tests.fixtures.example']
 
 
@@ -20,39 +18,31 @@ class TestConanCMake:
     @staticmethod
     def test_simple(example_runner: CliRunner) -> None:
         """Simple project"""
-        result = example_runner.invoke(
-            app,
-            [
-                'install',
-            ],
-        )
+        # By nature of running the test, we require PDM to develop the project and so it will be installed
+        result = subprocess.run(['pdm', 'install'], capture_output=True, text=True, check=False)
 
-        assert result.exit_code == 0, result.output
+        assert result.returncode == 0, f'PDM install failed: {result.stderr}'
 
         # Run the CMake configuration command
-        cmake_result = subprocess.run(['cmake', '--preset=default'], capture_output=True, text=True, check=False)
+        result = subprocess.run(['cmake', '--preset=default'], capture_output=True, text=True, check=False)
 
-        assert cmake_result.returncode == 0, f'CMake configuration failed: {cmake_result.stderr}'
+        assert result.returncode == 0, f'Cmake failed: {result.stderr}'
 
         # Verify that the build directory contains the expected files
         assert (Path('build') / 'CMakeCache.txt').exists(), 'build/CMakeCache.txt not found'
 
     @staticmethod
     def test_inject(example_runner: CliRunner) -> None:
         """Inject"""
-        result = example_runner.invoke(
-            app,
-            [
-                'install',
-            ],
-        )
+        # By nature of running the test, we require PDM to develop the project and so it will be installed
+        result = subprocess.run(['pdm', 'install'], capture_output=True, text=True, check=False)
 
-        assert result.exit_code == 0, result.output
+        assert result.returncode == 0, f'PDM install failed: {result.stderr}'
 
         # Run the CMake configuration command
-        cmake_result = subprocess.run(['cmake', '--preset=default'], capture_output=True, text=True, check=False)
+        result = subprocess.run(['cmake', '--preset=default'], capture_output=True, text=True, check=False)
 
-        assert cmake_result.returncode == 0, f'CMake configuration failed: {cmake_result.stderr}'
+        assert result.returncode == 0, f'Cmake failed: {result.stderr}'
 
         # Verify that the build directory contains the expected files
         assert (Path('build') / 'CMakeCache.txt').exists(), 'build/CMakeCache.txt not found'
diff --git a/tests/integration/examples/test_vcpkg_cmake.py b/tests/integration/examples/test_vcpkg_cmake.py
@@ -10,8 +10,6 @@
 import pytest
 from typer.testing import CliRunner
 
-from cppython.console.entry import app
-
 pytest_plugins = ['tests.fixtures.example']
 
 
@@ -22,21 +20,15 @@ class TestVcpkgCMake:
     @pytest.mark.skip(reason='TODO')
     def test_simple(example_runner: CliRunner) -> None:
         """Simple project"""
-        result = example_runner.invoke(
-            app,
-            [
-                'install',
-            ],
-        )
+        # By nature of running the test, we require PDM to develop the project and so it will be installed
+        result = subprocess.run(['pdm', 'install'], capture_output=True, text=True, check=False)
 
-        assert result.exit_code == 0, result.output
+        assert result.returncode == 0, f'PDM install failed: {result.stderr}'
 
         # Run the CMake configuration command
-        cmake_result = subprocess.run(
-            ['cmake', '--preset=default', '-B', 'build'], capture_output=True, text=True, check=False
-        )
+        result = subprocess.run(['cmake', '--preset=default'], capture_output=True, text=True, check=False)
 
-        assert cmake_result.returncode == 0, f'CMake configuration failed: {cmake_result.stderr}'
+        assert result.returncode == 0, f'Cmake failed: {result.stderr}'
 
         # Verify that the build directory contains the expected files
         assert (Path('build') / 'CMakeCache.txt').exists(), 'build/CMakeCache.txt not found'
diff --git a/tests/unit/plugins/conan/test_ast.py b/tests/unit/plugins/conan/test_ast.py
@@ -0,0 +1,80 @@
+"""Tests for the AST transformer that modifies ConanFile classes."""
+
+import ast
+from textwrap import dedent
+
+import libcst as cst
+
+from cppython.plugins.conan.builder import RequiresTransformer
+from cppython.plugins.conan.schema import ConanDependency
+
+
+class TestTransformer:
+    """Unit tests for the RequiresTransformer."""
+
+    class MockDependency(ConanDependency):
+        """A dummy dependency class for testing."""
+
+        @staticmethod
+        def requires() -> str:
+            """Return a dummy requires string."""
+            return 'test/1.2.3'
+
+    @staticmethod
+    def test_add_requires_when_missing() -> None:
+        """Test that the transformer adds requires when missing."""
+        dependency = TestTransformer.MockDependency(name='test')
+
+        code = """
+        class MyFile(ConanFile):
+            name = "test"
+            version = "1.0"
+        """
+
+        module = cst.parse_module(dedent(code))
+        transformer = RequiresTransformer([dependency])
+        modified = module.visit(transformer)
+        assert 'requires = ["test/1.2.3"]' in modified.code
+
+        # Verify the resulting code is valid Python syntax
+        ast.parse(modified.code)
+
+    @staticmethod
+    def test_replace_existing_requires() -> None:
+        """Test that the transformer replaces existing requires."""
+        dependency = TestTransformer.MockDependency(name='test')
+
+        code = """
+        class MyFile(ConanFile):
+            name = "test"
+            requires = ["old/0.1"]
+            version = "1.0"
+        """
+
+        module = cst.parse_module(dedent(code))
+        transformer = RequiresTransformer([dependency])
+        modified = module.visit(transformer)
+        assert 'requires = ["test/1.2.3"]' in modified.code
+        assert 'old/0.1' not in modified.code
+
+        # Verify the resulting code is valid Python syntax
+        ast.parse(modified.code)
+
+    @staticmethod
+    def test_no_conanfile_class() -> None:
+        """Test that the transformer does not modify non-ConanFile classes."""
+        dependency = TestTransformer.MockDependency(name='test')
+
+        code = """
+        class NotConan:
+            pass
+        """
+
+        module = cst.parse_module(dedent(code))
+        transformer = RequiresTransformer([dependency])
+        modified = module.visit(transformer)
+        # Should not add requires to non-ConanFile classes
+        assert 'requires' not in modified.code
+
+        # Verify the resulting code is valid Python syntax
+        ast.parse(modified.code)
