Bugfixes with live development server

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'sh_cpl.cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.1.post1'
+__version__ = '2021.4.1.post3'
 
 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='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

src/cpl_cli/cli.py

@@ -1,6 +1,8 @@
+import threading
 from typing import Optional
 
 from cpl.application.application_abc import ApplicationABC
+from cpl.console.console import Console
 from cpl_cli.command.build_service import BuildService
 from cpl_cli.command.generate_service import GenerateService
 from cpl_cli.command.install_service import InstallService
@@ -45,21 +47,24 @@ class CLI(ApplicationABC):
         Entry point of the CPL CLI
         :return:
         """
-        command = None
-        args = []
-        if len(self._configuration.additional_arguments) > 0:
-            command = self._configuration.additional_arguments[0]
-            if len(self._configuration.additional_arguments) > 1:
-                args = self._configuration.additional_arguments[1:]
-        else:
-            for cmd in self._command_handler.commands:
-                result = self._configuration.get_configuration(cmd.name)
-                if result is not None:
-                    command = cmd.name
-                    args.append(result)
+        try:
+            command = None
+            args = []
+            if len(self._configuration.additional_arguments) > 0:
+                command = self._configuration.additional_arguments[0]
+                if len(self._configuration.additional_arguments) > 1:
+                    args = self._configuration.additional_arguments[1:]
+            else:
+                for cmd in self._command_handler.commands:
+                    result = self._configuration.get_configuration(cmd.name)
+                    if result is not None:
+                        command = cmd.name
+                        args.append(result)
 
-        if command is None:
-            Error.error(f'Expected command')
-            return
+            if command is None:
+                Error.error(f'Expected command')
+                return
 
-        self._command_handler.handle(command, args)
+            self._command_handler.handle(command, args)
+        except KeyboardInterrupt:
+            exit()

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 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='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .version_settings import VersionSettings
 from .version_settings_name_enum import VersionSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

src/cpl_cli/live_server/live_server_service.py

@@ -28,7 +28,7 @@ class LiveServerService(ServiceABC, FileSystemEventHandler):
         self._build_settings = build_settings
 
         self._src_dir = os.path.join(self._runtime.working_directory, self._build_settings.source_path)
-        self._ls_thread = LiveServerThread(self._src_dir)
+        self._ls_thread = None
         self._observer = None
 
     def _start_observer(self):
@@ -54,10 +54,7 @@ class LiveServerService(ServiceABC, FileSystemEventHandler):
         while self._ls_thread.is_alive():
             time.sleep(1)
 
-        self._ls_thread = LiveServerThread(self._src_dir)
-        self._ls_thread.start()
-
-        self._start_observer()
+        self._start()
 
     def on_modified(self, event):
         """
@@ -73,14 +70,17 @@ class LiveServerService(ServiceABC, FileSystemEventHandler):
             self._observer.stop()
             self._restart()
 
+    def _start(self):
+        self._start_observer()
+        self._ls_thread = LiveServerThread(self._src_dir)
+        self._ls_thread.start()
+        self._ls_thread.join()
+        Console.close()
+
     def start(self):
         """
         Starts the CPL live development server
         :return:
         """
         Console.write_line('** CPL live development server is running **')
-        self._start_observer()
-        self._ls_thread.start()
-
-        Console.close()
-        Console.write('\n')
+        self._start()

src/cpl_cli/live_server/live_server_thread.py

@@ -4,7 +4,8 @@ import sys
 import threading
 from datetime import datetime
 
-from cpl.console import Console
+from cpl.console.console import Console
+from cpl.console.foreground_color_enum import ForegroundColorEnum
 
 
 class LiveServerThread(threading.Thread):
@@ -38,9 +39,12 @@ class LiveServerThread(threading.Thread):
             Console.error('Entry point main.py not found')
             return
 
+        Console.set_foreground_color(ForegroundColorEnum.green)
         Console.write_line('Read successfully')
+        Console.set_foreground_color(ForegroundColorEnum.cyan)
         now = datetime.now()
         Console.write_line(f'Started at {now.strftime("%Y-%m-%d %H:%M:%S")}\n\n')
+        Console.set_foreground_color(ForegroundColorEnum.default)
 
         self._command = [sys.executable, self._main, ''.join(sys.argv[2:])]
         subprocess.run(self._command)

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 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='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

src/cpl_cli/templates/new/console/src/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates.new.console.src'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

src/cpl_cli/templates/new/console/src/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.templates.new.console.src.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')

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.1.post1'
+__version__ = '2021.4.1.post3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='04', micro='01-1')
+version_info = VersionInfo(major='2021', minor='04', micro='01-3')