Skip to content

Update #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cppython/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
A click CLI for CPPython interfacing
"""

from logging import Logger
from pathlib import Path
from typing import Any, Type

Expand Down
37 changes: 21 additions & 16 deletions cppython/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from importlib import metadata
from typing import Any, Type, TypeVar

from cppython_core.core import cppython_logger
from cppython_core.schema import (
API,
CPPythonData,
Expand Down Expand Up @@ -58,7 +59,7 @@ def gather_plugins(self, plugin_type: Type[DerivedPlugin]) -> list[Type[DerivedP
TODO
"""
plugins = []
entry_points = metadata.entry_points(group=f"cppython.{plugin_type.plugin_group()}")
entry_points = metadata.entry_points(group=f"cppython.{plugin_type.group()}")

for entry_point in entry_points:
loaded_plugin_type = entry_point.load()
Expand Down Expand Up @@ -121,35 +122,36 @@ def __init__(

levels = [logging.WARNING, logging.INFO, logging.DEBUG]

self._logger = logging.getLogger("cppython")

# Add default output stream
console_handler = logging.StreamHandler()
self._logger.addHandler(console_handler)
self._logger.setLevel(levels[configuration.verbosity])
cppython_logger.addHandler(console_handler)
cppython_logger.setLevel(levels[configuration.verbosity])

self._logger.info("Initializing project")
cppython_logger.info("Initializing project")

builder = ProjectBuilder(self.configuration)
plugins = builder.gather_plugins(Generator)

if not plugins:
self._logger.info("No generator plugin was found")
cppython_logger.error("No generator plugin was found")
return

for plugin in plugins:
cppython_logger.warning(f"Generator plugin found: {plugin.name()}")

extended_pyproject_type = builder.generate_model(plugins)
self._pyproject = extended_pyproject_type(**pyproject_data)

if self.pyproject is None:
self._logger.info("Data is not defined")
cppython_logger.error("Data is not defined")
return

if self.pyproject.tool is None:
self._logger.info("Table [tool] is not defined")
cppython_logger.error("Table [tool] is not defined")
return

if self.pyproject.tool.cppython is None:
self._logger.info("Table [tool.cppython] is not defined")
cppython_logger.error("Table [tool.cppython] is not defined")
return

self._enabled = True
Expand All @@ -159,7 +161,7 @@ def __init__(
generator_configuration = GeneratorConfiguration()
self._generators = builder.create_generators(plugins, generator_configuration, self.pyproject)

self._logger.info("Initialized project")
cppython_logger.info("Initialized project successfully")

@property
def enabled(self) -> bool:
Expand Down Expand Up @@ -196,32 +198,35 @@ def download(self):
path.mkdir(parents=True, exist_ok=True)

if not generator.generator_downloaded(path):
self._logger.info(f"Downloading the {generator.name()} tool")
cppython_logger.warning(f"Downloading the {generator.name()} requirements to {path}")

# TODO: Make async with progress bar
generator.download_generator(path)
self._logger.info("Download complete")
cppython_logger.warning("Download complete")

# API Contract

def install(self) -> None:
if self._enabled:
self._logger.info("Installing project")
cppython_logger.info("Installing project")
self.download()

for generator in self._generators:
cppython_logger.info(f"Installing {generator.name()} generator")
generator.install()

def update(self) -> None:
if self._enabled:
self._logger.info("Updating project")
cppython_logger.info("Updating project")

for generator in self._generators:
cppython_logger.info(f"Updating {generator.name()} generator")
generator.update()

def build(self) -> None:
if self._enabled:
self._logger.info("Building project")
cppython_logger.info("Building project")

for generator in self._generators:
cppython_logger.info(f"Building {generator.name()} generator")
generator.build()
16 changes: 8 additions & 8 deletions pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tests/unit/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def test_generator_data_construction(self, mocker: MockerFixture):

assert model_type.__base__ == PyProject

generator_type = mocker.Mock(spec=Generator)
generator_type = mocker.Mock()
generator_type.name.return_value = "mock"
generator_type.data_type.return_value = MockGeneratorData

Expand Down Expand Up @@ -104,7 +104,7 @@ def test_generator_creation(self, mocker: MockerFixture):

assert not generators

generator = mocker.Mock(spec=Generator)
generator = mocker.Mock()
generators = builder.create_generators([generator], generator_configuration, default_pyproject)

assert len(generators) == 1