cfengine 0.11.0__tar.gz → 0.11.2__tar.gz

{cfengine-0.11.0 → cfengine-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.11.0
+Version: 0.11.2
 Summary: Human-oriented CLI for interacting with CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -696,7 +696,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: cf-remote>=0.7.3
 Requires-Dist: cfbs>=5.5.0
-Requires-Dist: tree-sitter-cfengine>=1.0.12
+Requires-Dist: tree-sitter-cfengine>=1.1.8
 Requires-Dist: tree-sitter>=0.25
 Requires-Dist: markdown-it-py>=3.0.0
 

{cfengine-0.11.0 → cfengine-0.11.2}/pyproject.toml

@@ -12,7 +12,7 @@ requires-python = ">=3.10"
 dependencies = [
     "cf-remote>=0.7.3",
     "cfbs>=5.5.0",
-    "tree-sitter-cfengine>=1.0.12",
+    "tree-sitter-cfengine>=1.1.8",
     "tree-sitter>=0.25",
     "markdown-it-py>=3.0.0",
 ]

{cfengine-0.11.0 → cfengine-0.11.2}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.11.0
+Version: 0.11.2
 Summary: Human-oriented CLI for interacting with CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -696,7 +696,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: cf-remote>=0.7.3
 Requires-Dist: cfbs>=5.5.0
-Requires-Dist: tree-sitter-cfengine>=1.0.12
+Requires-Dist: tree-sitter-cfengine>=1.1.8
 Requires-Dist: tree-sitter>=0.25
 Requires-Dist: markdown-it-py>=3.0.0
 

{cfengine-0.11.0 → cfengine-0.11.2}/src/cfengine.egg-info/requires.txt

@@ -1,5 +1,5 @@
 cf-remote>=0.7.3
 cfbs>=5.5.0
-tree-sitter-cfengine>=1.0.12
+tree-sitter-cfengine>=1.1.8
 tree-sitter>=0.25
 markdown-it-py>=3.0.0

{cfengine-0.11.0 → cfengine-0.11.2}/src/cfengine_cli/commands.py

@@ -1,11 +1,10 @@
 import sys
 import os
 import re
-import itertools
 import json
 from cfengine_cli.profile import profile_cfengine, generate_callstack
 from cfengine_cli.dev import dispatch_dev_subcommand
-from cfengine_cli.lint import lint_cfbs_json, lint_json, lint_policy_file
+from cfengine_cli.lint import lint_single_arg, lint_folder
 from cfengine_cli.shell import user_command
 from cfengine_cli.paths import bin
 from cfengine_cli.version import cfengine_cli_version_string
@@ -95,52 +94,17 @@ def format(names, line_length) -> int:
     return 0
 
 
-def _lint_folder(folder):
-    errors = 0
-    while folder.endswith(("/.", "/")):
-        folder = folder[0:-1]
-    for filename in itertools.chain(
-        find(folder, extension=".json"), find(folder, extension=".cf")
-    ):
-        if filename.startswith(("./.", "./out/", folder + "/.", folder + "/out/")):
-            continue
-        if filename.startswith(".") and not filename.startswith("./"):
-            continue
-        errors += _lint_single_file(filename)
-    return errors
-
-
-def _lint_single_file(file):
-    assert os.path.isfile(file)
-    if file.endswith("/cfbs.json"):
-        return lint_cfbs_json(file)
-    if file.endswith(".json"):
-        return lint_json(file)
-    assert file.endswith(".cf")
-    return lint_policy_file(file)
-
-
-def _lint_single_arg(arg):
-    if os.path.isdir(arg):
-        return _lint_folder(arg)
-    assert os.path.isfile(arg)
-    _lint_single_file(arg)
-    return 0
-
-
 def _lint(files) -> int:
 
     if not files:
-        return _lint_folder(".")
+        return lint_folder(".")
 
     errors = 0
 
     for file in files:
-        errors += _lint_single_arg(file)
+        errors += lint_single_arg(file)
 
-    if errors == 0:
-        return 0
-    return 1
+    return errors
 
 
 def lint(files) -> int:

{cfengine-0.11.0 → cfengine-0.11.2}/src/cfengine_cli/docs.py

@@ -16,7 +16,7 @@ import markdown_it
 from cfbs.pretty import pretty_file
 from cfbs.utils import find
 
-from cfengine_cli.lint import lint_policy_file
+from cfengine_cli.lint import lint_folder, lint_policy_file
 from cfengine_cli.utils import UserError
 
 IGNORED_DIRS = [".git"]
@@ -409,6 +409,9 @@ def check_docs() -> int:
 
     Run by the command:
     cfengine dev lint-docs"""
+    r = lint_folder(".")
+    if r != 0:
+        return r
     _process_markdown_code_blocks(
         path=".",
         languages=["json", "cf3"],

{cfengine-0.11.0 → cfengine-0.11.2}/src/cfengine_cli/lint.py

@@ -12,10 +12,12 @@ $ cfengine lint
 
 import os
 import json
+import itertools
 import tree_sitter_cfengine as tscfengine
 from tree_sitter import Language, Parser
 from cfbs.validate import validate_config
 from cfbs.cfbs_config import CFBSConfig
+from cfbs.utils import find
 
 DEPRECATED_PROMISE_TYPES = ["defaults", "guest_environments"]
 ALLOWED_BUNDLE_TYPES = ["agent", "common", "monitor", "server", "edit_line", "edit_xml"]
@@ -231,3 +233,35 @@ def lint_policy_file(
     else:
         print(f"FAIL: {filename} ({errors} error{'s' if errors > 0 else ''})")
     return errors
+
+
+def lint_folder(folder):
+    errors = 0
+    while folder.endswith(("/.", "/")):
+        folder = folder[0:-1]
+    for filename in itertools.chain(
+        find(folder, extension=".json"), find(folder, extension=".cf")
+    ):
+        if filename.startswith(("./.", "./out/", folder + "/.", folder + "/out/")):
+            continue
+        if filename.startswith(".") and not filename.startswith("./"):
+            continue
+        errors += lint_single_file(filename)
+    return errors
+
+
+def lint_single_file(file):
+    assert os.path.isfile(file)
+    if file.endswith("/cfbs.json"):
+        return lint_cfbs_json(file)
+    if file.endswith(".json"):
+        return lint_json(file)
+    assert file.endswith(".cf")
+    return lint_policy_file(file)
+
+
+def lint_single_arg(arg):
+    if os.path.isdir(arg):
+        return lint_folder(arg)
+    assert os.path.isfile(arg)
+    return lint_single_file(arg)

{cfengine-0.11.0 → cfengine-0.11.2}/src/cfengine_cli/masterfiles/generate_git_tags.py

@@ -42,24 +42,29 @@ def clone_or_update_repo(repo):
 def get_commit_shas_from_tags(repo_path):
     # Returns a mapping of git tag to commit SHA for all version tags in the repo
     output = (
-        subprocess.check_output(["git", "show-ref", "--tags"], cwd=repo_path)
+        subprocess.check_output(["git", "show-ref", "--tags", "-d"], cwd=repo_path)
         .decode()
         .strip()
     )
     tag_map = {}
 
     for line in output.splitlines():
-        ref = line.split()[1]
-        tag = ref.split("refs/tags/")[1]
-        if re.fullmatch(TAG_REGEX, tag):
-            sha = (
-                subprocess.check_output(
-                    ["git", "log", "-n", "1", "--format=%H", tag], cwd=repo_path
-                )
-                .decode()
-                .strip()
-            )
-            tag_map[tag] = sha
+        parts = line.split()
+        if len(parts) != 2:
+            continue
+        sha, ref = parts
+
+        if ref.startswith("refs/tags/"):
+            tag = ref.split("refs/tags/")[1]
+            if tag.endswith("^{}"):
+                tag_name = tag[:-3]
+                if re.fullmatch(TAG_REGEX, tag_name):
+                    tag_map[tag_name] = sha
+            else:
+                if re.fullmatch(TAG_REGEX, tag):
+                    # Only set if not already set by ^{}
+                    if tag not in tag_map:
+                        tag_map[tag] = sha
 
     return tag_map