From 36dfedf918e92a3ca73cbac37794e54fbc6bb1ee Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 23 Mar 2021 17:31:24 +0100 Subject: [PATCH] Bugfixes cpl cli output --- src/cpl_cli/command/build_service.py | 2 -- src/cpl_cli/command/generate_service.py | 2 -- src/cpl_cli/command/help_service.py | 2 -- src/cpl_cli/command/install_service.py | 2 -- src/cpl_cli/command/new_service.py | 5 ++--- src/cpl_cli/command/publish_service.py | 1 - src/cpl_cli/command/update_service.py | 2 -- src/cpl_cli/command_handler_service.py | 2 ++ 8 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/cpl_cli/command/build_service.py b/src/cpl_cli/command/build_service.py index dd8899d4..18ce4dbd 100644 --- a/src/cpl_cli/command/build_service.py +++ b/src/cpl_cli/command/build_service.py @@ -1,4 +1,3 @@ -from cpl.console.console import Console from cpl_cli.command_abc import CommandABC from cpl_cli.publish.publisher_abc import PublisherABC @@ -21,4 +20,3 @@ class BuildService(CommandABC): :return: """ self._publisher.build() - Console.write('\n') diff --git a/src/cpl_cli/command/generate_service.py b/src/cpl_cli/command/generate_service.py index b8ef2d11..a83d2f1f 100644 --- a/src/cpl_cli/command/generate_service.py +++ b/src/cpl_cli/command/generate_service.py @@ -148,5 +148,3 @@ class GenerateService(CommandABC): else: self._help('Usage: cpl generate [options]') exit() - - Console.write('\n') diff --git a/src/cpl_cli/command/help_service.py b/src/cpl_cli/command/help_service.py index 6c101838..647640f5 100644 --- a/src/cpl_cli/command/help_service.py +++ b/src/cpl_cli/command/help_service.py @@ -35,5 +35,3 @@ class HelpService(CommandABC): Console.write(f'\n\t{name} ') Console.set_foreground_color(ForegroundColorEnum.default) Console.write(f'{description}') - - Console.write('\n') diff --git a/src/cpl_cli/command/install_service.py b/src/cpl_cli/command/install_service.py index 35a8f9e3..bc392077 100644 --- a/src/cpl_cli/command/install_service.py +++ b/src/cpl_cli/command/install_service.py @@ -163,5 +163,3 @@ class InstallService(CommandABC): self._install_project() else: self._install_package(args[0]) - - Console.write('\n') diff --git a/src/cpl_cli/command/new_service.py b/src/cpl_cli/command/new_service.py index e8cf1bfb..2f46c390 100644 --- a/src/cpl_cli/command/new_service.py +++ b/src/cpl_cli/command/new_service.py @@ -20,7 +20,8 @@ from cpl_cli.configuration.version_settings_name_enum import VersionSettingsName from cpl_cli.templates.new.console.license import LicenseTemplate from cpl_cli.templates.new.console.readme_py import ReadmeTemplate from cpl_cli.templates.new.console.src.application import ApplicationTemplate -from cpl_cli.templates.new.console.src.main import MainWithApplicationHostAndStartupTemplate, MainWithoutApplicationHostTemplate, MainWithApplicationHostTemplate +from cpl_cli.templates.new.console.src.main import MainWithApplicationHostAndStartupTemplate, \ + MainWithoutApplicationHostTemplate, MainWithApplicationHostTemplate from cpl_cli.templates.new.console.src.startup import StartupTemplate from cpl_cli.templates.new.console.src.tests.init import TestsInitTemplate from cpl_cli.templates.template_file_abc import TemplateFileABC @@ -249,5 +250,3 @@ class NewService(CommandABC): else: self._help('Usage: cpl new [options]') exit() - - Console.write('\n') diff --git a/src/cpl_cli/command/publish_service.py b/src/cpl_cli/command/publish_service.py index 4975a7e1..7f459ea9 100644 --- a/src/cpl_cli/command/publish_service.py +++ b/src/cpl_cli/command/publish_service.py @@ -21,4 +21,3 @@ class PublishService(CommandABC): :return: """ self._publisher.publish() - Console.write('\n') diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index ddbe611a..0ff14d08 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -131,5 +131,3 @@ class UpdateService(CommandABC): self._check_project_dependencies() self._check_outdated() Pip.reset_executable() - - Console.write('\n') diff --git a/src/cpl_cli/command_handler_service.py b/src/cpl_cli/command_handler_service.py index ea602a99..63278ca7 100644 --- a/src/cpl_cli/command_handler_service.py +++ b/src/cpl_cli/command_handler_service.py @@ -2,6 +2,7 @@ import os from cpl.application.application_runtime_abc import ApplicationRuntimeABC from cpl.configuration.configuration_abc import ConfigurationABC +from cpl.console.console import Console from cpl.dependency_injection.service_abc import ServiceABC from cpl.dependency_injection.service_provider_abc import ServiceProviderABC from cpl_cli.error import Error @@ -51,3 +52,4 @@ class CommandHandler(ServiceABC): self._config.add_json_file('cpl.json', optional=True, output=False) self._services.get_service(command.command).run(args) + Console.write('\n')