Merge pull request 'cpl start & run - Bessere Einbindung mit den Build-Tools #124' (#131) from #124 into 2022.12

Reviewed-on: #131
Closes #124

cpl-workspace.json

@@ -131,7 +131,15 @@
       "di-cli": "pip install cpl-cli --pre --upgrade --extra-index-url https://pip-dev.sh-edraft.de",
       "di-discord": "pip install cpl-discord --pre --upgrade --extra-index-url https://pip-dev.sh-edraft.de",
       "di-query": "pip install cpl-query --pre --upgrade --extra-index-url https://pip-dev.sh-edraft.de",
-      "di-translation": "pip install cpl-translation --pre --upgrade --extra-index-url https://pip-dev.sh-edraft.de"
+      "di-translation": "pip install cpl-translation --pre --upgrade --extra-index-url https://pip-dev.sh-edraft.de",
+
+      "prod-install": "cpl pi-core; cpl pi-cli; cpl pi-query; cpl pi-translation;",
+      "pi": "cpl prod-install",
+      "pi-core": "pip install cpl-core --pre --upgrade --extra-index-url https://pip.sh-edraft.de",
+      "pi-cli": "pip install cpl-cli --pre --upgrade --extra-index-url https://pip.sh-edraft.de",
+      "pi-discord": "pip install cpl-discord --pre --upgrade --extra-index-url https://pip.sh-edraft.de",
+      "pi-query": "pip install cpl-query --pre --upgrade --extra-index-url https://pip.sh-edraft.de",
+      "pi-translation": "pip install cpl-translation --pre --upgrade --extra-index-url https://pip.sh-edraft.de"
     }
   }
 }

src/cpl_cli/command/generate_service.py

@@ -14,6 +14,7 @@ from cpl_cli._templates.generate.thread_template import ThreadTemplate
 from cpl_cli._templates.generate.validator_template import ValidatorTemplate
 from cpl_cli._templates.template_file_abc import TemplateFileABC
 from cpl_cli.command_abc import CommandABC
+from cpl_cli.configuration import WorkspaceSettings
 from cpl_core.configuration.configuration_abc import ConfigurationABC
 from cpl_core.console.console import Console
 from cpl_core.console.foreground_color_enum import ForegroundColorEnum
@@ -22,13 +23,20 @@ from cpl_core.utils.string import String
 
 class GenerateService(CommandABC):
 
-    def __init__(self, configuration: ConfigurationABC):
+    def __init__(
+            self,
+            configuration: ConfigurationABC,
+            workspace: WorkspaceSettings,
+    ):
         """
         Service for the CLI command generate
         :param configuration:
         """
         CommandABC.__init__(self)
 
+        self._config = configuration
+        self._workspace = workspace
+
         self._schematics = {
             "abc": {
                 "Upper": "ABC",
@@ -129,27 +137,7 @@ class GenerateService(CommandABC):
             template.write(value)
             template.close()
 
-    def _generate(self, schematic: str, name: str, template: TemplateFileABC):
-        """
-        Generates files by given schematic, name and template
-        :param schematic:
-        :param name:
-        :param template:
-        :return:
-        """
-        class_name = name
-        rel_path = ''
-        if '/' in name:
-            parts = name.split('/')
-            rel_path = '/'.join(parts[:-1])
-            class_name = parts[len(parts) - 1]
-
-        if 'src' not in rel_path and not os.path.exists(os.path.join(self._env.working_directory, rel_path)):
-            rel_path = f'src/{rel_path}'
-
-        template = template(class_name, schematic, self._schematics[schematic]["Upper"], rel_path)
-
-        file_path = os.path.join(self._env.working_directory, template.path, template.name)
+    def _create_init_files(self, file_path: str, template: TemplateFileABC, class_name: str, schematic: str, rel_path: str):
         if not os.path.isdir(os.path.dirname(file_path)):
             os.makedirs(os.path.dirname(file_path))
             directory = ''
@@ -171,6 +159,29 @@ class GenerateService(CommandABC):
                     spinner_foreground_color=ForegroundColorEnum.cyan
                 )
 
+    def _generate(self, schematic: str, name: str, template: TemplateFileABC):
+        """
+        Generates files by given schematic, name and template
+        :param schematic:
+        :param name:
+        :param template:
+        :return:
+        """
+        class_name = name
+        rel_path = ''
+        if '/' in name:
+            parts = name.split('/')
+            rel_path = '/'.join(parts[:-1])
+            class_name = parts[len(parts) - 1]
+
+            if self._workspace is not None and parts[0] in self._workspace.projects:
+                rel_path = os.path.dirname(self._workspace.projects[parts[0]])
+
+        template = template(class_name, schematic, self._schematics[schematic]["Upper"], rel_path)
+
+        file_path = os.path.join(self._env.working_directory, template.path, template.name)
+        self._create_init_files(file_path, template, class_name, schematic, rel_path)
+
         if os.path.isfile(file_path):
             Console.error(f'{String.first_to_upper(schematic)} already exists!\n')
             sys.exit()

src/cpl_cli/command/new_service.py

@@ -54,6 +54,7 @@ class NewService(CommandABC):
         self._use_service_providing: bool = False
         self._use_async: bool = False
         self._use_venv: bool = False
+        self._use_base: bool = False
 
     @property
     def help_message(self) -> str:
@@ -159,7 +160,8 @@ class NewService(CommandABC):
         if self._workspace is None:
             project_path = os.path.join(self._env.working_directory, self._rel_path, self._project.name)
         else:
-            project_path = os.path.join(self._env.working_directory, 'src', self._rel_path, String.convert_to_snake_case(self._project.name))
+            base = '' if self._use_base else 'src'
+            project_path = os.path.join(self._env.working_directory, base, self._rel_path, String.convert_to_snake_case(self._project.name))
 
         if os.path.isdir(project_path) and len(os.listdir(project_path)) > 0:
             Console.write_line(project_path)
@@ -292,6 +294,9 @@ class NewService(CommandABC):
         if self._env.working_directory.endswith(project):
             project = ''
 
+        if self._workspace is None and self._use_base:
+            project = f'{self._rel_path}/{project}'
+
         VenvHelper.init_venv(
             False,
             self._env,
@@ -335,6 +340,9 @@ class NewService(CommandABC):
         if 'venv' in args:
             self._use_venv = True
             args.remove('venv')
+        if 'base' in args:
+            self._use_base = True
+            args.remove('base')
 
         console = self._config.get_configuration(ProjectTypeEnum.console.value)
         library = self._config.get_configuration(ProjectTypeEnum.library.value)

src/cpl_cli/command/run_service.py

@@ -8,10 +8,12 @@ from cpl_cli.configuration import WorkspaceSettings
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings
 from cpl_cli.live_server.start_executable import StartExecutable
+from cpl_cli.publish import PublisherService
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.console.console import Console
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
+from cpl_core.utils import String
 
 
 class RunService(CommandABC):
@@ -22,7 +24,8 @@ class RunService(CommandABC):
                  services: ServiceProviderABC,
                  project_settings: ProjectSettings,
                  build_settings: BuildSettings,
-                 workspace: WorkspaceSettings
+                 workspace: WorkspaceSettings,
+                 publisher: PublisherService,
                  ):
         """
         Service for the CLI command start
@@ -41,8 +44,10 @@ class RunService(CommandABC):
         self._project_settings = project_settings
         self._build_settings = build_settings
         self._workspace = workspace
+        self._publisher = publisher
 
         self._src_dir = os.path.join(self._env.working_directory, self._build_settings.source_path)
+        self._is_dev = False
 
     @property
     def help_message(self) -> str:
@@ -80,16 +85,36 @@ class RunService(CommandABC):
 
         self._src_dir = os.path.dirname(json_file)
 
+    def _build(self):
+        if self._is_dev:
+            return
+
+        self._env.set_working_directory(self._src_dir)
+        self._publisher.build()
+        self._src_dir = os.path.abspath(os.path.join(
+            self._src_dir,
+            self._build_settings.output_path,
+            self._project_settings.name,
+            'build',
+            String.convert_to_snake_case(self._project_settings.name)
+        ))
+
     def execute(self, args: list[str]):
         """
         Entry point of command
         :param args:
         :return:
         """
+        if 'dev' in args:
+            self._is_dev = True
+            args.remove('dev')
+
         if len(args) >= 1:
             self._set_project_by_args(args[0])
             args.remove(args[0])
 
+        self._build()
+
         start_service = StartExecutable(self._env, self._build_settings)
         start_service.run(args, self._project_settings.python_executable, self._src_dir, output=False)
         Console.write_line()

src/cpl_cli/live_server/live_server_service.py

@@ -6,17 +6,24 @@ import psutil as psutil
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers import Observer
 
+from cpl_cli.publish import PublisherService
 from cpl_core.console.console import Console
 from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings
 from cpl_cli.live_server.live_server_thread import LiveServerThread
+from cpl_core.utils import String
 
 
 class LiveServerService(FileSystemEventHandler):
 
-    def __init__(self, env: ApplicationEnvironmentABC, project_settings: ProjectSettings,
-                 build_settings: BuildSettings):
+    def __init__(
+            self,
+            env: ApplicationEnvironmentABC,
+            project_settings: ProjectSettings,
+            build_settings: BuildSettings,
+            publisher: PublisherService,
+    ):
         """
         Service for the live development server
         :param env:
@@ -28,12 +35,15 @@ class LiveServerService(FileSystemEventHandler):
         self._env = env
         self._project_settings = project_settings
         self._build_settings = build_settings
+        self._publisher = publisher
 
         self._src_dir = os.path.join(self._env.working_directory, self._build_settings.source_path)
+        self._wd = self._src_dir
         self._ls_thread = None
         self._observer = None
 
         self._args: list[str] = []
+        self._is_dev = False
 
     def _start_observer(self):
         """
@@ -75,10 +85,11 @@ class LiveServerService(FileSystemEventHandler):
             self._restart()
 
     def _start(self):
+        self._build()
         self._start_observer()
         self._ls_thread = LiveServerThread(
             self._project_settings.python_executable,
-            self._src_dir,
+            self._wd,
             self._args,
             self._env,
             self._build_settings
@@ -87,6 +98,22 @@ class LiveServerService(FileSystemEventHandler):
         self._ls_thread.join()
         Console.close()
 
+    def _build(self):
+        if self._is_dev:
+            return
+
+        self._env.set_working_directory(self._src_dir)
+        Console.disable()
+        self._publisher.build()
+        Console.enable()
+        self._wd = os.path.abspath(os.path.join(
+            self._src_dir,
+            self._build_settings.output_path,
+            self._project_settings.name,
+            'build',
+            String.convert_to_snake_case(self._project_settings.name)
+        ))
+
     def start(self, args: list[str]):
         """
         Starts the CPL live development server
@@ -97,6 +124,10 @@ class LiveServerService(FileSystemEventHandler):
             Console.error('Project has no entry point.')
             return
 
+        if 'dev' in args:
+            self._is_dev = True
+            args.remove('dev')
+
         self._args = args
         Console.write_line('** CPL live development server is running **')
         self._start()

src/cpl_cli/startup_argument_extension.py

@@ -55,12 +55,15 @@ class StartupArgumentExtension(StartupExtensionABC):
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'startup', ['s', 'S']) \
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'service-providing', ['sp', 'SP']) \
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'nothing', ['n', 'N']) \
-            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'venv', ['v', 'V'])
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'venv', ['v', 'V']) \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'base', ['b', 'B'])
         config.create_console_argument(ArgumentTypeEnum.Executable, '', 'publish', ['p', 'P'], PublishService, True, validators=[ProjectValidator])
         config.create_console_argument(ArgumentTypeEnum.Executable, '', 'remove', ['r', 'R'], RemoveService, True, validators=[WorkspaceValidator]) \
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'simulate', ['s', 'S'])
-        config.create_console_argument(ArgumentTypeEnum.Executable, '', 'run', [], RunService, True, validators=[ProjectValidator])
-        config.create_console_argument(ArgumentTypeEnum.Executable, '', 'start', ['s', 'S'], StartService, True, validators=[ProjectValidator])
+        config.create_console_argument(ArgumentTypeEnum.Executable, '', 'run', [], RunService, True, validators=[ProjectValidator]) \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'dev', ['d', 'D'])
+        config.create_console_argument(ArgumentTypeEnum.Executable, '', 'start', ['s', 'S'], StartService, True, validators=[ProjectValidator]) \
+            .add_console_argument(ArgumentTypeEnum.Flag, '--', 'dev', ['d', 'D'])
         config.create_console_argument(ArgumentTypeEnum.Executable, '', 'uninstall', ['ui', 'UI'], UninstallService, True, validators=[ProjectValidator]) \
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'dev', ['d', 'D']) \
             .add_console_argument(ArgumentTypeEnum.Flag, '--', 'virtual', ['v', 'V']) \

