From 8fb570468c88b36d8dff7e18be1875ab3948f813 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 19 May 2021 08:28:59 +0200 Subject: [PATCH] More bugfixes & added generated test projects --- src/cpl_cli/__init__.py | 4 ++-- src/cpl_cli/_templates/__init__.py | 4 ++-- src/cpl_cli/_templates/build/__init__.py | 4 ++-- src/cpl_cli/_templates/generate/__init__.py | 4 ++-- src/cpl_cli/_templates/new/__init__.py | 4 ++-- src/cpl_cli/_templates/new/console/__init__.py | 4 ++-- .../_templates/new/console/source/__init__.py | 4 ++-- .../new/console/source/name/__init__.py | 4 ++-- .../new/console/source/tests/__init__.py | 4 ++-- src/cpl_cli/_templates/new/library/__init__.py | 4 ++-- .../_templates/new/library/source/__init__.py | 4 ++-- .../new/library/source/name/__init__.py | 4 ++-- .../new/library/source/tests/__init__.py | 4 ++-- src/cpl_cli/_templates/publish/__init__.py | 4 ++-- src/cpl_cli/command/__init__.py | 4 ++-- src/cpl_cli/configuration/__init__.py | 4 ++-- src/cpl_cli/cpl_cli.json | 2 +- src/cpl_cli/live_server/__init__.py | 4 ++-- src/cpl_cli/publish/__init__.py | 4 ++-- src/cpl_cli/source_creator/__init__.py | 4 ++-- src/cpl_cli/source_creator/console_builder.py | 2 +- src/cpl_cli/source_creator/library_builder.py | 2 +- src/tests/generated/simple-app/appsettings.json | 15 +++++++++++++++ src/tests/generated/simple-app/cpl-workspace.json | 8 ++++++++ .../src/simple_app}/__init__.py | 0 .../src/{ => simple_app}/application.py | 0 .../simple-app/src/{ => simple_app}/main.py | 2 +- .../{cpl.json => src/simple_app/simple-app.json} | 11 ++++++----- .../generated/simple-console/appsettings.json | 15 +++++++++++++++ .../generated/simple-console/cpl-workspace.json | 8 ++++++++ .../simple-console/src/simple_console/__init__.py | 1 + .../src/{ => simple_console}/main.py | 0 .../simple_console/simple-console.json} | 11 ++++++----- src/tests/generated/simple-di/appsettings.json | 15 +++++++++++++++ src/tests/generated/simple-di/cpl-workspace.json | 8 ++++++++ .../generated/simple-di/src/simple_di/__init__.py | 1 + .../simple-di/src/{ => simple_di}/main.py | 0 .../{cpl.json => src/simple_di/simple-di.json} | 11 ++++++----- .../{startup-app => simple-startup-app}/LICENSE | 0 .../{startup-app => simple-startup-app}/README.md | 0 .../generated/simple-startup-app/appsettings.json | 15 +++++++++++++++ .../simple-startup-app/cpl-workspace.json | 8 ++++++++ .../src/simple_startup_app/__init__.py | 1 + .../src/simple_startup_app}/application.py | 0 .../src/simple_startup_app}/main.py | 4 ++-- .../simple_startup_app/simple-startup-app.json} | 15 ++++++++------- .../src/simple_startup_app}/startup.py | 1 - .../simple-startup-app/src/tests/__init__.py | 1 + 48 files changed, 166 insertions(+), 67 deletions(-) create mode 100644 src/tests/generated/simple-app/appsettings.json create mode 100644 src/tests/generated/simple-app/cpl-workspace.json rename src/tests/generated/{startup-app/src/tests => simple-app/src/simple_app}/__init__.py (100%) rename src/tests/generated/simple-app/src/{ => simple_app}/application.py (100%) rename src/tests/generated/simple-app/src/{ => simple_app}/main.py (79%) rename src/tests/generated/simple-app/{cpl.json => src/simple_app/simple-app.json} (80%) create mode 100644 src/tests/generated/simple-console/appsettings.json create mode 100644 src/tests/generated/simple-console/cpl-workspace.json create mode 100644 src/tests/generated/simple-console/src/simple_console/__init__.py rename src/tests/generated/simple-console/src/{ => simple_console}/main.py (100%) rename src/tests/generated/simple-console/{cpl.json => src/simple_console/simple-console.json} (80%) create mode 100644 src/tests/generated/simple-di/appsettings.json create mode 100644 src/tests/generated/simple-di/cpl-workspace.json create mode 100644 src/tests/generated/simple-di/src/simple_di/__init__.py rename src/tests/generated/simple-di/src/{ => simple_di}/main.py (100%) rename src/tests/generated/simple-di/{cpl.json => src/simple_di/simple-di.json} (81%) rename src/tests/generated/{startup-app => simple-startup-app}/LICENSE (100%) rename src/tests/generated/{startup-app => simple-startup-app}/README.md (100%) create mode 100644 src/tests/generated/simple-startup-app/appsettings.json create mode 100644 src/tests/generated/simple-startup-app/cpl-workspace.json create mode 100644 src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py rename src/tests/generated/{startup-app/src => simple-startup-app/src/simple_startup_app}/application.py (100%) rename src/tests/generated/{startup-app/src => simple-startup-app/src/simple_startup_app}/main.py (68%) rename src/tests/generated/{startup-app/cpl.json => simple-startup-app/src/simple_startup_app/simple-startup-app.json} (72%) rename src/tests/generated/{startup-app/src => simple-startup-app/src/simple_startup_app}/startup.py (99%) create mode 100644 src/tests/generated/simple-startup-app/src/tests/__init__.py diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py index 6cdb0192..9ff8ff1a 100644 --- a/src/cpl_cli/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' 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='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py index 09f4ecfc..ac7712dd 100644 --- a/src/cpl_cli/_templates/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py index 28674a0d..493381ca 100644 --- a/src/cpl_cli/_templates/build/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/generate/__init__.py b/src/cpl_cli/_templates/generate/__init__.py index 8f548906..ec5dcd0c 100644 --- a/src/cpl_cli/_templates/generate/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/__init__.py b/src/cpl_cli/_templates/new/__init__.py index f512a54e..a7f12465 100644 --- a/src/cpl_cli/_templates/new/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/console/__init__.py b/src/cpl_cli/_templates/new/console/__init__.py index 325e5ebe..6ecb85de 100644 --- a/src/cpl_cli/_templates/new/console/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/console/source/__init__.py b/src/cpl_cli/_templates/new/console/source/__init__.py index bf2d5d1b..5e23d3ee 100644 --- a/src/cpl_cli/_templates/new/console/source/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/console/source/name/__init__.py b/src/cpl_cli/_templates/new/console/source/name/__init__.py index 02b1db7c..7446dbb9 100644 --- a/src/cpl_cli/_templates/new/console/source/name/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/console/source/tests/__init__.py b/src/cpl_cli/_templates/new/console/source/tests/__init__.py index 996b843f..277948ad 100644 --- a/src/cpl_cli/_templates/new/console/source/tests/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/library/__init__.py b/src/cpl_cli/_templates/new/library/__init__.py index 6a476d57..ec041ecc 100644 --- a/src/cpl_cli/_templates/new/library/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/library/source/__init__.py b/src/cpl_cli/_templates/new/library/source/__init__.py index 7caa1dbe..0f10e480 100644 --- a/src/cpl_cli/_templates/new/library/source/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/library/source/name/__init__.py b/src/cpl_cli/_templates/new/library/source/name/__init__.py index 5fe05779..843ea58b 100644 --- a/src/cpl_cli/_templates/new/library/source/name/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/new/library/source/tests/__init__.py b/src/cpl_cli/_templates/new/library/source/tests/__init__.py index 3a4ecabf..3558e1fb 100644 --- a/src/cpl_cli/_templates/new/library/source/tests/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py index 2990ba5b..fd07f969 100644 --- a/src/cpl_cli/_templates/publish/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py index f4c42539..b2625a2f 100644 --- a/src/cpl_cli/command/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' 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='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py index 6e9ba8b5..e6d294cf 100644 --- a/src/cpl_cli/configuration/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' 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='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/cpl_cli.json b/src/cpl_cli/cpl_cli.json index 0df13eaf..57376a16 100644 --- a/src/cpl_cli/cpl_cli.json +++ b/src/cpl_cli/cpl_cli.json @@ -4,7 +4,7 @@ "Version": { "Major": "2021", "Minor": "4", - "Micro": "1.rc2" + "Micro": "1.rc4" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py index 963d8f11..8b163895 100644 --- a/src/cpl_cli/live_server/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py index 2be3a6ef..ecce2f74 100644 --- a/src/cpl_cli/publish/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' 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='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py index 755d0ec7..3b120587 100644 --- a/src/cpl_cli/source_creator/__init__.py +++ b/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.4.1rc2' +__version__ = '2021.4.1rc4' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='4', micro='1.rc2') +version_info = VersionInfo(major='2021', minor='4', micro='1.rc4') diff --git a/src/cpl_cli/source_creator/console_builder.py b/src/cpl_cli/source_creator/console_builder.py index 4633d821..2e321b37 100644 --- a/src/cpl_cli/source_creator/console_builder.py +++ b/src/cpl_cli/source_creator/console_builder.py @@ -78,7 +78,7 @@ class ConsoleBuilder: ReadmeTemplate(), TestsInitTemplate(), AppsettingsTemplate(), - MainInitTemplate(project_name, 'src') + MainInitTemplate(project_name, os.path.join('src/', project_name_snake)) ] else: project_path = os.path.join( diff --git a/src/cpl_cli/source_creator/library_builder.py b/src/cpl_cli/source_creator/library_builder.py index 475bcfaf..2f410dcb 100644 --- a/src/cpl_cli/source_creator/library_builder.py +++ b/src/cpl_cli/source_creator/library_builder.py @@ -78,7 +78,7 @@ class LibraryBuilder: LicenseTemplate(), ReadmeTemplate(), TestsInitTemplate(), - NameInitTemplate(project_name, 'src/'), + NameInitTemplate(project_name, os.path.join('src/', project_name_snake)), AppsettingsTemplate() ] else: diff --git a/src/tests/generated/simple-app/appsettings.json b/src/tests/generated/simple-app/appsettings.json new file mode 100644 index 00000000..629e6ebd --- /dev/null +++ b/src/tests/generated/simple-app/appsettings.json @@ -0,0 +1,15 @@ +{ + "TimeFormatSettings": { + "DateFormat": "%Y-%m-%d", + "TimeFormat": "%H:%M:%S", + "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", + "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" + }, + + "LoggingSettings": { + "Path": "logs/", + "Filename": "log_$start_time.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "WARN" + } +} diff --git a/src/tests/generated/simple-app/cpl-workspace.json b/src/tests/generated/simple-app/cpl-workspace.json new file mode 100644 index 00000000..0ed056c2 --- /dev/null +++ b/src/tests/generated/simple-app/cpl-workspace.json @@ -0,0 +1,8 @@ +{ + "WorkspaceSettings": { + "DefaultProject": "simple-app", + "Projects": { + "simple-app": "src/simple_app/simple-app.json" + } + } +} \ No newline at end of file diff --git a/src/tests/generated/startup-app/src/tests/__init__.py b/src/tests/generated/simple-app/src/simple_app/__init__.py similarity index 100% rename from src/tests/generated/startup-app/src/tests/__init__.py rename to src/tests/generated/simple-app/src/simple_app/__init__.py diff --git a/src/tests/generated/simple-app/src/application.py b/src/tests/generated/simple-app/src/simple_app/application.py similarity index 100% rename from src/tests/generated/simple-app/src/application.py rename to src/tests/generated/simple-app/src/simple_app/application.py diff --git a/src/tests/generated/simple-app/src/main.py b/src/tests/generated/simple-app/src/simple_app/main.py similarity index 79% rename from src/tests/generated/simple-app/src/main.py rename to src/tests/generated/simple-app/src/simple_app/main.py index 3d3e7eba..c5d29314 100644 --- a/src/tests/generated/simple-app/src/main.py +++ b/src/tests/generated/simple-app/src/simple_app/main.py @@ -1,6 +1,6 @@ from cpl.application import ApplicationBuilder -from application import Application +from simple_app.application import Application def main(): diff --git a/src/tests/generated/simple-app/cpl.json b/src/tests/generated/simple-app/src/simple_app/simple-app.json similarity index 80% rename from src/tests/generated/simple-app/cpl.json rename to src/tests/generated/simple-app/src/simple_app/simple-app.json index f223da45..5375d662 100644 --- a/src/tests/generated/simple-app/cpl.json +++ b/src/tests/generated/simple-app/src/simple_app/simple-app.json @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "sh_cpl==2021.4.2" + "sh_cpl==2021.4.1rc2" ], "PythonVersion": ">=3.9.2", "PythonPath": { @@ -26,9 +26,9 @@ }, "BuildSettings": { "ProjectType": "console", - "SourcePath": "src", - "OutputPath": "dist", - "Main": "main", + "SourcePath": "", + "OutputPath": "../../dist", + "Main": "simple_app.main", "EntryPoint": "simple-app", "IncludePackageData": false, "Included": [], @@ -37,6 +37,7 @@ "*/logs", "*/tests" ], - "PackageData": {} + "PackageData": {}, + "ProjectReferences": [] } } \ No newline at end of file diff --git a/src/tests/generated/simple-console/appsettings.json b/src/tests/generated/simple-console/appsettings.json new file mode 100644 index 00000000..629e6ebd --- /dev/null +++ b/src/tests/generated/simple-console/appsettings.json @@ -0,0 +1,15 @@ +{ + "TimeFormatSettings": { + "DateFormat": "%Y-%m-%d", + "TimeFormat": "%H:%M:%S", + "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", + "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" + }, + + "LoggingSettings": { + "Path": "logs/", + "Filename": "log_$start_time.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "WARN" + } +} diff --git a/src/tests/generated/simple-console/cpl-workspace.json b/src/tests/generated/simple-console/cpl-workspace.json new file mode 100644 index 00000000..449bc77d --- /dev/null +++ b/src/tests/generated/simple-console/cpl-workspace.json @@ -0,0 +1,8 @@ +{ + "WorkspaceSettings": { + "DefaultProject": "simple-console", + "Projects": { + "simple-console": "src/simple_console/simple-console.json" + } + } +} \ No newline at end of file diff --git a/src/tests/generated/simple-console/src/simple_console/__init__.py b/src/tests/generated/simple-console/src/simple_console/__init__.py new file mode 100644 index 00000000..ad5eca30 --- /dev/null +++ b/src/tests/generated/simple-console/src/simple_console/__init__.py @@ -0,0 +1 @@ +# imports: diff --git a/src/tests/generated/simple-console/src/main.py b/src/tests/generated/simple-console/src/simple_console/main.py similarity index 100% rename from src/tests/generated/simple-console/src/main.py rename to src/tests/generated/simple-console/src/simple_console/main.py diff --git a/src/tests/generated/simple-console/cpl.json b/src/tests/generated/simple-console/src/simple_console/simple-console.json similarity index 80% rename from src/tests/generated/simple-console/cpl.json rename to src/tests/generated/simple-console/src/simple_console/simple-console.json index 63fe1a4d..e05e9201 100644 --- a/src/tests/generated/simple-console/cpl.json +++ b/src/tests/generated/simple-console/src/simple_console/simple-console.json @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "sh_cpl==2021.4.2" + "sh_cpl==2021.4.1rc2" ], "PythonVersion": ">=3.9.2", "PythonPath": { @@ -26,9 +26,9 @@ }, "BuildSettings": { "ProjectType": "console", - "SourcePath": "src", - "OutputPath": "dist", - "Main": "main", + "SourcePath": "", + "OutputPath": "../../dist", + "Main": "simple_console.main", "EntryPoint": "simple-console", "IncludePackageData": false, "Included": [], @@ -37,6 +37,7 @@ "*/logs", "*/tests" ], - "PackageData": {} + "PackageData": {}, + "ProjectReferences": [] } } \ No newline at end of file diff --git a/src/tests/generated/simple-di/appsettings.json b/src/tests/generated/simple-di/appsettings.json new file mode 100644 index 00000000..629e6ebd --- /dev/null +++ b/src/tests/generated/simple-di/appsettings.json @@ -0,0 +1,15 @@ +{ + "TimeFormatSettings": { + "DateFormat": "%Y-%m-%d", + "TimeFormat": "%H:%M:%S", + "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", + "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" + }, + + "LoggingSettings": { + "Path": "logs/", + "Filename": "log_$start_time.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "WARN" + } +} diff --git a/src/tests/generated/simple-di/cpl-workspace.json b/src/tests/generated/simple-di/cpl-workspace.json new file mode 100644 index 00000000..269f9340 --- /dev/null +++ b/src/tests/generated/simple-di/cpl-workspace.json @@ -0,0 +1,8 @@ +{ + "WorkspaceSettings": { + "DefaultProject": "simple-di", + "Projects": { + "simple-di": "src/simple_di/simple-di.json" + } + } +} \ No newline at end of file diff --git a/src/tests/generated/simple-di/src/simple_di/__init__.py b/src/tests/generated/simple-di/src/simple_di/__init__.py new file mode 100644 index 00000000..ad5eca30 --- /dev/null +++ b/src/tests/generated/simple-di/src/simple_di/__init__.py @@ -0,0 +1 @@ +# imports: diff --git a/src/tests/generated/simple-di/src/main.py b/src/tests/generated/simple-di/src/simple_di/main.py similarity index 100% rename from src/tests/generated/simple-di/src/main.py rename to src/tests/generated/simple-di/src/simple_di/main.py diff --git a/src/tests/generated/simple-di/cpl.json b/src/tests/generated/simple-di/src/simple_di/simple-di.json similarity index 81% rename from src/tests/generated/simple-di/cpl.json rename to src/tests/generated/simple-di/src/simple_di/simple-di.json index 8804958a..b5591ebf 100644 --- a/src/tests/generated/simple-di/cpl.json +++ b/src/tests/generated/simple-di/src/simple_di/simple-di.json @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "sh_cpl==2021.4.2.dev1" + "sh_cpl==2021.4.1rc2" ], "PythonVersion": ">=3.9.2", "PythonPath": { @@ -26,9 +26,9 @@ }, "BuildSettings": { "ProjectType": "console", - "SourcePath": "src", - "OutputPath": "dist", - "Main": "main", + "SourcePath": "", + "OutputPath": "../../dist", + "Main": "simple_di.main", "EntryPoint": "simple-di", "IncludePackageData": false, "Included": [], @@ -37,6 +37,7 @@ "*/logs", "*/tests" ], - "PackageData": {} + "PackageData": {}, + "ProjectReferences": [] } } \ No newline at end of file diff --git a/src/tests/generated/startup-app/LICENSE b/src/tests/generated/simple-startup-app/LICENSE similarity index 100% rename from src/tests/generated/startup-app/LICENSE rename to src/tests/generated/simple-startup-app/LICENSE diff --git a/src/tests/generated/startup-app/README.md b/src/tests/generated/simple-startup-app/README.md similarity index 100% rename from src/tests/generated/startup-app/README.md rename to src/tests/generated/simple-startup-app/README.md diff --git a/src/tests/generated/simple-startup-app/appsettings.json b/src/tests/generated/simple-startup-app/appsettings.json new file mode 100644 index 00000000..629e6ebd --- /dev/null +++ b/src/tests/generated/simple-startup-app/appsettings.json @@ -0,0 +1,15 @@ +{ + "TimeFormatSettings": { + "DateFormat": "%Y-%m-%d", + "TimeFormat": "%H:%M:%S", + "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", + "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" + }, + + "LoggingSettings": { + "Path": "logs/", + "Filename": "log_$start_time.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "WARN" + } +} diff --git a/src/tests/generated/simple-startup-app/cpl-workspace.json b/src/tests/generated/simple-startup-app/cpl-workspace.json new file mode 100644 index 00000000..9fe5c55c --- /dev/null +++ b/src/tests/generated/simple-startup-app/cpl-workspace.json @@ -0,0 +1,8 @@ +{ + "WorkspaceSettings": { + "DefaultProject": "simple-startup-app", + "Projects": { + "simple-startup-app": "src/simple_startup_app/simple-startup-app.json" + } + } +} \ No newline at end of file diff --git a/src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py new file mode 100644 index 00000000..ad5eca30 --- /dev/null +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py @@ -0,0 +1 @@ +# imports: diff --git a/src/tests/generated/startup-app/src/application.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/application.py similarity index 100% rename from src/tests/generated/startup-app/src/application.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/application.py diff --git a/src/tests/generated/startup-app/src/main.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py similarity index 68% rename from src/tests/generated/startup-app/src/main.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/main.py index 6e678925..4bbb4aed 100644 --- a/src/tests/generated/startup-app/src/main.py +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py @@ -1,7 +1,7 @@ from cpl.application import ApplicationBuilder -from application import Application -from startup import Startup +from simple_startup_app.application import Application +from simple_startup_app.startup import Startup def main(): diff --git a/src/tests/generated/startup-app/cpl.json b/src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json similarity index 72% rename from src/tests/generated/startup-app/cpl.json rename to src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json index 086c70ae..6c036f08 100644 --- a/src/tests/generated/startup-app/cpl.json +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json @@ -1,6 +1,6 @@ { "ProjectSettings": { - "Name": "startup-app", + "Name": "simple-startup-app", "Version": { "Major": "0", "Minor": "0", @@ -16,7 +16,7 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "sh_cpl==2021.4.2" + "sh_cpl==2021.4.1rc2" ], "PythonVersion": ">=3.9.2", "PythonPath": { @@ -26,10 +26,10 @@ }, "BuildSettings": { "ProjectType": "console", - "SourcePath": "src", - "OutputPath": "dist", - "Main": "main", - "EntryPoint": "startup-app", + "SourcePath": "", + "OutputPath": "../../dist", + "Main": "simple_startup_app.main", + "EntryPoint": "simple-startup-app", "IncludePackageData": false, "Included": [], "Excluded": [ @@ -37,6 +37,7 @@ "*/logs", "*/tests" ], - "PackageData": {} + "PackageData": {}, + "ProjectReferences": [] } } \ No newline at end of file diff --git a/src/tests/generated/startup-app/src/startup.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py similarity index 99% rename from src/tests/generated/startup-app/src/startup.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py index 07f5dece..8988cf31 100644 --- a/src/tests/generated/startup-app/src/startup.py +++ b/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py @@ -17,4 +17,3 @@ class Startup(StartupABC): def configure_services(self) -> ServiceProviderABC: return self._services.build_service_provider() - diff --git a/src/tests/generated/simple-startup-app/src/tests/__init__.py b/src/tests/generated/simple-startup-app/src/tests/__init__.py new file mode 100644 index 00000000..ad5eca30 --- /dev/null +++ b/src/tests/generated/simple-startup-app/src/tests/__init__.py @@ -0,0 +1 @@ +# imports: