autopkg-wrapper 2024.5.2__tar.gz → 2024.5.3__tar.gz

{autopkg_wrapper-2024.5.2 → autopkg_wrapper-2024.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autopkg-wrapper
-Version: 2024.5.2
+Version: 2024.5.3
 Summary: A package used to execute some autopkg functions, primarily within the context of a GitHub Actions runner.
 Home-page: https://github.com/smithjw/autopkg-wrapper
 License: BSD-3-Clause

autopkg_wrapper-2024.5.3/autopkg_wrapper/__init__.py

@@ -0,0 +1 @@
+__version__ = "2024.5.3"

{autopkg_wrapper-2024.5.2 → autopkg_wrapper-2024.5.3}/autopkg_wrapper/autopkg_wrapper.py

@@ -4,6 +4,7 @@ import logging
 import plistlib
 import subprocess
 import sys
+from datetime import datetime
 from itertools import chain
 from pathlib import Path
 
@@ -85,7 +86,12 @@ class Recipe(object):
             self.results["failed"] = True
             self.results["imported"] = ""
         else:
-            report = Path("/tmp/autopkg.plist")
+            report_dir = Path("/tmp/autopkg")
+            report_time = datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+            report_name = Path(f"{self.name}-{report_time}.plist")
+
+            report_dir.mkdir(parents=True, exist_ok=True)
+            report = report_dir / report_name
             report.touch(exist_ok=True)
 
             try:
@@ -195,21 +201,23 @@ def parse_recipe_list(recipes, recipe_file, post_processors):
     logging.info(f"Recipes: {recipes}") if recipes else None
     logging.info(f"Recipe List: {recipe_file}") if recipe_file else None
 
-    if recipe_file.suffix == ".json":
-        with open(recipe_file, "r") as f:
-            recipe_list = json.load(f)
-    elif recipe_file.suffix == ".txt":
-        with open(recipe_file, "r") as f:
-            recipe_list = f.read().splitlines()
-    elif isinstance(recipes, list):
-        recipe_list = recipes
-    elif isinstance(recipes, str):
-        if recipes.find(",") != -1:
-            # Assuming recipes separated by commas
-            recipe_list = [recipe.strip() for recipe in recipes.split(",") if recipe]
-        else:
-            # Assuming recipes separated by space
-            recipe_list = [recipe.strip() for recipe in recipes.split(" ") if recipe]
+    if recipe_file:
+        if recipe_file.suffix == ".json":
+            with open(recipe_file, "r") as f:
+                recipe_list = json.load(f)
+        elif recipe_file.suffix == ".txt":
+            with open(recipe_file, "r") as f:
+                recipe_list = f.read().splitlines()
+    if recipes:
+        if isinstance(recipes, list):
+            recipe_list = recipes
+        elif isinstance(recipes, str):
+            if recipes.find(",") != -1:
+                # Assuming recipes separated by commas
+                recipe_list = [recipe.strip() for recipe in recipes.split(",") if recipe]
+            else:
+                # Assuming recipes separated by space
+                recipe_list = [recipe.strip() for recipe in recipes.split(" ") if recipe]
 
     if recipe_list is None:
         logging.error(

{autopkg_wrapper-2024.5.2 → autopkg_wrapper-2024.5.3}/pyproject.toml

@@ -5,7 +5,7 @@
     name = "autopkg-wrapper"
     readme = "README.md"
     repository = "https://github.com/smithjw/autopkg-wrapper"
-    version = "2024.5.2"
+    version = "2024.5.3"
 
     [tool.poetry.scripts]
         # When built and installed by pip, the command autopkg_wrapper will be availble in to run within that environment

autopkg_wrapper-2024.5.2/autopkg_wrapper/__init__.py

@@ -1 +0,0 @@
-__version__ = "2024.5.2"