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

Command handling config bugfix

Browse Source
This commit is contained in:
Sven Heidemann
2021-03-16 22:06:37 +01:00
parent 8ef1416b35
commit ecd3e77a38
30 changed files with 62 additions and 55 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.post10'
__version__ = '2021.4.1.post11'
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-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
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-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

3
src/cpl_cli/command/update_service.py
View File

@@ -104,6 +104,9 @@ class UpdateService(CommandABC):
"""
if old_package in self._project_settings.dependencies:
index = self._project_settings.dependencies.index(old_package)
if '/' in new_package:
new_package = new_package.split('/')[0]
self._project_settings.dependencies[index] = new_package
config = {

7
src/cpl_cli/command_handler_service.py
View File

@@ -1,6 +1,7 @@
import os
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.dependency_injection.service_abc import ServiceABC
from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl_cli.error import Error
@@ -9,7 +10,7 @@ from cpl_cli.command_model import CommandModel
class CommandHandler(ServiceABC):
def __init__(self, runtime: ApplicationRuntimeABC, services: ServiceProviderABC):
def __init__(self, runtime: ApplicationRuntimeABC, config: ConfigurationABC, services: ServiceProviderABC):
"""
Service to handle incoming commands and args
:param runtime:
@@ -18,6 +19,7 @@ class CommandHandler(ServiceABC):
ServiceABC.__init__(self)
self._runtime = runtime
self._config = config
self._services = services
self._commands: list[CommandModel] = []
@@ -45,4 +47,7 @@ class CommandHandler(ServiceABC):
Error.error('The command requires to be run in an CPL project, but a project could not be found.')
return
if command.is_project_needed:
self._config.add_json_file('cpl.json', optional=True, output=False)
self._services.get_service(command.command).run(args)

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.post10'
__version__ = '2021.4.1.post11'
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-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
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-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

1
src/cpl_cli/startup.py
View File

@@ -46,7 +46,6 @@ class Startup(StartupABC):
def create_configuration(self) -> ConfigurationABC:
self._configuration.add_environment_variables('PYTHON_')
self._configuration.add_environment_variables('CPL_')
self._configuration.add_json_file('cpl.json', optional=True, output=False)
self._configuration.add_json_file('appsettings.json', path=self._app_host.application_runtime.runtime_directory,
optional=False, output=False)
self._configuration.add_console_argument(ConsoleArgument('', 'build', ['b', 'B'], ''))

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')

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.post10'
__version__ = '2021.4.1.post11'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-10')
version_info = VersionInfo(major='2021', minor='04', micro='01-11')