Bugfixes for start service

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/build/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.build'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/generate/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.generate'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/console/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/console/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/console/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/console/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/library/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/library/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/library/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/new/library/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/_templates/publish/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/cpl_cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "0.rc1"
+      "Micro": "1.dev2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.0.rc1"
+      "cpl-core>=2022.6.1.dev2"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},

src/cpl_cli/live_server/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.live_server'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/live_server/live_server_thread.py

@@ -60,7 +60,6 @@ class LiveServerThread(threading.Thread):
         Starts the CPL project
         :return:
         """
-        Console.write_line(self._build_settings.main)
         main = self._build_settings.main
         if '.' in self._build_settings.main:
             length = len(self._build_settings.main.split('.')) - 1
@@ -89,7 +88,10 @@ class LiveServerThread(threading.Thread):
         Console.set_foreground_color(ForegroundColorEnum.default)
 
         self._command = [self._executable, self._main]
-        if len(self._args) > 0:
-            self._command.append(''.join(self._args))
+        # if len(self._args) > 0:
+        #     self._command.append(' '.join(self._args))
+        for arg in self._args:
+            self._command.append(arg)
 
+        Console.write_line(self._command)
         subprocess.run(self._command, env=self._env_vars)

src/cpl_cli/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/source_creator/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.source_creator'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/startup_argument_extension.py

@@ -31,10 +31,10 @@ class StartupArgumentExtension(StartupExtensionABC):
         pass
 
     @staticmethod
-    def _search_project_json(env: ApplicationEnvironmentABC) -> Optional[str]:
+    def _search_project_json(working_directory: str) -> Optional[str]:
         project_name = None
-        name = os.path.basename(env.working_directory)
-        for r, d, f in os.walk(env.working_directory):
+        name = os.path.basename(working_directory)
+        for r, d, f in os.walk(working_directory):
             for file in f:
                 if file.endswith('.json'):
                     f_name = file.split('.json')[0]
@@ -49,10 +49,14 @@ class StartupArgumentExtension(StartupExtensionABC):
         if workspace is not None:
             for script in workspace.scripts:
                 config.create_console_argument(ArgumentTypeEnum.Executable, '', script, [], CustomScriptService)
+            return
 
-            project = workspace.projects[workspace.default_project]
-        else:
-            project = f'{self._search_project_json(env)}.json'
+        project = self._search_project_json(env.working_directory)
+        if project is not None:
+            project = f'{project}.json'
+
+        if project is None:
+            return
 
         config.add_json_file(project, optional=True, output=False)
 

src/cpl_cli/validators/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.validators'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.0rc1'
+__version__ = '2022.6.1.dev2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='0.rc1')
+version_info = VersionInfo(major='2022', minor='6', micro='1.dev2')

src/cpl_cli/validators/project_validator.py

@@ -1,17 +1,29 @@
+import os
+
 from cpl_cli import Error
 from cpl_cli.configuration import WorkspaceSettings, ProjectSettings
+from cpl_core.configuration import ConfigurationABC
 from cpl_core.configuration.validator_abc import ValidatorABC
+from cpl_core.environment import ApplicationEnvironmentABC
 
 
 class ProjectValidator(ValidatorABC):
 
-    def __init__(self, workspace: WorkspaceSettings, project: ProjectSettings):
-        self._workspace = workspace
-        self._project = project
+    def __init__(self, config: ConfigurationABC, env: ApplicationEnvironmentABC, workspace: WorkspaceSettings, project: ProjectSettings):
+        self._config: ConfigurationABC = config
+        self._env: ApplicationEnvironmentABC = env
+        self._workspace: WorkspaceSettings = workspace
+        self._project: ProjectSettings = project
 
         ValidatorABC.__init__(self)
 
     def validate(self) -> bool:
+        if self._project is None and self._workspace is not None:
+            project = self._workspace.projects[self._workspace.default_project]
+            self._config.add_json_file(project, optional=True, output=False)
+            self._project = self._config.get_configuration(ProjectSettings)
+            self._env.set_working_directory(os.path.join(self._env.working_directory, os.path.dirname(project)))
+
         result = self._project is not None or self._workspace is not None
         if not result:
             Error.error('The command requires to be run in an CPL project, but a project could not be found.')