inspy-logger 3.0.dev4__tar.gz → 3.0.1__tar.gz

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: inspy-logger
-Version: 3.0.dev4
+Version: 3.0.1
 Summary: Colorable, scalable logger for CLI
 Home-page: https://github.com/Inspyre-Softworks/inSPy-Logger
 License: MIT
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/inspy_logger/Scripts/main.py

@@ -48,10 +48,13 @@ def update():
     Since:
         v3.0
     """
-    if pypi_info.update_available:
-        print(f'\n\n[bold green]Update Available![/bold green] New version: [bold cyan]{pypi_info.new_version_available}[/bold cyan]')
-    else:
-        print(f'\n\n[bold green]No update available.[/bold green] Current version: [bold cyan]{parse_version()}[/bold cyan] {"which is newer than the available version on PyPi.org" if pypi_info.installed_newer_than_latest else ""}')
+    try:
+        if pypi_info.update_available:
+            print(f'\n\n[bold green]Update Available![/bold green] New version: [bold cyan]{pypi_info.new_version_available}[/bold cyan]')
+        else:
+            print(f'\n\n[bold green]No update available.[/bold green] Current version: [bold cyan]{parse_version()}[/bold cyan] {"which is newer than the available version on PyPi.org" if pypi_info.installed_newer_than_latest else ""}')
+    except Exception as e:
+        print(f'An error occurred during the update check: {str(e)}')
 
 
 def get_version_info():

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/inspy_logger/__about__.py

@@ -20,15 +20,4 @@ __authors__ = [
         ('Taylor-Jayde Blackstone', '<t.blackstone@inspyre.tech')
 ]
 
-'''
-File Change History:
-11/5/22 - 4:21 AM (v2.1.2):
-  -  Added description to docstring. (target: 2.1.2)
- 
-11/5/22 - 4:41 AM:
-  - Version bump (target: 2.1.3)
-  
-08/16/2023 - 13:49 (v3.0):
-  - Version bump (v2.1.3 -> v3.0-dev.1)
-
-'''
+'

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/inspy_logger/__init__.py

@@ -251,10 +251,12 @@ class Logger:
             """
             self._log(logging.INFO, message, args=(), stacklevel=2)
 
+
     def warning(self, message):
         """
         Logs a warning message.
 
+
         Args:
             message (str): The message to log.
         """
@@ -264,6 +266,7 @@ class Logger:
         """
         Logs an error message.
 
+
         Args:
             message (str): The message to log.
         """
@@ -284,6 +287,7 @@ class Logger:
 
         return f'<Logger: {name} w/ level {self.logger.level} at {hex_id}{parent_part}>'
 
+
     @classmethod
     def create_logger_for_caller(cls):
         """

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/inspy_logger/helpers/network.py

@@ -27,8 +27,7 @@ from __future__ import annotations
 from urllib.parse import quote as url_safe
 
 import requests
-
-from inspy_logger.helpers.cache import TLDCache
+from public_suffix_list import PublicSuffixList
 
 DEFAULT_TEST_HOSTS = [
         ['https', 'inspyre', 'tech'],
@@ -44,10 +43,11 @@ hosts = []
 :obj:`list`[:obj:`Host`]:
     A list of host objects that will be used to connect to.
 """
+psl = PublicSuffixList()
 
-TLD_CACHE = TLDCache()
+URL_SUFFIXES = psl._suffixes
 
-VALID_TLDS = TLD_CACHE.TLDs
+VALID_TLDS = URL_SUFFIXES
 
 
 class Host():
@@ -169,7 +169,7 @@ class Host():
         def tld(self, new):
             if not isinstance(new, str):
                 raise TypeError(f"New value must be a string not {type(new)}")
-            if new not in TLD_CACHE.TLDs:
+            if new not in URL_SUFFIXES:
                 raise ValueError("TLD must be valid!")
 
             self.__tld = new

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/inspy_logger/version.py

