sh-edraft.de/sh_cpl
2
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Removed application host

Browse Source
This commit is contained in:
Sven Heidemann
2021-03-19 14:15:53 +01:00
parent 132d2805ee
commit e2e763a424
46 changed files with 210 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpl_cli/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
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='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

7
src/cpl_cli/cli.py
View File

@@ -1,7 +1,10 @@
from typing import Optional
from cpl.application.application_abc import ApplicationABC
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.console.console import Console
from cpl.dependency_injection import ServiceProviderABC
from cpl_cli.command.build_service import BuildService
from cpl_cli.command.generate_service import GenerateService
from cpl_cli.command.install_service import InstallService
@@ -19,11 +22,11 @@ from cpl_cli.command.version_service import VersionService
class CLI(ApplicationABC):
def __init__(self):
def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC):
"""
CPL CLI
"""
ApplicationABC.__init__(self)
ApplicationABC.__init__(self, config, runtime, services)
self._command_handler: Optional[CommandHandler] = None

4
src/cpl_cli/command/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.1.post13'
__version__ = '2021.4.1.post14'
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='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/configuration/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.1.post13'
__version__ = '2021.4.1.post14'
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='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/live_server/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

8
src/cpl_cli/main.py
View File

@@ -1,12 +1,12 @@
from cpl.application.application_builder import ApplicationBuilder
from cpl_cli.cli import CLI
from cpl_cli.startup import Startup
def main():
cli = CLI()
cli.use_startup(Startup)
cli.build()
cli.run()
app_builder = ApplicationBuilder(CLI)
app_builder.use_startup(Startup)
app_builder.build().run()
if __name__ == '__main__':

4
src/cpl_cli/publish/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.1.post13'
__version__ = '2021.4.1.post14'
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='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

30
src/cpl_cli/startup.py
View File

@@ -1,7 +1,4 @@
from typing import Optional
from cpl.application.application_host import ApplicationHost
from cpl.application.application_host_abc import ApplicationHostABC
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.application.startup_abc import StartupABC
from cpl.configuration.console_argument import ConsoleArgument
from cpl.configuration.configuration_abc import ConfigurationABC
@@ -25,28 +22,17 @@ from cpl_cli.publish.publisher_abc import PublisherABC
class Startup(StartupABC):
def __init__(self):
StartupABC.__init__(self)
def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC):
StartupABC.__init__(self, config, runtime, services)
self._app_host: Optional[ApplicationHostABC] = None
self._configuration: Optional[ConfigurationABC] = None
self._services: Optional[ServiceProviderABC] = None
self._application_runtime.set_runtime_directory(__file__)
def create_application_host(self) -> ApplicationHostABC:
self._app_host = ApplicationHost()
def configure_configuration(self) -> ConfigurationABC:
self._configuration.argument_error_function = Error.error
self._app_host.application_runtime.set_runtime_directory(__file__)
self._app_host.console_argument_error_function(Error.error)
self._configuration = self._app_host.configuration
self._services = self._app_host.services
return self._app_host
def create_configuration(self) -> ConfigurationABC:
self._configuration.add_environment_variables('PYTHON_')
self._configuration.add_environment_variables('CPL_')
self._configuration.add_json_file('appsettings.json', path=self._app_host.application_runtime.runtime_directory,
self._configuration.add_json_file('appsettings.json', path=self._application_runtime.runtime_directory,
optional=False, output=False)
self._configuration.add_console_argument(ConsoleArgument('', 'build', ['b', 'B'], ''))
self._configuration.add_console_argument(ConsoleArgument('', 'generate', ['g', 'G'], '', console_arguments=[
@@ -73,7 +59,7 @@ class Startup(StartupABC):
return self._configuration
def create_services(self) -> ServiceProviderABC:
def configure_services(self) -> ServiceProviderABC:
self._services.add_singleton(CommandHandler)
self._services.add_transient(PublisherABC, PublisherService)

4
src/cpl_cli/templates/__init__.py
View File

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/templates/build/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/templates/generate/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/templates/new/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/templates/new/console/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/templates/new/console/src/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

11
src/cpl_cli/templates/new/console/src/application.py
View File

@@ -12,13 +12,16 @@ class ApplicationTemplate(TemplateFileABC):
self._path = 'src/'
self._value = textwrap.dedent("""\
from cpl.application.application_abc import ApplicationABC
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.console.console import Console
from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
class Application(ApplicationABC):
def __init__(self):
ApplicationABC.__init__(self)
def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC):
ApplicationABC.__init__(self, config, runtime, services)
def configure(self):
pass

18
src/cpl_cli/templates/new/console/src/main.py
View File

@@ -11,15 +11,16 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
self._name = 'main.py'
self._path = 'src/'
self._value = textwrap.dedent("""\
from startup import Startup
from cpl.application.application_builder import ApplicationBuilder
from application import Application
from startup import Startup
def main():
app = Application()
app.use_startup(Startup)
app.build()
app.run()
app_builder = ApplicationBuilder(Application)
app_builder.use_startup(Startup)
app_builder.build().run()
if __name__ == '__main__':
@@ -47,13 +48,14 @@ class MainWithApplicationHostTemplate(TemplateFileABC):
self._name = 'main.py'
self._path = 'src/'
self._value = textwrap.dedent("""\
from cpl.application.application_builder import ApplicationBuilder
from application import Application
def main():
app = Application()
app.build()
app.run()
app_builder = ApplicationBuilder(Application)
app_builder.build().run()
if __name__ == '__main__':

28
src/cpl_cli/templates/new/console/src/startup.py
View File

@@ -11,10 +11,7 @@ class StartupTemplate(TemplateFileABC):
self._name = 'startup.py'
self._path = 'src/'
self._value = textwrap.dedent("""\
from typing import Optional
from cpl.application.application_host import ApplicationHost
from cpl.application.application_host_abc import ApplicationHostABC
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.application.startup_abc import StartupABC
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
@@ -22,28 +19,15 @@ class StartupTemplate(TemplateFileABC):
class Startup(StartupABC):
def __init__(self):
StartupABC.__init__(self)
self._app_host: Optional[ApplicationHostABC] = None
self._configuration: Optional[ConfigurationABC] = None
self._services: Optional[ServiceProviderABC] = None
def create_application_host(self) -> ApplicationHostABC:
self._app_host = ApplicationHost()
self._configuration = self._app_host.configuration
self._services = self._app_host.services
return self._app_host
def create_configuration(self) -> ConfigurationABC:
pass
def __init__(self, config: ConfigurationABC, runtime: ApplicationRuntimeABC, services: ServiceProviderABC):
StartupABC.__init__(self, config, runtime, services)
def configure_configuration(self) -> ConfigurationABC:
return self._configuration
def create_services(self) -> ServiceProviderABC:
pass
def configure_services(self) -> ServiceProviderABC:
return self._services
""")
@property

4
src/cpl_cli/templates/new/console/src/tests/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')

4
src/cpl_cli/templates/publish/__init__.py
View File

@@ -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.1.post13'
__version__ = '2021.4.1.post14'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-13')
version_info = VersionInfo(major='2021', minor='04', micro='01-14')