Updated cli project file

Reviewed-on: #31

notices/pip.txt

@@ -2,7 +2,7 @@ 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-cli/publish/setup/*
+            twine upload -r pip.sh-edraft.de dist/sh_cpl/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/*

src/cpl/__init__.py

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

src/cpl/application/__init__.py

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

src/cpl/configuration/__init__.py

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

src/cpl/configuration/configuration_abc.py

@@ -81,14 +81,14 @@ class ConfigurationABC(ABC):
         pass
 
     @abstractmethod
-    def add_configuration(self, key_type: Union[str, type], value: ConfigurationModelABC):
+    def add_configuration(self, key_type: Union[str, type], value: Union[str, ConfigurationModelABC]):
         r"""Add configuration object
 
         Parameter
         ---------
             key_type: Union[:class:`str`, :class:`type`]
                 Type of the value
-            value: :class:`cpl.configuration.configuration_model_abc.ConfigurationModelABC`
+            value: Union[:class:`str`, :class:`cpl.configuration.configuration_model_abc.ConfigurationModelABC`]
                 Object of the value
         """
         pass

src/cpl/console/__init__.py

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

src/cpl/cpl.json

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

src/cpl/database/__init__.py

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

src/cpl/database/connection/__init__.py

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

src/cpl/database/context/__init__.py

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

src/cpl/dependency_injection/__init__.py

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

src/cpl/environment/__init__.py

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

src/cpl/logging/__init__.py

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

src/cpl/mailing/__init__.py

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

src/cpl/time/__init__.py

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

src/cpl/utils/__init__.py

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

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'
+__version__ = '2021.4.0.post1'
 
 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='None')
+version_info = VersionInfo(major='2021', minor='4', micro='0.post1')

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

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

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

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

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

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

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

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

@@ -1,7 +1,5 @@
-import os.path
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class ApplicationTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = 'application.py'
-        self._path = os.path.join(path, name)
+        self._path = path
         self._value = textwrap.dedent("""\
             from cpl.application import ApplicationABC
             from cpl.configuration import ConfigurationABC

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

@@ -1,7 +1,5 @@
-import os.path
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class MainInitTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = '__init__.py'
-        self._path = os.path.join(path, name)
+        self._path = path
         self._value = textwrap.dedent("""\
             # imports: 
         """)

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

@@ -1,4 +1,3 @@
-import os.path
 import textwrap
 
 from cpl.utils.string import String
@@ -12,11 +11,9 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
         name = String.convert_to_snake_case(name)
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
+        self._path = path
 
         import_pkg = f'{name}.'
-        if name == '':
-            import_pkg = ''
 
         self._value = textwrap.dedent(f"""\
             from cpl.application import ApplicationBuilder
@@ -55,11 +52,9 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
         name = String.convert_to_snake_case(name)
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
+        self._path = path
 
         import_pkg = f'{name}.'
-        if name == '':
-            import_pkg = ''
 
         self._value = textwrap.dedent(f"""\
             from cpl.application import ApplicationBuilder
@@ -96,11 +91,9 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
         name = String.convert_to_snake_case(name)
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
+        self._path = path
 
         import_pkg = f'{name}.'
-        if name == '':
-            import_pkg = ''
 
         self._value = textwrap.dedent("""\
             from cpl.console import Console
@@ -134,11 +127,9 @@ class MainWithDependencyInjection(TemplateFileABC):
 
         name = String.convert_to_snake_case(name)
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
+        self._path = path
 
         import_pkg = f'{name}.'
-        if name == '':
-            import_pkg = ''
 
         self._value = textwrap.dedent("""\
             from cpl.configuration import Configuration, ConfigurationABC

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

@@ -1,7 +1,5 @@
-import os.path
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class StartupTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = 'startup.py'
-        self._path = os.path.join(path, name)
+        self._path = path
         self._value = textwrap.dedent("""\
             from cpl.application import StartupABC
             from cpl.configuration import ConfigurationABC

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

@@ -11,15 +11,15 @@ sh-edraft Common Python library Command Line Interface
 
 """
 
-__title__ = 'cpl_cli.templates.new.console.source.tests'
+__title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4'
+__version__ = '2021.4.0.post1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='None')
+version_info = VersionInfo(major='2021', minor='4', micro='0.post1')

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

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

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

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

@@ -1,7 +1,5 @@
-import os
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class ApplicationTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = 'application.py'
-        self._path = os.path.join(path, name)
+        self._path = path
         self._value = textwrap.dedent("""\
             from cpl.application import ApplicationABC
             from cpl.configuration import ConfigurationABC

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

@@ -1,7 +1,5 @@
-import os
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class NameInitTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = '__init__.py'
-        self._path = os.path.join(path, name)
+        self._path = path
         self._value = textwrap.dedent("""\
             # imports: 
         """)

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

@@ -1,7 +1,5 @@
-import os.path
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
+        self._path = path
 
         import_pkg = f'{name}.'
         if name == '':
@@ -53,9 +50,8 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
+        self._path = path
 
         import_pkg = f'{name}.'
         if name == '':
@@ -95,11 +91,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
-
-        import_pkg = f'{name}.'
-        if name == '':
-            import_pkg = ''
+        self._path = path
 
         self._value = textwrap.dedent("""\
             from cpl.console import Console
@@ -132,11 +124,7 @@ class MainWithDependencyInjection(TemplateFileABC):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
-        self._path = os.path.join(path, name)
-
-        import_pkg = f'{name}.'
-        if name == '':
-            import_pkg = ''
+        self._path = path
 
         self._value = textwrap.dedent("""\
             from cpl.configuration import Configuration, ConfigurationABC

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

@@ -1,7 +1,5 @@
-import os
 import textwrap
 
-from cpl.utils.string import String
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 
@@ -10,9 +8,8 @@ class StartupTemplate(TemplateFileABC):
     def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
-        name = String.convert_to_snake_case(name)
         self._name = 'startup.py'
-        self._path = os.path.join(path, name)
+        self._path = path
         self._value = textwrap.dedent("""\
             from cpl.application import StartupABC
             from cpl.configuration import ConfigurationABC

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

@@ -11,15 +11,15 @@ sh-edraft Common Python library Command Line Interface
 
 """
 
-__title__ = 'cpl_cli.templates.new.library.source.tests'
+__title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4'
+__version__ = '2021.4.0.post1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='None')
+version_info = VersionInfo(major='2021', minor='4', micro='0.post1')

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

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'
+__version__ = '2021.4.0.post1'
 
 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='None')
+version_info = VersionInfo(major='2021', minor='4', micro='0.post1')

src/cpl_cli/command_handler_service.py

@@ -67,7 +67,8 @@ class CommandHandler(ABC):
                             if file.endswith('.json'):
                                 f_name = file.split('.json')[0]
                                 if f_name == name or \
-                                        String.convert_to_camel_case(f_name) == String.convert_to_camel_case(name):
+                                        String.convert_to_camel_case(f_name).lower() == String.convert_to_camel_case(
+                                    name).lower():
                                     project_name = f_name
                                     break
 

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'
+__version__ = '2021.4.0.post1'
 
 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='None')
+version_info = VersionInfo(major='2021', minor='4', micro='0.post1')

src/cpl_cli/cpl_cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "4",
-      "Micro": ""
+      "Micro": "0.post1"
     },
     "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.post1"
+      "sh_cpl==2021.4.0.post1"
     ],
     "PythonVersion": ">=3.8",
     "PythonPath": {},
@@ -30,7 +30,7 @@
     "EntryPoint": "cpl",
     "IncludePackageData": true,
     "Included": [
-      "*/templates"
+      "*/_templates"
     ],
     "Excluded": [
       "*/__pycache__",

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

src/cpl_cli/live_server/live_server_thread.py

@@ -70,6 +70,8 @@ class LiveServerThread(threading.Thread):
             Console.error('Entry point main.py not found')
             return
 
+        # set cwd to src/
+        self._env.set_working_directory(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)}'

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'
+__version__ = '2021.4.0.post1'
 
 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='None')
