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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autopkg-wrapper
-Version: 2024.5.2
+Version: 2024.5.5
 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
@@ -10,13 +10,13 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: chardet (==5.2.0)
-Requires-Dist: idna (==3.7)
-Requires-Dist: pygithub (==2.3.0)
-Requires-Dist: requests (==2.31.0)
-Requires-Dist: ruamel-yaml (==0.18.6)
-Requires-Dist: toml (==0.10.2)
-Requires-Dist: urllib3 (==2.2.1)
+Requires-Dist: chardet (>=5)
+Requires-Dist: idna (>=3)
+Requires-Dist: pygithub (>=2)
+Requires-Dist: requests (>=2)
+Requires-Dist: ruamel-yaml (>=0.18)
+Requires-Dist: toml (>=0.10)
+Requires-Dist: urllib3 (>=2)
 Project-URL: Repository, https://github.com/smithjw/autopkg-wrapper
 Description-Content-Type: text/markdown
 

autopkg_wrapper-2024.5.5/autopkg_wrapper/__init__.py

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

{autopkg_wrapper-2024.5.2 → autopkg_wrapper-2024.5.5}/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.5}/autopkg_wrapper/utils/args.py

@@ -24,6 +24,14 @@ def validate_directory(arg):
         message = f"Error! This is not valid directory: {arg}"
         raise argparse.ArgumentTypeError(message)
 
+def validate_bool(arg):
+    if isinstance(arg, bool):
+        return arg
+    elif isinstance(arg, str) and arg.lower() in ['0','false','no', 'f']:
+        return False
+    elif isinstance(arg, str) and arg.lower() in ['1','true','yes', 't']:
+        return True
+
 def setup_args():
     parser = argparse.ArgumentParser(description="Run autopkg recipes")
     recipe_arguments = parser.add_mutually_exclusive_group()
@@ -50,7 +58,7 @@ def setup_args():
     )
     parser.add_argument(
         "--debug",
-        default=os.getenv("AW_DEBUG", False),
+        default=validate_bool(os.getenv("AW_DEBUG", False)),
         action="store_true",
         help="Enable debug logging when running script",
     )

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

@@ -5,22 +5,21 @@
     name = "autopkg-wrapper"
     readme = "README.md"
     repository = "https://github.com/smithjw/autopkg-wrapper"
-    version = "2024.5.2"
+    version = "2024.5.5"
 
     [tool.poetry.scripts]
         # When built and installed by pip, the command autopkg_wrapper will be availble in to run within that environment
-        autopkg-wrapper = "autopkg_wrapper.autopkg_wrapper:main"
         autopkg_wrapper = "autopkg_wrapper.autopkg_wrapper:main"
 
     [tool.poetry.dependencies]
-        chardet = "5.2.0"
-        idna = "3.7"
-        pygithub = "2.3.0"
+        chardet = ">=5"
+        idna = ">=3"
+        pygithub = ">=2"
         python = "^3.12"
-        requests = "2.31.0"
-        ruamel-yaml = "0.18.6"
-        toml = "0.10.2"
-        urllib3 = "2.2.1"
+        requests = ">=2"
+        ruamel-yaml = ">=0.18"
+        toml = ">=0.10"
+        urllib3 = ">=2"
 
     [tool.poetry_bumpversion.file."autopkg_wrapper/__init__.py"]
 

autopkg_wrapper-2024.5.2/autopkg_wrapper/__init__.py

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