Compare commits

...

4 Commits

Author SHA1 Message Date
9c75008c9f Add cpl-mail project
All checks were successful
Test before pr merge / test-lint (pull_request) Successful in 8s
Build on push / prepare (push) Successful in 10s
Build on push / query (push) Successful in 18s
Build on push / core (push) Successful in 19s
Build on push / dependency (push) Successful in 19s
Build on push / cli (push) Successful in 24s
Build on push / mail (push) Successful in 17s
Build on push / translation (push) Successful in 16s
Build on push / database (push) Successful in 21s
Build on push / application (push) Successful in 21s
Build on push / auth (push) Successful in 15s
Build on push / api (push) Successful in 15s
2025-10-19 20:03:43 +02:00
df2c2b5b56 Workspace check project existence
All checks were successful
Test before pr merge / test-lint (pull_request) Successful in 6s
Build on push / prepare (push) Successful in 11s
Build on push / query (push) Successful in 19s
Build on push / core (push) Successful in 19s
Build on push / dependency (push) Successful in 19s
Build on push / cli (push) Successful in 19s
Build on push / application (push) Successful in 16s
Build on push / translation (push) Successful in 17s
Build on push / database (push) Successful in 20s
Build on push / mail (push) Successful in 20s
Build on push / auth (push) Successful in 15s
Build on push / api (push) Successful in 16s
2025-10-19 19:56:59 +02:00
e3b19c9984 Fixed init command regarding structure
All checks were successful
Test before pr merge / test-lint (pull_request) Successful in 7s
Build on push / prepare (push) Successful in 10s
Build on push / core (push) Successful in 19s
Build on push / query (push) Successful in 19s
Build on push / cli (push) Successful in 16s
Build on push / dependency (push) Successful in 19s
Build on push / application (push) Successful in 20s
Build on push / database (push) Successful in 21s
Build on push / translation (push) Successful in 20s
Build on push / mail (push) Successful in 23s
Build on push / auth (push) Successful in 15s
Build on push / api (push) Successful in 14s
2025-10-19 19:48:41 +02:00
91269f351b Fixed init command regarding package handling
All checks were successful
Test before pr merge / test-lint (pull_request) Successful in 7s
Build on push / prepare (push) Successful in 11s
Build on push / core (push) Successful in 19s
Build on push / query (push) Successful in 23s
Build on push / cli (push) Successful in 16s
Build on push / dependency (push) Successful in 19s
Build on push / database (push) Successful in 16s
Build on push / application (push) Successful in 18s
Build on push / mail (push) Successful in 20s
Build on push / translation (push) Successful in 20s
Build on push / auth (push) Successful in 19s
Build on push / api (push) Successful in 15s
2025-10-19 19:37:13 +02:00
4 changed files with 56 additions and 20 deletions

View File

@@ -3,7 +3,7 @@
"projects": [
"src/cli/cpl.project.json",
"src/core/cpl.project.json",
"test/cpl.project.json"
"src/mail/cpl.project.json"
],
"defaultProject": "cpl-cli",
"scripts": {

View File

@@ -1,3 +1,4 @@
from pathlib import Path
from typing import Optional, List, Dict
from cpl.cli.model.cpl_structure_model import CPLStructureModel
@@ -28,6 +29,20 @@ class Workspace(CPLStructureModel):
self._name = name
self._projects = projects
self._default_project = default_project
self._actual_projects = []
self._project_names = []
for project in projects:
if Path(project).is_dir() or not Path(project).exists():
raise ValueError(f"Project path '{project}' does not exist or is a directory.")
p = Project.from_file(project)
self._actual_projects.append(p)
self._project_names.append(p.name)
if default_project is not None and default_project not in self._project_names:
raise ValueError(f"Default project '{default_project}' not found in workspace projects.")
self._scripts = scripts
@property
@@ -48,11 +63,11 @@ class Workspace(CPLStructureModel):
@property
def actual_projects(self) -> List[Project]:
return [Project.from_file(p) for p in self._projects]
return self._actual_projects
@property
def project_names(self) -> List[str]:
return [Project.from_file(p).name for p in self._projects]
return self._project_names
@property
def default_project(self) -> Optional[str]:

View File

@@ -84,7 +84,7 @@ class Structure:
return Project.from_file(path)
workspace = Structure.find_workspace_in_path(path.parent)
workspace = Structure.find_workspace_in_path(path.parent, with_parents=True)
if workspace is None:
raise RuntimeError("No workspace found. Please run 'cpl init workspace' first.")
@@ -116,7 +116,7 @@ class Structure:
return workspace
@staticmethod
def init_project(rel_path: str, name: str, project_type: str, workspace: Workspace | None, install_deps=False, verbose=False):
def init_project(rel_path: str, name: str, project_type: str, workspace: Workspace | None, verbose=False):
if not Path(rel_path).exists():
rel_path = click.prompt("Project directory", type=click.Path(exists=True, file_okay=False), default="src")
@@ -138,21 +138,10 @@ class Structure:
)
project.save()
if install_deps:
from cpl.cli.command.package.install import install
old_cwd = os.getcwd()
os.chdir(Path(workspace.path).parent)
install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose)
if project_type in Structure._dependency_map:
for package in Structure._dependency_map[project_type]:
install.callback(package, project.name, dev=False, verbose=verbose)
os.chdir(old_cwd)
Console.write_line(f"Created {project_type} project '{name}'")
if workspace is not None:
rel_path = str(path.resolve().absolute().relative_to(Path(workspace.path).parent))
rel_path = str(path.resolve().absolute().relative_to(Path(workspace.path).parent)).replace("\\", "/")
if rel_path not in workspace.projects:
workspace.projects.append(rel_path)
workspace.save()
@@ -160,7 +149,16 @@ class Structure:
if verbose:
Console.write_line(f"Registered '{name}' in workspace.json")
Console.write_line(f"Created {project_type} project '{name}'")
from cpl.cli.command.package.install import install
old_cwd = os.getcwd()
os.chdir(Path(workspace.path).parent)
install.callback(f"cpl-cli>={cli.__version__}", project.name, dev=True, verbose=verbose)
if project_type in Structure._dependency_map:
for package in Structure._dependency_map[project_type]:
install.callback(package, project.name, dev=False, verbose=verbose)
os.chdir(old_cwd)
return project
@staticmethod
@@ -200,4 +198,4 @@ class Structure:
shutil.copy(src_file, tgt_file)
Console.write_line()
Structure.init_project(str(path), name, project_type, workspace, install_deps=True, verbose=verbose)
Structure.init_project(str(path), name, project_type, workspace, verbose=verbose)

23
src/mail/cpl.project.json Normal file
View File

@@ -0,0 +1,23 @@
{
"name": "cpl-mail",
"version": "0.1.0",
"type": "library",
"license": "",
"author": "",
"description": "",
"homepage": "",
"keywords": [],
"dependencies": {
"cpl-core": "~2024.7.0"
},
"devDependencies": {
"cpl-cli": ">2024.7.0"
},
"references": [],
"main": null,
"directory": "./",
"build": {
"include": [],
"exclude": []
}
}