src/cpl_core/logging/logger_service.py

@@ -169,7 +169,7 @@ class Logger(LoggerABC):
 
         # check if message can be shown in console
         if self._console.value >= LoggingLevelEnum.TRACE.value:
-            Console.set_foreground_color(ForegroundColorEnum.green)
+            Console.set_foreground_color(ForegroundColorEnum.grey)
             Console.write_line(output)
             Console.set_foreground_color(ForegroundColorEnum.default)
 
@@ -182,7 +182,7 @@ class Logger(LoggerABC):
 
         # check if message can be shown in console
         if self._console.value >= LoggingLevelEnum.DEBUG.value:
-            Console.set_foreground_color(ForegroundColorEnum.green)
+            Console.set_foreground_color(ForegroundColorEnum.blue)
             Console.write_line(output)
             Console.set_foreground_color(ForegroundColorEnum.default)
 

src/cpl_discord/cpl-discord.json

@@ -24,9 +24,7 @@
       "cpl-cli>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

src/cpl_query/base/default_lambda.py

@@ -0,0 +1,2 @@
+def default_lambda(x: object):
+    return x

src/cpl_query/base/ordered_queryable.py

@@ -0,0 +1,34 @@
+from collections.abc import Callable
+
+from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
+from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
+from cpl_query.iterable.iterable import Iterable
+
+
+class OrderedQueryable(OrderedQueryableABC):
+    r"""Implementation of :class: `cpl_query.extension.Iterable` `cpl_query.extension.OrderedIterableABC`
+    """
+
+    def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None):
+        OrderedQueryableABC.__init__(self, _t, _values, _func)
+
+    def then_by(self: OrderedQueryableABC, _func: Callable) -> OrderedQueryableABC:
+        if self is None:
+            raise ArgumentNoneException(ExceptionArgument.list)
+
+        if _func is None:
+            raise ArgumentNoneException(ExceptionArgument.func)
+
+        self._funcs.append(_func)
+
+        return OrderedQueryable(self.type, sorted(self, key=lambda *args: [f(*args) for f in self._funcs]), _func)
+
+    def then_by_descending(self: OrderedQueryableABC, _func: Callable) -> OrderedQueryableABC:
+        if self is None:
+            raise ArgumentNoneException(ExceptionArgument.list)
+
+        if _func is None:
+            raise ArgumentNoneException(ExceptionArgument.func)
+
+        self._funcs.append(_func)
+        return OrderedQueryable(self.type, sorted(self, key=lambda *args: [f(*args) for f in self._funcs], reverse=True), _func)

src/cpl_query/base/ordered_queryable_abc.py

@@ -2,20 +2,20 @@ from abc import abstractmethod
 from collections.abc import Callable
 from typing import Iterable
 
-from cpl_query.iterable.iterable_abc import IterableABC
+from cpl_query.base.queryable_abc import QueryableABC
 
 
-class OrderedIterableABC(IterableABC):
+class OrderedQueryableABC(QueryableABC):
 
     @abstractmethod
-    def __init__(self, _t: type, _func: Callable = None, _values: Iterable = None):
-        IterableABC.__init__(self, _t, _values)
+    def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None):
+        QueryableABC.__init__(self, _t, _values)
         self._funcs: list[Callable] = []
         if _func is not None:
             self._funcs.append(_func)
 
     @abstractmethod
-    def then_by(self, func: Callable) -> 'OrderedIterableABC':
+    def then_by(self, func: Callable) -> 'OrderedQueryableABC':
         r"""Sorts OrderedList in ascending order by function
 
         Parameter
@@ -29,7 +29,7 @@ class OrderedIterableABC(IterableABC):
         pass
 
     @abstractmethod
-    def then_by_descending(self, func: Callable) -> 'OrderedIterableABC':
+    def then_by_descending(self, func: Callable) -> 'OrderedQueryableABC':
         r"""Sorts OrderedList in descending order by function
 
         Parameter

src/cpl_query/base/queryable_abc.py

@@ -1,10 +1,19 @@
-from abc import abstractmethod, ABC
 from typing import Optional, Callable, Union
 
+from cpl_query._helper import is_number
+from cpl_query.base.sequence_abc import SequenceABC
+from cpl_query.exceptions import InvalidTypeException, ArgumentNoneException, ExceptionArgument, IndexOutOfRangeException
 
-class QueryableABC(ABC):
 
-    @abstractmethod
+def _default_lambda(x: object):
+    return x
+
+
+class QueryableABC(SequenceABC):
+
+    def __init__(self, t: type = None, values: list = None):
+        SequenceABC.__init__(self, t, values)
+
     def all(self, _func: Callable = None) -> bool:
         r"""Checks if every element of list equals result found by function
 
@@ -17,9 +26,11 @@ class QueryableABC(ABC):
         -------
             bool
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
+
+        return self.count(_func) == self.count()
 
-    @abstractmethod
     def any(self, _func: Callable = None) -> bool:
         r"""Checks if list contains result found by function
 
@@ -32,9 +43,11 @@ class QueryableABC(ABC):
         -------
             bool
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
+
+        return self.where(_func).count() > 0
 
-    @abstractmethod
     def average(self, _func: Callable = None) -> Union[int, float, complex]:
         r"""Returns average value of list
 
@@ -47,10 +60,12 @@ class QueryableABC(ABC):
         -------
             Union[int, float, complex]
         """
-        pass
+        if _func is None and not is_number(self.type):
+            raise InvalidTypeException()
 
-    @abstractmethod
-    def contains(self, value: object) -> bool:
+        return self.sum(_func) / self.count()
+
+    def contains(self, _value: object) -> bool:
         r"""Checks if list contains value given by function
 
         Parameter
@@ -62,9 +77,11 @@ class QueryableABC(ABC):
         -------
             bool
         """
-        pass
+        if _value is None:
+            raise ArgumentNoneException(ExceptionArgument.value)
+
+        return self.where(lambda x: x == _value).count() > 0
 
-    @abstractmethod
     def count(self, _func: Callable = None) -> int:
         r"""Returns length of list or count of found elements
 
@@ -77,9 +94,11 @@ class QueryableABC(ABC):
         -------
             int
         """
-        pass
+        if _func is None:
+            return self.__len__()
+
+        return self.where(_func).__len__()
 
-    @abstractmethod
     def distinct(self, _func: Callable = None) -> 'QueryableABC':
         r"""Returns list without redundancies
 
@@ -92,39 +111,62 @@ class QueryableABC(ABC):
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
 
-    @abstractmethod
-    def element_at(self, index: int) -> any:
+        result = []
+        known_values = []
+        for element in self:
+            value = _func(element)
+            if value in known_values:
+                continue
+
+            known_values.append(value)
+            result.append(element)
+
+        return type(self)(self._type, result)
+
+    def element_at(self, _index: int) -> any:
         r"""Returns element at given index
 
         Parameter
         ---------
-            index: :class:`int`
+            _index: :class:`int`
                 index
 
         Returns
         -------
-            Value at index: any
+            Value at _index: any
         """
-        pass
+        if _index is None:
+            raise ArgumentNoneException(ExceptionArgument.index)
 
-    @abstractmethod
-    def element_at_or_default(self, index: int) -> Optional[any]:
+        result = self[_index]
+        if result is None:
+            raise IndexOutOfRangeException
+
+        return result
+
+    def element_at_or_default(self, _index: int) -> Optional[any]:
         r"""Returns element at given index or None
 
         Parameter
         ---------
-            index: :class:`int`
+            _index: :class:`int`
                 index
 
         Returns
         -------
-            Value at index: Optional[any]
+            Value at _index: Optional[any]
         """
-        pass
+        if _index is None:
+            raise ArgumentNoneException(ExceptionArgument.index)
+
+        try:
+            return self[_index]
+        except IndexError:
+            return None
 
-    @abstractmethod
     def first(self) -> any:
         r"""Returns first element
 
@@ -132,9 +174,11 @@ class QueryableABC(ABC):
         -------
             First element of list: any
         """
-        pass
+        if len(self) == 0:
+            raise IndexOutOfRangeException()
+
+        return self[0]
 
-    @abstractmethod
     def first_or_default(self) -> any:
         r"""Returns first element or None
 
@@ -142,9 +186,11 @@ class QueryableABC(ABC):
         -------
             First element of list: Optional[any]
         """
-        pass
+        if len(self) == 0:
+            return None
+
+        return self[0]
 
-    @abstractmethod
     def for_each(self, _func: Callable = None):
         r"""Runs given function for each element of list
 
@@ -153,9 +199,36 @@ class QueryableABC(ABC):
             func: :class: `Callable`
                 function to call
         """
-        pass
+        if _func is not None:
+            for element in self:
+                _func(element)
+
+        return self
+
+    def group_by(self, _func: Callable = None) -> 'QueryableABC':
+        r"""Groups by func
+
+        Returns
+        -------
+            Grouped list[list[any]]: any
+        """
+        if _func is None:
+            _func = _default_lambda
+        groups = {}
+
+        for v in self:
+            value = _func(v)
+            if v not in groups:
+                groups[value] = []
+
+            groups[value].append(v)
+
+        v = []
+        for g in groups.values():
+            v.append(type(self)(None, g))
+        x = type(self)(type(self), v)
+        return x
 
-    @abstractmethod
     def last(self) -> any:
         r"""Returns last element
 
@@ -163,9 +236,11 @@ class QueryableABC(ABC):
         -------
             Last element of list: any
         """
-        pass
+        if len(self) == 0:
+            raise IndexOutOfRangeException()
+
+        return self[len(self) - 1]
 
-    @abstractmethod
     def last_or_default(self) -> any:
         r"""Returns last element or None
 
@@ -173,9 +248,11 @@ class QueryableABC(ABC):
         -------
             Last element of list: Optional[any]
         """
-        pass
+        if len(self) == 0:
+            return None
+
+        return self[len(self) - 1]
 
-    @abstractmethod
     def max(self, _func: Callable = None) -> Union[int, float, complex]:
         r"""Returns the highest value
 
@@ -188,19 +265,33 @@ class QueryableABC(ABC):
         -------
             Union[int, float, complex]
         """
-        pass
+        if _func is None and not is_number(self.type):
+            raise InvalidTypeException()
 
-    @abstractmethod
-    def median(self) -> Union[int, float]:
+        if _func is None:
+            _func = _default_lambda
+
+        return _func(max(self, key=_func))
+
+    def median(self, _func=None) -> Union[int, float]:
         r"""Return the median value of data elements
 
         Returns
         -------
             Union[int, float]
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
+
+        result = self.order_by(_func).select(_func).to_list()
+        length = len(result)
+        i = int(length / 2)
+        return (
+            result[i]
+            if length % 2 == 1
+            else (float(result[i - 1]) + float(result[i])) / float(2)
+        )
 
