Renamed cpl to cpl_core

Reviewed-on: #37
Closed #32

cpl-workspace.json

@@ -2,8 +2,10 @@
   "WorkspaceSettings": {
     "DefaultProject": "cpl_cli",
     "Projects": {
-      "cpl": "src/cpl/cpl.json",
-      "cpl_cli": "src/cpl_cli/cpl_cli.json"
-    }
+      "cpl_core": "src/cpl_core/cpl_core.json",
+      "cpl_cli": "src/cpl_cli/cpl_cli.json",
+      "cpl_query": "src/cpl_query/cpl_query.json"
+    },
+    "Scripts": {}
   }
 }

docs/build/html/_sources/quickstart.md.txt

@@ -83,7 +83,7 @@ To create the sample project to the following:
 3. Add ```Console.select``` as follows:
 
     ```py
-    from cpl.console import Console
+    from cpl_core.console import Console
 
 
     def main():
@@ -156,7 +156,7 @@ To create the sample project to the following:
     import random
     import string
 
-    from cpl.console import Console
+    from cpl_core.console import Console
 
 
     def generate_password(letters: str, length: int) -> str:

docs/source/quickstart.md

@@ -83,7 +83,7 @@ To create the sample project to the following:
 3. Add ```Console.select``` as follows:
 
     ```py
-    from cpl.console import Console
+    from cpl_core.console import Console
 
 
     def main():
@@ -156,7 +156,7 @@ To create the sample project to the following:
     import random
     import string
 
-    from cpl.console import Console
+    from cpl_core.console import Console
 
 
     def generate_password(letters: str, length: int) -> str:

notices/pip.txt

@@ -7,6 +7,10 @@ upload:
             twine upload --repository-url https://pip.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
             twine upload -r pip.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
 
+        query:
+            twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+            twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+
     exp:
         cpl:
             twine upload --repository-url https://pip-exp.sh-edraft.de dist/sh_cpl/publish/setup/*
@@ -16,6 +20,10 @@ upload:
             twine upload --repository-url https://pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
             twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
 
