Added workspace handling for new command

src/cpl_cli/source_creator/console_builder.py

@@ -2,6 +2,9 @@ import json
 import os
 from cpl.console.foreground_color_enum import ForegroundColorEnum
 from cpl.console.console import Console
+from cpl.utils.string import String
+from cpl_cli.configuration.workspace_settings import WorkspaceSettings
+from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum
 from cpl_cli.source_creator.template_builder import TemplateBuilder
 from cpl_cli.templates.new.console.appsettings_json import AppsettingsTemplate
 from cpl_cli.templates.new.console.license import LicenseTemplate
@@ -21,7 +24,17 @@ class ConsoleBuilder:
         pass
 
     @staticmethod
-    def build(project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
+    def _create_file(file_name: str, content: dict):
+        path = os.path.dirname(file_name)
+        if not os.path.isdir(path):
+            os.makedirs(path)
+
+        with open(file_name, 'w') as project_json:
+            project_json.write(json.dumps(content, indent=2))
+            project_json.close()
+
+    @classmethod
+    def build(cls, project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
               project_name: str, project_settings: dict):
         """
         Builds the console project files
@@ -36,10 +49,6 @@ class ConsoleBuilder:
         if not os.path.isdir(project_path):
             os.makedirs(project_path)
 
-        with open(os.path.join(project_path, 'cpl.json'), 'w') as project_json:
-            project_json.write(json.dumps(project_settings, indent=2))
-            project_json.close()
-
         templates: list[TemplateFileABC] = [
             LicenseTemplate(),
             ReadmeTemplate(),
@@ -62,6 +71,32 @@ class ConsoleBuilder:
             else:
                 templates.append(MainWithoutApplicationBaseTemplate(project_name))
 
+        workspace_file_path = f'{project_name}/cpl-workspace.json'
+        project_file_rel_path = f'src/{String.convert_to_snake_case(project_name)}/{project_name}.json'
+        Console.spinner(
+            f'Creating {workspace_file_path}',
+            cls._create_file,
+            workspace_file_path,
+            {
+                WorkspaceSettingsNameEnum.default_project.value: project_name,
+                WorkspaceSettingsNameEnum.projects.value: {
+                    project_name: project_file_rel_path
+                }
+            },
+            text_foreground_color=ForegroundColorEnum.green,
+            spinner_foreground_color=ForegroundColorEnum.cyan
+        )
+
+        project_file_path = f'{project_name}/{project_file_rel_path}'
+        Console.spinner(
+            f'Creating {project_file_path}',
+            cls._create_file,
+            project_file_path,
+            project_settings,
+            text_foreground_color=ForegroundColorEnum.green,
+            spinner_foreground_color=ForegroundColorEnum.cyan
+        )
+
         for template in templates:
             Console.spinner(
                 f'Creating {project_name}/{template.path}{template.name}',

src/cpl_cli/source_creator/library_builder.py

@@ -2,15 +2,17 @@ import json
 import os
 from cpl.console.foreground_color_enum import ForegroundColorEnum
 from cpl.console.console import Console
+from cpl.utils.string import String
+from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum
 from cpl_cli.source_creator.template_builder import TemplateBuilder
 from cpl_cli.templates.new.library.appsettings_json import AppsettingsTemplate
 from cpl_cli.templates.new.library.license import LicenseTemplate
 from cpl_cli.templates.new.library.readme_py import ReadmeTemplate
-from cpl_cli.templates.new.library.src.cli.application import ApplicationTemplate
-from cpl_cli.templates.new.library.src.cli.init import CLIInitTemplate
-from cpl_cli.templates.new.library.src.cli.main import MainWithApplicationHostAndStartupTemplate, \
+from cpl_cli.templates.new.library.src.name.application import ApplicationTemplate
+from cpl_cli.templates.new.library.src.name.init import NameInitTemplate
+from cpl_cli.templates.new.library.src.name.main import MainWithApplicationHostAndStartupTemplate, \
     MainWithoutApplicationBaseTemplate, MainWithApplicationBaseTemplate, MainWithDependencyInjection
-from cpl_cli.templates.new.library.src.cli.startup import StartupTemplate
+from cpl_cli.templates.new.library.src.name.startup import StartupTemplate
 from cpl_cli.templates.new.library.src.tests.init import TestsInitTemplate
 from cpl_cli.templates.template_file_abc import TemplateFileABC
 
@@ -21,7 +23,17 @@ class LibraryBuilder:
         pass
 
     @staticmethod
-    def build(project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
+    def _create_file(file_name: str, content: dict):
+        path = os.path.dirname(file_name)
+        if not os.path.isdir(path):
+            os.makedirs(path)
+
+        with open(file_name, 'w') as project_json:
+            project_json.write(json.dumps(content, indent=2))
+            project_json.close()
+
+    @classmethod
+    def build(cls, project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
               project_name: str, project_settings: dict):
         """
         Builds the library project files
@@ -36,15 +48,11 @@ class LibraryBuilder:
         if not os.path.isdir(project_path):
             os.makedirs(project_path)
 
-        with open(os.path.join(project_path, 'cpl.json'), 'w') as project_json:
-            project_json.write(json.dumps(project_settings, indent=2))
-            project_json.close()
-
         templates: list[TemplateFileABC] = [
             LicenseTemplate(),
             ReadmeTemplate(),
             TestsInitTemplate(),
-            CLIInitTemplate(project_name),
+            NameInitTemplate(project_name),
             AppsettingsTemplate()
         ]
 
@@ -55,13 +63,39 @@ class LibraryBuilder:
                 templates.append(StartupTemplate(project_name))
                 templates.append(MainWithApplicationHostAndStartupTemplate(project_name))
             else:
-                templates.append(MainWithApplicationBaseTemplate())
+                templates.append(MainWithApplicationBaseTemplate(project_name))
         else:
             if use_service_providing:
                 templates.append(MainWithDependencyInjection())
             else:
                 templates.append(MainWithoutApplicationBaseTemplate())
 
+        workspace_file_path = f'{project_name}/cpl-workspace.json'
+        project_file_rel_path = f'src/{String.convert_to_snake_case(project_name)}/{project_name}.json'
+        Console.spinner(
+            f'Creating {workspace_file_path}',
+            cls._create_file,
+            workspace_file_path,
+            {
+                WorkspaceSettingsNameEnum.default_project.value: project_name,
+                WorkspaceSettingsNameEnum.projects.value: {
+                    project_name: project_file_rel_path
+                }
+            },
+            text_foreground_color=ForegroundColorEnum.green,
+            spinner_foreground_color=ForegroundColorEnum.cyan
+        )
+
+        project_file_path = f'{project_name}/{project_file_rel_path}'
+        Console.spinner(
+            f'Creating {project_file_path}',
+            cls._create_file,
+            project_file_path,
+            project_settings,
+            text_foreground_color=ForegroundColorEnum.green,
+            spinner_foreground_color=ForegroundColorEnum.cyan
+        )
+
         for template in templates:
             Console.spinner(
                 f'Creating {project_name}/{template.path}{template.name}',