-    @abstractmethod
     def min(self, _func: Callable = None) -> Union[int, float, complex]:
         r"""Returns the lowest value
 
@@ -213,9 +304,14 @@ class QueryableABC(ABC):
         -------
             Union[int, float, complex]
         """
-        pass
+        if _func is None and not is_number(self.type):
+            raise InvalidTypeException()
+
+        if _func is None:
+            _func = _default_lambda
+
+        return _func(min(self, key=_func))
 
-    @abstractmethod
     def order_by(self, _func: Callable = None) -> 'QueryableABC':
         r"""Sorts elements by function in ascending order
 
@@ -228,9 +324,12 @@ class QueryableABC(ABC):
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
+
+        from cpl_query.base.ordered_queryable import OrderedQueryable
+        return OrderedQueryable(self.type, sorted(self, key=_func), _func)
 
-    @abstractmethod
     def order_by_descending(self, _func: Callable = None) -> 'QueryableABC':
         r"""Sorts elements by function in descending order
 
@@ -243,9 +342,12 @@ class QueryableABC(ABC):
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
+
+        from cpl_query.base.ordered_queryable import OrderedQueryable
+        return OrderedQueryable(self.type, sorted(self, key=_func, reverse=True), _func)
 
-    @abstractmethod
     def reverse(self) -> 'QueryableABC':
         r"""Reverses list
 
@@ -253,29 +355,31 @@ class QueryableABC(ABC):
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        return type(self)(self._type, list(reversed(self)))
 
-    @abstractmethod
-    def select(self, _f: Callable) -> 'QueryableABC':
+    def select(self, _func: Callable) -> 'QueryableABC':
         r"""Formats each element of list to a given format
 
         Returns
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _func is None:
+            _func = _default_lambda
 
-    @abstractmethod
-    def select_many(self, _f: Callable) -> 'QueryableABC':
+        return type(self)(any, [_func(_o) for _o in self])
+
+    def select_many(self, _func: Callable) -> 'QueryableABC':
         r"""Flattens resulting lists to one
 
         Returns
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        # The line below is pain. I don't understand anything of it...
+        # written on 09.11.2022 by Sven Heidemann
+        return type(self)(any, [_a for _o in self for _a in _func(_o)])
 
-    @abstractmethod
     def single(self) -> any:
         r"""Returns one single element of list
 
@@ -288,9 +392,13 @@ class QueryableABC(ABC):
             ArgumentNoneException: when argument is None
             Exception: when argument is None or found more than one element
         """
-        pass
+        if len(self) > 1:
+            raise Exception('Found more than one element')
+        elif len(self) == 0:
+            raise Exception('Found no element')
+
+        return self[0]
 
-    @abstractmethod
     def single_or_default(self) -> Optional[any]:
         r"""Returns one single element of list
 
@@ -298,39 +406,48 @@ class QueryableABC(ABC):
         -------
             Found value: Optional[any]
         """
-        pass
+        if len(self) > 1:
+            raise Exception('Index out of range')
+        elif len(self) == 0:
+            return None
 
-    @abstractmethod
-    def skip(self, index: int) -> 'QueryableABC':
+        return self[0]
+
+    def skip(self, _index: int) -> 'QueryableABC':
         r"""Skips all elements from index
 
         Parameter
         ---------
-            index: :class:`int`
+            _index: :class:`int`
                 index
 
         Returns
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _index is None:
+            raise ArgumentNoneException(ExceptionArgument.index)
 
-    @abstractmethod
-    def skip_last(self, index: int) -> 'QueryableABC':
+        return type(self)(self.type, values=self[_index:])
+
+    def skip_last(self, _index: int) -> 'QueryableABC':
         r"""Skips all elements after index
 
         Parameter
         ---------
-            index: :class:`int`
+            _index: :class:`int`
                 index
 
         Returns
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _index is None:
+            raise ArgumentNoneException(ExceptionArgument.index)
+
+        index = len(self) - _index
+        return type(self)(self._type, self[:index])
 
-    @abstractmethod
     def sum(self, _func: Callable = None) -> Union[int, float, complex]:
         r"""Sum of all values
 
@@ -343,39 +460,54 @@ class QueryableABC(ABC):
         -------
             Union[int, float, complex]
         """
-        pass
+        if _func is None and not is_number(self.type):
+            raise InvalidTypeException()
 
-    @abstractmethod
-    def take(self, index: int) -> 'QueryableABC':
+        if _func is None:
+            _func = _default_lambda
+
+        result = 0
+        for x in self:
+            result += _func(x)
+
+        return result
+
+    def take(self, _index: int) -> 'QueryableABC':
         r"""Takes all elements from index
 
         Parameter
         ---------
-            index: :class:`int`
+            _index: :class:`int`
                 index
 
         Returns
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _index is None:
+            raise ArgumentNoneException(ExceptionArgument.index)
 
-    @abstractmethod
-    def take_last(self, index: int) -> 'QueryableABC':
+        return type(self)(self._type, self[:_index])
+
+    def take_last(self, _index: int) -> 'QueryableABC':
         r"""Takes all elements after index
 
         Parameter
         ---------
-            index: :class:`int`
+            _index: :class:`int`
                 index
 
         Returns
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        index = len(self) - _index
+
+        if index >= len(self) or index < 0:
+            raise IndexOutOfRangeException()
+
+        return type(self)(self._type, self[index:])
 
-    @abstractmethod
     def where(self, _func: Callable = None) -> 'QueryableABC':
         r"""Select element by function
 
@@ -388,4 +520,15 @@ class QueryableABC(ABC):
         -------
             :class: `cpl_query.base.queryable_abc.QueryableABC`
         """
-        pass
+        if _func is None:
+            raise ArgumentNoneException(ExceptionArgument.func)
+
+        if _func is None:
+            _func = _default_lambda
+
+        result = []
+        for element in self:
+            if _func(element):
+                result.append(element)
+
+        return type(self)(self.type, result)

src/cpl_query/base/sequence_abc.py

@@ -0,0 +1,86 @@
+from abc import ABC, abstractmethod
+from itertools import islice
+
+from cpl_query.base.sequence_values import SequenceValues
+
+
+class SequenceABC(ABC):
+
+    @abstractmethod
+    def __init__(self, t: type = None, values: list = None):
+        ABC.__init__(self)
+        if values is None:
+            values = []
+
+        if t is None and len(values) > 0:
+            t = type(values[0])
+
+        if t is None:
+            t = any
+
+        self._type = t
+        self._set_values(values)
+
+    def __len__(self):
+        return len(self._values)
+
+    def __iter__(self):
+        return iter(self._values)
+
+    def next(self):
+        return next(self._values)
+
+    def __next__(self):
+        return self.next()
+
+    def __getitem__(self, n):
+        values = [x for x in self]
+        if isinstance(n, slice):
+            try:
+                return values[n]
+            except Exception as e:
+                raise e
+
+        for i in range(len(values)):
+            if i == n:
+                return values[i]
+
+    def __repr__(self):
+        return f'<{type(self).__name__} {list(self).__repr__()}>'
+
+    @property
+    def type(self) -> type:
+        return self._type
+
+    def _check_type(self, __object: any):
+        if self._type == any:
+            return
+
+        if self._type is not None and type(__object) != self._type and not isinstance(type(__object), self._type) and not issubclass(type(__object), self._type):
+            raise Exception(f'Unexpected type: {type(__object)}\nExpected type: {self._type}')
+
+    def _set_values(self, values: list):
+        self._values = SequenceValues(values, self._type)
+
+    def to_list(self) -> list:
+        r"""Converts :class: `cpl_query.base.sequence_abc.SequenceABC` to :class: `list`
+
+        Returns
+        -------
+            :class: `list`
+        """
+        return [x for x in self]
+
+    @classmethod
+    def empty(cls) -> 'SequenceABC':
+        r"""Returns an empty sequence
+
+        Returns
+        -------
+            Sequence object that contains no elements
+        """
+        return cls()
+
+    @classmethod
+    def range(cls, start: int, length: int) -> 'SequenceABC':
+        return cls(int, list(range(start, length)))

src/cpl_query/base/sequence_values.py

@@ -5,15 +5,13 @@ from cpl_query.exceptions import IndexOutOfRangeException
 
 
 class SequenceValues:
-    def __init__(self, data, _t: type):
-        if data is None:
-            data = []
-
+    def __init__(self, data: list, _t: type):
         if len(data) > 0:
             def type_check(_t: type, _l: list):
-                return all(isinstance(x, _t) for x in _l)
+                return all([_t == any or isinstance(x, _t) for x in _l])
 
             if not type_check(_t, data):
+                print([type(x) for x in data])
                 raise Exception(f'Unexpected type\nExpected type: {_t}')
 
         if not hasattr(data, '__iter__'):
@@ -30,7 +28,7 @@ class SequenceValues:
 
     def __iter__(self):
         i = 0
-        while i < len(self):
+        while i < self._len():
             yield next(self._cycle)
             i += 1
 

src/cpl_query/enumerable/__init__.py

@@ -19,12 +19,9 @@ __version__ = '2022.10.0.post2'
 
 from collections import namedtuple
 
-
 # imports:
 from .enumerable import Enumerable
 from .enumerable_abc import EnumerableABC
-from .ordered_enumerable import OrderedEnumerable
-from .ordered_enumerable_abc import OrderedEnumerableABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='10', micro='0.post2')

src/cpl_query/enumerable/enumerable.py

@@ -1,9 +1,4 @@
-from typing import Union, Callable, Optional
-
-from cpl_query._helper import is_number
 from cpl_query.enumerable.enumerable_abc import EnumerableABC
-from cpl_query.enumerable.ordered_enumerable_abc import OrderedEnumerableABC
-from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument, InvalidTypeException, IndexOutOfRangeException
 
 
 def _default_lambda(x: object):
@@ -14,294 +9,5 @@ class Enumerable(EnumerableABC):
     r"""Implementation of :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`
     """
 
-    def __init__(self, t: type = None, values: Union[list, iter] = None):
+    def __init__(self, t: type = None, values: list = None):
         EnumerableABC.__init__(self, t, values)
-
-    def all(self, _func: Callable = None) -> bool:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = self.where(_func)
-        return len(result) == len(self)
-
-    def any(self, _func: Callable = None) -> bool:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = self.where(_func)
-        return len(result) > 0
-
-    def average(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return float(self.sum(_func)) / float(self.count())
-
-    def contains(self, _value: object) -> bool:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _value is None:
-            raise ArgumentNoneException(ExceptionArgument.value)
-
-        return self.where(lambda x: x == _value).count() > 0
-
-    def count(self, _func: Callable = None) -> int:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            return len(self)
-
-        return len(self.where(_func))
-
-    def distinct(self, _func: Callable = None) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = Enumerable()
-        known_values = []
-        for element in self:
-            value = _func(element)
-            if value in known_values:
-                continue
-
-            known_values.append(value)
-            result.add(element)
-
-        return result
-
-    def element_at(self, _index: int) -> any:
-        self._values.reset()
-        while _index >= 0:
-            current = self.next()
-            if _index == 0:
-                return current
-            _index -= 1
-
-    def element_at_or_default(self, _index: int) -> any:
-        try:
-            return self.element_at(_index)
-        except IndexOutOfRangeException:
-            return None
-
-    @staticmethod
-    def empty() -> 'EnumerableABC':
-        r"""Returns an empty enumerable
-
-        Returns
-        -------
-            Enumerable object that contains no elements
-        """
-        return Enumerable()
-
-    def first(self: EnumerableABC, _func=None) -> any:
-        if _func is not None:
-            return self.where(_func).element_at(0)
-        return self.element_at(0)
-
-    def first_or_default(self: EnumerableABC, _func=None) -> Optional[any]:
-        if _func is not None:
-            return self.where(_func).element_at_or_default(0)
-        return self.element_at_or_default(0)
-
-    def for_each(self, _func: Callable = None):
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        for element in self:
-            _func(element)
-
-    def last(self: EnumerableABC) -> any:
-        return self.element_at(self.count() - 1)
-
-    def last_or_default(self: EnumerableABC) -> Optional[any]:
-        return self.element_at_or_default(self.count() - 1)
-
-    def max(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return _func(max(self, key=_func))
-
-    def median(self, _func=None) -> Union[int, float]:
-        if _func is None:
-            _func = _default_lambda
-        result = self.order_by(_func).select(_func).to_list()
-        length = len(result)
-        i = int(length / 2)
-        return (
-            result[i]
-            if length % 2 == 1
-            else (float(result[i - 1]) + float(result[i])) / float(2)
-        )
-
-    def min(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return _func(min(self, key=_func))
-
-    def order_by(self, _func: Callable = None) -> OrderedEnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        from cpl_query.enumerable.ordered_enumerable import OrderedEnumerable
-        return OrderedEnumerable(self.type, _func, sorted(self, key=_func))
-
-    def order_by_descending(self, _func: Callable = None) -> OrderedEnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        from cpl_query.enumerable.ordered_enumerable import OrderedEnumerable
-        return OrderedEnumerable(self.type, _func, sorted(self, key=_func, reverse=True))
-
-    @staticmethod
-    def range(start: int, length: int) -> 'EnumerableABC':
-        return Enumerable(int, range(start, length))
-
-    def reverse(self: EnumerableABC) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        return Enumerable(self.type, list(reversed(self.to_list())))
-
-    def select(self, _func: Callable = None) -> EnumerableABC:
-        if _func is None:
-            _func = _default_lambda
-
-        _l = [_func(_o) for _o in self]
-        return Enumerable(self._type if len(_l) < 1 else type(_l[0]), _l)
-
-    def select_many(self, _func: Callable = None) -> EnumerableABC:
-        if _func is None:
-            _func = _default_lambda
-
-        # The line below is pain. I don't understand anything of the list comprehension...
-        # written on 09.11.2022 by Sven Heidemann
-        _l = [_a for _o in self for _a in _func(_o)]
-        return Enumerable(self._type if len(_l) < 1 else type(_l[0]), _l)
-
-    def single(self: EnumerableABC) -> any:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) > 1:
-            raise IndexError('Found more than one element')
-        elif len(self) == 0:
-            raise IndexOutOfRangeException(f'{type(self).__name__} is empty')
-
-        return self.element_at(0)
-
-    def single_or_default(self: EnumerableABC) -> Optional[any]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) > 1:
-            raise IndexError('Found more than one element')
-        elif len(self) == 0:
-            return None
-
-        return self.element_at(0)
-
-    def skip(self, _index: int) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        _list = self.to_list()
-
-        return Enumerable(self.type, _list[_index:])
-
-    def skip_last(self, _index: int) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        index = len(self) - _index
-
-        return self.take(len(self) - _index)
-
-    def take(self, _index: int) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        _list = self.to_list()
-
-        return Enumerable(self.type, _list[:_index])
-
-    def take_last(self, _index: int) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        _list = self.to_list()
-        index = len(_list) - _index
-
-        return self.skip(index)
-
-    def sum(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return sum([_func(x) for x in self])
-
-    def where(self, _func: Callable = None) -> EnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            raise ArgumentNoneException(ExceptionArgument.func)
-
-        return Enumerable(self.type, list(filter(_func, self._values)))

src/cpl_query/enumerable/enumerable_abc.py

@@ -1,8 +1,6 @@
 from abc import abstractmethod
-from typing import Iterable
 
 from cpl_query.base.queryable_abc import QueryableABC
-from cpl_query.base.sequence_values import SequenceValues
 
 
 class EnumerableABC(QueryableABC):
@@ -11,81 +9,15 @@ class EnumerableABC(QueryableABC):
 
     @abstractmethod
     def __init__(self, t: type = None, values: list = None):
-        if t == any or t is None and values is not None:
-            t = type(values[0])
+        QueryableABC.__init__(self, t, values)
 
-        self._type, self._values, self._remove_error_check = t, SequenceValues(values, t), True
-
-    def __len__(self):
-        return len(self._values)
-
-    def __iter__(self):
-        return iter(self._values)
-
-    def next(self):
-        return next(self._values)
-
-    def __next__(self):
-        return self.next()
-
-    def __repr__(self):
-        return f'<{type(self).__name__} {list(self).__repr__()}>'
-
-    @property
-    def type(self) -> type:
-        return self._type
+        self._remove_error_check = True
 
     def set_remove_error_check(self, _value: bool):
         r"""Set flag to check if element exists before removing
         """
         self._remove_error_check = _value
 
-    def add(self, __object: object) -> None:
-        r"""Adds an element to the enumerable.
-        """
-        if self._type is not None and type(__object) != self._type and not isinstance(type(__object), self._type) and not issubclass(type(__object), self._type):
-            raise Exception(f'Unexpected type: {type(__object)}\nExpected type: {self._type}')
-
-        if len(self) == 0 and self._type is None:
-            self._type = type(__object)
-
-        self._values = SequenceValues([*self._values, __object], self._type)
-
-    def clear(self):
-        r"""Removes all elements
-        """
-        del self._values
-        self._values = []
-
-    def extend(self, __list: Iterable) -> 'EnumerableABC':
-        r"""Adds elements of given list to enumerable
-
-        Parameter
-        ---------
-            __enumerable: :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC`
-                index
-        """
-        self._values = SequenceValues([*self._values, *__list], self._type)
-        return self
-
-    def remove(self, __object: object) -> None:
-        r"""Removes element from list
-
-        Parameter
-        ---------
-            __object: :class:`object`
-                value
-
-        Raises
-        ---------
-            `Element not found` when element does not exist. Check can be deactivated by calling <enumerable>.set_remove_error_check(False)
-        """
-        if self._remove_error_check and __object not in self._values:
-            raise Exception('Element not found')
-
-        # self._values.remove(__object)
-        self._values = SequenceValues([x for x in self.to_list() if x != __object], self._type)
-
     def to_iterable(self) -> 'IterableABC':
         r"""Converts :class: `cpl_query.enumerable.enumerable_abc.EnumerableABC` to :class: `cpl_query.iterable.iterable_abc.IterableABC`
 
@@ -95,12 +27,3 @@ class EnumerableABC(QueryableABC):
         """
         from cpl_query.iterable.iterable import Iterable
         return Iterable(self._type, self.to_list())
-
-    def to_list(self) -> list:
-        r"""Converts :class: `cpl_query.base.sequence_abc.SequenceABC` to :class: `list`
-
-        Returns
-        -------
-            :class: `list`
-        """
-        return [x for x in self]

src/cpl_query/enumerable/ordered_enumerable.py

@@ -1,36 +0,0 @@
-from collections.abc import Callable
-from typing import Iterable
-
-from cpl_query.enumerable.enumerable import Enumerable
-from cpl_query.enumerable.ordered_enumerable_abc import OrderedEnumerableABC
-from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
-
-
-class OrderedEnumerable(Enumerable, OrderedEnumerableABC):
-    r"""Implementation of :class: `cpl_query.extension.Enumerable` `cpl_query.extension.OrderedEnumerableABC`
-    """
-
-    def __init__(self, _t: type, _func: Callable = None, _values: Iterable = None):
-        Enumerable.__init__(self, _t)
-        OrderedEnumerableABC.__init__(self, _t, _func, _values)
-
-    def then_by(self: OrderedEnumerableABC, _func: Callable) -> OrderedEnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            raise ArgumentNoneException(ExceptionArgument.func)
-
-        self._funcs.append(_func)
-
-        return OrderedEnumerable(self.type, _func, sorted(self, key=lambda *args: [f(*args) for f in self._funcs]))
-
-    def then_by_descending(self: OrderedEnumerableABC, _func: Callable) -> OrderedEnumerableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            raise ArgumentNoneException(ExceptionArgument.func)
-
-        self._funcs.append(_func)
-        return OrderedEnumerable(self.type, _func, sorted(self, key=lambda *args: [f(*args) for f in self._funcs], reverse=True))

src/cpl_query/enumerable/ordered_enumerable_abc.py

@@ -1,43 +0,0 @@
-from abc import abstractmethod
-from collections.abc import Callable
-from typing import Iterable
-
-from cpl_query.enumerable.enumerable_abc import EnumerableABC
-
-
-class OrderedEnumerableABC(EnumerableABC):
-
-    @abstractmethod
-    def __init__(self, _t: type, _func: Callable = None, _values: Iterable = None):
-        EnumerableABC.__init__(self, _t, _values)
-        self._funcs: list[Callable] = []
-        if _func is not None:
-            self._funcs.append(_func)
-
-    @abstractmethod
-    def then_by(self, func: Callable) -> 'OrderedEnumerableABC':
-        r"""Sorts OrderedList in ascending order by function
-
-        Parameter
-        ---------
-            func: :class:`Callable`
-            
-        Returns
-        -------
-            list of :class:`cpl_query.extension.OrderedEnumerableABC`
-        """
-        pass
-
-    @abstractmethod
-    def then_by_descending(self, func: Callable) -> 'OrderedEnumerableABC':
-        r"""Sorts OrderedList in descending order by function
-
-        Parameter
-        ---------
-            func: :class:`Callable`
-            
-        Returns
-        -------
-            list of :class:`cpl_query.extension.OrderedEnumerableABC`
-        """
-        pass

src/cpl_query/iterable/__init__.py

@@ -23,8 +23,6 @@ from collections import namedtuple
 # imports:
 from .iterable_abc import IterableABC
 from .iterable import Iterable
-from .ordered_iterable_abc import OrderedIterableABC
-from .ordered_iterable import OrderedIterable
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='10', micro='0.post2')

src/cpl_query/iterable/iterable.py

@@ -1,9 +1,6 @@
-from typing import Callable, Optional, Union, Iterable as IterableType
+from typing import Iterable as IterableType
 
-from cpl_query._helper import is_number
-from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument, InvalidTypeException, IndexOutOfRangeException
 from cpl_query.iterable.iterable_abc import IterableABC
-from cpl_query.iterable.ordered_iterable_abc import OrderedIterableABC
 
 
 def _default_lambda(x: object):
@@ -14,318 +11,3 @@ class Iterable(IterableABC):
 
     def __init__(self, t: type = None, values: IterableType = None):
         IterableABC.__init__(self, t, values)
-
-    def all(self, _func: Callable = None) -> bool:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = self.where(_func)
-        return len(result) == len(self)
-
-    def any(self, _func: Callable = None) -> bool:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = self.where(_func)
-        return len(result) > 0
-
-    def average(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return float(self.sum(_func)) / float(self.count())
-
-    def contains(self, _value: object) -> bool:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _value is None:
-            raise ArgumentNoneException(ExceptionArgument.value)
-
-        return self.where(lambda x: x == _value).count() > 0
-
-    def count(self, _func: Callable = None) -> int:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            return len(self)
-
-        return len(self.where(_func))
-
-    def distinct(self, _func: Callable = None) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = Iterable()
-        known_values = []
-        for element in self:
-            value = _func(element)
-            if value in known_values:
-                continue
-
-            known_values.append(value)
-            result.append(element)
-
-        return result
-
-    def element_at(self, _index: int) -> any:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        return self[_index]
-
-    def element_at_or_default(self, _index: int) -> any:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        try:
-            return self[_index]
-        except IndexError:
-            return None
-
-    def first(self: IterableABC) -> any:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) == 0:
-            raise IndexOutOfRangeException()
-
-        return self[0]
-
-    def first_or_default(self: IterableABC) -> Optional[any]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) == 0:
-            return None
-
-        return self[0]
-
-    def last(self: IterableABC) -> any:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) == 0:
-            raise IndexOutOfRangeException()
-
-        return self[len(self) - 1]
-
-    def last_or_default(self: IterableABC) -> Optional[any]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) == 0:
-            return None
-
-        return self[len(self) - 1]
-
-    def for_each(self, _func: Callable = None):
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        for element in self:
-            _func(element)
-
-    def max(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return _func(max(self, key=_func))
-
-    def median(self, _func=None) -> Union[int, float]:
-        if _func is None:
-            _func = _default_lambda
-        result = self.order_by(_func).select(_func).to_list()
-        length = len(result)
-        i = int(length / 2)
-        return (
-            result[i]
-            if length % 2 == 1
-            else (float(result[i - 1]) + float(result[i])) / float(2)
-        )
-
-    def min(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return _func(min(self, key=_func))
-
-    def order_by(self, _func: Callable = None) -> OrderedIterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        from cpl_query.iterable.ordered_iterable import OrderedIterable
-        return OrderedIterable(self.type, _func, sorted(self, key=_func))
-
-    def order_by_descending(self, _func: Callable = None) -> OrderedIterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            _func = _default_lambda
-
-        from cpl_query.iterable.ordered_iterable import OrderedIterable
-        return OrderedIterable(self.type, _func, sorted(self, key=_func, reverse=True))
-
-    def reverse(self: IterableABC) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        return Iterable().extend(reversed(self.to_list()))
-
-    def select(self, _func: Callable = None) -> IterableABC:
-        if _func is None:
-            _func = _default_lambda
-
-        result = Iterable()
-        result.extend(_func(_o) for _o in self)
-        return result
-
-    def select_many(self, _func: Callable = None) -> IterableABC:
-        if _func is None:
-            _func = _default_lambda
-
-        result = Iterable()
-        # The line below is pain. I don't understand anything of it...
-        # written on 09.11.2022 by Sven Heidemann
-        elements = [_a for _o in self for _a in _func(_o)]
-
-        result.extend(elements)
-        return result
-
-    def single(self: IterableABC) -> any:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) > 1:
-            raise Exception('Found more than one element')
-        elif len(self) == 0:
-            raise Exception('Found no element')
-
-        return self[0]
-
-    def single_or_default(self: IterableABC) -> Optional[any]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if len(self) > 1:
-            raise Exception('Index out of range')
-        elif len(self) == 0:
-            return None
-
-        return self[0]
-
-    def skip(self, _index: int) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        return Iterable(self.type, values=self[_index:])
-
-    def skip_last(self, _index: int) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        index = len(self) - _index
-
-        result = Iterable()
-        result.extend(self[:index])
-        return result
-
-    def take(self, _index: int) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _index is None:
-            raise ArgumentNoneException(ExceptionArgument.index)
-
-        result = Iterable()
-        result.extend(self[:_index])
-        return result
-
-    def take_last(self, _index: int) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        index = len(self) - _index
-
-        if index >= len(self) or index < 0:
-            raise IndexOutOfRangeException()
-
-        result = Iterable()
-        result.extend(self[index:])
-        return result
-
-    def sum(self, _func: Callable = None) -> Union[int, float, complex]:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None and not is_number(self.type):
-            raise InvalidTypeException()
-
-        if _func is None:
-            _func = _default_lambda
-
-        return sum([_func(x) for x in self])
-
-    def where(self, _func: Callable = None) -> IterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            raise ArgumentNoneException(ExceptionArgument.func)
-
-        if _func is None:
-            _func = _default_lambda
-
-        result = Iterable(self.type)
-        for element in self:
-            if _func(element):
-                result.append(element)
-
-        return result

src/cpl_query/iterable/iterable_abc.py

@@ -4,54 +4,45 @@ from typing import Iterable
 from cpl_query.base.queryable_abc import QueryableABC
 
 
-class IterableABC(list, QueryableABC):
+class IterableABC(QueryableABC):
     r"""ABC to define functions on list
     """
 
     @abstractmethod
     def __init__(self, t: type = None, values: Iterable = None):
-        values = [] if values is None else values
-        list.__init__(self, values)
+        QueryableABC.__init__(self, t, values)
 
-        if t is None and len(values) > 0:
-            t = type(values[0])
+    def __setitem__(self, i, val):
+        self._check_type(val)
+        values = [*self._values]
+        values[i] = val
+        self._set_values(values)
 
-        self._type = t
-
-    def __repr__(self):
-        return f'<{type(self).__name__} {list(self).__repr__()}>'
+    def __delitem__(self, i):
+        values = [*self._values]
+        del values[i]
+        self._set_values(values)
 
     @property
     def type(self) -> type:
         return self._type
 
-    def to_list(self) -> list:
-        r"""Converts :class: `cpl_query.base.sequence_abc.SequenceABC` to :class: `list`
-
-        Returns
-        -------
-            :class: `list`
-        """
-        return [x for x in self]
-
     def __str__(self):
         return str(self.to_list())
 
-    def append(self, __object: object) -> None:
+    def append(self, _object: object):
+        self.add(_object)
+
+    def add(self, _object: object):
         r"""Adds element to list
         Parameter
         ---------
-            __object: :class:`object`
+            _object: :class:`object`
                 value
         """
-        if self._type is not None and type(__object) != self._type and not isinstance(type(__object), self._type) and not issubclass(type(__object), self._type):
-            raise Exception(f'Unexpected type: {type(__object)}\nExpected type: {self._type}')
-
-        if len(self) == 0 and self._type is None:
-            self._type = type(__object)
-
-        # self._values = SequenceValues([*self._values, __object], self._type)
-        super().append(__object)
+        self._check_type(_object)
+        values = [*self._values, _object]
+        self._set_values(values)
 
     def extend(self, __iterable: Iterable) -> 'IterableABC':
         r"""Adds elements of given list to list

src/cpl_query/iterable/ordered_iterable.py

@@ -1,35 +0,0 @@
-from collections.abc import Callable
-
-from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
-from cpl_query.iterable.iterable import Iterable
-from cpl_query.iterable.ordered_iterable_abc import OrderedIterableABC
-
-
-class OrderedIterable(Iterable, OrderedIterableABC):
-    r"""Implementation of :class: `cpl_query.extension.Iterable` `cpl_query.extension.OrderedIterableABC`
-    """
-
-    def __init__(self, _t: type, _func: Callable = None, _values: Iterable = None):
-        Iterable.__init__(self, _t)
-        OrderedIterableABC.__init__(self, _t, _func, _values)
-
-    def then_by(self: OrderedIterableABC, _func: Callable) -> OrderedIterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            raise ArgumentNoneException(ExceptionArgument.func)
-
-        self._funcs.append(_func)
-
-        return OrderedIterable(self.type, _func, sorted(self, key=lambda *args: [f(*args) for f in self._funcs]))
-
-    def then_by_descending(self: OrderedIterableABC, _func: Callable) -> OrderedIterableABC:
-        if self is None:
-            raise ArgumentNoneException(ExceptionArgument.list)
-
-        if _func is None:
-            raise ArgumentNoneException(ExceptionArgument.func)
-
-        self._funcs.append(_func)
-        return OrderedIterable(self.type, _func, sorted(self, key=lambda *args: [f(*args) for f in self._funcs], reverse=True))

tests/custom/async/src/async/async.json

@@ -19,9 +19,7 @@
       "sh_cpl>=2021.10.0.post1"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/custom/database/cpl.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.2.dev1"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/custom/di/src/di/di.json

@@ -19,9 +19,7 @@
       "sh_cpl>=2021.10.0.post1"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/custom/discord/src/discord_bot/discord-bot.json

@@ -22,9 +22,7 @@
       "cpl-cli>=2022.7.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/custom/discord/src/modules/hello_world/hello-world.json

@@ -22,9 +22,7 @@
       "cpl-cli>=2022.7.0.post1"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/custom/general/src/general/arguments/__init__.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+"""
+general sh-edraft Common Python library
+~~~~~~~~~~~~~~~~~~~
+
+sh-edraft Common Python library
+
+:copyright: (c) 2020 - 2021 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'general.arguments'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
+__version__ = '2021.4.1'
+
+from collections import namedtuple
+
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='2021', minor='04', micro='01')

tests/custom/general/src/general/db/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl sh-edraft Common Python library
+general sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
 sh-edraft Common Python library
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'tests.db'
+__title__ = 'general.db'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
@@ -19,7 +19,8 @@ __version__ = '2021.4.1'
 
 from collections import namedtuple
 
+
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major=2021, minor=4, micro=1)
+version_info = VersionInfo(major='2021', minor='04', micro='01')

tests/custom/general/src/general/general.json

@@ -16,12 +16,12 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.10rc2",
-      "cpl-translation==2022.10rc2",
-      "cpl-query==2022.10rc2"
+      "cpl-core==2022.10.0.post9",
+      "cpl-translation==2022.10.0.post2",
+      "cpl-query==2022.10.0.post2"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.rc2"
+      "cpl-cli==2022.10"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {

tests/custom/translation/src/translation/translation.json

@@ -22,9 +22,7 @@
       "cpl-cli>=2022.6.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-app/cpl.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-app/src/simple_app/simple-app.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-console/cpl.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-console/src/simple_console/simple-console.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-di/cpl.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.2.dev1"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-di/src/simple_di/simple-di.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

tests/generated/startup-app/cpl.json

@@ -19,9 +19,7 @@
       "sh_cpl==2021.4.2"
     ],
     "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {

unittests/unittests/unittests.json

@@ -19,9 +19,7 @@
       "cpl-core>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": [],
     "DevDependencies": []
   },

unittests/unittests_cli/abc/command_test_case.py

@@ -0,0 +1,35 @@
+import os
+import shutil
+import traceback
+import unittest
+
+from unittests_cli.constants import PLAYGROUND_PATH
+
+
+class CommandTestCase(unittest.TestCase):
+
+    def __init__(self, method_name: str):
+        unittest.TestCase.__init__(self, method_name)
+
+    @classmethod
+    def setUpClass(cls):
+
+        try:
+            if os.path.exists(PLAYGROUND_PATH):
+                shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH)))
+
+            os.makedirs(PLAYGROUND_PATH)
+            os.chdir(PLAYGROUND_PATH)
+        except Exception as e:
+            print(f'Setup of {__name__} failed: {traceback.format_exc()}')
+
+    def setUp(self):
+        os.chdir(PLAYGROUND_PATH)
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            if os.path.exists(PLAYGROUND_PATH):
+                shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH)))
+        except Exception as e:
+            print(f'Cleanup of {__name__} failed: {traceback.format_exc()}')

unittests/unittests_cli/add_test_case.py

@@ -1,18 +1,16 @@
 import json
 import os
-import shutil
-import unittest
 
 from cpl_core.utils import String
-
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class AddTestCase(unittest.TestCase):
+class AddTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'add-test-project'
         self._target = 'add-test-library'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
@@ -26,19 +24,12 @@ class AddTestCase(unittest.TestCase):
         return project_json
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
         CLICommands.new('console', self._target, '--ab', '--s')
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def test_add(self):
         CLICommands.add(self._source, self._target)
         settings = self._get_project_settings()

unittests/unittests_cli/build_test_case.py

@@ -2,18 +2,17 @@ import filecmp
 import json
 import os
 import shutil
-import unittest
 
 from cpl_core.utils import String
-
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class BuildTestCase(unittest.TestCase):
+class BuildTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'build-test-source'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
 
@@ -31,18 +30,14 @@ class BuildTestCase(unittest.TestCase):
             project_file.close()
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        if not os.path.exists(PLAYGROUND_PATH):
+            os.makedirs(PLAYGROUND_PATH)
+        
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def _are_dir_trees_equal(self, dir1, dir2):
         """
         found at https://stackoverflow.com/questions/4187564/recursively-compare-two-directories-to-ensure-they-have-the-same-files-and-subdi

unittests/unittests_cli/cli_test_suite.py

@@ -32,8 +32,8 @@ class CLITestSuite(unittest.TestSuite):
         active_tests = [
             # nothing needed
             VersionTestCase,
-            GenerateTestCase,
             NewTestCase,
+            GenerateTestCase,
             # project needed
             BuildTestCase,
             PublishTestCase,
@@ -76,3 +76,8 @@ class CLITestSuite(unittest.TestSuite):
         self._setup()
         self._result = super().run(*args)
         self._cleanup()
+
+
+if __name__ == "__main__":
+    runner = unittest.TextTestRunner()
+    runner.run(CLITestSuite())

unittests/unittests_cli/constants.py

@@ -1,5 +1,9 @@
 import os
 
-PLAYGROUND_PATH = os.path.abspath(os.path.join(os.getcwd(), '../test_cli_playground'))
-TRANSLATION_PATH = os.path.abspath(os.path.join(os.getcwd(), '../unittests_translation'))
-CLI_PATH = os.path.abspath(os.path.join(os.getcwd(), '../../src/cpl_cli/main.py'))
+base = ''
+if not os.getcwd().endswith('unittests'):
+    base = '../'
+
+PLAYGROUND_PATH = os.path.abspath(os.path.join(os.getcwd(), f'{base}test_cli_playground'))
+TRANSLATION_PATH = os.path.abspath(os.path.join(os.getcwd(), f'{base}unittests_translation'))
+CLI_PATH = os.path.abspath(os.path.join(os.getcwd(), f'{base}../src/cpl_cli/main.py'))

unittests/unittests_cli/custom_test_case.py

@@ -1,7 +1,7 @@
-import unittest
+from unittests_cli.abc.command_test_case import CommandTestCase
 
 
-class CustomTestCase(unittest.TestCase):
+class CustomTestCase(CommandTestCase):
 
     def setUp(self):
         pass

unittests/unittests_cli/generate_test_case.py

@@ -1,41 +1,90 @@
 import os.path
-import unittest
 
+from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class GenerateTestCase(unittest.TestCase):
+class GenerateTestCase(CommandTestCase):
+    _project = 'test-console'
+    _t_path = 'test'
 
-    def _test_file(self, schematic: str, suffix: str):
-        CLICommands.generate(schematic, 'GeneratedFile')
-        file_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, f'generated_file{suffix}.py'))
+    @classmethod
+    def setUpClass(cls):
+        CommandTestCase.setUpClass()
+        CLICommands.new('console', cls._project, '--ab', '--s', '--venv')
+
+    def setUp(self):
+        os.chdir(PLAYGROUND_PATH)
+
+    def _test_file(self, schematic: str, suffix: str, path=None):
+        file = 'GeneratedFile'
+        expected_path = f'generated_file{suffix}.py'
+        if path is not None:
+            file = f'{path}/{file}'
+            expected_path = f'{path}/{expected_path}'
+        CLICommands.generate(schematic, file)
+        file_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, expected_path))
         file_exists = os.path.exists(file_path)
         self.assertTrue(file_exists)
 
+    def _test_file_with_project(self, schematic: str, suffix: str, path=None, enter=True):
+        file = f'GeneratedFile'
+        excepted_path = f'generated_file{suffix}.py'
+        if path is not None:
+            excepted_path = f'{self._project}/src/{String.convert_to_snake_case(self._project)}/{path}/generated_file_in_project{suffix}.py'
+            if enter:
+                os.chdir(path)
+                excepted_path = f'{path}/src/{String.convert_to_snake_case(self._project)}/generated_file_in_project{suffix}.py'
+
+            file = f'{path}/GeneratedFileInProject'
+
+        CLICommands.generate(schematic, file)
+        file_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, excepted_path))
+        self.assertTrue(os.path.exists(file_path))
+
     def test_abc(self):
         self._test_file('abc', '_abc')
+        self._test_file('abc', '_abc', path=self._t_path)
+        self._test_file('abc', '_abc', path=f'{self._t_path}/{self._t_path}')
+        self._test_file_with_project('abc', '_abc', path=self._project)
+        os.chdir(f'src/{String.convert_to_snake_case(self._project)}')
+        self._test_file_with_project('abc', '_abc', path='test', enter=False)
 
     def test_class(self):
         self._test_file('class', '')
+        self._test_file('class', '', path=self._t_path)
+        self._test_file_with_project('class', '', path=self._project)
 
     def test_enum(self):
         self._test_file('enum', '_enum')
+        self._test_file('enum', '_enum', path=self._t_path)
+        self._test_file_with_project('enum', '_enum', path=self._project)
+        os.chdir(f'src/{String.convert_to_snake_case(self._project)}')
+        self._test_file_with_project('enum', '_enum', path='test', enter=False)
 
     def test_pipe(self):
         self._test_file('pipe', '_pipe')
+        self._test_file('pipe', '_pipe', path=self._t_path)
+        self._test_file_with_project('pipe', '_pipe', path=self._project)
 
     def test_service(self):
         self._test_file('service', '_service')
+        self._test_file_with_project('service', '_service', path=self._project)
 
     def test_settings(self):
         self._test_file('settings', '_settings')
+        self._test_file_with_project('settings', '_settings', path=self._project)
 
     def test_test_case(self):
         self._test_file('test_case', '_test_case')
+        self._test_file_with_project('test_case', '_test_case', path=self._project)
 
     def test_thread(self):
         self._test_file('thread', '_thread')
+        self._test_file_with_project('thread', '_thread', path=self._project)
 
     def test_validator(self):
         self._test_file('validator', '_validator')
+        self._test_file_with_project('validator', '_validator', path=self._project)

unittests/unittests_cli/install_test_case.py

@@ -6,14 +6,15 @@ import sys
 import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class InstallTestCase(unittest.TestCase):
+class InstallTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'install-test-source'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
 
@@ -31,18 +32,14 @@ class InstallTestCase(unittest.TestCase):
             project_file.close()
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        if not os.path.exists(PLAYGROUND_PATH):
+            os.makedirs(PLAYGROUND_PATH)
+        
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def _get_installed_packages(self) -> dict:
         reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
         return dict([tuple(r.decode().split('==')) for r in reqs.split()])

unittests/unittests_cli/new_test_case.py

@@ -1,18 +1,18 @@
 import json
 import os
-import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class NewTestCase(unittest.TestCase):
+class NewTestCase(CommandTestCase):
 
-    def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
 
-    def _test_project(self, project_type: str, name: str, *args, test_venv=False):
+    def _test_project(self, project_type: str, name: str, *args, test_venv=False, without_ws=False):
         CLICommands.new(project_type, name, *args)
         workspace_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, name))
         self.assertTrue(os.path.exists(workspace_path))
@@ -22,7 +22,15 @@ class NewTestCase(unittest.TestCase):
             self.assertTrue(os.path.exists(os.path.join(workspace_path, 'venv/bin/python')))
             self.assertTrue(os.path.islink(os.path.join(workspace_path, 'venv/bin/python')))
 
-        project_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, name, 'src', String.convert_to_snake_case(name)))
+        base = 'src'
+        if '--base' in args and '/' in name:
+            base = name.split('/')[0]
+            name = name.replace(f'{name.split("/")[0]}/', '')
+
+        project_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, name, base, String.convert_to_snake_case(name)))
+        if without_ws:
+            project_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, base, name, 'src/', String.convert_to_snake_case(name)))
+
         self.assertTrue(os.path.exists(project_path))
         self.assertTrue(os.path.join(project_path, f'{name}.json'))
         self.assertTrue(os.path.join(project_path, f'main.py'))
@@ -54,10 +62,14 @@ class NewTestCase(unittest.TestCase):
             self.assertTrue(os.path.exists(os.path.join(workspace_path, 'venv/bin/python')))
             self.assertTrue(os.path.islink(os.path.join(workspace_path, 'venv/bin/python')))
 
-        project_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, workspace_name, 'src', String.convert_to_snake_case(name)))
+        base = 'src'
+        if '--base' in args and '/' in name:
+            base = name.split('/')[0]
+            name = name.replace(f'{name.split("/")[0]}/', '')
+
+        project_path = os.path.abspath(os.path.join(PLAYGROUND_PATH, workspace_name, base, String.convert_to_snake_case(name)))
         self.assertTrue(os.path.exists(project_path))
         self.assertTrue(os.path.join(project_path, f'{name}.json'))
-        os.chdir(os.path.abspath(os.path.join(os.getcwd(), '../')))
 
     def _test_sub_directory_project(self, project_type: str, directory: str, name: str, workspace_name: str, *args):
         os.chdir(os.path.abspath(os.path.join(os.getcwd(), workspace_name)))
@@ -83,11 +95,12 @@ class NewTestCase(unittest.TestCase):
         self.assertEqual(build_settings['Main'], f'{String.convert_to_snake_case(name)}.main')
         self.assertEqual(build_settings['EntryPoint'], name)
 
-        os.chdir(os.path.abspath(os.path.join(os.getcwd(), '../')))
-
     def test_console(self):
         self._test_project('console', 'test-console', '--ab', '--s', '--venv', test_venv=True)
 
+    def test_console_with_other_base(self):
+        self._test_project('console', 'tools/test-console', '--ab', '--s', '--venv', '--base', test_venv=True, without_ws=True)
+
     def test_console_without_s(self):
         self._test_project('console', 'test-console-without-s', '--ab')
 
@@ -100,6 +113,9 @@ class NewTestCase(unittest.TestCase):
     def test_sub_console(self):
         self._test_sub_project('console', 'test-sub-console', 'test-console', '--ab', '--s', '--sp', '--venv', test_venv=True)
 
+    def test_sub_console_with_other_base(self):
+        self._test_sub_project('console', 'tools/test-sub-console', 'test-console', '--ab', '--s', '--sp', '--venv', '--base', test_venv=True)
+
     def test_library(self):
         self._test_project('library', 'test-library', '--ab', '--s', '--sp')
 

unittests/unittests_cli/publish_test_case.py

@@ -5,15 +5,16 @@ import shutil
 import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class PublishTestCase(unittest.TestCase):
+class PublishTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'publish-test-source'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
 
@@ -31,18 +32,14 @@ class PublishTestCase(unittest.TestCase):
             project_file.close()
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        if not os.path.exists(PLAYGROUND_PATH):
+            os.makedirs(PLAYGROUND_PATH)
+        
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def _are_dir_trees_equal(self, dir1, dir2):
         """
         found at https://stackoverflow.com/questions/4187564/recursively-compare-two-directories-to-ensure-they-have-the-same-files-and-subdi

unittests/unittests_cli/remove_test_case.py

@@ -3,14 +3,15 @@ import os
 import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class RemoveTestCase(unittest.TestCase):
+class RemoveTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'add-test-project'
         self._target = 'add-test-library'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
@@ -24,7 +25,10 @@ class RemoveTestCase(unittest.TestCase):
         return project_json
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        if not os.path.exists(PLAYGROUND_PATH):
+            os.makedirs(PLAYGROUND_PATH)
+        
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))

unittests/unittests_cli/run_test_case.py

@@ -1,28 +1,24 @@
 import json
 import os
 import shutil
-import subprocess
-import sys
 import unittest
 
-import pkg_resources
-
 from cpl_core.utils import String
-
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class RunTestCase(unittest.TestCase):
+class RunTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'run-test'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
-        self._appsettings = f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'
         self._application = f'src/{String.convert_to_snake_case(self._source)}/application.py'
         self._test_code = f"""
         import json
+        import os
         settings = dict()
         with open('appsettings.json', 'r', encoding='utf-8') as cfg:
             # load json
@@ -30,14 +26,19 @@ class RunTestCase(unittest.TestCase):
             cfg.close()
             
         settings['RunTest']['WasStarted'] = 'True'
+        settings['RunTest']['Path'] = os.path.dirname(os.path.realpath(__file__))
         
         with open('appsettings.json', 'w', encoding='utf-8') as project_file:
             project_file.write(json.dumps(settings, indent=2))
             project_file.close()
         """
 
-    def _get_appsettings(self):
-        with open(os.path.join(os.getcwd(), self._appsettings), 'r', encoding='utf-8') as cfg:
+    def _get_appsettings(self, is_dev=False):
+        appsettings = f'dist/{self._source}/build/{String.convert_to_snake_case(self._source)}/appsettings.json'
+        if is_dev:
+            appsettings = f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'
+
+        with open(os.path.join(os.getcwd(), appsettings), 'r', encoding='utf-8') as cfg:
             # load json
             project_json = json.load(cfg)
             cfg.close()
@@ -45,12 +46,12 @@ class RunTestCase(unittest.TestCase):
         return project_json
 
     def _save_appsettings(self, settings: dict):
-        with open(os.path.join(os.getcwd(), self._appsettings), 'w', encoding='utf-8') as project_file:
+        with open(os.path.join(os.getcwd(), f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'), 'w', encoding='utf-8') as project_file:
             project_file.write(json.dumps(settings, indent=2))
             project_file.close()
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
@@ -60,13 +61,6 @@ class RunTestCase(unittest.TestCase):
             file.write(f'\t\t{self._test_code}')
             file.close()
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def test_run(self):
         CLICommands.run()
         settings = self._get_appsettings()
@@ -77,9 +71,16 @@ class RunTestCase(unittest.TestCase):
             'True',
             settings['RunTest']['WasStarted']
         )
+        self.assertNotEqual(
+            os.path.join(os.getcwd(), f'src/{String.convert_to_snake_case(self._source)}'),
+            settings['RunTest']['Path']
+        )
+        self.assertEqual(
+            os.path.join(os.getcwd(), f'dist/{self._source}/build/{String.convert_to_snake_case(self._source)}'),
+            settings['RunTest']['Path']
+        )
 
     def test_run_by_project(self):
-        os.chdir(os.path.join(os.getcwd()))
         CLICommands.run(self._source)
         settings = self._get_appsettings()
         self.assertNotEqual(settings, {})
@@ -89,3 +90,41 @@ class RunTestCase(unittest.TestCase):
             'True',
             settings['RunTest']['WasStarted']
         )
+        self.assertNotEqual(
+            os.path.join(os.getcwd(), f'src/{String.convert_to_snake_case(self._source)}'),
+            settings['RunTest']['Path']
+        )
+        self.assertEqual(
+            os.path.join(os.getcwd(), f'dist/{self._source}/build/{String.convert_to_snake_case(self._source)}'),
+            settings['RunTest']['Path']
+        )
+
+    def test_run_dev(self):
+        CLICommands.run(is_dev=True)
+        settings = self._get_appsettings(is_dev=True)
+        self.assertNotEqual(settings, {})
+        self.assertIn('RunTest', settings)
+        self.assertIn('WasStarted', settings['RunTest'])
+        self.assertEqual(
+            'True',
+            settings['RunTest']['WasStarted']
+        )
+        self.assertEqual(
+            os.path.join(os.getcwd(), f'src/{String.convert_to_snake_case(self._source)}'),
+            settings['RunTest']['Path']
+        )
+
+    def test_run_dev_by_project(self):
+        CLICommands.run(self._source, is_dev=True)
+        settings = self._get_appsettings(is_dev=True)
+        self.assertNotEqual(settings, {})
+        self.assertIn('RunTest', settings)
+        self.assertIn('WasStarted', settings['RunTest'])
+        self.assertEqual(
+            'True',
+            settings['RunTest']['WasStarted']
+        )
+        self.assertEqual(
+            os.path.join(os.getcwd(), f'src/{String.convert_to_snake_case(self._source)}'),
+            settings['RunTest']['Path']
+        )

unittests/unittests_cli/start_test_case.py

@@ -5,21 +5,23 @@ import time
 import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_cli.threads.start_test_thread import StartTestThread
 from unittests_shared.cli_commands import CLICommands
 
 
-class StartTestCase(unittest.TestCase):
+class StartTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'start-test'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
         self._appsettings = f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'
         self._application = f'src/{String.convert_to_snake_case(self._source)}/application.py'
         self._test_code = f"""
         import json
+        import os
         settings = dict()
         with open('appsettings.json', 'r', encoding='utf-8') as cfg:
             # load json
@@ -30,14 +32,19 @@ class StartTestCase(unittest.TestCase):
             settings['RunTest']['WasRestarted'] = 'True'
         
         settings['RunTest']['WasStarted'] = 'True'