@@ -14,9 +14,9 @@ RELEASE_MAP = {
 __VERSION__ = {
     'major': 3,
     'minor': 0,
-    'patch': 0,
-    'release': 'dev',
-    'release_num': 4
+    'patch': 1,
+    'release': 'final',
+    'release_num': 0
 }
 
 
@@ -50,8 +50,11 @@ def get_full_version_name():
     """
     ver = parse_version()
     ver = ver.split('-')[0]
-    return f'v{ver} {RELEASE_MAP[__VERSION__["release"]]} ({__VERSION__["release_num"]})'
 
+    release_type = RELEASE_MAP[__VERSION__["release"]]
+    release_num = __VERSION__["release_num"]
+    release_str = f" {release_type} {'' if __VERSION__['release'].lower() == 'final' else f'({release_num})'}"
+    return f'v{ver}{release_str}'
 
 def get_pypi_info():
     """

{inspy_logger-3.0.dev4 → inspy_logger-3.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "inspy-logger"
-version = "3.0-dev.4"
+version = "3.0.1"
 description = "Colorable, scalable logger for CLI"
 authors = ["Taylor-Jayde Blackstone <tayjaybabee@gmail.com>"]
 homepage = 'https://github.com/Inspyre-Softworks/inSPy-Logger'
@@ -58,6 +58,10 @@ autoclasstoc = "^1.6.0"
 sphinx-autodoc-annotation = "^1.0.post1"
 sphinxcontrib-autoprogram = "^0.1.8"
 
+
+[tool.poetry.group.dev.dependencies]
+poetry-plugin-export = "^1.6.0"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

inspy_logger-3.0.dev4/inspy_logger/helpers/cache.py

@@ -1,140 +0,0 @@
-from __future__ import annotations
-
-from os import makedirs
-from pathlib import Path
-from pickle import dump as pkl_dump
-from pickle import load as pkl_load
-from time import time
-from appdirs import user_cache_dir
-from domain_suffixes.suffixes import Suffixes
-from humanize.time import precisedelta
-
-PICKLE_FILEPATH = Path(
-    user_cache_dir(
-        appname='InspyLogger',
-        appauthor='Inspyre-Softworks'
-    )
-).joinpath('tld.pkl')
-
-
-class TLDCache(object):
-
-    parent_dir = PICKLE_FILEPATH.parent
-
-    def __init__(self):
-        self.__created_ts = None
-        self.__pickle_fp_exists = None
-        self.__num_tlds = None
-        self.__tlds = None
-        self.__data = None
-        self.__last_renewal_ts = None
-        self.__renewal_hist = None
-
-    def build(self):
-        self.__data = {
-                'created_ts': time(),
-                'renewal_data': {
-                        'last_ts': None,
-                        'history': [],
-                },
-                'tlds': self.fetch_from_source()
-        }
-
-        return self.__data
-
-    @staticmethod
-    def load(self):
-        """ Load the pickle file for the cache.
-
-        Will attempt to load the pickle file into memory from the path indicated by :obj:`PICKLE_FILEPATH`
-
-        Raises:
-            :exception:`FileNotFoundError`: If the pickle file does not exist.
-
-        """
-        with open(PICKLE_FILEPATH, 'rb') as pfp:
-            res = pkl_load(pfp)
-
-        return res
-
-    def write(self):
-        """ Write the pickle file.
-
-        Write the contents of the cache to the file-system path indicated by :obj:`PICKLE_FILEPATH`
-
-        Raises:
-            :exception:`PermissionError`: If the pickle file can't be written due to permissions writing the file to storage.
-        """
-
-        if not self.parent_dir.exists():
-            makedirs(self.parent_dir, exist_ok=True)
-
-        with open(PICKLE_FILEPATH, 'wb') as pfp:
-            pkl_dump(self.__data, pfp)
-
-    @staticmethod
-    def fetch_from_source(self):
-        """ Fetch the top-level-domain list from the source
-
-        Returns:
-            :class:`list`: A list of all known top-level domain suffixes from the domain-suffixes package.
-        """
-        suffixes = Suffixes()
-        return suffixes.get_all_tlds()
-
-    @property
-    def contents(self) -> dict:
-        if self.__data is None:
-            try:
-                self.__data = self.load()
-            except FileNotFoundError:
-                self.__data = self.build()
-                self.write()
-
-        return self.__data
-
-    @property
-    def TLDs(self) -> list:
-        """ Returns a list of TLDs (top-level domains) for validating against """
-        return self.contents['tlds']
-
-    @property
-    def created_timestamp(self) -> float:
-        """
-        An alias for :attr:`created_ts`
-
-        Returns:
-            created_ts (float):
-                The time (in seconds since Epoch) when the cache was created.
-
-        """
-        return self.created_ts
-
-    @property
-    def created_ts(self) -> float:
-        """
-        The time (in seconds since Epoch) when the cache was created
-        """
-        return self.contents['created_ts']
-
-    @property
-    def age_in_seconds(self) -> float:
-        """
-        The number of seconds that have elapsed since creation of the cache.
-        """
-        return time() - self.created_ts
-
-    @property
-    def age(self) -> str:
-        return precisedelta(self.age_in_seconds)
-
-
-"""
-File Change History:
-
-11/5/22 - 4:24 AM (target: v2.1.2):
-  - Code cleanup
-  - Transform from class functions to static methods;
-      - `TLDCache.load`
-      - `TLDCache.fetch_from_source`                
-"""