diff --git a/cpl.json b/cpl.json index ae5f889b..744a8115 100644 --- a/cpl.json +++ b/cpl.json @@ -4,7 +4,7 @@ "Version": { "Major": "2021", "Minor": "04", - "Micro": "02" + "Micro": "02.dev1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl/__init__.py b/src/cpl/__init__.py index 008e5a56..f804633e 100644 --- a/src/cpl/__init__.py +++ b/src/cpl/__init__.py @@ -15,11 +15,11 @@ __title__ = 'sh_cpl.cpl' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/application/__init__.py b/src/cpl/application/__init__.py index 87eca6e5..e40a2baa 100644 --- a/src/cpl/application/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py index f374e0d5..41c6a31b 100644 --- a/src/cpl/configuration/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py index 1e9a8e92..e75ea363 100644 --- a/src/cpl/console/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py index 7605162f..ce33ca70 100644 --- a/src/cpl/database/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/database/connection/__init__.py b/src/cpl/database/connection/__init__.py index 3ae7b65d..2e962b51 100644 --- a/src/cpl/database/connection/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/database/context/__init__.py b/src/cpl/database/context/__init__.py index 66a4a5bc..c4d4e74a 100644 --- a/src/cpl/database/context/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/dependency_injection/__init__.py b/src/cpl/dependency_injection/__init__.py index d5df833a..73436d6e 100644 --- a/src/cpl/dependency_injection/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple @@ -29,4 +29,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py index b719647c..a753f129 100644 --- a/src/cpl/environment/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py index 49f70e66..2e6ced30 100644 --- a/src/cpl/logging/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py index c6ed9193..726f559d 100644 --- a/src/cpl/mailing/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py index c5145d81..b53d88b3 100644 --- a/src/cpl/time/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py index 009cebf8..83743a08 100644 --- a/src/cpl/utils/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index f7c22826..d464193a 100644 --- a/src/cpl_cli/__init__.py +++ b/src/cpl_cli/__init__.py @@ -15,7 +15,7 @@ __title__ = 'sh_cpl.cpl_cli' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index 95d6aa56..8f0ce1f1 100644 --- a/src/cpl_cli/command/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/command/new_service.py b/src/cpl_cli/command/new_service.py index 565cc1c9..34e4fc83 100644 --- a/src/cpl_cli/command/new_service.py +++ b/src/cpl_cli/command/new_service.py @@ -20,7 +20,7 @@ from cpl_cli.templates.new.console.license import LicenseTemplate from cpl_cli.templates.new.console.readme_py import ReadmeTemplate from cpl_cli.templates.new.console.src.application import ApplicationTemplate from cpl_cli.templates.new.console.src.main import MainWithApplicationHostAndStartupTemplate, \ - MainWithoutApplicationHostTemplate, MainWithApplicationHostTemplate + MainWithoutApplicationBaseTemplate, MainWithApplicationBaseTemplate, MainWithDependencyInjection from cpl_cli.templates.new.console.src.startup import StartupTemplate from cpl_cli.templates.new.console.src.tests.init import TestsInitTemplate from cpl_cli.templates.template_file_abc import TemplateFileABC @@ -133,27 +133,26 @@ class NewService(CommandABC): return project_path - def _get_project_informations(self): + def _get_project_information(self): """ - Gets project informations from user + Gets project information's from user :return: """ - result = Console.read('Do you want to use application host? (y/n) ') + result = Console.read('Do you want to use application base? (y/n) ') if result.lower() == 'y': self._use_application_api = True - if self._use_application_api: - result = Console.read('Do you want to use startup? (y/n) ') - if result.lower() == 'y': - self._use_startup = True + result = Console.read('Do you want to use service providing? (y/n) ') + if result.lower() == 'y': + self._use_service_providing = True + + if self._use_application_api: + result = Console.read('Do you want to use startup? (y/n) ') + if result.lower() == 'y': + self._use_startup = True Console.set_foreground_color(ForegroundColorEnum.default) - # else: - # result = Console.read('Do you want to use service providing? (y/n) ') - # if result.lower() == 'y': - # self._use_service_providing = True - def _build_project_dir(self, project_path: str): """ Builds the project files @@ -172,15 +171,20 @@ class NewService(CommandABC): ReadmeTemplate(), TestsInitTemplate() ] + if self._use_application_api: templates.append(ApplicationTemplate()) + if self._use_startup: templates.append(StartupTemplate()) templates.append(MainWithApplicationHostAndStartupTemplate()) else: - templates.append(MainWithApplicationHostTemplate()) + templates.append(MainWithApplicationBaseTemplate()) else: - templates.append(MainWithoutApplicationHostTemplate()) + if self._use_service_providing: + templates.append(MainWithDependencyInjection()) + else: + templates.append(MainWithoutApplicationBaseTemplate()) for template in templates: Console.spinner( @@ -225,7 +229,7 @@ class NewService(CommandABC): if path is None: return - self._get_project_informations() + self._get_project_information() try: self._build_project_dir(path) except Exception as e: diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 5a53289c..b620df12 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple @@ -28,4 +28,4 @@ from .version_settings import VersionSettings from .version_settings_name_enum import VersionSettingsNameEnum VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index d826d0f0..3f825f5b 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 2f324b45..58828771 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' 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='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/__init__.py b/src/cpl_cli/templates/__init__.py index cd80bf44..528d43ac 100644 --- a/src/cpl_cli/templates/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/build/__init__.py b/src/cpl_cli/templates/build/__init__.py index a8ef97fc..d43eaa61 100644 --- a/src/cpl_cli/templates/build/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/generate/__init__.py b/src/cpl_cli/templates/generate/__init__.py index f0e04313..dbb44826 100644 --- a/src/cpl_cli/templates/generate/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/new/__init__.py b/src/cpl_cli/templates/new/__init__.py index 67aa1aa9..2f4a904b 100644 --- a/src/cpl_cli/templates/new/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/new/console/__init__.py b/src/cpl_cli/templates/new/console/__init__.py index 214acb2f..10025b60 100644 --- a/src/cpl_cli/templates/new/console/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/new/console/src/__init__.py b/src/cpl_cli/templates/new/console/src/__init__.py index 93766c79..85d458de 100644 --- a/src/cpl_cli/templates/new/console/src/__init__.py +++ b/src/cpl_cli/templates/new/console/src/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates.new.console.src' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/new/console/src/application.py b/src/cpl_cli/templates/new/console/src/application.py index 3d22124d..65c33d12 100644 --- a/src/cpl_cli/templates/new/console/src/application.py +++ b/src/cpl_cli/templates/new/console/src/application.py @@ -11,7 +11,7 @@ class ApplicationTemplate(TemplateFileABC): self._name = 'application.py' self._path = 'src/' self._value = textwrap.dedent("""\ - from cpl.application import ApplicationABC, ApplicationRuntimeABC + from cpl.application import ApplicationABC from cpl.configuration import ConfigurationABC from cpl.console import Console from cpl.dependency_injection import ServiceProviderABC @@ -19,8 +19,8 @@ class ApplicationTemplate(TemplateFileABC): class Application(ApplicationABC): - def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC): - ApplicationABC.__init__(self, config, runtime, services) + def __init__(self, config: ConfigurationABC, services: ServiceProviderABC): + ApplicationABC.__init__(self, config, services) def configure(self): pass diff --git a/src/cpl_cli/templates/new/console/src/main.py b/src/cpl_cli/templates/new/console/src/main.py index 76d8c8c6..9ed2afa1 100644 --- a/src/cpl_cli/templates/new/console/src/main.py +++ b/src/cpl_cli/templates/new/console/src/main.py @@ -40,7 +40,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC): return self._value -class MainWithApplicationHostTemplate(TemplateFileABC): +class MainWithApplicationBaseTemplate(TemplateFileABC): def __init__(self): TemplateFileABC.__init__(self) @@ -75,7 +75,7 @@ class MainWithApplicationHostTemplate(TemplateFileABC): return self._value -class MainWithoutApplicationHostTemplate(TemplateFileABC): +class MainWithoutApplicationBaseTemplate(TemplateFileABC): def __init__(self): TemplateFileABC.__init__(self) @@ -105,3 +105,49 @@ class MainWithoutApplicationHostTemplate(TemplateFileABC): @property def value(self) -> str: return self._value + + +class MainWithDependencyInjection(TemplateFileABC): + + def __init__(self): + TemplateFileABC.__init__(self) + + self._name = 'main.py' + self._path = 'src/' + self._value = textwrap.dedent("""\ + from cpl.configuration import Configuration, ConfigurationABC + from cpl.console import Console + from cpl.dependency_injection import ServiceCollection, ServiceProviderABC + + + def configure_configuration() -> ConfigurationABC: + config = Configuration() + return config + + + def configure_services(config: ConfigurationABC) -> ServiceProviderABC: + services = ServiceCollection(config) + return services.build_service_provider() + + + def main(): + config = configure_configuration() + provider = configure_services(config) + Console.write_line('Hello World') + + + if __name__ == '__main__': + main() + """) + + @property + def name(self) -> str: + return self._name + + @property + def path(self) -> str: + return self._path + + @property + def value(self) -> str: + return self._value diff --git a/src/cpl_cli/templates/new/console/src/startup.py b/src/cpl_cli/templates/new/console/src/startup.py index 2e770d9c..b7b44e0e 100644 --- a/src/cpl_cli/templates/new/console/src/startup.py +++ b/src/cpl_cli/templates/new/console/src/startup.py @@ -11,18 +11,18 @@ class StartupTemplate(TemplateFileABC): self._name = 'startup.py' self._path = 'src/' self._value = textwrap.dedent("""\ - from cpl.application import ApplicationRuntimeABC, StartupABC + from cpl.application import StartupABC from cpl.configuration import ConfigurationABC from cpl.dependency_injection import ServiceProviderABC class Startup(StartupABC): - def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC): + def __init__(self, config: ConfigurationABC, services: ServiceProviderABC): StartupABC.__init__(self) self._configuration = config - self._application_runtime = runtime + self._environment = self._configuration.environment self._services = services def configure_configuration(self) -> ConfigurationABC: diff --git a/src/cpl_cli/templates/new/console/src/tests/__init__.py b/src/cpl_cli/templates/new/console/src/tests/__init__.py index 3c8f9b00..63fc1bba 100644 --- a/src/cpl_cli/templates/new/console/src/tests/__init__.py +++ b/src/cpl_cli/templates/new/console/src/tests/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates.new.console.src.tests' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.4.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/cpl_cli/templates/publish/__init__.py b/src/cpl_cli/templates/publish/__init__.py index 81138751..0afdd047 100644 --- a/src/cpl_cli/templates/publish/__init__.py +++ b/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.2' +__version__ = '2021.4.2.dev1' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='04', micro='02') +version_info = VersionInfo(major='2021', minor='04', micro='02.dev1') diff --git a/src/tests/custom/cpl-test/src/main.py b/src/tests/custom/cpl-test/src/main.py deleted file mode 100644 index f104c661..00000000 --- a/src/tests/custom/cpl-test/src/main.py +++ /dev/null @@ -1,13 +0,0 @@ -from cpl.console.console import Console - -from model.test_model import TestModel - - -def main(): - Console.write_line('Hello World') - Console.write_line('Dies ist ein test') - test = TestModel() - - -if __name__ == '__main__': - main() diff --git a/src/tests/custom/cpl-test/src/model/test_model.py b/src/tests/custom/cpl-test/src/model/test_model.py deleted file mode 100644 index 86fecae0..00000000 --- a/src/tests/custom/cpl-test/src/model/test_model.py +++ /dev/null @@ -1,22 +0,0 @@ -import time - -from cpl.console import Console - - -class TestModel: - - def __init__(self): - Console.spinner('Waiting: ', self._wait, 10) - option = Console.select('->', 'Select option: ', [ - 'Option 1', - 'Option 2', - 'Option 3', - 'Option 4', - 'Option 5', - 'Option 6' - ]) - Console.write_line('You selected', option) - - @staticmethod - def _wait(count: int): - time.sleep(count) diff --git a/src/tests/custom/cpl-test/LICENSE b/src/tests/generated/simple-app/LICENSE similarity index 100% rename from src/tests/custom/cpl-test/LICENSE rename to src/tests/generated/simple-app/LICENSE diff --git a/src/tests/custom/cpl-test/README.md b/src/tests/generated/simple-app/README.md similarity index 100% rename from src/tests/custom/cpl-test/README.md rename to src/tests/generated/simple-app/README.md diff --git a/src/tests/custom/cpl-test/cpl.json b/src/tests/generated/simple-app/cpl.json similarity index 69% rename from src/tests/custom/cpl-test/cpl.json rename to src/tests/generated/simple-app/cpl.json index 88718a04..24144f52 100644 --- a/src/tests/custom/cpl-test/cpl.json +++ b/src/tests/generated/simple-app/cpl.json @@ -1,6 +1,6 @@ { "ProjectSettings": { - "Name": "cpl-test", + "Name": "simple-app", "Version": { "Major": "0", "Minor": "0", @@ -16,18 +16,20 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "sh_cpl==2021.4.1.post13" + "sh_cpl==2021.4.2" ], "PythonVersion": ">=3.9.2", - "PythonPath": "/home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_common_py_lib/src/tests/custom/general/../../../../cpl-env/bin/python3.9", + "PythonPath": { + "linux": "" + }, "Classifiers": [] }, "BuildSettings": { "SourcePath": "src", "OutputPath": "dist", "Main": "main", - "EntryPoint": "cpl-test", - "IncludePackageData": true, + "EntryPoint": "simple-app", + "IncludePackageData": false, "Included": [], "Excluded": [ "*/__pycache__", diff --git a/src/tests/generated/simple-app/src/application.py b/src/tests/generated/simple-app/src/application.py new file mode 100644 index 00000000..0a98353b --- /dev/null +++ b/src/tests/generated/simple-app/src/application.py @@ -0,0 +1,16 @@ +from cpl.application import ApplicationABC +from cpl.configuration import ConfigurationABC +from cpl.console import Console +from cpl.dependency_injection import ServiceProviderABC + + +class Application(ApplicationABC): + + def __init__(self, config: ConfigurationABC, services: ServiceProviderABC): + ApplicationABC.__init__(self, config, services) + + def configure(self): + pass + + def main(self): + Console.write_line('Hello World') diff --git a/src/tests/generated/simple-app/src/main.py b/src/tests/generated/simple-app/src/main.py new file mode 100644 index 00000000..3d3e7eba --- /dev/null +++ b/src/tests/generated/simple-app/src/main.py @@ -0,0 +1,12 @@ +from cpl.application import ApplicationBuilder + +from application import Application + + +def main(): + app_builder = ApplicationBuilder(Application) + app_builder.build().run() + + +if __name__ == '__main__': + main() diff --git a/src/tests/custom/cpl-test/src/tests/__init__.py b/src/tests/generated/simple-app/src/tests/__init__.py similarity index 100% rename from src/tests/custom/cpl-test/src/tests/__init__.py rename to src/tests/generated/simple-app/src/tests/__init__.py diff --git a/src/tests/custom/cpl-test/src/model/__init__.py b/src/tests/generated/simple-console/LICENSE similarity index 100% rename from src/tests/custom/cpl-test/src/model/__init__.py rename to src/tests/generated/simple-console/LICENSE diff --git a/src/tests/generated/simple-console/README.md b/src/tests/generated/simple-console/README.md new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/generated/simple-console/cpl.json b/src/tests/generated/simple-console/cpl.json new file mode 100644 index 00000000..9e82f06d --- /dev/null +++ b/src/tests/generated/simple-console/cpl.json @@ -0,0 +1,41 @@ +{ + "ProjectSettings": { + "Name": "simple-console", + "Version": { + "Major": "0", + "Minor": "0", + "Micro": "0" + }, + "Author": "", + "AuthorEmail": "", + "Description": "", + "LongDescription": "", + "URL": "", + "CopyrightDate": "", + "CopyrightName": "", + "LicenseName": "", + "LicenseDescription": "", + "Dependencies": [ + "sh_cpl==2021.4.2" + ], + "PythonVersion": ">=3.9.2", + "PythonPath": { + "linux": "" + }, + "Classifiers": [] + }, + "BuildSettings": { + "SourcePath": "src", + "OutputPath": "dist", + "Main": "main", + "EntryPoint": "simple-console", + "IncludePackageData": false, + "Included": [], + "Excluded": [ + "*/__pycache__", + "*/logs", + "*/tests" + ], + "PackageData": {} + } +} \ No newline at end of file diff --git a/src/tests/generated/simple-console/src/main.py b/src/tests/generated/simple-console/src/main.py new file mode 100644 index 00000000..42e34771 --- /dev/null +++ b/src/tests/generated/simple-console/src/main.py @@ -0,0 +1,9 @@ +from cpl.console import Console + + +def main(): + Console.write_line('Hello World') + + +if __name__ == '__main__': + main() diff --git a/src/tests/generated/simple-console/src/tests/__init__.py b/src/tests/generated/simple-console/src/tests/__init__.py new file mode 100644 index 00000000..ad5eca30 --- /dev/null +++ b/src/tests/generated/simple-console/src/tests/__init__.py @@ -0,0 +1 @@ +# imports: diff --git a/src/tests/generated/startup-app/LICENSE b/src/tests/generated/startup-app/LICENSE new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/generated/startup-app/README.md b/src/tests/generated/startup-app/README.md new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/generated/startup-app/cpl.json b/src/tests/generated/startup-app/cpl.json new file mode 100644 index 00000000..ecbc7ef4 --- /dev/null +++ b/src/tests/generated/startup-app/cpl.json @@ -0,0 +1,41 @@ +{ + "ProjectSettings": { + "Name": "startup-app", + "Version": { + "Major": "0", + "Minor": "0", + "Micro": "0" + }, + "Author": "", + "AuthorEmail": "", + "Description": "", + "LongDescription": "", + "URL": "", + "CopyrightDate": "", + "CopyrightName": "", + "LicenseName": "", + "LicenseDescription": "", + "Dependencies": [ + "sh_cpl==2021.4.2" + ], + "PythonVersion": ">=3.9.2", + "PythonPath": { + "linux": "" + }, + "Classifiers": [] + }, + "BuildSettings": { + "SourcePath": "src", + "OutputPath": "dist", + "Main": "main", + "EntryPoint": "startup-app", + "IncludePackageData": false, + "Included": [], + "Excluded": [ + "*/__pycache__", + "*/logs", + "*/tests" + ], + "PackageData": {} + } +} \ No newline at end of file diff --git a/src/tests/generated/startup-app/src/application.py b/src/tests/generated/startup-app/src/application.py new file mode 100644 index 00000000..0a98353b --- /dev/null +++ b/src/tests/generated/startup-app/src/application.py @@ -0,0 +1,16 @@ +from cpl.application import ApplicationABC +from cpl.configuration import ConfigurationABC +from cpl.console import Console +from cpl.dependency_injection import ServiceProviderABC + + +class Application(ApplicationABC): + + def __init__(self, config: ConfigurationABC, services: ServiceProviderABC): + ApplicationABC.__init__(self, config, services) + + def configure(self): + pass + + def main(self): + Console.write_line('Hello World') diff --git a/src/tests/generated/startup-app/src/main.py b/src/tests/generated/startup-app/src/main.py new file mode 100644 index 00000000..6e678925 --- /dev/null +++ b/src/tests/generated/startup-app/src/main.py @@ -0,0 +1,14 @@ +from cpl.application import ApplicationBuilder + +from application import Application +from startup import Startup + + +def main(): + app_builder = ApplicationBuilder(Application) + app_builder.use_startup(Startup) + app_builder.build().run() + + +if __name__ == '__main__': + main() diff --git a/src/tests/generated/startup-app/src/startup.py b/src/tests/generated/startup-app/src/startup.py new file mode 100644 index 00000000..5b8ef5af --- /dev/null +++ b/src/tests/generated/startup-app/src/startup.py @@ -0,0 +1,20 @@ +from cpl.application import StartupABC +from cpl.configuration import ConfigurationABC +from cpl.dependency_injection import ServiceProviderABC + + +class Startup(StartupABC): + + def __init__(self, config: ConfigurationABC, services: ServiceProviderABC): + StartupABC.__init__(self) + + self._configuration = config + self._environment = self._configuration.environment + self._services = services + + def configure_configuration(self) -> ConfigurationABC: + return self._configuration + + def configure_services(self) -> ServiceProviderABC: + return self._services + diff --git a/src/tests/generated/startup-app/src/tests/__init__.py b/src/tests/generated/startup-app/src/tests/__init__.py new file mode 100644 index 00000000..ad5eca30 --- /dev/null +++ b/src/tests/generated/startup-app/src/tests/__init__.py @@ -0,0 +1 @@ +# imports: