2021.4.6 #25
@ -93,12 +93,12 @@ class NewService(CommandABC):
|
|||||||
def _create_build_settings(self):
|
def _create_build_settings(self):
|
||||||
main = f'{String.convert_to_snake_case(self._project.name)}.main'
|
main = f'{String.convert_to_snake_case(self._project.name)}.main'
|
||||||
if self._command == ProjectTypeEnum.library.value:
|
if self._command == ProjectTypeEnum.library.value:
|
||||||
main = f'{String.convert_to_snake_case(self._project.name)}_cli.main'
|
main = f'{String.convert_to_snake_case(self._project.name)}.main'
|
||||||
|
|
||||||
self._build_dict = {
|
self._build_dict = {
|
||||||
BuildSettingsNameEnum.project_type.value: self._command,
|
BuildSettingsNameEnum.project_type.value: self._command,
|
||||||
BuildSettingsNameEnum.source_path.value: 'src',
|
BuildSettingsNameEnum.source_path.value: '',
|
||||||
BuildSettingsNameEnum.output_path.value: 'dist',
|
BuildSettingsNameEnum.output_path.value: '../../dist',
|
||||||
BuildSettingsNameEnum.main.value: main,
|
BuildSettingsNameEnum.main.value: main,
|
||||||
BuildSettingsNameEnum.entry_point.value: self._project.name,
|
BuildSettingsNameEnum.entry_point.value: self._project.name,
|
||||||
BuildSettingsNameEnum.include_package_data.value: False,
|
BuildSettingsNameEnum.include_package_data.value: False,
|
||||||
|
@ -26,6 +26,8 @@ from .project_settings import ProjectSettings
|
|||||||
from .project_settings_name_enum import ProjectSettingsNameEnum
|
from .project_settings_name_enum import ProjectSettingsNameEnum
|
||||||
from .version_settings import VersionSettings
|
from .version_settings import VersionSettings
|
||||||
from .version_settings_name_enum import VersionSettingsNameEnum
|
from .version_settings_name_enum import VersionSettingsNameEnum
|
||||||
|
from .workspace_settings import WorkspaceSettings
|
||||||
|
from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
|
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
|
||||||
version_info = VersionInfo(major='2021', minor='4', micro='None')
|
version_info = VersionInfo(major='2021', minor='4', micro='None')
|
||||||
|
@ -2,6 +2,9 @@ import json
|
|||||||
import os
|
import os
|
||||||
from cpl.console.foreground_color_enum import ForegroundColorEnum
|
from cpl.console.foreground_color_enum import ForegroundColorEnum
|
||||||
from cpl.console.console import Console
|
from cpl.console.console import Console
|
||||||
|
from cpl.utils.string import String
|
||||||
|
from cpl_cli.configuration.workspace_settings import WorkspaceSettings
|
||||||
|
from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum
|
||||||
from cpl_cli.source_creator.template_builder import TemplateBuilder
|
from cpl_cli.source_creator.template_builder import TemplateBuilder
|
||||||
from cpl_cli.templates.new.console.appsettings_json import AppsettingsTemplate
|
from cpl_cli.templates.new.console.appsettings_json import AppsettingsTemplate
|
||||||
from cpl_cli.templates.new.console.license import LicenseTemplate
|
from cpl_cli.templates.new.console.license import LicenseTemplate
|
||||||
@ -21,7 +24,17 @@ class ConsoleBuilder:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def build(project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
|
def _create_file(file_name: str, content: dict):
|
||||||
|
path = os.path.dirname(file_name)
|
||||||
|
if not os.path.isdir(path):
|
||||||
|
os.makedirs(path)
|
||||||
|
|
||||||
|
with open(file_name, 'w') as project_json:
|
||||||
|
project_json.write(json.dumps(content, indent=2))
|
||||||
|
project_json.close()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def build(cls, project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
|
||||||
project_name: str, project_settings: dict):
|
project_name: str, project_settings: dict):
|
||||||
"""
|
"""
|
||||||
Builds the console project files
|
Builds the console project files
|
||||||
@ -36,10 +49,6 @@ class ConsoleBuilder:
|
|||||||
if not os.path.isdir(project_path):
|
if not os.path.isdir(project_path):
|
||||||
os.makedirs(project_path)
|
os.makedirs(project_path)
|
||||||
|
|
||||||
with open(os.path.join(project_path, 'cpl.json'), 'w') as project_json:
|
|
||||||
project_json.write(json.dumps(project_settings, indent=2))
|
|
||||||
project_json.close()
|
|
||||||
|
|
||||||
templates: list[TemplateFileABC] = [
|
templates: list[TemplateFileABC] = [
|
||||||
LicenseTemplate(),
|
LicenseTemplate(),
|
||||||
ReadmeTemplate(),
|
ReadmeTemplate(),
|
||||||
@ -62,6 +71,32 @@ class ConsoleBuilder:
|
|||||||
else:
|
else:
|
||||||
templates.append(MainWithoutApplicationBaseTemplate(project_name))
|
templates.append(MainWithoutApplicationBaseTemplate(project_name))
|
||||||
|
|
||||||
|
workspace_file_path = f'{project_name}/cpl-workspace.json'
|
||||||
|
project_file_rel_path = f'src/{String.convert_to_snake_case(project_name)}/{project_name}.json'
|
||||||
|
Console.spinner(
|
||||||
|
f'Creating {workspace_file_path}',
|
||||||
|
cls._create_file,
|
||||||
|
workspace_file_path,
|
||||||
|
{
|
||||||
|
WorkspaceSettingsNameEnum.default_project.value: project_name,
|
||||||
|
WorkspaceSettingsNameEnum.projects.value: {
|
||||||
|
project_name: project_file_rel_path
|
||||||
|
}
|
||||||
|
},
|
||||||
|
text_foreground_color=ForegroundColorEnum.green,
|
||||||
|
spinner_foreground_color=ForegroundColorEnum.cyan
|
||||||
|
)
|
||||||
|
|
||||||
|
project_file_path = f'{project_name}/{project_file_rel_path}'
|
||||||
|
Console.spinner(
|
||||||
|
f'Creating {project_file_path}',
|
||||||
|
cls._create_file,
|
||||||
|
project_file_path,
|
||||||
|
project_settings,
|
||||||
|
text_foreground_color=ForegroundColorEnum.green,
|
||||||
|
spinner_foreground_color=ForegroundColorEnum.cyan
|
||||||
|
)
|
||||||
|
|
||||||
for template in templates:
|
for template in templates:
|
||||||
Console.spinner(
|
Console.spinner(
|
||||||
f'Creating {project_name}/{template.path}{template.name}',
|
f'Creating {project_name}/{template.path}{template.name}',
|
||||||
|
@ -2,15 +2,17 @@ import json
|
|||||||
import os
|
import os
|
||||||
from cpl.console.foreground_color_enum import ForegroundColorEnum
|
from cpl.console.foreground_color_enum import ForegroundColorEnum
|
||||||
from cpl.console.console import Console
|
from cpl.console.console import Console
|
||||||
|
from cpl.utils.string import String
|
||||||
|
from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum
|
||||||
from cpl_cli.source_creator.template_builder import TemplateBuilder
|
from cpl_cli.source_creator.template_builder import TemplateBuilder
|
||||||
from cpl_cli.templates.new.library.appsettings_json import AppsettingsTemplate
|
from cpl_cli.templates.new.library.appsettings_json import AppsettingsTemplate
|
||||||
from cpl_cli.templates.new.library.license import LicenseTemplate
|
from cpl_cli.templates.new.library.license import LicenseTemplate
|
||||||
from cpl_cli.templates.new.library.readme_py import ReadmeTemplate
|
from cpl_cli.templates.new.library.readme_py import ReadmeTemplate
|
||||||
from cpl_cli.templates.new.library.src.cli.application import ApplicationTemplate
|
from cpl_cli.templates.new.library.src.name.application import ApplicationTemplate
|
||||||
from cpl_cli.templates.new.library.src.cli.init import CLIInitTemplate
|
from cpl_cli.templates.new.library.src.name.init import NameInitTemplate
|
||||||
from cpl_cli.templates.new.library.src.cli.main import MainWithApplicationHostAndStartupTemplate, \
|
from cpl_cli.templates.new.library.src.name.main import MainWithApplicationHostAndStartupTemplate, \
|
||||||
MainWithoutApplicationBaseTemplate, MainWithApplicationBaseTemplate, MainWithDependencyInjection
|
MainWithoutApplicationBaseTemplate, MainWithApplicationBaseTemplate, MainWithDependencyInjection
|
||||||
from cpl_cli.templates.new.library.src.cli.startup import StartupTemplate
|
from cpl_cli.templates.new.library.src.name.startup import StartupTemplate
|
||||||
from cpl_cli.templates.new.library.src.tests.init import TestsInitTemplate
|
from cpl_cli.templates.new.library.src.tests.init import TestsInitTemplate
|
||||||
from cpl_cli.templates.template_file_abc import TemplateFileABC
|
from cpl_cli.templates.template_file_abc import TemplateFileABC
|
||||||
|
|
||||||
@ -21,7 +23,17 @@ class LibraryBuilder:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def build(project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
|
def _create_file(file_name: str, content: dict):
|
||||||
|
path = os.path.dirname(file_name)
|
||||||
|
if not os.path.isdir(path):
|
||||||
|
os.makedirs(path)
|
||||||
|
|
||||||
|
with open(file_name, 'w') as project_json:
|
||||||
|
project_json.write(json.dumps(content, indent=2))
|
||||||
|
project_json.close()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def build(cls, project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
|
||||||
project_name: str, project_settings: dict):
|
project_name: str, project_settings: dict):
|
||||||
"""
|
"""
|
||||||
Builds the library project files
|
Builds the library project files
|
||||||
@ -36,15 +48,11 @@ class LibraryBuilder:
|
|||||||
if not os.path.isdir(project_path):
|
if not os.path.isdir(project_path):
|
||||||
os.makedirs(project_path)
|
os.makedirs(project_path)
|
||||||
|
|
||||||
with open(os.path.join(project_path, 'cpl.json'), 'w') as project_json:
|
|
||||||
project_json.write(json.dumps(project_settings, indent=2))
|
|
||||||
project_json.close()
|
|
||||||
|
|
||||||
templates: list[TemplateFileABC] = [
|
templates: list[TemplateFileABC] = [
|
||||||
LicenseTemplate(),
|
LicenseTemplate(),
|
||||||
ReadmeTemplate(),
|
ReadmeTemplate(),
|
||||||
TestsInitTemplate(),
|
TestsInitTemplate(),
|
||||||
CLIInitTemplate(project_name),
|
NameInitTemplate(project_name),
|
||||||
AppsettingsTemplate()
|
AppsettingsTemplate()
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -55,13 +63,39 @@ class LibraryBuilder:
|
|||||||
templates.append(StartupTemplate(project_name))
|
templates.append(StartupTemplate(project_name))
|
||||||
templates.append(MainWithApplicationHostAndStartupTemplate(project_name))
|
templates.append(MainWithApplicationHostAndStartupTemplate(project_name))
|
||||||
else:
|
else:
|
||||||
templates.append(MainWithApplicationBaseTemplate())
|
templates.append(MainWithApplicationBaseTemplate(project_name))
|
||||||
else:
|
else:
|
||||||
if use_service_providing:
|
if use_service_providing:
|
||||||
templates.append(MainWithDependencyInjection())
|
templates.append(MainWithDependencyInjection())
|
||||||
else:
|
else:
|
||||||
templates.append(MainWithoutApplicationBaseTemplate())
|
templates.append(MainWithoutApplicationBaseTemplate())
|
||||||
|
|
||||||
|
workspace_file_path = f'{project_name}/cpl-workspace.json'
|
||||||
|
project_file_rel_path = f'src/{String.convert_to_snake_case(project_name)}/{project_name}.json'
|
||||||
|
Console.spinner(
|
||||||
|
f'Creating {workspace_file_path}',
|
||||||
|
cls._create_file,
|
||||||
|
workspace_file_path,
|
||||||
|
{
|
||||||
|
WorkspaceSettingsNameEnum.default_project.value: project_name,
|
||||||
|
WorkspaceSettingsNameEnum.projects.value: {
|
||||||
|
project_name: project_file_rel_path
|
||||||
|
}
|
||||||
|
},
|
||||||
|
text_foreground_color=ForegroundColorEnum.green,
|
||||||
|
spinner_foreground_color=ForegroundColorEnum.cyan
|
||||||
|
)
|
||||||
|
|
||||||
|
project_file_path = f'{project_name}/{project_file_rel_path}'
|
||||||
|
Console.spinner(
|
||||||
|
f'Creating {project_file_path}',
|
||||||
|
cls._create_file,
|
||||||
|
project_file_path,
|
||||||
|
project_settings,
|
||||||
|
text_foreground_color=ForegroundColorEnum.green,
|
||||||
|
spinner_foreground_color=ForegroundColorEnum.cyan
|
||||||
|
)
|
||||||
|
|
||||||
for template in templates:
|
for template in templates:
|
||||||
Console.spinner(
|
Console.spinner(
|
||||||
f'Creating {project_name}/{template.path}{template.name}',
|
f'Creating {project_name}/{template.path}{template.name}',
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
"""
|
|
||||||
sh_cpl-cli sh-edraft Common Python library CLI
|
|
||||||
~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
sh-edraft Common Python library Command Line Interface
|
|
||||||
|
|
||||||
:copyright: (c) 2020 - 2021 sh-edraft.de
|
|
||||||
:license: MIT, see LICENSE for more details.
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
__title__ = 'cpl_cli.templates.new.library.cli'
|
|
||||||
__author__ = 'Sven Heidemann'
|
|
||||||
__license__ = 'MIT'
|
|
||||||
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
|
|
||||||
__version__ = '2021.4'
|
|
||||||
|
|
||||||
from collections import namedtuple
|
|
||||||
|
|
||||||
# imports:
|
|
||||||
|
|
||||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
|
|
||||||
version_info = VersionInfo(major='2021', minor='4', micro='None')
|
|
@ -1,29 +0,0 @@
|
|||||||
import textwrap
|
|
||||||
|
|
||||||
from cpl.utils.string import String
|
|
||||||
from cpl_cli.templates.template_file_abc import TemplateFileABC
|
|
||||||
|
|
||||||
|
|
||||||
class CLIInitTemplate(TemplateFileABC):
|
|
||||||
|
|
||||||
def __init__(self, name: str):
|
|
||||||
TemplateFileABC.__init__(self)
|
|
||||||
|
|
||||||
name = String.convert_to_snake_case(name)
|
|
||||||
self._name = '__init__.py'
|
|
||||||
self._path = f'src/{name}_cli/'
|
|
||||||
self._value = textwrap.dedent("""\
|
|
||||||
# imports:
|
|
||||||
""")
|
|
||||||
|
|
||||||
@property
|
|
||||||
def name(self) -> str:
|
|
||||||
return self._name
|
|
||||||
|
|
||||||
@property
|
|
||||||
def path(self) -> str:
|
|
||||||
return self._path
|
|
||||||
|
|
||||||
@property
|
|
||||||
def value(self) -> str:
|
|
||||||
return self._value
|
|
@ -11,7 +11,7 @@ class ApplicationTemplate(TemplateFileABC):
|
|||||||
|
|
||||||
name = String.convert_to_snake_case(name)
|
name = String.convert_to_snake_case(name)
|
||||||
self._name = 'application.py'
|
self._name = 'application.py'
|
||||||
self._path = f'src/{name}_cli/'
|
self._path = f'src/{name}/'
|
||||||
self._value = textwrap.dedent("""\
|
self._value = textwrap.dedent("""\
|
||||||
from cpl.application import ApplicationABC
|
from cpl.application import ApplicationABC
|
||||||
from cpl.configuration import ConfigurationABC
|
from cpl.configuration import ConfigurationABC
|
@ -1,13 +1,15 @@
|
|||||||
import textwrap
|
import textwrap
|
||||||
|
|
||||||
|
from cpl.utils.string import String
|
||||||
from cpl_cli.templates.template_file_abc import TemplateFileABC
|
from cpl_cli.templates.template_file_abc import TemplateFileABC
|
||||||
|
|
||||||
|
|
||||||
class TestsInitTemplate(TemplateFileABC):
|
class NameInitTemplate(TemplateFileABC):
|
||||||
|
|
||||||
def __init__(self, name: str):
|
def __init__(self, name: str):
|
||||||
TemplateFileABC.__init__(self)
|
TemplateFileABC.__init__(self)
|
||||||
|
|
||||||
|
name = String.convert_to_snake_case(name)
|
||||||
self._name = '__init__.py'
|
self._name = '__init__.py'
|
||||||
self._path = f'src/{name}/'
|
self._path = f'src/{name}/'
|
||||||
self._value = textwrap.dedent("""\
|
self._value = textwrap.dedent("""\
|
||||||
|
@ -11,12 +11,12 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
|
|||||||
|
|
||||||
name = String.convert_to_snake_case(name)
|
name = String.convert_to_snake_case(name)
|
||||||
self._name = 'main.py'
|
self._name = 'main.py'
|
||||||
self._path = f'src/{name}_cli/'
|
self._path = f'src/{name}/'
|
||||||
self._value = textwrap.dedent(f"""\
|
self._value = textwrap.dedent(f"""\
|
||||||
from cpl.application import ApplicationBuilder
|
from cpl.application import ApplicationBuilder
|
||||||
|
|
||||||
from {name}_cli.application import Application
|
from {name}.application import Application
|
||||||
from {name}_cli.startup import Startup
|
from {name}.startup import Startup
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
@ -44,15 +44,16 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
|
|||||||
|
|
||||||
class MainWithApplicationBaseTemplate(TemplateFileABC):
|
class MainWithApplicationBaseTemplate(TemplateFileABC):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self, name: str):
|
||||||
TemplateFileABC.__init__(self)
|
TemplateFileABC.__init__(self)
|
||||||
|
|
||||||
|
name = String.convert_to_snake_case(name)
|
||||||
self._name = 'main.py'
|
self._name = 'main.py'
|
||||||
self._path = 'src/'
|
self._path = 'src/'
|
||||||
self._value = textwrap.dedent(f"""\
|
self._value = textwrap.dedent(f"""\
|
||||||
from cpl.application import ApplicationBuilder
|
from cpl.application import ApplicationBuilder
|
||||||
|
|
||||||
from {name}_cli.application import Application
|
from {name}.application import Application
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
@ -11,7 +11,7 @@ class StartupTemplate(TemplateFileABC):
|
|||||||
|
|
||||||
name = String.convert_to_snake_case(name)
|
name = String.convert_to_snake_case(name)
|
||||||
self._name = 'startup.py'
|
self._name = 'startup.py'
|
||||||
self._path = f'src/{name}_cli/'
|
self._path = f'src/{name}/'
|
||||||
self._value = textwrap.dedent("""\
|
self._value = textwrap.dedent("""\
|
||||||
from cpl.application import StartupABC
|
from cpl.application import StartupABC
|
||||||
from cpl.configuration import ConfigurationABC
|
from cpl.configuration import ConfigurationABC
|
Loading…
Reference in New Issue
Block a user