+version_info = VersionInfo(major='2021', minor='4', micro='0.post1')

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

src/cpl_cli/source_creator/console_builder.py

@@ -78,7 +78,7 @@ class ConsoleBuilder:
                 ReadmeTemplate(),
                 TestsInitTemplate(),
                 AppsettingsTemplate(),
-                MainInitTemplate(project_name, 'src')
+                MainInitTemplate(project_name, os.path.join('src/', project_name_snake))
             ]
         else:
             project_path = os.path.join(
@@ -97,10 +97,9 @@ class ConsoleBuilder:
             os.makedirs(project_path)
 
         src_rel_path = ''
-        src_name = ''
-        if workspace is None:
-            src_rel_path = 'src/'
         src_name = project_name_snake
+        if workspace is None:
+            src_rel_path = os.path.join('src/', src_name)
 
         if use_application_api:
             templates.append(ApplicationTemplate(src_name, src_rel_path))
@@ -122,11 +121,12 @@ class ConsoleBuilder:
 
         project_file_path = f'{project_name_snake}/{project_name}.json'
         if workspace is None:
-            src_path = f'{proj_name}/src/{project_name_snake}'
+            src_path = f'src/{project_name_snake}'
             workspace_file_path = f'{proj_name}/cpl-workspace.json'
-            project_file_path = f'{src_path}/{project_name}.json'
+            project_file_rel_path = f'{src_path}/{project_name}.json'
+            project_file_path = f'{proj_name}/{src_path}/{project_name}.json'
             cls._create_workspace(workspace_file_path, project_name, {
-                project_name: project_file_path
+                project_name: project_file_rel_path
             })
 
         else:

src/cpl_cli/source_creator/library_builder.py

@@ -78,7 +78,7 @@ class LibraryBuilder:
                 LicenseTemplate(),
                 ReadmeTemplate(),
                 TestsInitTemplate(),
-                NameInitTemplate(project_name, 'src/'),
+                NameInitTemplate(project_name, os.path.join('src/', project_name_snake)),
                 AppsettingsTemplate()
             ]
         else:
