Use Updated Plugins

cppython/plugins/interface/console.py → cppython/console.py

@@ -7,9 +7,9 @@
 
 import click
 import tomlkit
+from cppython_core.schema import GeneratorDataType, Interface, PyProject
 
 from cppython.project import Project
-from cppython.schema import GeneratorDataType, Interface, PyProject
 
 
 def _create_pyproject():
@@ -111,4 +111,7 @@ def write_pyproject(self) -> None:
         """
 
     def print(self, string: str) -> None:
+        """
+        TODO
+        """
         click.echo(string)

cppython/plugins/test/data.py → cppython/data.py

@@ -4,11 +4,11 @@
 
 from pathlib import Path
 
-from cppython.schema import PEP621, CPPythonData, PyProject, TargetEnum
+from cppython_core.schema import PEP621, CPPythonData, PyProject, TargetEnum, ToolData
 
 default_pep621 = PEP621(name="test_name", version="1.0")
 
 # CMake is a default plugin
 default_cppython_data = CPPythonData(**{"generator": "cmake", "target": TargetEnum.EXE, "install-path": Path()})
-
-default_pyproject = PyProject(project=default_pep621, cppython=default_cppython_data)
+default_tool_data = ToolData(**{"cppython": default_cppython_data})
+default_pyproject = PyProject(**{"project": default_pep621, "tool": default_tool_data})

cppython/project.py

@@ -5,8 +5,8 @@
 from importlib import metadata
 from typing import Callable, Optional, Type, TypeVar
 
-from cppython.exceptions import ConfigError
-from cppython.schema import API, Generator, Interface, Plugin, PyProject
+from cppython_core.exceptions import ConfigError
+from cppython_core.schema import API, Generator, Interface, Plugin, PyProject
 
 
 class Project(API):
@@ -16,11 +16,16 @@ class Project(API):
 
     def __init__(self, interface: Interface, pyproject: PyProject) -> None:
 
-        self.enabled = pyproject.cppython is not None
+        self.enabled = False
 
-        if not self.enabled:
+        if pyproject.tool is None:
             return
 
+        if pyproject.tool.cppython is None:
+            return
+
+        self.enabled = True
+
         self._interface = interface
 
         PluginType = TypeVar("PluginType", bound=Type[Plugin])
@@ -40,10 +45,10 @@ def find_plugin_type(plugin_type: PluginType, condition: Callable[[str], bool])
 
             return None
 
-        plugin_type = find_plugin_type(Generator, lambda name: name == pyproject.cppython.generator)
+        plugin_type = find_plugin_type(Generator, lambda name: name == pyproject.tool.cppython.generator)
 
         if plugin_type is None:
-            raise ConfigError(f"No generator plugin with the name '{pyproject.cppython.generator}' was found.")
+            raise ConfigError(f"No generator plugin with the name '{pyproject.tool.cppython.generator}' was found.")
 
         generator_data = interface.read_generator_data(plugin_type.data_type())
         self._generator = plugin_type(pyproject, generator_data)
@@ -52,11 +57,11 @@ def download(self):
         """
         Download the generator tooling if required
         """
-        if not self._generator.downloaded():
+        if not self._generator.generator_downloaded():
             self._interface.print(f"Downloading the {self._generator.name()} tool")
 
             # TODO: Make async with progress bar
-            self._generator.download()
+            self._generator.download_generator()
             self._interface.print("Download complete")
 
     # API Contract