+        settings['RunTest']['Path'] = os.path.dirname(os.path.realpath(__file__))
         
         with open('appsettings.json', 'w', encoding='utf-8') as project_file:
             project_file.write(json.dumps(settings, indent=2))
             project_file.close()
         """
 
-    def _get_appsettings(self):
-        with open(os.path.join(os.getcwd(), self._appsettings), 'r', encoding='utf-8') as cfg:
+    def _get_appsettings(self, is_dev=False):
+        appsettings = f'dist/{self._source}/build/{String.convert_to_snake_case(self._source)}/appsettings.json'
+        if is_dev:
+            appsettings = f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'
+
+        with open(os.path.join(os.getcwd(), appsettings), 'r', encoding='utf-8') as cfg:
             # load json
             project_json = json.load(cfg)
             cfg.close()
@@ -45,12 +52,15 @@ class StartTestCase(unittest.TestCase):
         return project_json
 
     def _save_appsettings(self, settings: dict):
-        with open(os.path.join(os.getcwd(), self._appsettings), 'w', encoding='utf-8') as project_file:
+        with open(os.path.join(os.getcwd(), f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'), 'w', encoding='utf-8') as project_file:
             project_file.write(json.dumps(settings, indent=2))
             project_file.close()
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        if not os.path.exists(PLAYGROUND_PATH):
+            os.makedirs(PLAYGROUND_PATH)
+
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
@@ -60,16 +70,42 @@ class StartTestCase(unittest.TestCase):
             file.write(f'\t\t{self._test_code}')
             file.close()
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def test_start(self):
         thread = StartTestThread()
         thread.start()
+        time.sleep(5)
+        settings = self._get_appsettings()
+        self.assertNotEqual(settings, {})
+        self.assertIn('RunTest', settings)
+        self.assertIn('WasStarted', settings['RunTest'])
+        self.assertEqual(
+            'True',
+            settings['RunTest']['WasStarted']
+        )
+
+        with open(os.path.join(os.getcwd(), self._application), 'a', encoding='utf-8') as file:
+            file.write(f'# trigger restart (comment generated by unittest)')
+            file.close()
+
+        time.sleep(5)
+
+        settings = self._get_appsettings()
+        self.assertNotEqual(settings, {})
+        self.assertIn('RunTest', settings)
+        self.assertIn('WasStarted', settings['RunTest'])
+        self.assertIn('WasRestarted', settings['RunTest'])
+        self.assertEqual(
+            'True',
+            settings['RunTest']['WasStarted']
+        )
+        self.assertEqual(
+            'True',
+            settings['RunTest']['WasRestarted']
+        )
+
+    def test_start_dev(self):
+        thread = StartTestThread(is_dev=True)
+        thread.start()
         time.sleep(1)
         settings = self._get_appsettings()
         self.assertNotEqual(settings, {})
@@ -86,7 +122,7 @@ class StartTestCase(unittest.TestCase):
 
         time.sleep(1)
 
-        settings = self._get_appsettings()
+        settings = self._get_appsettings(is_dev=True)
         self.assertNotEqual(settings, {})
         self.assertIn('RunTest', settings)
         self.assertIn('WasStarted', settings['RunTest'])

unittests/unittests_cli/threads/start_test_thread.py

@@ -5,8 +5,9 @@ from unittests_shared.cli_commands import CLICommands
 
 class StartTestThread(threading.Thread):
 
-    def __init__(self):
+    def __init__(self, is_dev=False):
         threading.Thread.__init__(self, daemon=True)
+        self._is_dev = is_dev
 
     def run(self):
-        CLICommands.start(True)
+        CLICommands.start(is_dev=self._is_dev, output=True)

unittests/unittests_cli/uninstall_test_case.py

@@ -6,14 +6,15 @@ import sys
 import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class UninstallTestCase(unittest.TestCase):
+class UninstallTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'uninstall-test-source'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
         self._version = '1.7.3'
@@ -29,18 +30,14 @@ class UninstallTestCase(unittest.TestCase):
         return project_json
 
     def setUp(self):
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
+        if not os.path.exists(PLAYGROUND_PATH):
+            os.makedirs(PLAYGROUND_PATH)
+
+        os.chdir(PLAYGROUND_PATH)
         # create projects
         CLICommands.new('console', self._source, '--ab', '--s')
         os.chdir(os.path.join(os.getcwd(), self._source))
 
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def _get_installed_packages(self) -> dict:
         reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
         return dict([tuple(r.decode().split('==')) for r in reqs.split()])

unittests/unittests_cli/unittests_cli.json

@@ -20,9 +20,7 @@
       "cpl-cli>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": [],
     "DevDependencies": []
   },

unittests/unittests_cli/update_test_case.py

@@ -6,14 +6,15 @@ import sys
 import unittest
 
 from cpl_core.utils import String
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_shared.cli_commands import CLICommands
 
 
-class UpdateTestCase(unittest.TestCase):
+class UpdateTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._source = 'install-test-source'
         self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
 
@@ -22,10 +23,19 @@ class UpdateTestCase(unittest.TestCase):
         self._old_package = f'{self._old_package_name}=={self._old_version}'
 
         # todo: better way to do shit required
-        self._new_version = '2.0.1'
+        self._new_version = '2.1.0'
         self._new_package_name = 'discord.py'
         self._new_package = f'{self._new_package_name}=={self._new_version}'
 
+    def setUp(self):
+        CLICommands.uninstall(self._old_package)
+        CLICommands.uninstall(self._new_package)
+        os.chdir(PLAYGROUND_PATH)
+        # create projects
+        CLICommands.new('console', self._source, '--ab', '--s')
+        os.chdir(os.path.join(os.getcwd(), self._source))
+        CLICommands.install(self._old_package)
+
     def _get_project_settings(self):
         with open(os.path.join(os.getcwd(), self._project_file), 'r', encoding='utf-8') as cfg:
             # load json
@@ -39,22 +49,6 @@ class UpdateTestCase(unittest.TestCase):
             project_file.write(json.dumps(settings, indent=2))
             project_file.close()
 
-    def setUp(self):
-        CLICommands.uninstall(self._old_package)
-        CLICommands.uninstall(self._new_package)
-        os.chdir(os.path.abspath(PLAYGROUND_PATH))
-        # create projects
-        CLICommands.new('console', self._source, '--ab', '--s')
-        os.chdir(os.path.join(os.getcwd(), self._source))
-        CLICommands.install(self._old_package)
-
-    def cleanUp(self):
-        # remove projects
-        if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
-            return
-
-        shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
-
     def _get_installed_packages(self) -> dict:
         reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
         return dict([tuple(r.decode().split('==')) for r in reqs.split()])
@@ -85,5 +79,3 @@ class UpdateTestCase(unittest.TestCase):
         packages = self._get_installed_packages()
         self.assertIn(self._new_package_name, packages)
         self.assertEqual(self._new_version, packages[self._new_package_name])
-
-

unittests/unittests_cli/version_test_case.py

@@ -12,13 +12,14 @@ import cpl_cli
 from cpl_core.console import ForegroundColorEnum
 from termcolor import colored
 
+from unittests_cli.abc.command_test_case import CommandTestCase
 from unittests_shared.cli_commands import CLICommands
 
 
-class VersionTestCase(unittest.TestCase):
+class VersionTestCase(CommandTestCase):
 
-    def __init__(self, methodName: str):
-        unittest.TestCase.__init__(self, methodName)
+    def __init__(self, method_name: str):
+        CommandTestCase.__init__(self, method_name)
         self._block_banner = ""
         self._block_version = ""
         self._block_package_header = ""

unittests/unittests_core/unittests_core.json

@@ -19,9 +19,7 @@
       "cpl-core>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": [],
     "DevDependencies": []
   },

unittests/unittests_query/enumerable_query_test_case.py

@@ -11,7 +11,16 @@ from unittests_query.models import User, Address
 class EnumerableQueryTestCase(unittest.TestCase):
 
     def setUp(self) -> None:
-        self._tests = Enumerable(User)
+        users = []
+        for i in range(0, 100):
+            users.append(User(
+                String.random_string(string.ascii_letters, 8).lower(),
+                Address(
+                    String.random_string(string.ascii_letters, 10).lower(),
+                    randint(1, 10)
+                )
+            ))
+
         self._t_user = User(
             'Test user',
             Address(
@@ -27,22 +36,10 @@ class EnumerableQueryTestCase(unittest.TestCase):
             )
         )
 
-        self._generate_test_data()
+        users.append(self._t_user)
+        users.append(self._t_user2)
 
-    def _generate_test_data(self):
-        for i in range(0, 100):
-            user = User(
-                String.random_string(string.ascii_letters, 8).lower(),
-                Address(
-                    String.random_string(string.ascii_letters, 10).lower(),
-                    randint(1, 10)
-                )
-            )
-
-            self._tests.add(user)
-
-        self._tests.add(self._t_user)
-        self._tests.add(self._t_user2)
+        self._tests = Enumerable(User, users)
 
     def test_any(self):
         results = []

unittests/unittests_query/enumerable_test_case.py

@@ -6,17 +6,9 @@ from cpl_query.enumerable.enumerable import Enumerable
 class EnumerableTestCase(unittest.TestCase):
 
     def setUp(self) -> None:
-        self._list = Enumerable(int)
-
-    def _clear(self):
-        self._list.clear()
-        self.assertEqual(self._list, [])
+        self._list = Enumerable(int, list(range(1, 4)))
 
     def test_append(self):
-        self._list.add(1)
-        self._list.add(2)
-        self._list.add(3)
-
         self.assertEqual(self._list.to_list(), [1, 2, 3])
         self.assertRaises(Exception, lambda v: self._list.add(v), '3')
 
@@ -38,30 +30,7 @@ class EnumerableTestCase(unittest.TestCase):
             n += 1
 
     def test_get(self):
-        self._list.add(1)
-        self._list.add(2)
-        self._list.add(3)
-
         self.assertEqual(self._list.element_at(2), [1, 2, 3][2])
 
     def test_count(self):
-        self._list.add(1)
-        self._list.add(2)
-        self._list.add(3)
-
         self.assertEqual(self._list.count(), 3)
-
-    def test_remove(self):
-        old_values = self._list._values
-        self._list.add(1)
-        self.assertNotEqual(old_values, self._list._values)
-        self._list.add(2)
-        self._list.add(3)
-
-        self.assertEqual(self._list.to_list(), [1, 2, 3])
-        self.assertRaises(Exception, lambda v: self._list.add(v), '3')
-        old_values = self._list._values
-        self._list.remove(3)
-        self.assertNotEqual(old_values, self._list._values)
-        self.assertEqual(self._list.to_list(), [1, 2])
-        self.assertRaises(Exception, lambda v: self._list.add(v), '3')

unittests/unittests_query/iterable_query_test_case.py

@@ -5,6 +5,7 @@ from random import randint
 from cpl_core.utils import String
 from cpl_query.exceptions import InvalidTypeException, ArgumentNoneException
 from cpl_query.extension.list import List
+from cpl_query.iterable import Iterable
 from unittests_query.models import User, Address
 
 
@@ -102,8 +103,18 @@ class IterableQueryTestCase(unittest.TestCase):
         self.assertEqual(1, self._tests.count(lambda u: u == self._t_user))
 
     def test_distinct(self):
-        res = self._tests.distinct(lambda u: u.address.nr).where(lambda u: u.address.nr == 5)
-        self.assertEqual(1, len(res))
+        res = self._tests.select(lambda u: u.address.nr).where(lambda a: a == 5).distinct()
+        self.assertEqual(1, res.count())
+
+        addresses = []
+        for u in self._tests:
+            if u.address.nr in addresses:
+                continue
+
+            addresses.append(u.address.nr)
+
+        res2 = self._tests.distinct(lambda x: x.address.nr).select(lambda x: x.address.nr).to_list()
+        self.assertEqual(addresses, res2)
 
     def test_element_at(self):
         index = randint(0, len(self._tests) - 1)
@@ -168,6 +179,29 @@ class IterableQueryTestCase(unittest.TestCase):
         self.assertEqual(res[0], s_res)
         self.assertIsNone(sn_res)
 
+    def test_group_by(self):
+        def by_adr(u):
+            return u.address.nr
+
+        t = self._tests.select(by_adr).group_by()
+        res = self._tests.group_by(by_adr)
+        self.assertTrue(isinstance(res.first_or_default(), Iterable))
+        self.assertNotEqual(self._tests.count(), res.count())
+        self.assertEqual(self._tests.distinct(by_adr).count(), res.count())
+
+        elements = List(int)
+        groups = {}
+        for x in range(0, 1000):
+            v = randint(1, 100)
+            if v not in groups:
+                groups[v] = []
+
+            groups[v].append(v)
+            elements.append(v)
+
+        r1, r2 = list(groups.values()), elements.group_by().select(lambda l: l.to_list()).to_list()
+        self.assertEqual(r1, r2)
+
     def test_for_each(self):
         users = []
         self._tests.for_each(lambda user: (

unittests/unittests_query/models.py

@@ -4,9 +4,15 @@ class User:
         self.name = name
         self.address = address
 
+    def __repr__(self):
+        return f'<{type(self).__name__} {self.name} {self.address}>'
+
 
 class Address:
 
     def __init__(self, street, nr):
         self.street = street
         self.nr = nr
+
+    def __repr__(self):
+        return f'<{type(self).__name__} {self.street} {self.nr}>'

unittests/unittests_query/performance_test_case.py

@@ -19,9 +19,9 @@ class PerformanceTestCase(unittest.TestCase):
             i += 1
 
     def test_range(self):
-        default = timeit.timeit(lambda: list(self.values), number=COUNT)
-        enumerable = timeit.timeit(lambda: Enumerable(int, self.values), number=COUNT)
-        iterable = timeit.timeit(lambda: Iterable(int, self.values), number=COUNT)
+        default = timeit.timeit(lambda: list(range(0, VALUES)), number=COUNT)
+        iterable = timeit.timeit(lambda: Iterable.range(0, VALUES), number=COUNT)
+        enumerable = timeit.timeit(lambda: Enumerable.range(0, VALUES), number=COUNT)
 
         print('Range')
         print(f'd: {default}s')
@@ -32,9 +32,9 @@ class PerformanceTestCase(unittest.TestCase):
         self.assertLess(default, iterable)
 
     def test_where_single(self):
-        default = timeit.timeit(lambda: [x for x in list(self.values) if x == 50], number=COUNT)
-        iterable = timeit.timeit(lambda: Iterable(int, self.values).where(lambda x: x == 50).single(), number=COUNT)
-        enumerable = timeit.timeit(lambda: Enumerable(int, self.values).where(lambda x: x == 50).single(), number=COUNT)
+        default = timeit.timeit(lambda: [x for x in list(range(0, VALUES)) if x == 50], number=COUNT)
+        iterable = timeit.timeit(lambda: Iterable.range(0, VALUES).where(lambda x: x == 50).single(), number=COUNT)
+        enumerable = timeit.timeit(lambda: Enumerable.range(0, VALUES).where(lambda x: x == 50).single(), number=COUNT)
 
         print('Where single')
         print(f'd: {default}s')
@@ -55,7 +55,7 @@ class PerformanceTestCase(unittest.TestCase):
         for i in range(VALUES):
             values.append(TestModel(i, TestModel(i + 1)))
 
-        default = timeit.timeit(lambda: [x for x in list(values) if x.tm.value == 50], number=COUNT)
+        default = timeit.timeit(lambda: [x for x in values if x.tm.value == 50], number=COUNT)
         iterable = timeit.timeit(lambda: Iterable(TestModel, values).where(lambda x: x.tm.value == 50).single(), number=COUNT)
         enumerable = timeit.timeit(lambda: Enumerable(TestModel, values).where(lambda x: x.tm.value == 50).single(), number=COUNT)
 

unittests/unittests_query/unittests_query.json

@@ -20,9 +20,7 @@
       "cpl-query>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": [],
     "DevDependencies": []
   },

unittests/unittests_shared/cli_commands.py

@@ -1,5 +1,6 @@
 import os
 import subprocess
+import sys
 
 from unittests_cli.constants import CLI_PATH
 
@@ -23,7 +24,7 @@ class CLICommands:
     @staticmethod
     def _run_with_output(cmd: str, *args) -> str:
         env_vars = os.environ
-        # env_vars['CPL_IS_UNITTEST'] = 'NO'
+        env_vars['CPL_IS_UNITTEST'] = 'NO'
 
         command = ['python', CLI_PATH, cmd]
         for arg in args:
@@ -64,15 +65,23 @@ class CLICommands:
         cls._run('remove', project, output=output)
 
     @classmethod
-    def run(cls, project: str = None, output=False):
+    def run(cls, project: str = None, is_dev=False, output=False):
+        args = []
+        if is_dev:
+            args.append('--dev')
+
         if project is None:
-            cls._run('run', output=output)
+            cls._run('run', *args, output=output)
             return
-        cls._run('run', project, output=output)
+        cls._run('run', project, *args, output=output)
 
     @classmethod
-    def start(cls, output=False):
-        cls._run('start', output=output)
+    def start(cls, is_dev=False, output=False):
+        args = []
+        if is_dev:
+            args.append('--dev')
+
+        cls._run('start', *args, output=output)
 
     @classmethod
     def uninstall(cls, package: str, is_dev=False, output=False):

unittests/unittests_shared/unittests_shared.json

@@ -19,9 +19,7 @@
       "cpl-core>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": [],
     "DevDependencies": []
   },

unittests/unittests_translation/translation_test_suite.py

@@ -1,11 +1,7 @@
-import os
-import shutil
-import traceback
 import unittest
 from typing import Optional
 from unittest import TestResult
 
-from unittests_cli.constants import PLAYGROUND_PATH
 from unittests_translation.translation_test_case import TranslationTestCase
 
 
@@ -25,27 +21,5 @@ class TranslationTestSuite(unittest.TestSuite):
         for test in active_tests:
             self.addTests(loader.loadTestsFromTestCase(test))
 
-    def _setup(self):
-        try:
-            if os.path.exists(PLAYGROUND_PATH):
-                shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH)))
-
-            os.makedirs(PLAYGROUND_PATH)
-            os.chdir(PLAYGROUND_PATH)
-        except Exception as e:
-            print(f'Setup of {__name__} failed: {traceback.format_exc()}')
-
-    def _cleanup(self):
-        try:
-            if self._result is not None and (len(self._result.errors) > 0 or len(self._result.failures) > 0):
-                return
-
-            if os.path.exists(PLAYGROUND_PATH):
-                shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH)))
-        except Exception as e:
-            print(f'Cleanup of {__name__} failed: {traceback.format_exc()}')
-
     def run(self, *args):
-        self._setup()
         self._result = super().run(*args)
-        self._cleanup()

unittests/unittests_translation/unittests_translation.json

@@ -23,9 +23,7 @@
       "cpl-cli>=2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {