Fixed init command regarding package handling

.gitea/workflows/build-dev.yaml

@@ -16,68 +16,68 @@ jobs:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, application, auth, core, dependency ]
     with:
-      working_directory: src/cpl-api
+      working_directory: src/api
     secrets: inherit
 
   application:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-application
+      working_directory: src/application
     secrets: inherit
 
   auth:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency,  database ]
     with:
-      working_directory: src/cpl-auth
+      working_directory: src/auth
     secrets: inherit
 
   cli:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core ]
     with:
-      working_directory: src/cpl-cli
+      working_directory: src/cli
     secrets: inherit
 
   core:
     uses: ./.gitea/workflows/package.yaml
     needs: [prepare]
     with:
-      working_directory: src/cpl-core
+      working_directory: src/core
     secrets: inherit
 
   database:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-database
+      working_directory: src/database
     secrets: inherit
 
   dependency:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core ]
     with:
-      working_directory: src/cpl-dependency
+      working_directory: src/dependency
     secrets: inherit
 
   mail:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-mail
+      working_directory: src/mail
     secrets: inherit
 
   query:
     uses: ./.gitea/workflows/package.yaml
     needs: [prepare]
     with:
-      working_directory: src/cpl-query
+      working_directory: src/query
     secrets: inherit
 
   translation:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-translation
+      working_directory: src/translation
     secrets: inherit

README.md

@@ -0,0 +1,22 @@
+## Prepare for development
+
+After cloning the repository, run the following commands to set up your development environment:
+
+```bash
+python -m venv .venv
+source .venv/bin/activate
+# On Windows use `.venv\Scripts\activate`
+# On Windows with git bash use `source .venv/Scripts/activate`
+bash install.sh
+```
+
+Install cpl-cli as a development package:
+
+```bash
+pip install -e src/core
+pip install -e src/cli
+# test with:
+cpl v
+```
+
+When using Pycharm, mark all directories under `src/` as "Sources Root" and `exa` to ensure proper module resolution.

install.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Find and combine requirements from src/cpl-*/requirements.txt,
+# Find and combine requirements from src/*/requirements.txt,
 # filtering out lines whose *package name* starts with "cpl-".
 # Works with pinned versions, extras, markers, editable installs, and VCS refs.
 
 shopt -s nullglob
 
-req_files=(src/cpl-*/requirements.txt)
+req_files=(src/*/requirements.txt)
 if ((${#req_files[@]} == 0)); then
-  echo "No requirements files found at src/cpl-*/requirements.txt" >&2
+  echo "No requirements files found at src/*/requirements.txt" >&2
   exit 1
 fi
 

src/cli/cpl/cli/command/structure/init.py

@@ -12,7 +12,8 @@ from cpl.core.console import Console
 @click.command("init")
 @click.argument("target", required=False)
 @click.argument("name", required=False)
-def init(target: str, name: str):
+@click.option("--verbose", "-v", is_flag=True, help="Enable verbose output")
+def init(target: str, name: str, verbose: bool = False):
     workspace = None
     project = None
 
@@ -30,9 +31,9 @@ def init(target: str, name: str):
     if target in ["workspace", "ws"]:
         workspace = Structure.init_workspace("./", name or click.prompt("Workspace name", default="my-workspace"))
     elif target in PROJECT_TYPES:
-        workspace = Structure.find_workspace_in_path(Path(name).parent)
+        workspace = Structure.find_workspace_in_path(Path(name or "./").parent, with_parents=True)
         project = Structure.init_project(
-            "./", name or click.prompt("Project name", default=f"my-{target}"), target, workspace
+            "./", name or click.prompt("Project name", default=f"my-{target}"), target, workspace, verbose=verbose
         )
     else:
         Console.error(f"Unknown target '{target}'")

src/cli/cpl/cli/utils/structure.py

@@ -151,7 +151,7 @@ class Structure:
         os.chdir(old_cwd)
 
         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()
@@ -199,4 +199,4 @@ class Structure:
                 shutil.copy(src_file, tgt_file)
 
         Console.write_line()
-        Structure.init_project(str(path), name, project_type, workspace)
+        Structure.init_project(str(path), name, project_type, workspace, verbose=verbose)