More bugfixes & added generated test projects

This commit is contained in:
Sven Heidemann 2021-05-19 08:28:59 +02:00
parent 128fda60b0
commit 8fb570468c
48 changed files with 166 additions and 67 deletions

View File

@ -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')

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.build'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.generate'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.publish'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -4,7 +4,7 @@
"Version": {
"Major": "2021",
"Minor": "4",
"Micro": "1.rc2"
"Micro": "1.rc4"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@ -15,11 +15,11 @@ __title__ = 'cpl_cli.live_server'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.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')

View File

@ -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')

View File

@ -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(

View File

@ -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:

View File

@ -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"
}
}

View File

@ -0,0 +1,8 @@
{
"WorkspaceSettings": {
"DefaultProject": "simple-app",
"Projects": {
"simple-app": "src/simple_app/simple-app.json"
}
}
}

View File

@ -1,6 +1,6 @@
from cpl.application import ApplicationBuilder
from application import Application
from simple_app.application import Application
def main():

View File

@ -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": []
}
}

View File

@ -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"
}
}

View File

@ -0,0 +1,8 @@
{
"WorkspaceSettings": {
"DefaultProject": "simple-console",
"Projects": {
"simple-console": "src/simple_console/simple-console.json"
}
}
}

View File

@ -0,0 +1 @@
# imports:

View File

@ -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": []
}
}

View File

@ -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"
}
}

View File

@ -0,0 +1,8 @@
{
"WorkspaceSettings": {
"DefaultProject": "simple-di",
"Projects": {
"simple-di": "src/simple_di/simple-di.json"
}
}
}

View File

@ -0,0 +1 @@
# imports:

View File

@ -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": []
}
}

View File

@ -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"
}
}

View File

@ -0,0 +1,8 @@
{
"WorkspaceSettings": {
"DefaultProject": "simple-startup-app",
"Projects": {
"simple-startup-app": "src/simple_startup_app/simple-startup-app.json"
}
}
}

View File

@ -0,0 +1 @@
# imports:

View File

@ -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():

View File

@ -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": []
}
}

View File

@ -17,4 +17,3 @@ class Startup(StartupABC):
def configure_services(self) -> ServiceProviderABC:
return self._services.build_service_provider()

View File

@ -0,0 +1 @@
# imports: