pyhw 0.10.2__tar.gz → 0.11.0__tar.gz

{pyhw-0.10.2/src/pyhw.egg-info → pyhw-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.10.2
+Version: 0.11.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.1.3
+Requires-Dist: pypci-ng>=0.1.4
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.10.2 → pyhw-0.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.10.2"
+version = "0.11.0"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 keywords = ["neofetch", "system information", "command line tool", "python", "hardware information", "fastfetch", "fetching"]
 authors = [
@@ -14,7 +14,7 @@ readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.1.3"
+    "pypci-ng>=0.1.4"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

pyhw-0.11.0/src/pyhw/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.11.0'

{pyhw-0.10.2 → pyhw-0.11.0}/src/pyhw/__main__.py

@@ -13,9 +13,17 @@ from .backend.nic import NICDetect
 from .backend.npu import NPUDetect
 from .pyhwUtil import createDataString
 from .pyhwUtil import getOS, selectOSLogo
+from .pyhwUtil import ReleaseChecker
 import multiprocessing
 
 
+def check_release(release_dict):
+    releaseChecker = ReleaseChecker()
+    release_dict["is_new_release"] = releaseChecker.check_for_updates()
+    release_dict["release"] = releaseChecker.LatestVersion
+    release_dict["current"] = releaseChecker.CurrentVersion
+
+
 def detect_title(os, result_dict):
     result_dict["title"] = TitleDetect(os=os).getTitle().title
 
@@ -76,8 +84,10 @@ def main():
 
     manager = multiprocessing.Manager()
     result_dict = manager.dict()
+    release_dict = manager.dict()
 
     processes = [
+        multiprocessing.Process(target=check_release, args=(release_dict,)),
         multiprocessing.Process(target=detect_title, args=(current_os, result_dict)),
         multiprocessing.Process(target=detect_host, args=(current_os, result_dict)),
         multiprocessing.Process(target=detect_kernel, args=(current_os, result_dict)),
@@ -94,7 +104,7 @@ def main():
     for process in processes:
         process.start()
 
-    for process in processes:
+    for process in processes[1:]:
         process.join()
 
     for key, value in result_dict.items():
@@ -103,32 +113,18 @@ def main():
     logo_os = selectOSLogo(OSDetect(os=current_os).getOSInfo().id)
     Printer(logo_os=logo_os, data=createDataString(data)).cPrint()
 
-
-# def main():
-#     current_os = getOS()
-#     if current_os not in ["linux", "macos", "freebsd", "windows"]:
-#         print(f"Only Linux, macOS, FreeBSD and Windows are supported for now. Current OS: {current_os}")
-#         return
-#     data = Data()
-#     data.title = TitleDetect(os=current_os).getTitle().title
-#     data.Host = HostDetect(os=current_os).getHostInfo().model
-#     data.Kernel = KernelDetect(os=current_os).getKernelInfo().kernel
-#     data.Shell = ShellDetect(os=current_os).getShellInfo().info
-#     data.Uptime = UptimeDetect(os=current_os).getUptime().uptime
-#     data.OS = OSDetect(os=current_os).getOSInfo().prettyName
-#     data.CPU = CPUDetect(os=current_os).getCPUInfo().cpu
-#     gpu_info = GPUDetect(os=current_os).getGPUInfo()
-#     if gpu_info.number > 0:
-#         data.GPU = gpu_info.gpus
-#     data.Memory = MemoryDetect(os=current_os).getMemoryInfo().memory
-#     nic_info = NICDetect(os=current_os).getNICInfo()
-#     if nic_info.number > 0:
-#         data.NIC = nic_info.nics
-#     npu_info = NPUDetect(os=current_os).getNPUInfo()
-#     if npu_info.number > 0:
-#         data.NPU = npu_info.npus
-#
-#     Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
+    processes[0].join()
+    if release_dict["is_new_release"]:
+        print(f"🔔 Found a newer version: v{release_dict['release']} (current: v{release_dict['current']})")
+        print("👉 You can use the following command to upgrade:")
+        if ReleaseChecker().isInPIPX:
+            print(f"   pipx upgrade pyhw")
+        else:
+            print(f"   pip install -U pyhw")
+    # else:
+    #     # debug
+    #     print("🎉 You are using the latest version of pyhw!")
+    #     print(f"🔔 Release: v{release_dict['release']} (current: v{release_dict['current']})")
 
 
 if __name__ == "__main__":

{pyhw-0.10.2 → pyhw-0.11.0}/src/pyhw/pyhwUtil/__init__.py

@@ -1,4 +1,5 @@
 from .pyhwUtil import getOS, getArch, getDocker, createDataString, selectOSLogo
 from .sysctlUtil import sysctlGetString, sysctlGetInt
+from .cliUtil import ReleaseChecker
 
-__all__ = ["getOS", "getArch", "getDocker", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt"]
+__all__ = ["getOS", "getArch", "getDocker", "createDataString", "selectOSLogo", "sysctlGetString", "sysctlGetInt", "ReleaseChecker"]

pyhw-0.11.0/src/pyhw/pyhwUtil/cliUtil.py

@@ -0,0 +1,62 @@
+import sys
+import site
+import os
+import urllib.request
+import json
+import importlib.metadata
+
+
+class ReleaseChecker:
+    PACKAGE_NAME = "pyhw"
+
+    def __init__(self):
+        self.isInPIPX = self.__is_running_in_pipx()
+        self.CurrentVersion = self.__get_installed_version()
+        self.LatestVersion = self.__get_latest_version()
+
+    @staticmethod
+    def __is_running_in_pipx():
+        return (
+            "pipx" in sys.prefix or
+            any("pipx" in path for path in site.getsitepackages()) or
+            "PIPX_BIN_DIR" in os.environ
+        )
+
+    def __get_installed_version(self):
+        try:
+            return importlib.metadata.version(self.PACKAGE_NAME)
+        except importlib.metadata.PackageNotFoundError:
+            return None
+
+    def __get_latest_version(self):
+        url = f"https://pypi.org/pypi/{self.PACKAGE_NAME}/json"
+        try:
+            with urllib.request.urlopen(url, timeout=3) as response:
+                data = json.load(response)
+                return data["info"]["version"]
+        except Exception:
+            return None
+
+    @staticmethod
+    def parse_version(version):
+        return tuple(map(int, version.split(".")))
+
+    def __is_newer_version(self):
+        if self.CurrentVersion is None or self.LatestVersion is None:
+            return False
+        else:
+            return self.parse_version(self.CurrentVersion) < self.parse_version(self.LatestVersion)
+
+    def check_for_updates(self):
+        return self.__is_newer_version()
+
+    def check_for_updates_print(self):
+        if self.__is_newer_version():
+            print(f"🔔 Found newer version: {self.CurrentVersion} (current: {self.LatestVersion})")
+            print("👉 You can use the following command to upgrade:")
+            if self.isInPIPX:
+                print(f"   pipx upgrade {self.PACKAGE_NAME}")
+            else:
+                print(f"   pip install -U {self.PACKAGE_NAME}")
+
+

{pyhw-0.10.2 → pyhw-0.11.0/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.10.2
+Version: 0.11.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.1.3
+Requires-Dist: pypci-ng>=0.1.4
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)

{pyhw-0.10.2 → pyhw-0.11.0}/src/pyhw.egg-info/SOURCES.txt

@@ -112,5 +112,7 @@ src/pyhw/library/lib/iokitGPULib.dylib
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py
+src/pyhw/pyhwUtil/cliUtil.py
 src/pyhw/pyhwUtil/pyhwUtil.py
-src/pyhw/pyhwUtil/sysctlUtil.py
+src/pyhw/pyhwUtil/sysctlUtil.py
+test/test_cliUtil.py

pyhw-0.11.0/src/pyhw.egg-info/requires.txt

@@ -0,0 +1 @@
+pypci-ng>=0.1.4

pyhw-0.11.0/test/test_cliUtil.py

@@ -0,0 +1,74 @@
+import pytest
+import sys
+import site
+import os
+import json
+from unittest.mock import MagicMock
+from pyhw.pyhwUtil.cliUtil import ReleaseChecker
+
+
+@pytest.mark.parametrize("sys_prefix, site_packages, env_vars, expected", [
+    ("pipx", [], {}, True),
+    ("normal_prefix", ["/some/path/pipx"], {}, True),
+    ("normal_prefix", [], {"PIPX_BIN_DIR": "/some/dir"}, True),
+    ("normal_prefix", [], {}, False)
+])
+def test_is_running_in_pipx(sys_prefix, site_packages, env_vars, expected, monkeypatch):
+    monkeypatch.setattr(sys, "prefix", sys_prefix)
+    monkeypatch.setattr(site, "getsitepackages", lambda: site_packages)
+    monkeypatch.setattr(os, "environ", env_vars)
+
+    checker = ReleaseChecker()
+    assert checker.isInPIPX == expected
+
+
+@pytest.fixture
+def mock_installed_version(monkeypatch):
+    def mock_version(package_name):
+        return "0.10.1" if package_name == "pyhw" else None
+
+    monkeypatch.setattr("importlib.metadata.version", mock_version)
+
+
+def test_get_installed_version(mock_installed_version):
+    checker = ReleaseChecker()
+    assert checker.CurrentVersion == "0.10.1"
+
+
+@pytest.fixture
+def mock_pypi_response(monkeypatch):
+    mock_response = MagicMock()
+    mock_response.__enter__.return_value = mock_response
+    mock_response.read.return_value = json.dumps({"info": {"version": "0.11.0"}}).encode()
+
+    monkeypatch.setattr("urllib.request.urlopen", lambda *args, **kwargs: mock_response)
+
+
+def test_get_latest_version(mock_pypi_response):
+    checker = ReleaseChecker()
+    assert checker.LatestVersion == "0.11.0"
+
+
+@pytest.mark.parametrize("version, expected", [
+    ("0.10.1", (0, 10, 1)),
+    ("1.2.3", (1, 2, 3)),
+    ("2.0.0", (2, 0, 0)),
+    ("3.11.22", (3, 11, 22))
+])
+def test_parse_version(version, expected):
+    assert ReleaseChecker.parse_version(version) == expected
+
+
+@pytest.mark.parametrize("installed, latest, expected", [
+    ("0.10.1", "0.11.0", True),
+    ("0.11.0", "0.11.0", False),
+    ("0.12.0", "0.11.0", False),
+    (None, "0.11.0", False),
+    ("0.10.1", None, False)
+])
+def test_is_newer_version(installed, latest, expected, monkeypatch):
+    monkeypatch.setattr(ReleaseChecker, "_ReleaseChecker__get_installed_version", lambda self: installed)
+    monkeypatch.setattr(ReleaseChecker, "_ReleaseChecker__get_latest_version", lambda self: latest)
+
+    checker = ReleaseChecker()
+    assert checker.check_for_updates() == expected

pyhw-0.10.2/src/pyhw/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.10.2'

pyhw-0.10.2/src/pyhw.egg-info/requires.txt

@@ -1 +0,0 @@
-pypci-ng>=0.1.3