scripts/upload.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
 if [ $1 == "-prod" ]; then
-  twine upload -r pip.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
 elif [ $1 == "-prod" ]; then
-  twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip-exp.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip-exp.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip-.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip-.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
 
 else
-  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
 fi

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 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='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/console/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/console/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/console/source/name/application.py

@@ -5,51 +5,29 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class ApplicationTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'application.py'
         self._path = path
-        self._use_async = use_async
+        self._value = textwrap.dedent("""\
-        
+            from cpl_core.application import ApplicationABC
-        if self._use_async:
+            from cpl_core.configuration import ConfigurationABC
-            self._value = textwrap.dedent("""\
+            from cpl_core.console import Console
-                from cpl_core.application import ApplicationABC
+            from cpl_core.dependency_injection import ServiceProviderABC
-                from cpl_core.configuration import ConfigurationABC
-                from cpl_core.console import Console
-                from cpl_core.dependency_injection import ServiceProviderABC
-                    
-                    
-                class Application(ApplicationABC):
                 
-                    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
-                        ApplicationABC.__init__(self, config, services)
                 
-                    async def configure(self):
+            class Application(ApplicationABC):
-                        pass
+            
-                
+                def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
-                    async def main(self):
+                    ApplicationABC.__init__(self, config, services)
-                        Console.write_line('Hello World')
+            
-            """)
+                def configure(self):
-        else:
+                    pass
-            self._value = textwrap.dedent("""\
+            
-                from cpl_core.application import ApplicationABC
+                def main(self):
-                from cpl_core.configuration import ConfigurationABC
+                    Console.write_line('Hello World')
-                from cpl_core.console import Console
+        """)
-                from cpl_core.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')
-            """)
 
     @property
     def name(self) -> str:

src/cpl_cli/_templates/new/console/source/name/main.py