@@ -98,10 +98,9 @@ class LibraryBuilder:
             os.makedirs(project_path)
 
         src_rel_path = ''
-        src_name = ''
-        if workspace is None:
-            src_rel_path = 'src/'
         src_name = project_name_snake
+        if workspace is None:
+            src_rel_path = os.path.join('src/', src_name)
 
         if use_application_api:
             templates.append(ApplicationTemplate(src_name, src_rel_path))
@@ -123,11 +122,12 @@ class LibraryBuilder:
 
         project_file_path = f'{project_name_snake}/{project_name}.json'
         if workspace is None:
-            src_path = f'{proj_name}/src/{project_name_snake}'
+            src_path = f'src/{project_name_snake}'
             workspace_file_path = f'{proj_name}/cpl-workspace.json'
-            project_file_path = f'{src_path}/{project_name}.json'
+            project_file_rel_path = f'{src_path}/{project_name}.json'
+            project_file_path = f'{proj_name}/{src_path}/{project_name}.json'
             cls._create_workspace(workspace_file_path, project_name, {
-                project_name: project_file_path
+                project_name: project_file_rel_path
             })
 
         else:

src/cpl_cli/source_creator/template_builder.py

@@ -19,6 +19,6 @@ class TemplateBuilder:
         if not os.path.isdir(file_rel_path):
             os.makedirs(file_rel_path)
 
-        with open(file_path, 'w') as license_file:
-            license_file.write(template.value)
-            license_file.close()
+        with open(file_path, 'w') as file:
+            file.write(template.value)
+            file.close()

src/tests/generated/simple-app/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-app/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-app",
+    "Projects": {
+      "simple-app": "src/simple_app/simple-app.json"
+    }
+  }
+}

src/tests/generated/simple-app/src/simple_app/main.py

@@ -1,6 +1,6 @@
 from cpl.application import ApplicationBuilder
 
-from application import Application
+from simple_app.application import Application
 
 
 def main():

src/tests/generated/simple-app/src/simple_app/simple-app.json

@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,9 +26,9 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_app.main",
     "EntryPoint": "simple-app",
     "IncludePackageData": false,
     "Included": [],
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-console/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-console/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-console",
+    "Projects": {
+      "simple-console": "src/simple_console/simple-console.json"
+    }
+  }
+}

src/tests/generated/simple-console/src/simple_console/__init__.py

@@ -0,0 +1 @@
+# imports: 

src/tests/generated/simple-console/src/simple_console/simple-console.json

@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,9 +26,9 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_console.main",
     "EntryPoint": "simple-console",
     "IncludePackageData": false,
     "Included": [],
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-di/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-di/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-di",
+    "Projects": {
+      "simple-di": "src/simple_di/simple-di.json"
+    }
+  }
+}

src/tests/generated/simple-di/src/simple_di/__init__.py

@@ -0,0 +1 @@
+# imports: 

src/tests/generated/simple-di/src/simple_di/simple-di.json

@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2.dev1"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,9 +26,9 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_di.main",
     "EntryPoint": "simple-di",
     "IncludePackageData": false,
     "Included": [],
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-startup-app/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-startup-app/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-startup-app",
+    "Projects": {
+      "simple-startup-app": "src/simple_startup_app/simple-startup-app.json"
+    }
+  }
+}

src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py

@@ -0,0 +1 @@
+# imports: 

src/tests/generated/simple-startup-app/src/simple_startup_app/main.py

@@ -1,7 +1,7 @@
 from cpl.application import ApplicationBuilder
 
-from application import Application
-from startup import Startup
+from simple_startup_app.application import Application
+from simple_startup_app.startup import Startup
 
 
 def main():

src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json

@@ -1,6 +1,6 @@
 {
   "ProjectSettings": {
-    "Name": "startup-app",
+    "Name": "simple-startup-app",
     "Version": {
       "Major": "0",
       "Minor": "0",
@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,10 +26,10 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
-    "EntryPoint": "startup-app",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_startup_app.main",
+    "EntryPoint": "simple-startup-app",
     "IncludePackageData": false,
     "Included": [],
     "Excluded": [
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py

@@ -17,4 +17,3 @@ class Startup(StartupABC):
 
     def configure_services(self) -> ServiceProviderABC:
         return self._services.build_service_provider()
-

src/tests/generated/simple-startup-app/src/tests/__init__.py

@@ -0,0 +1 @@
+# imports: