From f9f04901c0d271a51f1e3d4aa7979afa148f182c Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 22 May 2021 12:53:04 +0200 Subject: [PATCH] Bugfixes --- scripts/build.sh | 0 scripts/chrome.sh | 0 scripts/create_docs.sh | 0 scripts/publish.sh | 0 src/cpl_cli/publish/publisher_service.py | 2 +- src/tests/generated/simple-app/cpl.json | 42 +++++++++++++++++++ .../generated/simple-app/src/application.py | 16 +++++++ src/tests/generated/simple-app/src/main.py | 12 ++++++ src/tests/generated/simple-console/cpl.json | 42 +++++++++++++++++++ .../generated/simple-console/src/main.py | 9 ++++ src/tests/generated/simple-di/cpl.json | 42 +++++++++++++++++++ src/tests/generated/simple-di/src/main.py | 23 ++++++++++ src/tests/generated/startup-app/LICENSE | 0 src/tests/generated/startup-app/README.md | 0 src/tests/generated/startup-app/cpl.json | 42 +++++++++++++++++++ .../generated/startup-app/src/application.py | 16 +++++++ src/tests/generated/startup-app/src/main.py | 14 +++++++ .../generated/startup-app/src/startup.py | 20 +++++++++ .../startup-app/src/tests/__init__.py | 1 + 19 files changed, 280 insertions(+), 1 deletion(-) mode change 100644 => 100755 scripts/build.sh mode change 100644 => 100755 scripts/chrome.sh mode change 100644 => 100755 scripts/create_docs.sh mode change 100644 => 100755 scripts/publish.sh create mode 100644 src/tests/generated/simple-app/cpl.json create mode 100644 src/tests/generated/simple-app/src/application.py create mode 100644 src/tests/generated/simple-app/src/main.py create mode 100644 src/tests/generated/simple-console/cpl.json create mode 100644 src/tests/generated/simple-console/src/main.py create mode 100644 src/tests/generated/simple-di/cpl.json create mode 100644 src/tests/generated/simple-di/src/main.py create mode 100644 src/tests/generated/startup-app/LICENSE create mode 100644 src/tests/generated/startup-app/README.md create mode 100644 src/tests/generated/startup-app/cpl.json create mode 100644 src/tests/generated/startup-app/src/application.py create mode 100644 src/tests/generated/startup-app/src/main.py create mode 100644 src/tests/generated/startup-app/src/startup.py create mode 100644 src/tests/generated/startup-app/src/tests/__init__.py diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 diff --git a/scripts/chrome.sh b/scripts/chrome.sh old mode 100644 new mode 100755 diff --git a/scripts/create_docs.sh b/scripts/create_docs.sh old mode 100644 new mode 100755 diff --git a/scripts/publish.sh b/scripts/publish.sh old mode 100644 new mode 100755 diff --git a/src/cpl_cli/publish/publisher_service.py b/src/cpl_cli/publish/publisher_service.py index f4187783..79b46af6 100644 --- a/src/cpl_cli/publish/publisher_service.py +++ b/src/cpl_cli/publish/publisher_service.py @@ -333,7 +333,7 @@ class PublisherService(PublisherABC): length = len(self._build_settings.main.split('.')) main_name = self._build_settings.main.split('.')[length - 1] - sys.path.insert(0, self._source_path) + sys.path.insert(0, os.path.join(self._source_path, '../')) main_mod = __import__(self._build_settings.main) main = getattr(main_mod, main_name) except Exception as e: diff --git a/src/tests/generated/simple-app/cpl.json b/src/tests/generated/simple-app/cpl.json new file mode 100644 index 00000000..f223da45 --- /dev/null +++ b/src/tests/generated/simple-app/cpl.json @@ -0,0 +1,42 @@ +{ + "ProjectSettings": { + "Name": "simple-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": { + "ProjectType": "console", + "SourcePath": "src", + "OutputPath": "dist", + "Main": "main", + "EntryPoint": "simple-app", + "IncludePackageData": false, + "Included": [], + "Excluded": [ + "*/__pycache__", + "*/logs", + "*/tests" + ], + "PackageData": {} + } +} \ No newline at end of file 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/generated/simple-console/cpl.json b/src/tests/generated/simple-console/cpl.json new file mode 100644 index 00000000..63fe1a4d --- /dev/null +++ b/src/tests/generated/simple-console/cpl.json @@ -0,0 +1,42 @@ +{ + "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": { + "ProjectType": "console", + "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-di/cpl.json b/src/tests/generated/simple-di/cpl.json new file mode 100644 index 00000000..8804958a --- /dev/null +++ b/src/tests/generated/simple-di/cpl.json @@ -0,0 +1,42 @@ +{ + "ProjectSettings": { + "Name": "simple-di", + "Version": { + "Major": "0", + "Minor": "0", + "Micro": "0" + }, + "Author": "", + "AuthorEmail": "", + "Description": "", + "LongDescription": "", + "URL": "", + "CopyrightDate": "", + "CopyrightName": "", + "LicenseName": "", + "LicenseDescription": "", + "Dependencies": [ + "sh_cpl==2021.4.2.dev1" + ], + "PythonVersion": ">=3.9.2", + "PythonPath": { + "linux": "" + }, + "Classifiers": [] + }, + "BuildSettings": { + "ProjectType": "console", + "SourcePath": "src", + "OutputPath": "dist", + "Main": "main", + "EntryPoint": "simple-di", + "IncludePackageData": false, + "Included": [], + "Excluded": [ + "*/__pycache__", + "*/logs", + "*/tests" + ], + "PackageData": {} + } +} \ No newline at end of file diff --git a/src/tests/generated/simple-di/src/main.py b/src/tests/generated/simple-di/src/main.py new file mode 100644 index 00000000..a6bd96ec --- /dev/null +++ b/src/tests/generated/simple-di/src/main.py @@ -0,0 +1,23 @@ +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() 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..086c70ae --- /dev/null +++ b/src/tests/generated/startup-app/cpl.json @@ -0,0 +1,42 @@ +{ + "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": { + "ProjectType": "console", + "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..07f5dece --- /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, ServiceCollectionABC + + +class Startup(StartupABC): + + def __init__(self, config: ConfigurationABC, services: ServiceCollectionABC): + 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.build_service_provider() + 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: