python4cpm 1.1.7__tar.gz → 1.1.8__tar.gz

{python4cpm-1.1.7/src/python4cpm.egg-info → python4cpm-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python4cpm
-Version: 1.1.7
+Version: 1.1.8
 Summary: Python for CPM
 Author-email: Gonzalo Atienza Rela <gonatienza@gmail.com>
 License-Expression: MIT

{python4cpm-1.1.7 → python4cpm-1.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python4cpm"
-version = "1.1.7"
+version = "1.1.8"
 description = "Python for CPM"
 authors = [
   { name = "Gonzalo Atienza Rela", email = "gonatienza@gmail.com" }

{python4cpm-1.1.7 → python4cpm-1.1.8}/src/python4cpm/accounts.py

@@ -1,5 +1,5 @@
 from python4cpm.envhandler import EnvHandler, Props
-from python4cpm.secret import Secret
+from python4cpm.secrets import Password, NewPassword
 
 
 class BaseAccount(EnvHandler):
@@ -11,7 +11,7 @@ class BaseAccount(EnvHandler):
         password: str | None
     ) -> None:
         self._username = username
-        self._password = Secret.from_env_var(password)
+        self._password = Password.from_env_var(password)
 
     @classmethod
     def get(cls) -> object | None:
@@ -25,7 +25,7 @@ class BaseAccount(EnvHandler):
         return self._username
 
     @property
-    def password(self) -> Secret:
+    def password(self) -> Password:
         return self._password
 
 
@@ -62,7 +62,7 @@ class TargetAccount(BaseAccount):
         self._object_name = object_name
         self._address = address
         self._port = port
-        self._new_password = Secret.from_env_var(new_password)
+        self._new_password = NewPassword.from_env_var(new_password)
 
     @property
     def policy_id(self) -> str | None:
@@ -85,7 +85,7 @@ class TargetAccount(BaseAccount):
         return self._port
 
     @property
-    def new_password(self) -> Secret:
+    def new_password(self) -> NewPassword:
         return self._new_password
 
 

python4cpm-1.1.8/src/python4cpm/exithandler.py

@@ -0,0 +1,27 @@
+from python4cpm.loggerhandler import LoggerHandler
+import atexit
+import sys
+
+
+class ExitHandler:
+    _ERROR_MESSAGE = "No close signal called"
+    _closed = False
+
+    @classmethod
+    def reset(cls) -> None:
+        cls._closed = False
+
+    @classmethod
+    def set_closed(cls) -> None:
+        cls._closed = True
+
+    @classmethod
+    def on_exit(cls) -> None:
+        if cls._closed is False:
+            for logger in LoggerHandler.get_all_loggers():
+                logger.error(cls._ERROR_MESSAGE)
+            sys.stderr.write(cls._ERROR_MESSAGE)
+            sys.stderr.flush()
+
+
+atexit.register(ExitHandler.on_exit)

python4cpm-1.1.7/src/python4cpm/logger.py → python4cpm-1.1.8/src/python4cpm/loggerhandler.py

@@ -3,7 +3,7 @@ import logging
 from logging.handlers import RotatingFileHandler
 
 
-class Logger:
+class LoggerHandler:
     _LOGS_DIR = os.path.join("Logs", "ThirdParty")
     _LOGGING_LEVELS = {
         "critical": logging.CRITICAL,
@@ -13,6 +13,7 @@ class Logger:
         "debug": logging.DEBUG
     }
     _DEFAULT_LEVEL = "error"
+    _all_loggers = []
 
     @classmethod
     def get_logger(
@@ -42,4 +43,9 @@ class Logger:
         formatter = logging.Formatter(fmt=fmt, datefmt=datefmt)
         handler.setFormatter(formatter)
         logger.addHandler(handler)
+        cls._all_loggers.append(logger)
         return logger
+
+    @classmethod
+    def get_all_loggers(cls):
+        return cls._all_loggers

{python4cpm-1.1.7 → python4cpm-1.1.8}/src/python4cpm/python4cpm.py

@@ -1,10 +1,10 @@
 import sys
-import atexit
 import logging
-from python4cpm.secret import Secret
+from python4cpm.secrets import Secret
 from python4cpm.args import Args
-from python4cpm.logger import Logger
+from python4cpm.loggerhandler import LoggerHandler
 from python4cpm.accounts import TargetAccount, LogonAccount, ReconcileAccount
+from python4cpm.exithandler import ExitHandler
 
 
 class Python4CPM:
@@ -36,8 +36,6 @@ class Python4CPM:
         self._log_obj(self._target_account)
         self._log_obj(self._logon_account)
         self._log_obj(self._reconcile_account)
-        self._closed = False
-        atexit.register(self._on_exit)
 
     @property
     def args(self) -> Args:
@@ -66,7 +64,7 @@ class Python4CPM:
             self._target_account.object_name
         )
         name = "-".join(name_parts)
-        return Logger.get_logger(name, self._args.logging_level)
+        return LoggerHandler.get_logger(name, self._args.logging_level)
 
     def _verify_action(self) -> None:
         if self._args.action not in self._VALID_ACTIONS:
@@ -91,17 +89,10 @@ class Python4CPM:
         else:
             code = self._FAILED_UNRECOVERABLE_CODE
         self._logger.error(f"Closing with code {code}")
-        self._closed = True
+        ExitHandler.set_closed()
         sys.exit(code)
 
     def close_success(self) -> None:
         self._logger.debug(f"Closing with code {self._SUCCESS_CODE}")
-        self._closed = True
+        ExitHandler.set_closed()
         sys.exit(self._SUCCESS_CODE)
-
-    def _on_exit(self):
-        if self._closed is False:
-            message = "No close signal called"
-            self._logger.error(message)
-            sys.stderr.write(message)
-            sys.stderr.flush()

python4cpm-1.1.7/src/python4cpm/secret.py → python4cpm-1.1.8/src/python4cpm/secrets.py

@@ -3,7 +3,7 @@ from python4cpm.crypto import Crypto
 
 class Secret:
     def __init__(self, secret: str) -> None:
-        self._secret = secret
+        self._value = secret
 
     @classmethod
     def from_env_var(cls, secret: str | None) -> object | None:
@@ -18,5 +18,13 @@ class Secret:
 
     def get(self) -> str:
         if Crypto.ENABLED:
-            return Crypto.decrypt(self._secret)
-        return self._secret
+            return Crypto.decrypt(self._value)
+        return self._value
+
+
+class Password(Secret):
+    pass
+
+
+class NewPassword(Secret):
+    pass

{python4cpm-1.1.7 → python4cpm-1.1.8/src/python4cpm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python4cpm
-Version: 1.1.7
+Version: 1.1.8
 Summary: Python for CPM
 Author-email: Gonzalo Atienza Rela <gonatienza@gmail.com>
 License-Expression: MIT

{python4cpm-1.1.7 → python4cpm-1.1.8}/src/python4cpm.egg-info/SOURCES.txt

@@ -7,10 +7,11 @@ src/python4cpm/args.py
 src/python4cpm/crypto.py
 src/python4cpm/devhelper.py
 src/python4cpm/envhandler.py
-src/python4cpm/logger.py
+src/python4cpm/exithandler.py
+src/python4cpm/loggerhandler.py
 src/python4cpm/python4cpm.py
 src/python4cpm/python4cpmhandler.py
-src/python4cpm/secret.py
+src/python4cpm/secrets.py
 src/python4cpm.egg-info/PKG-INFO
 src/python4cpm.egg-info/SOURCES.txt
 src/python4cpm.egg-info/dependency_links.txt