From 3d001ade0acc8f302e726649753bbb584b51c36f Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 12 Mar 2021 20:37:31 +0100 Subject: [PATCH] Bugfixes --- docs/todo.txt | 1 - src/cpl/configuration/configuration.py | 6 +-- src/cpl/environment/__init__.py | 2 +- ...ironment.py => application_environment.py} | 4 +- src/tests/custom/console/main.py | 3 +- src/tests/custom/general/cpl.json | 46 +++++++++++++------ src/tests/custom/general/main.py | 7 ++- 7 files changed, 46 insertions(+), 23 deletions(-) rename src/cpl/environment/{hosting_environment.py => application_environment.py} (92%) diff --git a/docs/todo.txt b/docs/todo.txt index 08a40aa3..21f0b806 100644 --- a/docs/todo.txt +++ b/docs/todo.txt @@ -1,3 +1,2 @@ -- create console select with up & down arrows - add command start - add command update \ No newline at end of file diff --git a/src/cpl/configuration/configuration.py b/src/cpl/configuration/configuration.py index 8e8cc75e..6d55b423 100644 --- a/src/cpl/configuration/configuration.py +++ b/src/cpl/configuration/configuration.py @@ -10,7 +10,7 @@ from cpl.configuration.configuration_variable_name_enum import ConfigurationVari from cpl.configuration.console_argument import ConsoleArgument from cpl.console.console import Console from cpl.console.foreground_color_enum import ForegroundColorEnum -from cpl.environment.hosting_environment import HostingEnvironment +from cpl.environment.application_environment import ApplicationEnvironment from cpl.environment.environment_abc import EnvironmentABC from cpl.environment.environment_name_enum import EnvironmentNameEnum @@ -20,7 +20,7 @@ class Configuration(ConfigurationABC): def __init__(self): ConfigurationABC.__init__(self) - self._hosting_environment = HostingEnvironment() + self._hosting_environment = ApplicationEnvironment() self._config: dict[Union[type, str], Union[ConfigurationModelABC, str]] = {} self._argument_types: list[ConsoleArgument] = [] @@ -70,7 +70,7 @@ class Configuration(ConfigurationABC): def _set_variable(self, name: str, value: str): if name == ConfigurationVariableNameEnum.environment.value: - self._hosting_environment.environment_name = EnvironmentName(value) + self._hosting_environment.environment_name = EnvironmentNameEnum(value) elif name == ConfigurationVariableNameEnum.name.value: self._hosting_environment.application_name = value diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py index 00e964f0..b17c2365 100644 --- a/src/cpl/environment/__init__.py +++ b/src/cpl/environment/__init__.py @@ -22,7 +22,7 @@ from collections import namedtuple # imports: from .environment_abc import EnvironmentABC from .environment_name_enum import EnvironmentNameEnum -from .hosting_environment import HostingEnvironment +from .application_environment import ApplicationEnvironment VersionInfo = namedtuple('VersionInfo', 'major minor micro') version_info = VersionInfo(major=2021, minor=4, micro=1) diff --git a/src/cpl/environment/hosting_environment.py b/src/cpl/environment/application_environment.py similarity index 92% rename from src/cpl/environment/hosting_environment.py rename to src/cpl/environment/application_environment.py index 48abbf8d..c7d154b8 100644 --- a/src/cpl/environment/hosting_environment.py +++ b/src/cpl/environment/application_environment.py @@ -5,7 +5,7 @@ from cpl.environment.environment_abc import EnvironmentABC from cpl.environment.environment_name_enum import EnvironmentNameEnum -class HostingEnvironment(EnvironmentABC): +class ApplicationEnvironment(EnvironmentABC): def __init__(self, name: EnvironmentNameEnum = EnvironmentNameEnum.production, crp: str = './'): EnvironmentABC.__init__(self) @@ -21,7 +21,7 @@ class HostingEnvironment(EnvironmentABC): @environment_name.setter def environment_name(self, environment_name: str): - self._environment_name = EnvironmentName(environment_name) + self._environment_name = EnvironmentNameEnum(environment_name) @property def application_name(self) -> str: diff --git a/src/tests/custom/console/main.py b/src/tests/custom/console/main.py index d429b44a..61df2284 100644 --- a/src/tests/custom/console/main.py +++ b/src/tests/custom/console/main.py @@ -8,8 +8,7 @@ def test_spinner(): if __name__ == '__main__': Console.write_line('Hello World') - # Console.spinner('Test:', test_spinner, spinner_foreground_color=ForegroundColorEnum.cyan, - # text_foreground_color='green') + Console.spinner('Test:', test_spinner, spinner_foreground_color=ForegroundColorEnum.cyan, text_foreground_color='green') opts = [ 'Option 1', 'Option 2', diff --git a/src/tests/custom/general/cpl.json b/src/tests/custom/general/cpl.json index caed5474..f7b312d2 100644 --- a/src/tests/custom/general/cpl.json +++ b/src/tests/custom/general/cpl.json @@ -1,24 +1,44 @@ { "ProjectSettings": { "Name": "sh_cpl.tests", - "Author": "Sven Heidemann", - "Description": "Common Python Library CLI", - "LongDescription": "Common Python Library CLI", - "CopyrightDate": "2020", - "CopyrightName": "sh-edraft.de", - "LicenseName": "MIT", - "LicenseDescription": ", see LICENSE for more details.", "Version": { "Major": "2021", "Minor": "04", "Micro": "01" }, - "SourcePath": "./", - "DistPath": "../../dist", - "Included": [], + "Author": "Sven Heidemann", + "AuthorEmail": "sven.heidemann@sh-edraft.de", + "Description": "sh-edraft Common Python library", + "LongDescription": "sh-edraft Common Python library", + "URL": "https://www.sh-edraft.de", + "CopyrightDate": "2020 - 2021", + "CopyrightName": "sh-edraft.de", + "LicenseName": "MIT", + "LicenseDescription": "MIT, see LICENSE for more details.", + "Dependencies": [ + "mysql-connector", + "SQLAlchemy", + "termcolor", + "pyfiglet", + "tabulate", + "pynput" + ], + "PythonVersion": ">=3.8" + }, + "BuildSettings": { + "SourcePath": "", + "OutputPath": "dist", + "Main": "main", + "EntryPoint": "cpl", + "IncludePackageData": "False", + "Included": [ + "*/templates" + ], "Excluded": [ - "__pycache__", - "logs" - ] + "*/__pycache__", + "*/logs", + "*/tests" + ], + "PackageData": {} } } \ No newline at end of file diff --git a/src/tests/custom/general/main.py b/src/tests/custom/general/main.py index 9b5fd8eb..142b759f 100644 --- a/src/tests/custom/general/main.py +++ b/src/tests/custom/general/main.py @@ -1,8 +1,13 @@ from tests.custom.general.application import Application from tests.custom.general.startup import Startup -if __name__ == '__main__': + +def main(): app = Application() app.use_startup(Startup) app.build() app.run() + + +if __name__ == '__main__': + main()