Merge pull request '2021.10' (#41) from 2021.10 into master

Reviewed-on: #41

notices/pip.txt

@@ -1,8 +1,8 @@
 upload:
     prod:
         cpl:
-            twine upload --repository-url https://pip.sh-edraft.de dist/sh_cpl/publish/setup/*
-            twine upload -r pip.sh-edraft.de dist/sh_cpl/publish/setup/*
+            twine upload --repository-url https://pip.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+            twine upload -r pip.sh-edraft.de dist/sh_cpl-core/publish/setup/*
         cli:
             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/*
@@ -13,8 +13,8 @@ upload:
 
     exp:
         cpl:
-            twine upload --repository-url https://pip-exp.sh-edraft.de dist/sh_cpl/publish/setup/*
-            twine upload -r pip-exp.sh-edraft.de dist/sh_cpl/publish/setup/*
+            twine upload --repository-url https://pip-exp.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+            twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-core/publish/setup/*
 
         cli:
             twine upload --repository-url https://pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
@@ -26,8 +26,8 @@ upload:
 
     dev:
         cpl:
-            twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl/publish/setup/*
-            twine upload -r pip-dev.sh-edraft.de dist/sh_cpl/publish/setup/*
+            twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+            twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-core/publish/setup/*
 
         cli:
             twine upload --repository-url https://pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/*

scripts/publish.sh

@@ -12,4 +12,4 @@ cpl publish
 
 # CPL Query
 cd /home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_cpl/src/cpl_query
-cpl
+cpl publish

scripts/upload.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ $1 == "-prod" ]; then
+  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
+elif [ $1 == "-prod" ]; then
+  twine upload -r pip-exp.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip-exp.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip-.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
+
+else
+  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
+fi

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.10.5'
+__version__ = '2021.10.0'
 
 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='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 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='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_cli/command/version_service.py

@@ -45,9 +45,14 @@ class VersionService(CommandABC):
         Console.write_line(f'OS: {platform.system()} {platform.processor()}')
 
         Console.write_line('\nCPL packages:')
+        cpl_packages = [
+            'cpl_core',
+            'cpl_cli',
+            'cpl_query'
+        ]
         packages = []
-        for importer, modname, is_pkg in pkgutil.iter_modules(cpl_core.__path__):
-            module = importer.find_module(modname).load_module(modname)
+        for modname in cpl_packages:
+            module = pkgutil.find_loader(modname).load_module(modname)
             if '__version__' in dir(module):
                 packages.append([f'{modname}', module.__version__])
 

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.10.5'
+__version__ = '2021.10.0'
 
 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='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_cli/cpl_cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "5"
+      "Micro": "0"
     },
     "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-core>=2021.10.0"
     ],
     "PythonVersion": ">=3.8",
     "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 - 2021 sh-edraft.de'
-__version__ = '2021.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 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='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

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.10.5'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='5')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_cli/startup.py

@@ -25,30 +25,25 @@ from cpl_cli.error import Error
 from cpl_cli.live_server.live_server_service import LiveServerService
 from cpl_cli.publish.publisher_service import PublisherService
 from cpl_cli.publish.publisher_abc import PublisherABC
+from cpl_core.environment import ApplicationEnvironment
 
 
 class Startup(StartupABC):
 
-    def __init__(self, config: ConfigurationABC, services: ServiceCollectionABC):
+    def __init__(self):
         StartupABC.__init__(self)
 
-        self._configuration = config
-        self._env = self._configuration.environment
-        self._services = services
+    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+        environment.set_runtime_directory(os.path.dirname(__file__))
+        configuration.argument_error_function = Error.error
 
-        self._env.set_runtime_directory(os.path.dirname(__file__))
+        configuration.add_environment_variables('PYTHON_')
+        configuration.add_environment_variables('CPL_')
+        configuration.add_json_file('appsettings.json', path=environment.runtime_directory, optional=False, output=False)
 
-    def configure_configuration(self) -> ConfigurationABC:
-        self._configuration.argument_error_function = Error.error
-
-        self._configuration.add_environment_variables('PYTHON_')
-        self._configuration.add_environment_variables('CPL_')
-        self._configuration.add_json_file('appsettings.json', path=self._env.runtime_directory,
-                                          optional=False, output=False)
-
-        self._configuration.add_console_argument(ConsoleArgument('', 'add', ['a', 'a'], ' '))
-        self._configuration.add_console_argument(ConsoleArgument('', 'build', ['b', 'B'], ''))
-        self._configuration.add_console_argument(ConsoleArgument('', 'generate', ['g', 'G'], '', console_arguments=[
+        configuration.add_console_argument(ConsoleArgument('', 'add', ['a', 'a'], ' '))
+        configuration.add_console_argument(ConsoleArgument('', 'build', ['b', 'B'], ''))
+        configuration.add_console_argument(ConsoleArgument('', 'generate', ['g', 'G'], '', console_arguments=[
             ConsoleArgument('', 'abc', ['a', 'A'], ' '),
             ConsoleArgument('', 'class', ['c', 'C'], ' '),
             ConsoleArgument('', 'enum', ['e', 'E'], ' '),
@@ -56,54 +51,54 @@ class Startup(StartupABC):
             ConsoleArgument('', 'settings', ['st', 'ST'], ' '),
             ConsoleArgument('', 'thread', ['t', 't'], ' ')
         ]))
-        self._configuration.add_console_argument(
+        configuration.add_console_argument(
             ConsoleArgument('', 'help', ['h', 'H'], ' ', is_value_token_optional=True)
         )
-        self._configuration.add_console_argument(
+        configuration.add_console_argument(
             ConsoleArgument('', 'install', ['i', 'I'], ' ', is_value_token_optional=True)
         )
-        self._configuration.add_console_argument(ConsoleArgument('', 'new', ['n', 'N'], '', console_arguments=[
+        configuration.add_console_argument(ConsoleArgument('', 'new', ['n', 'N'], '', console_arguments=[
             ConsoleArgument('', 'console', ['c', 'C'], ' '),
             ConsoleArgument('', 'library', ['l', 'L'], ' ')
         ]))
-        self._configuration.add_console_argument(ConsoleArgument('', 'publish', ['p', 'P'], ''))
-        self._configuration.add_console_argument(ConsoleArgument('', 'remove', ['r', 'R'], ' '))
-        self._configuration.add_console_argument(ConsoleArgument('', 'start', ['s', 'S'], ''))
-        self._configuration.add_console_argument(ConsoleArgument('', 'uninstall', ['ui', 'UI'], ' '))
-        self._configuration.add_console_argument(ConsoleArgument('', 'update', ['u', 'U'], ''))
-        self._configuration.add_console_argument(ConsoleArgument('', 'version', ['v', 'V'], ''))
+        configuration.add_console_argument(ConsoleArgument('', 'publish', ['p', 'P'], ''))
+        configuration.add_console_argument(ConsoleArgument('', 'remove', ['r', 'R'], ' '))
+        configuration.add_console_argument(ConsoleArgument('', 'start', ['s', 'S'], ''))
+        configuration.add_console_argument(ConsoleArgument('', 'uninstall', ['ui', 'UI'], ' '))
+        configuration.add_console_argument(ConsoleArgument('', 'update', ['u', 'U'], ''))
+        configuration.add_console_argument(ConsoleArgument('', 'version', ['v', 'V'], ''))
 
-        self._configuration.add_console_argument(ConsoleArgument('', '--help', ['-h', '-H'], ''))
+        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)
+        if os.path.isfile(os.path.join(environment.working_directory, 'cpl-workspace.json')):
+            configuration.add_json_file('cpl-workspace.json', optional=True, output=False)
+            workspace: Optional[WorkspaceSettings] = configuration.get_configuration(WorkspaceSettings)
             for script in workspace.scripts:
-                self._configuration.add_console_argument(
+                configuration.add_console_argument(
                     ConsoleArgument('', script, [], ' ', is_value_token_optional=True))
 
-        self._configuration.add_console_arguments(error=False)
+        configuration.add_console_arguments(error=False)
 
-        return self._configuration
+        return configuration
 
-    def configure_services(self) -> ServiceProviderABC:
-        self._services.add_singleton(CommandHandler)
+    def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+        services.add_singleton(CommandHandler)
 
-        self._services.add_transient(PublisherABC, PublisherService)
-        self._services.add_transient(LiveServerService)
+        services.add_transient(PublisherABC, PublisherService)
+        services.add_transient(LiveServerService)
 
-        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)
-        self._services.add_transient(NewService)
-        self._services.add_transient(PublishService)
-        self._services.add_transient(RemoveService)
-        self._services.add_transient(StartService)
-        self._services.add_transient(UninstallService)
-        self._services.add_transient(UpdateService)
-        self._services.add_transient(VersionService)
+        services.add_transient(AddService)
+        services.add_transient(BuildService)
+        services.add_transient(CustomScriptService)
+        services.add_transient(GenerateService)
+        services.add_transient(HelpService)
+        services.add_transient(InstallService)
+        services.add_transient(NewService)
+        services.add_transient(PublishService)
+        services.add_transient(RemoveService)
+        services.add_transient(StartService)
+        services.add_transient(UninstallService)
+        services.add_transient(UpdateService)
+        services.add_transient(VersionService)
 
-        return self._services.build_service_provider()
+        return services.build_service_provider()

src/cpl_core/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 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='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/application/application_builder.py

@@ -1,9 +1,12 @@
-from typing import Type, Optional
+import types
+from typing import Type, Optional, Callable
 
 from cpl_core.application.application_abc import ApplicationABC
 from cpl_core.application.application_builder_abc import ApplicationBuilderABC
+from cpl_core.application.application_extension_abc import ApplicationExtensionABC
 from cpl_core.application.startup_abc import StartupABC
 from cpl_core.configuration.configuration import Configuration
+from cpl_core.console import Console
 from cpl_core.dependency_injection.service_collection import ServiceCollection
 
 
@@ -25,12 +28,25 @@ class ApplicationBuilder(ApplicationBuilderABC):
         self._environment = self._configuration.environment
         self._services = ServiceCollection(self._configuration)
 
+        self._extensions: list[Callable] = []
+
     def use_startup(self, startup: Type[StartupABC]):
         self._startup = startup()
 
+    def use_extension(self, extension: Type[ApplicationExtensionABC]):
+        if extension not in self._extensions:
+            self._extensions.append(extension)
+
     def build(self) -> ApplicationABC:
         if self._startup is not None:
             self._startup.configure_configuration(self._configuration, self._environment)
             self._startup.configure_services(self._services, self._environment)
 
-        return self._app(self._configuration, self._services.build_service_provider())
+        config = self._configuration
+        services = self._services.build_service_provider()
+
+        for ex in self._extensions:
+            extension = ex()
+            extension.run(config, services)
+
+        return self._app(config, services)

src/cpl_core/application/application_extension_abc.py

@@ -0,0 +1,13 @@
+from abc import ABC, abstractmethod
+
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC
+
+
+class ApplicationExtensionABC(ABC):
+
+    @abstractmethod
+    def __init__(self): pass
+
+    @abstractmethod
+    def run(self, config: ConfigurationABC, services: ServiceProviderABC): pass

src/cpl_core/configuration/__init__.py

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

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 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='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/cpl_core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "6"
+      "Micro": "0"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 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='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 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='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 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='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 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='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.6'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='6')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_query/__init__.py

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

src/cpl_query/_extension/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_query._extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0rc1'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.rc1')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_query/_query/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_query._query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0rc1'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.rc1')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/cpl_query/cpl_query.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "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-core>=2021.10.0"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {},

src/cpl_query/extension/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_query.extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0rc1'
+__version__ = '2021.10.0'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.rc1')
+version_info = VersionInfo(major='2021', minor='10', micro='0')

src/tests/custom/general/src/general/application.py

@@ -1,13 +1,12 @@
 import time
 from typing import Optional
 
-from cpl_core.application.application_abc import ApplicationABC
-from cpl_core.configuration.configuration_abc import ConfigurationABC
+from cpl_core.application import ApplicationABC
+from cpl_core.configuration import ConfigurationABC
 from cpl_core.console.console import Console
-from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_core.logging.logger_abc import LoggerABC
-from cpl_core.mailing.email import EMail
-from cpl_core.mailing.email_client_abc import EMailClientABC
+from cpl_core.mailing import EMailClientABC, EMail
 from test_service import TestService
 
 
@@ -37,6 +36,7 @@ class Application(ApplicationABC):
         self._mailer = self._services.get_service(EMailClientABC)
 
     def main(self):
+        if self._configuration.environment.application_name != '':
             self._logger.header(f'{self._configuration.environment.application_name}:')
         self._logger.debug(__name__, f'Host: {self._configuration.environment.host_name}')
         self._logger.debug(__name__, f'Environment: {self._configuration.environment.environment_name}')

src/tests/custom/general/src/general/main.py

@@ -1,11 +1,13 @@
-from cpl_core.application.application_builder import ApplicationBuilder
 from application import Application
+from cpl_core.application import ApplicationBuilder
+from general.test_extension import TestExtension
 from startup import Startup
 
 
 def main():
     app_builder = ApplicationBuilder(Application)
     app_builder.use_startup(Startup)
+    app_builder.use_extension(TestExtension)
     app_builder.build().run()
 
 

src/tests/custom/general/src/general/test_extension.py

@@ -0,0 +1,13 @@
+from cpl_core.application.application_extension_abc import ApplicationExtensionABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.console import Console
+from cpl_core.dependency_injection import ServiceProviderABC
+
+
+class TestExtension(ApplicationExtensionABC):
+
+    def __init__(self):
+        ApplicationExtensionABC.__init__(self)
+
+    def run(self, config: ConfigurationABC, services: ServiceProviderABC):
+        Console.write_line('Hello World from App Extension')