@@ -6,7 +6,7 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -15,44 +15,22 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
-        if use_async:
+        self._value = textwrap.dedent(f"""\
-            self._value = textwrap.dedent(f"""\
+            from cpl_core.application import ApplicationBuilder
-                import asyncio
+            
-                
+            from {import_pkg}application import Application
-                from cpl_core.application import ApplicationBuilder
+            from {import_pkg}startup import Startup
-                
+            
-                from {import_pkg}application import Application
+            
-                from {import_pkg}startup import Startup
+            def main():
-                
+                app_builder = ApplicationBuilder(Application)
-                
+                app_builder.use_startup(Startup)
-                async def main():
+                app_builder.build().run()
-                    app_builder = ApplicationBuilder(Application)
+            
-                    app_builder.use_startup(Startup)
+            
-                    app: Application = await app_builder.build_async()
+            if __name__ == '__main__':
-                    await app.run_async()
+                main()
-                
+        """)
-                
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent(f"""\
-                from cpl_core.application import ApplicationBuilder
-                
-                from {import_pkg}application import Application
-                from {import_pkg}startup import Startup
-                
-                
-                def main():
-                    app_builder = ApplicationBuilder(Application)
-                    app_builder.use_startup(Startup)
-                    app_builder.build().run()
-                
-                
-                if __name__ == '__main__':
-                    main()
-            """)
 
     @property
     def name(self) -> str:
@@ -69,7 +47,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
 class MainWithApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -78,40 +56,20 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
-        if use_async:
+        self._value = textwrap.dedent(f"""\
-            self._value = textwrap.dedent(f"""\
+            from cpl_core.application import ApplicationBuilder
-                import asyncio
+            
-                
+            from {import_pkg}application import Application
-                from cpl_core.application import ApplicationBuilder
+            
-                
+            
-                from {import_pkg}application import Application
+            def main():
-                
+                app_builder = ApplicationBuilder(Application)
-                
+                app_builder.build().run()
-                async def main():
+            
-                    app_builder = ApplicationBuilder(Application)
+            
-                    app: Application = await app_builder.build_async()
+            if __name__ == '__main__':
-                    await app.run_async()
+                main()
-                
+        """)
-                
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent(f"""\
-                from cpl_core.application import ApplicationBuilder
-                
-                from {import_pkg}application import Application
-                
-                
-                def main():
-                    app_builder = ApplicationBuilder(Application)
-                    app_builder.build().run()
-                
-                
-                if __name__ == '__main__':
-                    main()
-            """)
 
     @property
     def name(self) -> str:
@@ -128,7 +86,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -137,33 +95,17 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
-        if use_async:
+        self._value = textwrap.dedent("""\
-            self._value = textwrap.dedent("""\
+            from cpl_core.console import Console
-                import asyncio
+            
-                
+            
-                from cpl_core.console import Console
+            def main():
-                
+                Console.write_line('Hello World')
-                
+            
-                async def main():
+            
-                    Console.write_line('Hello World')
+            if __name__ == '__main__':
-                
+                main()
-                
+        """)
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent("""\
-                from cpl_core.console import Console
-                
-                
-                def main():
-                    Console.write_line('Hello World')
-                
-                
-                if __name__ == '__main__':
-                    main()
-            """)
 
     @property
     def name(self) -> str:
@@ -180,7 +122,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithDependencyInjection(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -189,61 +131,31 @@ class MainWithDependencyInjection(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
-        if use_async:
+        self._value = textwrap.dedent("""\
-            self._value = textwrap.dedent("""\
+            from cpl_core.configuration import Configuration, ConfigurationABC
-                import asyncio
+            from cpl_core.console import Console
-                
+            from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
-                from cpl_core.configuration import Configuration, ConfigurationABC
+            
-                from cpl_core.console import Console
+            
-                from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
+            def configure_configuration() -> ConfigurationABC:
-                
+                config = Configuration()
-                
+                return config
-                async def configure_configuration() -> ConfigurationABC:
+            
-                    config = Configuration()
+            
-                    return config
+            def configure_services(config: ConfigurationABC) -> ServiceProviderABC:
-                
+                services = ServiceCollection(config)
-                
+                return services.build_service_provider()
-                async def configure_services(config: ConfigurationABC) -> ServiceProviderABC:
+            
-                    services = ServiceCollection(config)
+            
-                    return services.build_service_provider()
+            def main():
-                
+                config = configure_configuration()
-                
+                provider = configure_services(config)
-                async def main():
+                Console.write_line('Hello World')
-                    config = await configure_configuration()
+            
-                    provider = await configure_services(config)
+            
-                    Console.write_line('Hello World')
+            if __name__ == '__main__':
-                
+                main()
-                
+        """)
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent("""\
-                from cpl_core.configuration import Configuration, ConfigurationABC
-                from cpl_core.console import Console
-                from cpl_core.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:

src/cpl_cli/_templates/new/console/source/name/startup.py

@@ -5,51 +5,29 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class StartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'startup.py'
         self._path = path
-        self._use_async = use_async
+        self._value = textwrap.dedent("""\
-        
+            from cpl_core.application import StartupABC
-        if self._use_async:
+            from cpl_core.configuration import ConfigurationABC
-            self._value = textwrap.dedent("""\
+            from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-                from cpl_core.application import StartupABC
+            from cpl_core.environment import ApplicationEnvironment
-                from cpl_core.configuration import ConfigurationABC
+            
-                from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+            
-                from cpl_core.environment import ApplicationEnvironment
+            class Startup(StartupABC):
-                
+            
-                
+                def __init__(self):
-                class Startup(StartupABC):
+                    StartupABC.__init__(self)
-                
+            
-                    def __init__(self):
+                def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
-                        StartupABC.__init__(self)
+                    return configuration
-                
+            
-                    async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+                def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
-                        return configuration
+                    return services.build_service_provider()
-                
+        """)
-                    async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
-                        return services.build_service_provider()
-            """)
-        else:
-            self._value = textwrap.dedent("""\
-                from cpl_core.application import StartupABC
-                from cpl_core.configuration import ConfigurationABC
-                from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-                from cpl_core.environment import ApplicationEnvironment
-                
-                
-                class Startup(StartupABC):
-                
-                    def __init__(self):
-                        StartupABC.__init__(self)
-                
-                    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
-                        return configuration
-                
-                    def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
-                        return services.build_service_provider()
-            """)
 
     @property
     def name(self) -> str:

src/cpl_cli/_templates/new/console/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/library/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/library/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/library/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/_templates/new/library/source/name/application.py

@@ -5,50 +5,29 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class ApplicationTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'application.py'
         self._path = path
-        
+        self._value = textwrap.dedent("""\
-        if use_async:
+            from cpl_core.application import ApplicationABC
-            self._value = textwrap.dedent("""\
+            from cpl_core.configuration import ConfigurationABC
-                from cpl_core.application import ApplicationABC
+            from cpl_core.console import Console
-                from cpl_core.configuration import ConfigurationABC
+            from cpl_core.dependency_injection import ServiceProviderABC
-                from cpl_core.console import Console
-                from cpl_core.dependency_injection import ServiceProviderABC
-                    
-                    
-                class Application(ApplicationABC):
                 
-                    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
-                        ApplicationABC.__init__(self, config, services)
                 
-                    async def configure(self):
+            class Application(ApplicationABC):
-                        pass
+            
-                
+                def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
-                    async def main(self):
+                    ApplicationABC.__init__(self, config, services)
-                        Console.write_line('Hello World')
+            
-            """)
+                def configure(self):
-        else:
+                    pass
-            self._value = textwrap.dedent("""\
+            
-                from cpl_core.application import ApplicationABC
+                def main(self):
-                from cpl_core.configuration import ConfigurationABC
+                    Console.write_line('Hello World')
-                from cpl_core.console import Console
+        """)
-                from cpl_core.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')
-            """)
 
     @property
     def name(self) -> str:

src/cpl_cli/_templates/new/library/source/name/main.py

@@ -5,7 +5,7 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
@@ -15,44 +15,22 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
         if name == '':
             import_pkg = ''
 
-        if use_async:
+        self._value = textwrap.dedent(f"""\
-            self._value = textwrap.dedent(f"""\
+            from cpl_core.application import ApplicationBuilder
-                import asyncio
+            
-                
+            from {import_pkg}application import Application
-                from cpl_core.application import ApplicationBuilder
+            from {import_pkg}startup import Startup
-                
+            
-                from {import_pkg}application import Application
+            
-                from {import_pkg}startup import Startup
+            def main():
-                
+                app_builder = ApplicationBuilder(Application)
-                
+                app_builder.use_startup(Startup)
-                async def main():
+                app_builder.build().run()
-                    app_builder = ApplicationBuilder(Application)
+            
-                    app_builder.use_startup(Startup)
+            
-                    app: Application = await app_builder.build_async()
+            if __name__ == '__main__':
-                    await app.run_async()
+                main()
-                
+        """)
-                
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent(f"""\
-                from cpl_core.application import ApplicationBuilder
-                
-                from {import_pkg}application import Application
-                from {import_pkg}startup import Startup
-                
-                
-                def main():
-                    app_builder = ApplicationBuilder(Application)
-                    app_builder.use_startup(Startup)
-                    app_builder.build().run()
-                
-                
-                if __name__ == '__main__':
-                    main()
-            """)
 
     @property
     def name(self) -> str:
@@ -69,7 +47,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
 class MainWithApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
@@ -79,40 +57,20 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
         if name == '':
             import_pkg = ''
 
-        if use_async:
+        self._value = textwrap.dedent(f"""\
-            self._value = textwrap.dedent(f"""\
+            from cpl_core.application import ApplicationBuilder
-                import asyncio
+            
-                
+            from {import_pkg}application import Application
-                from cpl_core.application import ApplicationBuilder
+            
-                
+            
-                from {import_pkg}application import Application
+            def main():
-                
+                app_builder = ApplicationBuilder(Application)
-                
+                app_builder.build().run()
-                async def main():
+            
-                    app_builder = ApplicationBuilder(Application)
+            
-                    app: Application = await app_builder.build_async()
+            if __name__ == '__main__':
-                    await app.run_async()
+                main()
-                
+        """)
-                
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent(f"""\
-                from cpl_core.application import ApplicationBuilder
-                
-                from {import_pkg}application import Application
-                
-                
-                def main():
-                    app_builder = ApplicationBuilder(Application)
-                    app_builder.build().run()
-                
-                
-                if __name__ == '__main__':
-                    main()
-            """)
 
     @property
     def name(self) -> str:
@@ -129,39 +87,23 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
         self._path = path
 
-        if use_async:
+        self._value = textwrap.dedent("""\
-            self._value = textwrap.dedent("""\
+            from cpl_core.console import Console
-                import asyncio
+            
-                
+            
-                from cpl_core.console import Console
+            def main():
-                
+                Console.write_line('Hello World')
-                
+            
-                async def main():
+            
-                    Console.write_line('Hello World')
+            if __name__ == '__main__':
-                
+                main()
-                
+        """)
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent("""\
-                from cpl_core.console import Console
-                
-                
-                def main():
-                    Console.write_line('Hello World')
-                
-                
-                if __name__ == '__main__':
-                    main()
-            """)
 
     @property
     def name(self) -> str:
@@ -178,67 +120,37 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithDependencyInjection(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
         self._path = path
-        
+
-        if use_async:
+        self._value = textwrap.dedent("""\
-            self._value = textwrap.dedent("""\
+            from cpl_core.configuration import Configuration, ConfigurationABC
-                import asyncio
+            from cpl_core.console import Console
-                
+            from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
-                from cpl_core.configuration import Configuration, ConfigurationABC
+            
-                from cpl_core.console import Console
+            
-                from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
+            def configure_configuration() -> ConfigurationABC:
-                
+                config = Configuration()
-                
+                return config
-                async def configure_configuration() -> ConfigurationABC:
+            
-                    config = Configuration()
+            
-                    return config
+            def configure_services(config: ConfigurationABC) -> ServiceProviderABC:
-                
+                services = ServiceCollection(config)
-                
+                return services.build_service_provider()
-                async def configure_services(config: ConfigurationABC) -> ServiceProviderABC:
+            
-                    services = ServiceCollection(config)
+            
-                    return services.build_service_provider()
+            def main():
-                
+                config = configure_configuration()
-                
+                provider = configure_services(config)
-                async def main():
+                Console.write_line('Hello World')
-                    config = await configure_configuration()
+            
-                    provider = await configure_services(config)
+            
-                    Console.write_line('Hello World')
+            if __name__ == '__main__':
-                
+                main()
-                
+        """)
-                if __name__ == '__main__':
-                    ml = asyncio.get_event_loop()
-                    ml.run_until_complete(main())
-            """)
-        else:
-            self._value = textwrap.dedent("""\
-                from cpl_core.configuration import Configuration, ConfigurationABC
-                from cpl_core.console import Console
-                from cpl_core.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:

src/cpl_cli/_templates/new/library/source/name/startup.py

@@ -5,50 +5,29 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class StartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str, use_async: bool):
+    def __init__(self, name: str, path: str):
         TemplateFileABC.__init__(self)
 
         self._name = 'startup.py'
         self._path = path
-        
+        self._value = textwrap.dedent("""\
-        if use_async:
+            from cpl_core.application import StartupABC
-            self._value = textwrap.dedent("""\
+            from cpl_core.configuration import ConfigurationABC
-                from cpl_core.application import StartupABC
+            from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-                from cpl_core.configuration import ConfigurationABC
+            from cpl_core.environment import ApplicationEnvironment
-                from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+            
-                from cpl_core.environment import ApplicationEnvironment
+            
-                
+            class Startup(StartupABC):
-                
+            
-                class Startup(StartupABC):
+                def __init__(self):
-                
+                    StartupABC.__init__(self)
-                    def __init__(self):
+            
-                        StartupABC.__init__(self)
+                def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
-                
+                    return configuration
-                    async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+            
-                        return configuration
+                def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
-                
+                    return services.build_service_provider()
-                    async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+        """)
-                        return services.build_service_provider()
-            """)
-        else:
-            self._value = textwrap.dedent("""\
-                from cpl_core.application import StartupABC
-                from cpl_core.configuration import ConfigurationABC
-                from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
-                from cpl_core.environment import ApplicationEnvironment
-                
-                
-                class Startup(StartupABC):
-                
-                    def __init__(self):
-                        StartupABC.__init__(self)
-                
-                    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
-                        return configuration
-                
-                    def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
-                        return services.build_service_provider()
-            """)
 
     @property
     def name(self) -> str:

src/cpl_cli/_templates/new/library/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 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='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/command/new_service.py

@@ -46,7 +46,6 @@ class NewService(CommandABC):
         self._use_application_api: bool = False
         self._use_startup: bool = False
         self._use_service_providing: bool = False
-        self._use_async: bool = False
 
     @property
     def help_message(self) -> str:
@@ -178,10 +177,6 @@ class NewService(CommandABC):
             result = Console.read('Do you want to use service providing? (y/n) ')
             if result.lower() == 'y':
                 self._use_service_providing = True
-                
-        result = Console.read('Do you want to use async? (y/n) ')
-        if result.lower() == 'y':
-            self._use_async = True
 
         Console.set_foreground_color(ForegroundColorEnum.default)
 
@@ -207,7 +202,6 @@ class NewService(CommandABC):
                 self._use_application_api,
                 self._use_startup,
                 self._use_service_providing,
-                self._use_async,
                 self._project.name,
                 self._project_json,
                 self._workspace
@@ -237,7 +231,6 @@ class NewService(CommandABC):
                 self._use_application_api,
                 self._use_startup,
                 self._use_service_providing,
-                self._use_async,
                 self._project.name,
                 self._project_json,
                 self._workspace

src/cpl_cli/command/version_service.py

@@ -52,11 +52,7 @@ class VersionService(CommandABC):
         ]
         packages = []
         for modname in cpl_packages:
-            module = pkgutil.find_loader(modname)
+            module = pkgutil.find_loader(modname).load_module(modname)
-            if module is None:
-                break
-            
-            module = module.load_module(modname)
             if '__version__' in dir(module):
                 packages.append([f'{modname}', module.__version__])
 

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/cpl_cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "3"
+      "Micro": "2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "sh_cpl-core>=2021.10.2"
+      "sh_cpl-core>=2021.10.0.post1"
     ],
     "PythonVersion": ">=3.8",
     "PythonPath": {},

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.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

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.10.3'
+__version__ = '2021.10.2'
 
 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='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/source_creator/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.source_creator'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.3'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='3')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_cli/source_creator/console_builder.py

@@ -59,14 +59,13 @@ class ConsoleBuilder:
 
     @classmethod
     def build(cls, project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
-              use_async: bool, project_name: str, project_settings: dict, workspace: Optional[WorkspaceSettings]):
+              project_name: str, project_settings: dict, workspace: Optional[WorkspaceSettings]):
         """
         Builds the console project files
         :param project_path:
         :param use_application_api:
         :param use_startup:
         :param use_service_providing:
-        :param use_async:
         :param project_name:
         :param project_settings:
         :param workspace:
@@ -80,8 +79,7 @@ class ConsoleBuilder:
                 ReadmeTemplate(),
                 TestsInitTemplate(),
                 AppsettingsTemplate(),
-                MainInitTemplate(project_name, os.path.join(
+                MainInitTemplate(project_name, os.path.join('src/', project_name_snake))
-                    'src/', project_name_snake))
             ]
         else:
             project_path = os.path.join(
@@ -105,22 +103,18 @@ class ConsoleBuilder:
             src_rel_path = os.path.join('src/', src_name)
 
         if use_application_api:
-            templates.append(ApplicationTemplate(src_name, src_rel_path, use_async))
+            templates.append(ApplicationTemplate(src_name, src_rel_path))
 
             if use_startup:
-                templates.append(StartupTemplate(src_name, src_rel_path, use_async))
+                templates.append(StartupTemplate(src_name, src_rel_path))
-                templates.append(MainWithApplicationHostAndStartupTemplate(
+                templates.append(MainWithApplicationHostAndStartupTemplate(src_name, src_rel_path))
-                    src_name, src_rel_path, use_async))
             else:
-                templates.append(MainWithApplicationBaseTemplate(
+                templates.append(MainWithApplicationBaseTemplate(src_name, src_rel_path))
-                    src_name, src_rel_path, use_async))
         else:
             if use_service_providing:
-                templates.append(MainWithDependencyInjection(
+                templates.append(MainWithDependencyInjection(src_name, src_rel_path))
-                    src_name, src_rel_path, use_async))
             else:
-                templates.append(MainWithoutApplicationBaseTemplate(
+                templates.append(MainWithoutApplicationBaseTemplate(src_name, src_rel_path))
-                    src_name, src_rel_path, use_async))
 
         proj_name = project_name
         if workspace is not None:
@@ -138,8 +132,7 @@ class ConsoleBuilder:
 
         else:
             workspace.projects[project_name] = f'src/{project_file_path}'
-            cls._create_workspace('cpl-workspace.json',
+            cls._create_workspace('cpl-workspace.json', workspace.default_project, workspace.projects)
-                                  workspace.default_project, workspace.projects)
 
         Console.spinner(
             f'Creating {project_file_path}',

src/cpl_cli/source_creator/library_builder.py

@@ -59,7 +59,7 @@ class LibraryBuilder:
 
     @classmethod
     def build(cls, project_path: str, use_application_api: bool, use_startup: bool,
-              use_async: bool, use_service_providing: bool, project_name: str, project_settings: dict,
+              use_service_providing: bool, project_name: str, project_settings: dict,
               workspace: Optional[WorkspaceSettings]):
         """
         Builds the library project files
@@ -67,7 +67,6 @@ class LibraryBuilder:
         :param use_application_api:
         :param use_startup:
         :param use_service_providing:
-        :param use_async:
         :param project_name:
         :param project_settings:
         :param workspace:
@@ -80,8 +79,7 @@ class LibraryBuilder:
                 LicenseTemplate(),
                 ReadmeTemplate(),
                 TestsInitTemplate(),
-                NameInitTemplate(project_name, os.path.join(
+                NameInitTemplate(project_name, os.path.join('src/', project_name_snake)),
-                    'src/', project_name_snake)),
                 AppsettingsTemplate()
             ]
         else:
@@ -110,18 +108,14 @@ class LibraryBuilder:
 
             if use_startup:
                 templates.append(StartupTemplate(src_name, src_rel_path))
-                templates.append(MainWithApplicationHostAndStartupTemplate(
+                templates.append(MainWithApplicationHostAndStartupTemplate(src_name, src_rel_path))
-                    src_name, src_rel_path))
             else:
-                templates.append(MainWithApplicationBaseTemplate(
+                templates.append(MainWithApplicationBaseTemplate(src_name, src_rel_path))
-                    src_name, src_rel_path))
         else:
             if use_service_providing:
-                templates.append(MainWithDependencyInjection(
+                templates.append(MainWithDependencyInjection(src_name, src_rel_path))
-                    src_name, src_rel_path))
             else:
-                templates.append(MainWithoutApplicationBaseTemplate(
+                templates.append(MainWithoutApplicationBaseTemplate(src_name, src_rel_path))
-                    src_name, src_rel_path))
 
         proj_name = project_name
         if workspace is not None:
@@ -139,8 +133,7 @@ class LibraryBuilder:
 
         else:
             workspace.projects[project_name] = f'src/{project_file_path}'
-            cls._create_workspace('cpl-workspace.json',
+            cls._create_workspace('cpl-workspace.json', workspace.default_project, workspace.projects)
-                                  workspace.default_project, workspace.projects)
 
         Console.spinner(
             f'Creating {project_file_path}',

src/cpl_core/application/application_abc.py

@@ -35,6 +35,17 @@ class ApplicationABC(ABC):
         except KeyboardInterrupt:
             Console.close()
     
+    def run(self):
+        r"""Entry point
+
+        Called by custom Application.main
+        """
+        try:
+            self.configure()
+            self.main()
+        except KeyboardInterrupt:
+            Console.close()
+    
     async def run_async(self):
         r"""Entry point