autopkg-wrapper 2024.2.8__tar.gz → 2024.5.1__tar.gz

{autopkg_wrapper-2024.2.8 → autopkg_wrapper-2024.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autopkg-wrapper
-Version: 2024.2.8
+Version: 2024.5.1
 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
@@ -11,8 +11,8 @@ 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.6)
-Requires-Dist: pygithub (==2.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)

autopkg_wrapper-2024.5.1/autopkg_wrapper/__init__.py

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

{autopkg_wrapper-2024.2.8 → autopkg_wrapper-2024.5.1}/autopkg_wrapper/autopkg_wrapper.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import json
 import logging
 import plistlib
 import subprocess
@@ -32,7 +33,7 @@ class Recipe(object):
         return name
 
     def verify_trust_info(self):
-        cmd = ["/usr/local/bin/autopkg", "verify-trust-info", self.filename, "-vv"]
+        cmd = ["/usr/local/bin/autopkg", "verify-trust-info", self.filename, "-v"]
         cmd = " ".join(cmd)
         logging.debug(f"cmd: {str(cmd)}")
 
@@ -91,7 +92,7 @@ class Recipe(object):
                     "/usr/local/bin/autopkg",
                     "run",
                     self.filename,
-                    "-vv",
+                    "-v",
                     "--report-plist",
                     str(report),
                 ]
@@ -153,7 +154,7 @@ def get_override_repo_info(args):
     return git_info
 
 
-def update_recipe_repo(recipe, git_info, disable_recipe_trust_check):
+def update_recipe_repo(recipe, git_info, disable_recipe_trust_check, args):
     logging.debug(f"recipe.verified: {recipe.verified}")
     logging.debug(f"disable_recipe_trust_check: {disable_recipe_trust_check}")
 
@@ -168,6 +169,10 @@ def update_recipe_repo(recipe, git_info, disable_recipe_trust_check):
             logging.debug("Updating repo as recipe verification failed")
             current_branch = git.get_current_branch(git_info)
 
+            if args.disable_git_commands:
+                logging.info("Not runing git commands as --disable-git-commands has been set")
+                return
+
             if current_branch != git_info["override_trust_branch"]:
                 logging.debug(f"override_trust_branch: {git_info["override_trust_branch"]}")
                 git.create_branch(git_info)
@@ -184,10 +189,16 @@ def parse_recipe_list(recipes, recipe_file, post_processors):
     """Parsing list of recipes into a common format"""
     recipe_list = None
 
-    logging.debug(f"Recipes: {recipes}") if recipes else None
-    logging.debug(f"Recipe List: {recipe_file}") if recipe_file else None
+    logging.info(f"Recipes: {recipes}") if recipes else None
+    logging.info(f"Recipe List: {recipe_file}") if recipe_file else None
 
