Working on deptool

Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>

Author: olehermanse

src/cfengine_cli/dependency_tables.py

@@ -707,36 +707,86 @@ def parse_args():
     return parser.parse_args()
 
 
-def main():
-    args = parse_args()
-
-    if args.compare and len(args.refs) % 2 == 1:
+def deptool(
+    compare,
+    refs,
+    repo_path,
+    no_info,
+    json_path,
+    cdx_sbom_path_template,
+    patch,
+    skip_unchanged,
+):
+    if compare and len(refs) % 2 == 1:
         log.warning("comparing with an odd number of versions")
 
-    dr = DepsReader(repo_path=args.repo_path, log_info=not args.no_info)
+    dr = DepsReader(repo_path=repo_path, log_info=not no_info)
 
-    if args.json_path:
-        dr.write_deps_json(args.json_path, args.refs)
+    if json_path:
+        dr.write_deps_json(json_path, refs)
 
-    if args.cdx_sbom_path_template:
-        dr.write_cdx_sboms(args.cdx_sbom_path_template, args.refs)
+    if cdx_sbom_path_template:
+        dr.write_cdx_sboms(cdx_sbom_path_template, refs)
 
-    if args.patch or not args.compare:
+    if patch or not compare:
         updated_readme, updated_agent_table, updated_hub_table = (
-            dr.updated_deps_markdown_table(args.refs)
+            dr.updated_deps_markdown_table(refs)
         )
 
-    if args.compare:
-        comparison_table = dr.comparison_md_table(args.refs, args.skip_unchanged)
+    if compare:
+        comparison_table = dr.comparison_md_table(refs, skip_unchanged)
         print(comparison_table)
     else:
         print("### Agent dependencies\n")
         print(updated_agent_table)
         print("\n### Enterprise Hub dependencies\n")
         print(updated_hub_table)
 
-    if args.patch:
+    if patch:
         dr.patch_readme(updated_readme)
+    return 0
+
+
+def main() -> int:
+    args = parse_args()
+    return deptool(
+        compare=args.compare,
+        refs=args.refs,
+        repo_path=args.repo_path,
+        no_info=args.no_info,
+        json_path=args.json_path,
+        cdx_sbom_path_template=args.cdx_sbom_path_template,
+        patch=args.patch,
+        skip_unchanged=args.skip_unchanged,
+    )
+
+
+def update_dependency_tables() -> int:
+    deptool(
+        compare=False,
+        refs=ACTIVE_BRANCHES,
+        repo_path=".",
+        no_info=False,
+        json_path=None,
+        cdx_sbom_path_template=None,
+        patch=True,
+        skip_unchanged=False,
+    )
+    return 0
+
+
+def print_release_dependency_tables(versions) -> int:
+    deptool(
+        compare=True,
+        refs=versions,
+        repo_path=".",
+        no_info=False,
+        json_path=None,
+        cdx_sbom_path_template=None,
+        patch=False,
+        skip_unchanged=True,
+    )
+    return 0
 
 
 if __name__ == "__main__":

src/cfengine_cli/deptool.py

@@ -1,7 +1,10 @@
 import os
 from cfbs.commands import generate_release_information_command
 from cfengine_cli.utils import UserError
-from cfengine_cli.dependency_tables import update_dependency_tables
+from cfengine_cli.deptool import (
+    update_dependency_tables,
+    print_release_dependency_tables,
+)
 from cfengine_cli.docs import update_docs, check_docs
 
 
@@ -23,13 +26,20 @@ def _expect_repo(repo) -> bool:
     return answer
 
 
-def dependency_tables() -> int:
+def deps_readme() -> int:
     answer = _expect_repo("buildscripts")
     if answer:
         return update_dependency_tables()
     return 1
 
 
+def deps_release(args) -> int:
+    answer = _expect_repo("buildscripts")
+    if answer:
+        return print_release_dependency_tables(args)
+    return 1
+
+
 def docs_format() -> int:
     answer = _expect_repo("documentation")
     if answer:
@@ -52,9 +62,11 @@ def release_information() -> int:
     return 1
 
 
-def dispatch_dev_subcommand(subcommand) -> int:
-    if subcommand == "dependency-tables":
-        return dependency_tables()
+def dispatch_dev_subcommand(subcommand, args) -> int:
+    if subcommand == "deps-readme":
+        return deps_readme()
+    if subcommand == "deps-release":
+        return deps_release(args)
     if subcommand == "docs-format":
         return docs_format()
     if subcommand == "docs-check":