+        query:
+            twine upload --repository-url https://pip-exp.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+            twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+
     dev:
         cpl:
             twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl/publish/setup/*
@@ -25,15 +33,22 @@ upload:
             twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
             twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
 
+        query:
+            twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+            twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+
 install:
     prod:
         pip install --extra-index-url https://pip.sh-edraft.de/ sh_cpl
         pip install --extra-index-url https://pip.sh-edraft.de/ sh_cpl-cli
+        pip install --extra-index-url https://pip.sh-edraft.de/ sh_cpl-query
 
     exp:
         pip install --extra-index-url https://pip-exp.sh-edraft.de/ sh_cpl
         pip install --extra-index-url https://pip-exp.sh-edraft.de/ sh_cpl-cli
+        pip install --extra-index-url https://pip-exp.sh-edraft.de/ sh_cpl-query
 
     dev:
         pip install --extra-index-url https://pip-dev.sh-edraft.de/ sh_cpl
         pip install --extra-index-url https://pip-dev.sh-edraft.de/ sh_cpl-cli
+        pip install --extra-index-url https://pip-dev.sh-edraft.de/ sh_cpl-query

scripts/build.sh

@@ -2,10 +2,14 @@
 # activate venv
 source /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/cpl-env/bin/activate
 
-# CLI
-cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/
+# CPL
+cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_core
 cpl build
 
-# CPL
-cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl
+# CLI
+cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_cli
+cpl build
+
+# CPL Query
+cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_query
 cpl build

scripts/create_docs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 cd ../docs/
-sphinx-apidoc -o source/ ../src/cpl
+sphinx-apidoc -o source/ ../src/cpl_core
 make clean
 make html;

scripts/hello_world.py

@@ -0,0 +1 @@
+print('Hello World')

scripts/publish.sh

@@ -2,10 +2,14 @@
 # activate venv
 source /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/cpl-env/bin/activate
 
-# CLI
-cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/
+# CPL
+cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_core
 cpl publish
 
-# CPL
-cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl
-cpl publish
+# CLI
+cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_cli
+cpl publish
+
+# CPL Query
+cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_query
+cpl

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/_templates/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/_templates/generate/abc_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 

src/cpl_cli/_templates/generate/class_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 

src/cpl_cli/_templates/generate/configmodel_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -16,8 +16,8 @@ class ConfigModelTemplate(TemplateFileABC):
         self._value = textwrap.dedent("""\
         import traceback
 
-        from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-        from cpl.console import Console
+        from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+        from cpl_core.console import Console
         
         
         class $Name(ConfigurationModelABC):

src/cpl_cli/_templates/generate/enum_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 

src/cpl_cli/_templates/generate/init_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 

src/cpl_cli/_templates/generate/service_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 

src/cpl_cli/_templates/generate/thread_template.py

@@ -1,7 +1,7 @@
 import textwrap
 from string import Template
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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

@@ -11,10 +11,10 @@ class ApplicationTemplate(TemplateFileABC):
         self._name = 'application.py'
         self._path = path
         self._value = textwrap.dedent("""\
-            from cpl.application import ApplicationABC
-            from cpl.configuration import ConfigurationABC
-            from cpl.console import Console
-            from cpl.dependency_injection import ServiceProviderABC
+            from cpl_core.application import ApplicationABC
+            from cpl_core.configuration import ConfigurationABC
+            from cpl_core.console import Console
+            from cpl_core.dependency_injection import ServiceProviderABC
                 
                 
             class Application(ApplicationABC):

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

@@ -1,6 +1,6 @@
 import textwrap
 
-from cpl.utils.string import String
+from cpl_core.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -16,7 +16,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
         import_pkg = f'{name}.'
 
         self._value = textwrap.dedent(f"""\
-            from cpl.application import ApplicationBuilder
+            from cpl_core.application import ApplicationBuilder
             
             from {import_pkg}application import Application
             from {import_pkg}startup import Startup
@@ -57,7 +57,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
         import_pkg = f'{name}.'
 
         self._value = textwrap.dedent(f"""\
-            from cpl.application import ApplicationBuilder
+            from cpl_core.application import ApplicationBuilder
             
             from {import_pkg}application import Application
             
@@ -96,7 +96,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
         import_pkg = f'{name}.'
 
         self._value = textwrap.dedent("""\
-            from cpl.console import Console
+            from cpl_core.console import Console
             
             
             def main():
@@ -132,9 +132,9 @@ class MainWithDependencyInjection(TemplateFileABC):
         import_pkg = f'{name}.'
 
         self._value = textwrap.dedent("""\
-            from cpl.configuration import Configuration, ConfigurationABC
-            from cpl.console import Console
-            from cpl.dependency_injection import ServiceCollection, ServiceProviderABC
+            from cpl_core.configuration import Configuration, ConfigurationABC
+            from cpl_core.console import Console
+            from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
             
             
             def configure_configuration() -> ConfigurationABC:

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

@@ -11,9 +11,9 @@ class StartupTemplate(TemplateFileABC):
         self._name = 'startup.py'
         self._path = path
         self._value = textwrap.dedent("""\
-            from cpl.application import StartupABC
-            from cpl.configuration import ConfigurationABC
-            from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+            from cpl_core.application import StartupABC
+            from cpl_core.configuration import ConfigurationABC
+            from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
             
             
             class Startup(StartupABC):

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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

@@ -11,10 +11,10 @@ class ApplicationTemplate(TemplateFileABC):
         self._name = 'application.py'
         self._path = path
         self._value = textwrap.dedent("""\
-            from cpl.application import ApplicationABC
-            from cpl.configuration import ConfigurationABC
-            from cpl.console import Console
-            from cpl.dependency_injection import ServiceProviderABC
+            from cpl_core.application import ApplicationABC
+            from cpl_core.configuration import ConfigurationABC
+            from cpl_core.console import Console
+            from cpl_core.dependency_injection import ServiceProviderABC
                 
                 
             class Application(ApplicationABC):

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

@@ -16,7 +16,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
             import_pkg = ''
 
         self._value = textwrap.dedent(f"""\
-            from cpl.application import ApplicationBuilder
+            from cpl_core.application import ApplicationBuilder
             
             from {import_pkg}application import Application
             from {import_pkg}startup import Startup
@@ -58,7 +58,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
             import_pkg = ''
 
         self._value = textwrap.dedent(f"""\
-            from cpl.application import ApplicationBuilder
+            from cpl_core.application import ApplicationBuilder
             
             from {import_pkg}application import Application
             
@@ -94,7 +94,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
         self._path = path
 
         self._value = textwrap.dedent("""\
-            from cpl.console import Console
+            from cpl_core.console import Console
             
             
             def main():
@@ -127,9 +127,9 @@ class MainWithDependencyInjection(TemplateFileABC):
         self._path = path
 
         self._value = textwrap.dedent("""\
-            from cpl.configuration import Configuration, ConfigurationABC
-            from cpl.console import Console
-            from cpl.dependency_injection import ServiceCollection, ServiceProviderABC
+            from cpl_core.configuration import Configuration, ConfigurationABC
+            from cpl_core.console import Console
+            from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
             
             
             def configure_configuration() -> ConfigurationABC:

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

@@ -11,9 +11,9 @@ class StartupTemplate(TemplateFileABC):
         self._name = 'startup.py'
         self._path = path
         self._value = textwrap.dedent("""\
-            from cpl.application import StartupABC
-            from cpl.configuration import ConfigurationABC
-            from cpl.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+            from cpl_core.application import StartupABC
+            from cpl_core.configuration import ConfigurationABC
+            from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
             
             
             class Startup(StartupABC):

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/cli.py

@@ -1,11 +1,14 @@
+import os
 from typing import Optional
 
-from cpl.application.application_abc import ApplicationABC
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.dependency_injection import ServiceProviderABC
+from cpl_core.application.application_abc import ApplicationABC
+from cpl_core.configuration.console_argument import ConsoleArgument
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_cli.command.add_service import AddService
 from cpl_cli.command.build_service import BuildService
+from cpl_cli.command.custom_script_service import CustomScriptService
 from cpl_cli.command.generate_service import GenerateService
 from cpl_cli.command.install_service import InstallService
 from cpl_cli.command.new_service import NewService
@@ -16,6 +19,7 @@ from cpl_cli.command.uninstall_service import UninstallService
 from cpl_cli.command.update_service import UpdateService
 from cpl_cli.command_handler_service import CommandHandler
 from cpl_cli.command_model import CommandModel
+from cpl_cli.configuration.workspace_settings import WorkspaceSettings
 from cpl_cli.error import Error
 from cpl_cli.command.help_service import HelpService
 from cpl_cli.command.version_service import VersionService
@@ -48,6 +52,11 @@ class CLI(ApplicationABC):
         self._command_handler.add_command(CommandModel('update', ['u', 'U'], UpdateService, False, True, True))
         self._command_handler.add_command(CommandModel('version', ['v', 'V'], VersionService, False, False, False))
 
+        if os.path.isfile(os.path.join(self._environment.working_directory, 'cpl-workspace.json')):
+            workspace: Optional[WorkspaceSettings] = self._configuration.get_configuration(WorkspaceSettings)
+            for script in workspace.scripts:
+                self._command_handler.add_command(CommandModel(script, [], CustomScriptService, True, True, False))
+
         self._command_handler.add_command(CommandModel('--help', ['-h', '-H'], HelpService, False, False, False))
         self._options.append('--help')
 
@@ -100,6 +109,10 @@ class CLI(ApplicationABC):
                         for arg in result_args:
                             args.append(arg)
 
+                    else:
+                        Error.error(f'Unexpected command')
+                        return
+
             if command is None:
                 Error.error(f'Expected command')
                 return

src/cpl_cli/cli_settings.py

@@ -1,8 +1,8 @@
 import traceback
 from typing import Optional
 
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.console.console import Console
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console.console import Console
 from cpl_cli.cli_settings_name_enum import CLISettingsNameEnum
 
 

src/cpl_cli/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 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='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/command/add_service.py

@@ -3,9 +3,9 @@ import os
 import textwrap
 from typing import Optional
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings

src/cpl_cli/command/custom_script_service.py

@@ -0,0 +1,39 @@
+import os
+import subprocess
+import sys
+
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_cli.command_abc import CommandABC
+from cpl_cli.configuration.workspace_settings import WorkspaceSettings
+
+
+class CustomScriptService(CommandABC):
+
+    def __init__(self, config: ConfigurationABC, ws: WorkspaceSettings):
+        """
+        Service for CLI scripts
+        """
+        CommandABC.__init__(self)
+
+        self._config = config
+        self._workspace = ws
+
+    @property
+    def help_message(self) -> str:
+        return ''
+
+    def run(self, args: list[str]):
+        cmd = args[0] if len(args) > 0 else self._config.additional_arguments[0]
+
+        for script in self._workspace.scripts:
+            if script == cmd:
+                command = self._workspace.scripts[script]
+                try:
+                    run_command = []
+                    for word in command.split(' '):
+                        run_command.append(word)
+
+                    subprocess.run(run_command)
+                except Exception as e:
+                    Console.error(str(e))

src/cpl_cli/command/generate_service.py

@@ -2,10 +2,10 @@ import os
 import textwrap
 from collections import Callable
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.console import Console
-from cpl.utils.string import String
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.console import Console
+from cpl_core.utils.string import String
 from cpl_cli.command_abc import CommandABC
 from cpl_cli._templates.generate.init_template import InitTemplate
 from cpl_cli._templates.generate.abc_template import ABCTemplate

src/cpl_cli/command/help_service.py

@@ -1,9 +1,9 @@
 import textwrap
 from typing import Optional
 
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
 from cpl_cli.command_handler_service import CommandHandler
 from cpl_cli.command_abc import CommandABC
 

src/cpl_cli/command/install_service.py

@@ -5,11 +5,11 @@ import textwrap
 
 from packaging import version
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl.utils.pip import Pip
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.utils.pip import Pip
 from cpl_cli.cli_settings import CLISettings
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration.build_settings import BuildSettings

src/cpl_cli/command/new_service.py

@@ -5,12 +5,12 @@ from typing import Optional
 
 from packaging import version
 
-import cpl
+import cpl_core
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.console import Console
-from cpl.utils.string import String
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.console import Console
+from cpl_core.utils.string import String
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.build_settings_name_enum import BuildSettingsNameEnum
@@ -96,7 +96,7 @@ class NewService(CommandABC):
             ProjectSettingsNameEnum.license_name.value: '',
             ProjectSettingsNameEnum.license_description.value: '',
             ProjectSettingsNameEnum.dependencies.value: [
-                f'sh_cpl=={version.parse(cpl.__version__)}'
+                f'sh_cpl>={version.parse(cpl_core.__version__)}'
             ],
             ProjectSettingsNameEnum.python_version.value: f'>={sys.version.split(" ")[0]}',
             ProjectSettingsNameEnum.python_path.value: {

src/cpl_cli/command/remove_service.py

@@ -3,10 +3,10 @@ import shutil
 import json
 import textwrap
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration import WorkspaceSettings, WorkspaceSettingsNameEnum
 

src/cpl_cli/command/uninstall_service.py

@@ -3,11 +3,11 @@ import os
 import subprocess
 import textwrap
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl.utils.pip import Pip
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.utils.pip import Pip
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings

src/cpl_cli/command/update_service.py

@@ -3,11 +3,11 @@ import os
 import subprocess
 import textwrap
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl.utils.pip import Pip
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.utils.pip import Pip
 from cpl_cli.cli_settings import CLISettings
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration import BuildSettings

src/cpl_cli/command/version_service.py

@@ -4,10 +4,10 @@ import platform
 import pkg_resources
 import textwrap
 
-import cpl
 import cpl_cli
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
+import cpl_core
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
 from cpl_cli.command_abc import CommandABC
 
 
@@ -46,7 +46,7 @@ class VersionService(CommandABC):
 
         Console.write_line('\nCPL packages:')
         packages = []
-        for importer, modname, is_pkg in pkgutil.iter_modules(cpl.__path__):
+        for importer, modname, is_pkg in pkgutil.iter_modules(cpl_core.__path__):
             module = importer.find_module(modname).load_module(modname)
             if '__version__' in dir(module):
                 packages.append([f'{modname}', module.__version__])

src/cpl_cli/command_handler_service.py

@@ -2,10 +2,11 @@ import os
 from abc import ABC
 from typing import Optional
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
-from cpl.utils.string import String
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.utils.string import String
+from cpl_cli.command.custom_script_service import CustomScriptService
 from cpl_cli.configuration.workspace_settings import WorkspaceSettings
 from cpl_cli.error import Error
 from cpl_cli.command_model import CommandModel
@@ -57,7 +58,6 @@ class CommandHandler(ABC):
                 workspace: Optional[WorkspaceSettings] = None
 
                 if os.path.isfile(os.path.join(self._env.working_directory, 'cpl-workspace.json')):
-                    self._config.add_json_file('cpl-workspace.json', optional=True, output=False)
                     workspace = self._config.get_configuration(WorkspaceSettings)
 
                 if command.is_project_needed:
@@ -111,5 +111,27 @@ class CommandHandler(ABC):
 
                     self._config.add_json_file(project_json, optional=True, output=False)
 
-                self._services.get_service(command.command).run(args)
+                # pre scripts
                 Console.write('\n')
+                self._handle_pre_or_post_scripts(True, workspace, command)
+                self._services.get_service(command.command).run(args)
+                # post scripts
+                Console.write('\n\n')
+                self._handle_pre_or_post_scripts(False, workspace, command)
+                Console.write('\n')
+
+    def _handle_pre_or_post_scripts(self, pre: bool, workspace: WorkspaceSettings, command: CommandModel):
+        script_type = 'pre-' if pre else 'post-'
+        if workspace is not None and len(workspace.scripts) > 0:
+            for script in workspace.scripts:
+                if script_type in script and script.split(script_type)[1] == command.name:
+                    script_name = script
+                    script_cmd = workspace.scripts[script]
+                    if script_cmd in workspace.scripts:
+                        script_name = workspace.scripts[script]
+
+                    css: CustomScriptService = self._services.get_service(CustomScriptService)
+                    if css is None:
+                        continue
+
+                    css.run([script_name])

src/cpl_cli/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 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='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/configuration/build_settings.py

@@ -2,9 +2,9 @@ import sys
 import traceback
 from typing import Optional
 
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
 from cpl_cli.configuration.build_settings_name_enum import BuildSettingsNameEnum
 from cpl_cli.configuration.project_type_enum import ProjectTypeEnum
 
@@ -76,7 +76,11 @@ class BuildSettings(ConfigurationModelABC):
             self._included = settings[BuildSettingsNameEnum.included.value]
             self._excluded = settings[BuildSettingsNameEnum.excluded.value]
             self._package_data = settings[BuildSettingsNameEnum.package_data.value]
-            self._project_references = settings[BuildSettingsNameEnum.project_references.value]
+
+            if BuildSettingsNameEnum.project_references.value in settings:
+                self._project_references = settings[BuildSettingsNameEnum.project_references.value]
+            else:
+                self._project_references = []
 
             if sys.platform == 'win32':
                 self._source_path = str(self._source_path).replace('/', '\\')

src/cpl_cli/configuration/project_settings.py

@@ -3,9 +3,9 @@ import sys
 import traceback
 from typing import Optional
 
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
 from cpl_cli.configuration.version_settings import VersionSettings
 from cpl_cli.configuration.project_settings_name_enum import ProjectSettingsNameEnum
 from cpl_cli.error import Error
@@ -127,7 +127,11 @@ class ProjectSettings(ConfigurationModelABC):
 
             self._python_executable = path
 
-            self._classifiers = settings[ProjectSettingsNameEnum.classifiers.value]
+            if ProjectSettingsNameEnum.classifiers.value:
+                self._classifiers = settings[ProjectSettingsNameEnum.classifiers.value]
+            else:
+                self._classifiers = []
+
         except Exception as e:
             Console.set_foreground_color(ForegroundColorEnum.red)
             Console.write_line(

src/cpl_cli/configuration/version_settings.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl_cli.configuration.version_settings_name_enum import VersionSettingsNameEnum
 
 

src/cpl_cli/configuration/workspace_settings.py

@@ -1,8 +1,8 @@
 import traceback
 from typing import Optional
 
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.console import Console
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console import Console
 from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 
@@ -13,6 +13,7 @@ class WorkspaceSettings(ConfigurationModelABC):
         
         self._default_project: Optional[str] = None
         self._projects: dict[str, str] = {}
+        self._scripts: dict[str, str] = {}
         
     @property
     def default_project(self) -> str:
@@ -22,10 +23,19 @@ class WorkspaceSettings(ConfigurationModelABC):
     def projects(self) -> dict[str, str]:
         return self._projects
 
+    @property
+    def scripts(self):
+        return self._scripts
+
     def from_dict(self, settings: dict):
         try:
             self._default_project = settings[WorkspaceSettingsNameEnum.default_project.value]
             self._projects = settings[WorkspaceSettingsNameEnum.projects.value]
+
+            if WorkspaceSettingsNameEnum.scripts.value in settings:
+                self._scripts = settings[WorkspaceSettingsNameEnum.scripts.value]
+            else:
+                self._scripts = {}
         except Exception as e:
             Console.error(f'[ ERROR ] [ {__name__} ]: Reading error in {self.__name__} settings')
             Console.error(f'[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}')

src/cpl_cli/configuration/workspace_settings_name_enum.py

@@ -5,3 +5,4 @@ class WorkspaceSettingsNameEnum(Enum):
 
     default_project = 'DefaultProject'
     projects = 'Projects'
+    scripts = 'Scripts'

src/cpl_cli/cpl_cli.json

@@ -3,8 +3,8 @@
     "Name": "sh_cpl-cli",
     "Version": {
       "Major": "2021",
-      "Minor": "4",
-      "Micro": "0.post1"
+      "Minor": "10",
+      "Micro": "5"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "sh_cpl==2021.4.0.post1"
+      "sh_cpl>=2021.4.0.post1"
     ],
     "PythonVersion": ">=3.8",
     "PythonPath": {},

src/cpl_cli/error.py

@@ -1,5 +1,5 @@
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.console import Console
 
 
 class Error:

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/live_server/live_server_service.py

@@ -6,8 +6,8 @@ import psutil as psutil
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers import Observer
 
-from cpl.console.console import Console
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.console.console import Console
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings
 from cpl_cli.live_server.live_server_thread import LiveServerThread

src/cpl_cli/live_server/live_server_thread.py

@@ -4,9 +4,9 @@ import sys
 import threading
 from datetime import datetime
 
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
 from cpl_cli.configuration import BuildSettings
 
 
@@ -71,13 +71,14 @@ class LiveServerThread(threading.Thread):
             return
 
         # set cwd to src/
-        self._env.set_working_directory(os.path.abspath(os.path.join(self._path, '../')))
+        self._env.set_working_directory(os.path.abspath(os.path.join(self._path)))
+        src_cwd = os.path.abspath(os.path.join(self._path, '../'))
         if sys.platform == 'win32':
-            self._env_vars['PYTHONPATH'] = f'{self._env.working_directory};' \
-                                     f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
+            self._env_vars['PYTHONPATH'] = f'{src_cwd};' \
+                                           f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
         else:
-            self._env_vars['PYTHONPATH'] = f'{self._env.working_directory}:' \
-                                     f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
+            self._env_vars['PYTHONPATH'] = f'{src_cwd}:' \
+                                           f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
 
         Console.set_foreground_color(ForegroundColorEnum.green)
         Console.write_line('Read successfully')
@@ -86,6 +87,8 @@ class LiveServerThread(threading.Thread):
         Console.write_line(f'Started at {now.strftime("%Y-%m-%d %H:%M:%S")}\n\n')
         Console.set_foreground_color(ForegroundColorEnum.default)
 
-        os.chdir(self._env.working_directory)
-        self._command = [self._executable, self._main, ''.join(self._args)]
+        self._command = [self._executable, self._main]
+        if len(self._args) > 0:
+            self._command.append(''.join(self._args))
+
         subprocess.run(self._command, env=self._env_vars)

src/cpl_cli/main.py

@@ -1,4 +1,4 @@
-from cpl.application.application_builder import ApplicationBuilder
+from cpl_core.application.application_builder import ApplicationBuilder
 from cpl_cli.cli import CLI
 from cpl_cli.startup import Startup
 

src/cpl_cli/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 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='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/publish/publisher_service.py

@@ -7,10 +7,10 @@ import setuptools
 from packaging import version
 from setuptools import sandbox
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.console import Console
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.console import Console
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings
 from cpl_cli.publish.publisher_abc import PublisherABC
@@ -333,7 +333,7 @@ class PublisherService(PublisherABC):
                     length = len(self._build_settings.main.split('.'))
                     main_name = self._build_settings.main.split('.')[length - 1]
 
-                sys.path.insert(0, self._source_path)
+                sys.path.insert(0, os.path.join(self._source_path, '../'))
                 main_mod = __import__(self._build_settings.main)
                 main = getattr(main_mod, main_name)
             except Exception as e:

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 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.5'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='5')

src/cpl_cli/source_creator/console_builder.py

@@ -2,9 +2,9 @@ import json
 import os
 from typing import Optional
 
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.console import Console
-from cpl.utils.string import String
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.console import Console
+from cpl_core.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
@@ -43,7 +43,8 @@ class ConsoleBuilder:
         ws_dict = {
             WorkspaceSettings.__name__: {
                 WorkspaceSettingsNameEnum.default_project.value: project_name,
-                WorkspaceSettingsNameEnum.projects.value: projects
+                WorkspaceSettingsNameEnum.projects.value: projects,
+                WorkspaceSettingsNameEnum.scripts: {}
             }
         }
 

src/cpl_cli/source_creator/library_builder.py

@@ -2,9 +2,9 @@ import json
 import os
 from typing import Optional
 
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.console import Console
-from cpl.utils.string import String
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.console import Console
+from cpl_core.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
@@ -43,7 +43,8 @@ class LibraryBuilder:
         ws_dict = {
             WorkspaceSettings.__name__: {
                 WorkspaceSettingsNameEnum.default_project.value: project_name,
-                WorkspaceSettingsNameEnum.projects.value: projects
+                WorkspaceSettingsNameEnum.projects.value: projects,
+                WorkspaceSettingsNameEnum.scripts: {}
             }
         }
 

src/cpl_cli/startup.py

@@ -1,12 +1,14 @@
 import os
+from typing import Optional
 
-from cpl.application.startup_abc import StartupABC
-from cpl.configuration.console_argument import ConsoleArgument
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.dependency_injection.service_collection_abc import ServiceCollectionABC
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.application.startup_abc import StartupABC
+from cpl_core.configuration.console_argument import ConsoleArgument
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.dependency_injection.service_collection_abc import ServiceCollectionABC
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
 from cpl_cli.command.add_service import AddService
 from cpl_cli.command.build_service import BuildService
+from cpl_cli.command.custom_script_service import CustomScriptService
 from cpl_cli.command.generate_service import GenerateService
 from cpl_cli.command.install_service import InstallService
 from cpl_cli.command.new_service import NewService
@@ -18,6 +20,7 @@ from cpl_cli.command.update_service import UpdateService
 from cpl_cli.command_handler_service import CommandHandler
 from cpl_cli.command.help_service import HelpService
 from cpl_cli.command.version_service import VersionService
+from cpl_cli.configuration.workspace_settings import WorkspaceSettings
 from cpl_cli.error import Error
 from cpl_cli.live_server.live_server_service import LiveServerService
 from cpl_cli.publish.publisher_service import PublisherService
@@ -72,6 +75,13 @@ class Startup(StartupABC):
 
         self._configuration.add_console_argument(ConsoleArgument('', '--help', ['-h', '-H'], ''))
 
+        if os.path.isfile(os.path.join(self._env.working_directory, 'cpl-workspace.json')):
+            self._configuration.add_json_file('cpl-workspace.json', optional=True, output=False)
+            workspace: Optional[WorkspaceSettings] = self._configuration.get_configuration(WorkspaceSettings)
+            for script in workspace.scripts:
+                self._configuration.add_console_argument(
+                    ConsoleArgument('', script, [], ' ', is_value_token_optional=True))
+
         self._configuration.add_console_arguments(error=False)
 
         return self._configuration
@@ -84,6 +94,7 @@ class Startup(StartupABC):
 
         self._services.add_transient(AddService)
         self._services.add_transient(BuildService)
+        self._services.add_transient(CustomScriptService)
         self._services.add_transient(GenerateService)
         self._services.add_transient(HelpService)
         self._services.add_transient(InstallService)

src/cpl_core/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,15 +11,15 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl'
+__title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/application/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.application'
+__title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .application_builder_abc import ApplicationBuilderABC
 from .startup_abc import StartupABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/application/application_abc.py

@@ -1,10 +1,10 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.console import Console
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
-from cpl.environment import ApplicationEnvironmentABC
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.environment import ApplicationEnvironmentABC
 
 
 class ApplicationABC(ABC):

src/cpl_core/application/application_builder.py

@@ -1,10 +1,10 @@
 from typing import Type, Optional
 
-from cpl.application.application_abc import ApplicationABC
-from cpl.application.application_builder_abc import ApplicationBuilderABC
-from cpl.application.startup_abc import StartupABC
-from cpl.configuration.configuration import Configuration
-from cpl.dependency_injection.service_collection import ServiceCollection
+from cpl_core.application.application_abc import ApplicationABC
+from cpl_core.application.application_builder_abc import ApplicationBuilderABC
+from cpl_core.application.startup_abc import StartupABC
+from cpl_core.configuration.configuration import Configuration
+from cpl_core.dependency_injection.service_collection import ServiceCollection
 
 
 class ApplicationBuilder(ApplicationBuilderABC):

src/cpl_core/application/application_builder_abc.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from typing import Type
 
-from cpl.application.application_abc import ApplicationABC
-from cpl.application.startup_abc import StartupABC
+from cpl_core.application.application_abc import ApplicationABC
+from cpl_core.application.startup_abc import StartupABC
 
 
 class ApplicationBuilderABC(ABC):

src/cpl_core/application/startup_abc.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
 
 
 class StartupABC(ABC):

src/cpl_core/configuration/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.configuration'
+__title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .configuration_variable_name_enum import ConfigurationVariableNameEnum
 from .console_argument import ConsoleArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/configuration/configuration.py

@@ -4,15 +4,15 @@ import sys
 from collections import Callable
 from typing import Union, Type, Optional
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.configuration.configuration_variable_name_enum import ConfigurationVariableNameEnum
-from cpl.configuration.console_argument import ConsoleArgument
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.environment.application_environment import ApplicationEnvironment
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
-from cpl.environment.environment_name_enum import EnvironmentNameEnum
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.configuration.configuration_variable_name_enum import ConfigurationVariableNameEnum
+from cpl_core.configuration.console_argument import ConsoleArgument
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.environment.application_environment import ApplicationEnvironment
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.environment.environment_name_enum import EnvironmentNameEnum
 
 
 class Configuration(ConfigurationABC):

src/cpl_core/configuration/configuration_abc.py

@@ -2,9 +2,9 @@ from abc import abstractmethod, ABC
 from collections import Callable
 from typing import Type, Union, Optional
 
-from cpl.configuration.console_argument import ConsoleArgument
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.configuration.console_argument import ConsoleArgument
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
 
 
 class ConfigurationABC(ABC):

src/cpl_core/console/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.console'
+__title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/console/console.py

@@ -11,10 +11,10 @@ from pynput.keyboard import Key
 from tabulate import tabulate
 from termcolor import colored
 
-from cpl.console.background_color_enum import BackgroundColorEnum
-from cpl.console.console_call import ConsoleCall
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.console.spinner_thread import SpinnerThread
+from cpl_core.console.background_color_enum import BackgroundColorEnum
+from cpl_core.console.console_call import ConsoleCall
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.spinner_thread import SpinnerThread
 
 
 class Console:

src/cpl_core/console/spinner_thread.py

@@ -5,8 +5,8 @@ import time
 
 from termcolor import colored
 
-from cpl.console.background_color_enum import BackgroundColorEnum
-from cpl.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.console.background_color_enum import BackgroundColorEnum
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
 
 
 class SpinnerThread(threading.Thread):

src/cpl_core/cpl_core.json

@@ -1,10 +1,10 @@
 {
   "ProjectSettings": {
-    "Name": "sh_cpl",
+    "Name": "sh_cpl-core",
     "Version": {
       "Major": "2021",
-      "Minor": "4",
-      "Micro": "0.post1"
+      "Minor": "10",
+      "Micro": "6"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.database'
+__title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings
 from .database_settings_name_enum import DatabaseSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/database/connection/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.database.connection'
+__title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/database/connection/database_connection.py

@@ -3,10 +3,10 @@ from typing import Optional
 from sqlalchemy import engine, create_engine
 from sqlalchemy.orm import Session, sessionmaker
 
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.database.connection.database_connection_abc import DatabaseConnectionABC
-from cpl.database.database_settings import DatabaseSettings
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC
+from cpl_core.database.database_settings import DatabaseSettings
 
 
 class DatabaseConnection(DatabaseConnectionABC):

src/cpl_core/database/context/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.database.context'
+__title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/database/context/database_context.py

@@ -1,13 +1,13 @@
 from sqlalchemy import engine, Table
 from sqlalchemy.orm import Session
 
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.database.connection.database_connection import DatabaseConnection
-from cpl.database.connection.database_connection_abc import DatabaseConnectionABC
-from cpl.database.context.database_context_abc import DatabaseContextABC
-from cpl.database.database_settings import DatabaseSettings
-from cpl.database.database_model import DatabaseModel
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.database.connection.database_connection import DatabaseConnection
+from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC
+from cpl_core.database.context.database_context_abc import DatabaseContextABC
+from cpl_core.database.database_settings import DatabaseSettings
+from cpl_core.database.database_model import DatabaseModel
 
 
 class DatabaseContext(DatabaseContextABC):

src/cpl_core/database/database_settings.py

@@ -1,10 +1,10 @@
 import traceback
 from typing import Optional
 
-from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.console.console import Console
-from cpl.console.foreground_color_enum import ForegroundColorEnum
-from cpl.database.database_settings_name_enum import DatabaseSettingsNameEnum
+from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
+from cpl_core.console.console import Console
+from cpl_core.console.foreground_color_enum import ForegroundColorEnum
+from cpl_core.database.database_settings_name_enum import DatabaseSettingsNameEnum
 
 
 class DatabaseSettings(ConfigurationModelABC):

src/cpl_core/dependency_injection/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+sh_cpl-core sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,11 +11,11 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'cpl.dependency_injection'
+__title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.0.post1'
+__version__ = '2021.10.6'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='6')

src/cpl_core/dependency_injection/service_collection.py

@@ -1,16 +1,16 @@
 from typing import Union, Type, Callable, Optional
 
-from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.database.database_settings import DatabaseSettings
-from cpl.database.context.database_context_abc import DatabaseContextABC
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
-from cpl.dependency_injection.service_collection_abc import ServiceCollectionABC
-from cpl.dependency_injection.service_descriptor import ServiceDescriptor
-from cpl.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum
-from cpl.dependency_injection.service_provider import ServiceProvider
-from cpl.logging.logger_service import Logger
-from cpl.logging.logger_abc import LoggerABC
-from cpl.utils.credential_manager import CredentialManager
+from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.database.database_settings import DatabaseSettings
+from cpl_core.database.context.database_context_abc import DatabaseContextABC
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.dependency_injection.service_collection_abc import ServiceCollectionABC
+from cpl_core.dependency_injection.service_descriptor import ServiceDescriptor
+from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum
+from cpl_core.dependency_injection.service_provider import ServiceProvider
+from cpl_core.logging.logger_service import Logger
+from cpl_core.logging.logger_abc import LoggerABC
+from cpl_core.utils.credential_manager import CredentialManager
 
 
 class ServiceCollection(ServiceCollectionABC):

src/cpl_core/dependency_injection/service_collection_abc.py

@@ -2,9 +2,9 @@ from abc import abstractmethod, ABC
 from collections import Callable
 from typing import Type
 
-from cpl.database.database_settings import DatabaseSettings
-from cpl.database.context.database_context_abc import DatabaseContextABC
-from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.database.database_settings import DatabaseSettings
+from cpl_core.database.context.database_context_abc import DatabaseContextABC
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
 
 
 class ServiceCollectionABC(ABC):