-    if isinstance(recipes, list):
+    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:
@@ -199,13 +210,14 @@ def parse_recipe_list(recipes, recipe_file, post_processors):
 
     if recipe_list is None:
         logging.error(
-            """Please provide a recipe to run via the following methods:
-    --recipes
-    --recipe-list
+            """Please provide recipes to run via the following methods:
+    --recipes recipe_one.download recipe_two.download
+    --recipe-file path/to/recipe_list.json
     Comma separated list in the AUTOPKG_RECIPES env variable"""
         )
         sys.exit(1)
 
+    logging.info(f"Processing the following recipes: {recipe_list}")
     recipe_map = [Recipe(name, post_processors=post_processors) for name in recipe_list]
 
     return recipe_map
@@ -228,7 +240,7 @@ def parse_post_processors(post_processors):
         case str():
             post_processors_list = [post_processor.strip() for post_processor in post_processors.split(" ") if post_processor.strip()]
 
-    logging.debug(f"Post Processors List: {post_processors_list}")
+    logging.info(f"Post Processors List: {post_processors_list}") if post_processors_list else None
 
     return post_processors_list
 
@@ -255,6 +267,7 @@ def process_recipe(recipe, disable_recipe_trust_check):
 
 
 def main():
+    print("Hello World")
     args = setup_args()
     setup_logger(args.debug if args.debug else False)
     logging.info("Running autopkg_wrapper")
@@ -265,9 +278,9 @@ def main():
     recipe_list = parse_recipe_list(recipes=args.recipes, recipe_file=args.recipe_file, post_processors=post_processors_list)
 
     for recipe in recipe_list:
-        logging.debug(f"Processing Recipe: {recipe.name}")
+        logging.info(f"Processing Recipe: {recipe.name}")
         process_recipe(recipe=recipe, disable_recipe_trust_check=args.disable_recipe_trust_check)
-        update_recipe_repo(git_info=override_repo_info, recipe=recipe, disable_recipe_trust_check=args.disable_recipe_trust_check)
+        update_recipe_repo(git_info=override_repo_info, recipe=recipe, disable_recipe_trust_check=args.disable_recipe_trust_check, args=args)
         slack.send_notification(recipe=recipe, token=args.slack_token) if args.slack_token else None
 
     recipe.pr_url = git.create_pull_request(git_info=override_repo_info, recipe=recipe) if args.create_pr else None

{autopkg_wrapper-2024.2.8 → autopkg_wrapper-2024.5.1}/autopkg_wrapper/utils/args.py

@@ -30,19 +30,27 @@ def setup_args():
     recipe_arguments.add_argument(
         "--recipe-file",
         type=validate_file,
-        default=None,
-        help="Path to a list of recipes to run",
+        default=os.getenv("AW_RECIPE_FILE", None),
+        help="Provide the list of recipes to run via a JSON file for easier management.",
     )
     recipe_arguments.add_argument(
         "--recipes",
-        "--recipe",
         nargs="*",
-        default=os.getenv("AUTOPKG_RECIPES", None),
-        help="Recipes to run with autopkg",
+        default=os.getenv("AW_RECIPES", None),
+        help="""
+            Recipes to run via CLI flag or environment variable. If the '--recipes' flag is used, simply
+            provide a space-separated list on the command line:
+                `autopkg-wrapper --recipes recipe_one.download recipe_two.download`
+            Alternatively, you can provide a space/comma-separated list in the 'AW_RECIPES' environment
+            variable:
+                `export AW_RECIPES="recipe_one.download recipe_two.download"`
+                `export AW_RECIPES="recipe_one.pkg,recipe_two.pkg"`
+                `autopkg-wrapper`
+            """,
     )
     parser.add_argument(
         "--debug",
-        default=os.getenv("DEBUG", False),
+        default=os.getenv("AW_DEBUG", False),
         action="store_true",
         help="Enable debug logging when running script",
     )
@@ -55,6 +63,13 @@ def setup_args():
             of this application.
             """,
     )
+    parser.add_argument(
+        "--disable-git-commands",
+        action="store_true",
+        help="""
+            If this option is used, git commands won't be run
+            """,
+    )
     parser.add_argument("--slack-token", default=os.getenv("SLACK_WEBHOOK_TOKEN", None), help=argparse.SUPPRESS)
     parser.add_argument("--github-token", default=os.getenv("GITHUB_TOKEN", None))
     parser.add_argument(
@@ -67,7 +82,7 @@ def setup_args():
     )
     parser.add_argument(
         "--create-pr",
-        default=os.getenv("CREATE_PR", False),
+        default=os.getenv("AW_CREATE_PR", False),
         action="store_true",
         help="If enabled, autopkg_wrapper will open a PR for updated trust information",
     )

{autopkg_wrapper-2024.2.8 → autopkg_wrapper-2024.5.1}/pyproject.toml

@@ -5,7 +5,7 @@
     name = "autopkg-wrapper"
     readme = "README.md"
     repository = "https://github.com/smithjw/autopkg-wrapper"
-    version = "2024.2.8"
+    version = "2024.5.1"
 
     [tool.poetry.scripts]
         # When built and installed by pip, the command autopkg_wrapper will be availble in to run within that environment
@@ -14,8 +14,8 @@
 
     [tool.poetry.dependencies]
         chardet = "5.2.0"
-        idna = "3.6"
-        pygithub = "2.2.0"
+        idna = "3.7"
+        pygithub = "2.3.0"
         python = "^3.12"
         requests = "2.31.0"
         ruamel-yaml = "0.18.6"

autopkg_wrapper-2024.2.8/autopkg_wrapper/__init__.py

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