patcherctl 2.0__tar.gz → 2.0.2__tar.gz

{patcherctl-2.0 → patcherctl-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: patcherctl
-Version: 2.0
+Version: 2.0.2
 Summary: Fetch patch management data from Jamf Pro to generate comprehensive reports in both Excel and PDF formats
 Author: Andrew Lerman, Chris Ball
 Author-email: info@liquidzoo.io
@@ -268,7 +268,8 @@ Requires-Dist: sphinx-togglebutton; extra == "docs"
     </a>
 </p>
 
-![](https://img.shields.io/pypi/l/patcherctl)&nbsp;![](https://img.shields.io/badge/Python-3.10+-3776AB.svg?style=flat&logo=python&logoColor=white)&nbsp;![](https://img.shields.io/github/v/release/liquidz00/Patcher?color=orange)&nbsp;![](https://github.com/liquidz00/patcher/actions/workflows/pytest.yml/badge.svg)&nbsp;![](https://img.shields.io/pypi/v/patcherctl?color=yellow)
+![](https://img.shields.io/pypi/l/patcherctl)&nbsp;![](https://img.shields.io/badge/Python-3.10+-3776AB.svg?style=flat&logo=python&logoColor=white)&nbsp;![](https://img.shields.io/github/v/release/liquidz00/Patcher?color=orange)&nbsp;![](https://github.com/liquidz00/patcher/actions/workflows/pytest.yml/badge.svg)&nbsp;![](https://img.shields.io/pypi/v/patcherctl?color=yellow)&nbsp;![](https://img.shields.io/badge/macOS-10.13%2B-blueviolet?logo=apple&logoSize=auto)
+
 
 ----
 

{patcherctl-2.0 → patcherctl-2.0.2}/README.md

@@ -4,7 +4,8 @@
     </a>
 </p>
 
-![](https://img.shields.io/pypi/l/patcherctl)&nbsp;![](https://img.shields.io/badge/Python-3.10+-3776AB.svg?style=flat&logo=python&logoColor=white)&nbsp;![](https://img.shields.io/github/v/release/liquidz00/Patcher?color=orange)&nbsp;![](https://github.com/liquidz00/patcher/actions/workflows/pytest.yml/badge.svg)&nbsp;![](https://img.shields.io/pypi/v/patcherctl?color=yellow)
+![](https://img.shields.io/pypi/l/patcherctl)&nbsp;![](https://img.shields.io/badge/Python-3.10+-3776AB.svg?style=flat&logo=python&logoColor=white)&nbsp;![](https://img.shields.io/github/v/release/liquidz00/Patcher?color=orange)&nbsp;![](https://github.com/liquidz00/patcher/actions/workflows/pytest.yml/badge.svg)&nbsp;![](https://img.shields.io/pypi/v/patcherctl?color=yellow)&nbsp;![](https://img.shields.io/badge/macOS-10.13%2B-blueviolet?logo=apple&logoSize=auto)
+
 
 ----
 

{patcherctl-2.0 → patcherctl-2.0.2}/pyproject.toml

@@ -45,7 +45,7 @@ Repository = "https://github.com/liquidz00/Patcher"
 Issues = "https://github.com/liquidz00/Patcher/issues/new?assignees=&labels=bug&projects=&template=issue.md&title=%5BISSUE%5D+Your+Issue+Title"
 
 [project.scripts]
-patcherctl = "patcher.cli:main"
+patcherctl = "patcher.cli:cli"
 
 [project.optional-dependencies]
 all = [

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcher/__about__.py

@@ -1,2 +1,2 @@
 __title__ = "patcher"
-__version__ = "2.0"
+__version__ = "2.0.2"

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcher/client/api_client.py

@@ -96,6 +96,7 @@ class ApiClient(BaseAPIClient):
         patch_titles = [
             PatchTitle(
                 title=summary.get("title"),
+                title_id=summary.get("softwareTitleId"),
                 released=self._convert_tz(summary.get("releaseDate")),
                 hosts_patched=summary.get("upToDate"),
                 missing_patch=summary.get("outOfDate"),

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcher/client/report_manager.py

@@ -81,6 +81,7 @@ class ReportManager:
             mapped = [
                 PatchTitle(
                     title=f"iOS {latest_versions_dict[version]['ProductVersion']}",
+                    title_id="iOS",
                     released=latest_versions_dict[version]["ReleaseDate"],
                     hosts_patched=counts["count"],
                     missing_patch=counts["total"] - counts["count"],
@@ -149,6 +150,7 @@ class ReportManager:
             output_path = self._validate_directory(path)
 
             self.log.debug("Attempting to retrieve policy IDs.")
+            await animation.update_msg("Retrieving policy IDs from Jamf...")
             try:
                 patch_ids = await self.api_client.get_policies()
                 self.log.info(f"Retrieved policy IDs for {len(patch_ids)} policies.")
@@ -159,6 +161,7 @@ class ReportManager:
                 )
 
             self.log.debug("Attempting to retrieve patch summaries.")
+            await animation.update_msg("Retrieving patch summaries from Jamf...")
             try:
                 patch_reports = await self.api_client.get_summaries(patch_ids)
                 self.log.info(f"Received policy summaries for {len(patch_reports)} policies.")
@@ -170,22 +173,27 @@ class ReportManager:
 
             # (option) Sort
             if sort:
+                await animation.update_msg("Sorting reports...")
                 patch_reports = await self._sort(patch_reports, sort)
 
             # (option) Omit
             if omit:
+                await animation.update_msg("Omitting recent releases...")
                 patch_reports = await self._omit(patch_reports)
 
             # (option) iOS
             if ios:
+                await animation.update_msg("Including iOS info...")
                 patch_reports = await self._ios(patch_reports)
 
             # Generate reports
+            await animation.update_msg("Generating Excel file...")
             excel_file = await self._generate_excel(
                 patch_reports=patch_reports, reports_dir=output_path
             )
 
             if pdf:
+                await animation.update_msg("Generating PDF report...")
                 await self._generate_pdf(excel_file=excel_file, date_format=date_format)
 
         # Manually stop animation to show success message cleanly

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcher/models/patch.py

@@ -1,6 +1,6 @@
-from typing import List, Optional
+from typing import List, Optional, Union
 
-from pydantic import model_validator
+from pydantic import field_validator, model_validator
 
 from . import Model
 from .label import Label
@@ -12,6 +12,8 @@ class PatchTitle(Model):
 
     :ivar title: The name of the patch title.
     :type title: :py:class:`str`
+    :ivar title_id: The ``softwareTitleId`` of the patch title from Jamf API response.
+    :type title_id: :py:class:`str`
     :ivar released: The release date of the patch title.
     :type released: :py:class:`str`
     :ivar hosts_patched: The number of hosts that have applied the patch.
@@ -24,17 +26,33 @@ class PatchTitle(Model):
     :type completion_percent: :py:class:`float`
     :ivar total_hosts: The total number of hosts.
     :type total_hosts: :py:class:`int`
-    :ivar install_label: The corresponding `Installomator <https://github.com/Installomator/Installomator>`_ label if available.
+    :ivar install_label: The corresponding `Installomator <https://github.com/Installomator/Installomator>`_ label(s) if available.
     """
 
     title: str
+    title_id: str
     released: str
     hosts_patched: int
     missing_patch: int
     latest_version: str
     completion_percent: float = 0.0
     total_hosts: int = 0
-    install_label: Optional[List[Label]] = None  # account for variants (e.g., zulujdk8, zulujdk9)
+    install_label: Optional[List[Label]] = []  # account for variants (e.g., zulujdk8, zulujdk9)
+
+    def __str__(self):
+        return f"{self.title} ({self.latest_version})"
+
+    @field_validator("title_id")
+    def cast_as_string(cls, value: Union[int, str]) -> str:
+        """
+        Ensures the ``title_id`` property is always a string, regardless of type in API response payload.
+
+        :param value: The value of the ``title_id`` field.
+        :type value: :py:obj:`~typing.Union` [:py:class:`int` | :py:class:`str`]
+        :return: The value cast as a string.
+        :rtype: :py:class:`str`
+        """
+        return str(value)
 
     # Calculate completion percent via model validator
     @model_validator(mode="after")

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcher/utils/animation.py

@@ -26,7 +26,7 @@ class Animation:
         self.enable_animation = enable_animation
         self.task = None
         self.lock = asyncio.Lock()
-        self.spinner_chars = ["\u25E4", "\u25E5", "\u25E2", "\u25E3"]
+        self.spinner_chars = ["\u25e4", "\u25e5", "\u25e2", "\u25e3"]
         self.colors = ["cyan", "magenta", "bright_cyan", "bright_magenta"]
         self.last_message_length = 0
 

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcher/utils/data_manager.py

@@ -15,7 +15,7 @@ from .logger import LogMe
 
 class DataManager:
 
-    _IGNORED = ["install_label"]
+    _IGNORED = ["install_label", "title_id"]
 
     def __init__(self, disable_cache: bool = False):
         """
@@ -139,7 +139,6 @@ class DataManager:
         self.log.debug("Attempting to create DataFrame from PatchTitle objects.")
         try:
             df = pd.DataFrame([patch.model_dump() for patch in patch_titles])
-            df = df.drop(columns=DataManager._IGNORED, errors="ignore")  # Drop excluded columns
             df.columns = [column.replace("_", " ").title() for column in df.columns]
             self.log.info(
                 f"Created DataFrame from {len(patch_titles)} PatchTitle objects successfully."
@@ -154,7 +153,7 @@ class DataManager:
         skipped_rows = 0
         patch_titles = []
 
-        for index, row in df.iterrows():
+        for _, row in df.iterrows():
             try:
                 patch = PatchTitle(
                     **{key.lower().replace(" ", "_"): value for key, value in row.items()}
@@ -163,7 +162,7 @@ class DataManager:
             except (KeyError, ValueError, TypeError, ValidationError) as e:
                 exception_name = type(e).__name__
                 self.log.warning(
-                    f"Error processing row at {index} due to {exception_name}. Skipping this row. Details: {e}."
+                    f"Encountered {exception_name} during PatchTitle creation. Skipping row. Details: {e}."
                 )
                 skipped_rows += 1
 
@@ -191,6 +190,9 @@ class DataManager:
 
         current_date = datetime.now().strftime("%m-%d-%y")
         df = self._create_dataframe(patch_titles)
+        df = df.drop(
+            columns=[col.replace("_", " ").title() for col in DataManager._IGNORED], errors="ignore"
+        )  # Drop excluded columns
 
         self.log.debug("Attempting to export patch reports to Excel.")
         try:
@@ -242,7 +244,11 @@ class DataManager:
         file_path = export_dir / f"patch-analysis-{current_date}.html"
 
         filtered_data = [
-            {key: value for key, value in patch.model_dump().items() if key not in self._IGNORED}
+            {
+                key: value
+                for key, value in patch.model_dump().items()
+                if key not in DataManager._IGNORED
+            }
             for patch in titles
         ]
 

{patcherctl-2.0 → patcherctl-2.0.2}/src/patcherctl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: patcherctl
-Version: 2.0
+Version: 2.0.2
 Summary: Fetch patch management data from Jamf Pro to generate comprehensive reports in both Excel and PDF formats
 Author: Andrew Lerman, Chris Ball
 Author-email: info@liquidzoo.io
@@ -268,7 +268,8 @@ Requires-Dist: sphinx-togglebutton; extra == "docs"
     </a>
 </p>
 
-![](https://img.shields.io/pypi/l/patcherctl)&nbsp;![](https://img.shields.io/badge/Python-3.10+-3776AB.svg?style=flat&logo=python&logoColor=white)&nbsp;![](https://img.shields.io/github/v/release/liquidz00/Patcher?color=orange)&nbsp;![](https://github.com/liquidz00/patcher/actions/workflows/pytest.yml/badge.svg)&nbsp;![](https://img.shields.io/pypi/v/patcherctl?color=yellow)
+![](https://img.shields.io/pypi/l/patcherctl)&nbsp;![](https://img.shields.io/badge/Python-3.10+-3776AB.svg?style=flat&logo=python&logoColor=white)&nbsp;![](https://img.shields.io/github/v/release/liquidz00/Patcher?color=orange)&nbsp;![](https://github.com/liquidz00/patcher/actions/workflows/pytest.yml/badge.svg)&nbsp;![](https://img.shields.io/pypi/v/patcherctl?color=yellow)&nbsp;![](https://img.shields.io/badge/macOS-10.13%2B-blueviolet?logo=apple&logoSize=auto)
+
 
 ----
 

patcherctl-2.0.2/src/patcherctl.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+patcherctl = patcher.cli:cli

{patcherctl-2.0 → patcherctl-2.0.2}/tests/test_analyzer.py

@@ -8,6 +8,7 @@ from src.patcher.models.patch import PatchTitle
 # Mock DataFrame for testing
 mock_data = {
     "Title": ["Patch A", "Patch B", "Patch C"],
+    "Title Id": ["0", "1", "2"],
     "Released": ["2022-01-01", "2023-01-01", "2023-12-01"],
     "Hosts Patched": [50, 30, 20],
     "Missing Patch": [10, 20, 5],
@@ -30,6 +31,7 @@ def test_patch_title_calculation():
     """Test the PatchTitle model's completion percentage calculation."""
     patch_title = PatchTitle(
         title="Patch A",
+        title_id="0",
         released="2022-01-01",
         hosts_patched=50,
         missing_patch=10,
@@ -41,6 +43,7 @@ def test_patch_title_calculation():
     # Test with zero total hosts
     patch_title_zero = PatchTitle(
         title="Patch B",
+        title_id="1",
         released="2023-01-01",
         hosts_patched=0,
         missing_patch=0,
@@ -86,6 +89,7 @@ def test_filter_titles(analyzer, mock_data_manager):
     patch_titles = [
         PatchTitle(
             title="Patch A",
+            title_id="0",
             released="2022-01-01",
             hosts_patched=50,
             missing_patch=10,
@@ -95,6 +99,7 @@ def test_filter_titles(analyzer, mock_data_manager):
         ),
         PatchTitle(
             title="Patch B",
+            title_id="1",
             released="2023-01-01",
             hosts_patched=30,
             missing_patch=20,
@@ -104,6 +109,7 @@ def test_filter_titles(analyzer, mock_data_manager):
         ),
         PatchTitle(
             title="Patch C",
+            title_id="2",
             released="2023-12-01",
             hosts_patched=20,
             missing_patch=5,
@@ -147,6 +153,7 @@ def test_filter_titles_parametrized(analyzer, criteria, expected_count, mock_dat
     mock_data_manager.titles = [
         PatchTitle(
             title="Patch A",
+            title_id="0",
             released="2022-01-01",
             hosts_patched=50,
             missing_patch=10,
@@ -154,6 +161,7 @@ def test_filter_titles_parametrized(analyzer, criteria, expected_count, mock_dat
         ),
         PatchTitle(
             title="Patch B",
+            title_id="1",
             released="2023-01-01",
             hosts_patched=30,
             missing_patch=20,
@@ -161,6 +169,7 @@ def test_filter_titles_parametrized(analyzer, criteria, expected_count, mock_dat
         ),
         PatchTitle(
             title="Patch C",
+            title_id="2",
             released="2023-12-01",
             hosts_patched=20,
             missing_patch=5,

{patcherctl-2.0 → patcherctl-2.0.2}/tests/test_data_manager.py

@@ -24,6 +24,7 @@ def test_export_to_excel_success(sample_patch_reports, temp_output_dir):
         assert not df.empty
         assert list(df.columns) == [
             "Title",
+            # "Title Id",
             "Released",
             "Hosts Patched",
             "Missing Patch",
@@ -88,6 +89,7 @@ def test_titles_property_setter_valid():
     patch_titles = [
         PatchTitle(
             title="Patch A",
+            title_id="0",
             released="2022-01-01",
             hosts_patched=50,
             missing_patch=10,
@@ -95,6 +97,7 @@ def test_titles_property_setter_valid():
         ),
         PatchTitle(
             title="Patch B",
+            title_id="1",
             released="2023-01-01",
             hosts_patched=30,
             missing_patch=20,
@@ -130,6 +133,7 @@ def test_export_to_excel_permission_error(temp_output_path):
     mock_patches = [
         PatchTitle(
             title="Patch A",
+            title_id="0",
             released="2022-01-01",
             hosts_patched=50,
             missing_patch=10,
@@ -139,6 +143,7 @@ def test_export_to_excel_permission_error(temp_output_path):
         ),
         PatchTitle(
             title="Patch B",
+            title_id="1",
             released="2023-01-01",
             hosts_patched=30,
             missing_patch=20,
@@ -148,6 +153,7 @@ def test_export_to_excel_permission_error(temp_output_path):
         ),
         PatchTitle(
             title="Patch C",
+            title_id="2",
             released="2023-12-01",
             hosts_patched=20,
             missing_patch=5,

{patcherctl-2.0 → patcherctl-2.0.2}/tests/test_ios.py

@@ -93,6 +93,7 @@ async def test_calculate_ios_on_latest_success(patcher_instance):
     expected_result = [
         PatchTitle(
             title="iOS 17.5.1",
+            title_id="iOS",
             released="2024-05-20T00:00:00Z",
             hosts_patched=2,
             missing_patch=0,
@@ -102,6 +103,7 @@ async def test_calculate_ios_on_latest_success(patcher_instance):
         ),
         PatchTitle(
             title="iOS 16.7.8",
+            title_id="iOS",
             released="2024-05-13T00:00:00Z",
             hosts_patched=1,
             missing_patch=0,
@@ -138,6 +140,7 @@ async def test_calculate_ios_on_latest_no_devices_on_latest(patcher_instance):
     expected_result = [
         PatchTitle(
             title="iOS 17.5.1",
+            title_id="iOS",
             released="2024-05-20T00:00:00Z",
             hosts_patched=0,
             missing_patch=1,
@@ -147,6 +150,7 @@ async def test_calculate_ios_on_latest_no_devices_on_latest(patcher_instance):
         ),
         PatchTitle(
             title="iOS 16.7.8",
+            title_id="iOS",
             released="2024-05-13T00:00:00Z",
             hosts_patched=0,
             missing_patch=1,
@@ -179,6 +183,7 @@ async def test_calculate_ios_on_latest_all_devices_on_latest(patcher_instance):
     expected_result = [
         PatchTitle(
             title="iOS 17.5.1",
+            title_id="iOS",
             released="2024-05-20T00:00:00Z",
             hosts_patched=2,
             missing_patch=0,
@@ -211,6 +216,7 @@ async def test_calculate_ios_on_latest_some_devices_on_latest(patcher_instance):
     expected_result = [
         PatchTitle(
             title="iOS 17.5.1",
+            title_id="iOS",
             released="2024-05-20T00:00:00Z",
             hosts_patched=1,
             missing_patch=1,

{patcherctl-2.0 → patcherctl-2.0.2}/tests/test_ui.py

@@ -76,13 +76,13 @@ def test_config_load_existing(ui_manager):
 
 def test_config_load_default(ui_manager):
     with (
-        patch.object(Path, "exists", side_effect=lambda: False),
-        patch.object(ui_manager, "_download_font", MagicMock()),
         patch("plistlib.load", return_value={}),
+        patch.object(Path, "exists", return_value=False),
+        patch.object(ui_manager, "create_default_config") as mock_create_default,
     ):
         config = ui_manager.config
-        assert config["FONT_REGULAR_PATH"].endswith("Assistant-Regular.ttf")
-        assert config["FONT_BOLD_PATH"].endswith("Assistant-Bold.ttf")
+        mock_create_default.assert_called_once()
+        assert config == {}
 
 
 def test_download_font_success(ui_manager):

patcherctl-2.0/src/patcherctl.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-patcherctl = patcher.cli:main