Improve handling around cli.

Author: funilrys

PyFunceble/cli/continuous_integration/base.py

@@ -72,19 +72,19 @@ class ContinuousIntegrationBase:
     :param authorized:
         The authorization to run.
     :param git_email:
-        The email to apply while initilizing the git repository for push.
+        The email to apply while initializing the git repository for push.
     :param git_name:
-        The name to apply while initilizing the git repository for push.
+        The name to apply while initializing the git repository for push.
     :param git_branch:
         The branch to use while testing.
     :param git_distribution_branch:
         The branch to push the results into.
     :param token:
-        The token to apply while initilizing the git repository for push.
+        The token to apply while initializing the git repository for push.
     :param command:
         The command to execute before each push (except the latest one).
     :param end_command:
-        The commant to execute at the very end.
+        The command to execute at the very end.
     :param commit_message:
         The commit message to apply before each push (except the latest one).
     :param end_commit_message:
@@ -202,7 +202,7 @@ def execute_if_authorized(default: Any = None):  # pylint: disable=no-self-argum
         Otherwise, apply the given :code:`default`.
         """
 
-        def inner_metdhod(func):
+        def inner_method(func):
             @functools.wraps(func)
             def wrapper(self, *args, **kwargs):
                 if self.authorized:
@@ -211,7 +211,7 @@ def wrapper(self, *args, **kwargs):
 
             return wrapper
 
-        return inner_metdhod
+        return inner_method
 
     def ensure_git_email_is_given(func):  # pylint: disable=no-self-argument
         """
@@ -609,7 +609,7 @@ def command(self, value: str) -> None:
             raise TypeError(f"<value> should be {str}, {type(value)} given.")
 
         if not value:
-            raise ValueError("<value> should not be empy.")
+            raise ValueError("<value> should not be empty.")
 
         self._command = value
 
@@ -651,7 +651,7 @@ def end_command(self, value: str) -> None:
             raise TypeError(f"<value> should be {str}, {type(value)} given.")
 
         if not value:
-            raise ValueError("<value> should not be empy.")
+            raise ValueError("<value> should not be empty.")
 
         self._end_command = value
 
@@ -693,7 +693,7 @@ def commit_message(self, value: str) -> None:
             raise TypeError(f"<value> should be {str}, {type(value)} given.")
 
         if not value:
-            raise ValueError("<value> should not be empy.")
+            raise ValueError("<value> should not be empty.")
 
         self._commit_message = value
 
@@ -735,7 +735,7 @@ def end_commit_message(self, value: str) -> None:
             raise TypeError(f"<value> should be {str}, {type(value)} given.")
 
         if not value:
-            raise ValueError("<value> should not be empy.")
+            raise ValueError("<value> should not be empty.")
 
         self._end_commit_message = value
 
@@ -835,7 +835,7 @@ def get_remote_destination():
     @staticmethod
     def exec_command(command: str, allow_stdout: bool) -> None:
         """
-        Exceutes the given command.
+        Executes the given command.
 
         :param command:
             The command to execute.
@@ -1293,17 +1293,17 @@ def init(self) -> "ContinuousIntegrationBase":
         The purpose of this method is to be able to have some custom init based
         on the CI we are currently on.
 
-        The init method should be manually started before runing any further
+        The init method should be manually started before running any further
         action.
 
         .. warning::
             We assume that we are aware that you should run this method first.
         """
 
-        PyFunceble.facility.Logger.info("Started initizalization of workflow.")
+        PyFunceble.facility.Logger.info("Started initialization of workflow.")
 
         self.init_git()
 
-        PyFunceble.facility.Logger.info("Finished initizalization of workflow.")
+        PyFunceble.facility.Logger.info("Finished initialization of workflow.")
 
         return self

PyFunceble/cli/credential_loader.py

@@ -66,7 +66,7 @@
 
 class CredentialLoader:
     """
-    Provides our creadential loader.
+    Provides our credentials loader.
 
     The idea is to have an interface which provides the credential to use
     but at the same time load and initiate the credential interface after
@@ -123,7 +123,7 @@ def execute_if_authorized(default: Any = None):  # pylint: disable=no-self-argum
         Otherwise, apply the given :code:`default`.
         """
 
-        def inner_metdhod(func):
+        def inner_method(func):
             @functools.wraps(func)
             def wrapper(self, *args, **kwargs):
                 if self.authorized:
@@ -132,7 +132,7 @@ def wrapper(self, *args, **kwargs):
 
             return wrapper
 
-        return inner_metdhod
+        return inner_method
 
     def start_if_not_started(func):  # pylint: disable=no-self-argument
         """
@@ -248,9 +248,7 @@ def ask_for_info(self, var_name: str, default: Any) -> str:
         else:
             user_input = input(message)
 
-        if user_input:
-            return user_input
-        return default
+        return user_input or default
 
     @execute_if_authorized(None)
     @ensure_db_type_is_given

PyFunceble/cli/entry_points/clean.py

@@ -57,7 +57,6 @@
 
 import colorama
 
-import PyFunceble.cli.facility
 import PyFunceble.cli.storage
 import PyFunceble.cli.utils.ascii_logo
 import PyFunceble.facility

PyFunceble/cli/entry_points/production.py

@@ -71,7 +71,7 @@ def producer() -> None:  # pylint: disable=too-many-statements
     description = (
         f"{colorama.Style.BRIGHT}{colorama.Fore.GREEN}PyFunceble Production Preparator"
         f"{colorama.Style.RESET_ALL} - "
-        "The Production peparator for PyFunceble."
+        "The Production preparator for PyFunceble."
     )
 
     parser = argparse.ArgumentParser(

PyFunceble/cli/entry_points/pyfunceble/cli.py

@@ -473,7 +473,7 @@ def get_test_control_group_data() -> List[Tuple[List[str], dict]]:
             {
                 "dest": "self_contained.lookup.netinfo",
                 "action": "store_true",
-                "help": "Only perform a network information (or networket "
+                "help": "Only perform a network information (or network "
                 "socket) lookup.",
             },
         ),

PyFunceble/cli/execution_time.py

@@ -90,7 +90,7 @@ def execute_if_authorized(default: Any = None):  # pylint: disable=no-self-argum
         Otherwise, apply the given :code:`default`.
         """
 
-        def inner_metdhod(func):
+        def inner_method(func):
             @functools.wraps(func)
             def wrapper(self, *args, **kwargs):
                 if self.authorized:
@@ -99,7 +99,7 @@ def wrapper(self, *args, **kwargs):
 
             return wrapper
 
-        return inner_metdhod
+        return inner_method
 
     @staticmethod
     def split_difference(start: datetime.datetime, end: datetime.datetime) -> dict:

PyFunceble/cli/filesystem/cleanup.py

@@ -55,8 +55,6 @@
 
 import PyFunceble.cli.facility
 import PyFunceble.cli.factory
-import PyFunceble.cli.utils.testing
-import PyFunceble.sessions
 from PyFunceble.cli.filesystem.dir_base import FilesystemDirBase
 from PyFunceble.database.sqlalchemy.all_schemas import Continue, Inactive
 from PyFunceble.helpers.file import FileHelper
@@ -71,7 +69,7 @@ class FilesystemCleanup(FilesystemDirBase):
 
     def clean_database(self) -> "FilesystemCleanup":
         """
-        Cleanups the uneeded data that were stored in the database.
+        Cleanups the unneeded data that were stored in the database.
 
         .. warning::
             This method cleans everything except the WHOIS records.

PyFunceble/cli/filesystem/dir_base.py

@@ -70,6 +70,8 @@ class FilesystemDirBase:
 
     INLINE_DEST: str = "_inline_"
 
+    directory_helper: Optional[DirectoryHelper] = None
+
     def __init__(
         self,
         parent_dirname: Optional[str] = None,
@@ -83,6 +85,8 @@ def __init__(
 
         self.db_session = db_session
 
+        self.directory_helper = DirectoryHelper()
+
     @property
     def parent_dirname(self) -> Optional[str]:
         """
@@ -187,5 +191,5 @@ def get_output_basedir(self) -> str:
         else:
             result = PyFunceble.cli.storage.OUTPUT_DIRECTORY
 
-        DirectoryHelper(result).create()
+        self.directory_helper.set_path(result).create()
         return result

PyFunceble/cli/filesystem/dir_structure/backup.py

@@ -55,7 +55,6 @@
 import PyFunceble.facility
 from PyFunceble.cli.filesystem.dir_structure.base import DirectoryStructureBase
 from PyFunceble.helpers.dict import DictHelper
-from PyFunceble.helpers.directory import DirectoryHelper
 from PyFunceble.helpers.file import FileHelper
 from PyFunceble.helpers.hash import HashHelper
 
@@ -75,7 +74,7 @@ def get_backup_data(self) -> dict:
         file_helper = FileHelper()
         hash_helper = HashHelper()
 
-        for file in DirectoryHelper(base_dir).list_all_files():
+        for file in self.directory_helper.set_path(base_dir).list_all_files():
             file_helper.set_path(file)
             reduced_path = self.get_path_without_base_dir(file)
 

PyFunceble/cli/filesystem/dir_structure/base.py

@@ -58,7 +58,6 @@
 except ImportError:  # pragma: no cover ## Retro compatibility
     import importlib_resources as package_resources
 
-
 from PyFunceble.cli.filesystem.cleanup import FilesystemCleanup
 from PyFunceble.cli.filesystem.dir_base import FilesystemDirBase