cfengine 0.16.0__tar.gz → 0.16.2__tar.gz

{cfengine-0.16.0 → cfengine-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.16.0
+Version: 0.16.2
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{cfengine-0.16.0 → cfengine-0.16.2}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.16.0
+Version: 0.16.2
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{cfengine-0.16.0 → cfengine-0.16.2}/src/cfengine_cli/format.py

@@ -711,6 +711,10 @@ def _format_block_header(node: Node, fmt: Formatter) -> list[Node]:
 def _needs_blank_line_before(child: Node, indent: int, line_length: int) -> bool:
     """Check if a blank separator line should precede this child node."""
     prev = child.prev_named_sibling
+    # Empty comments preceding this child will be dropped — look past them
+    # so we evaluate against the real prior content.
+    while prev and prev.type == "comment" and _is_empty_comment(prev):
+        prev = prev.prev_named_sibling
     if not prev:
         return False
 
@@ -747,14 +751,13 @@ def _needs_blank_line_before(child: Node, indent: int, line_length: int) -> bool
         if prev.type in BLOCK_TYPES:
             return True
         parent = child.parent
-        # Trailing comment at the end of a bundle body lands deeply
-        # indented (aligned with the deepest attribute); insert a blank
-        # line so it doesn't run into the preceding section.
+        # Comment at bundle_block_body level after a bundle_section —
+        # either a trailing comment for the previous section or a leading
+        # comment for the next one. Either way, visually separate it.
         if (
             prev.type == "bundle_section"
             and parent
             and parent.type == "bundle_block_body"
-            and _skip_comments(child.next_named_sibling, "next") is None
         ):
             return True
         if parent and parent.type in {"bundle_section", "class_guarded_promises"}:
@@ -778,12 +781,27 @@ def _needs_blank_line_before(child: Node, indent: int, line_length: int) -> bool
 
 
 def _is_empty_comment(node: Node) -> bool:
-    """Check if a bare '#' comment should be dropped (not between other comments)."""
+    """Check if a bare '#' comment should be dropped.
+
+    A run of bare '#' between two non-empty comments collapses to a
+    single '#' — the first in the run is kept, the rest are dropped.
+    Bare '#' not flanked by real comments is always dropped."""
     if text(node).strip() != "#":
         return False
     prev = node.prev_named_sibling
+    # Not the first in a run of '#' — a kept '#' precedes us, drop.
+    if prev and prev.type == "comment" and text(prev).strip() == "#":
+        return True
+    # First in a run — kept only if a non-empty comment sits on each side
+    # (forward search walks past the rest of the run to find one).
+    if not (prev and prev.type == "comment"):
+        return True
     nxt = node.next_named_sibling
-    return not (prev and prev.type == "comment" and nxt and nxt.type == "comment")
+    while nxt and nxt.type == "comment" and text(nxt).strip() == "#":
+        nxt = nxt.next_named_sibling
+    if not (nxt and nxt.type == "comment"):
+        return True
+    return False
 
 
 def _skip_comments(sibling: Node | None, direction: str = "next") -> Node | None:

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/004_comments.expected.cf

@@ -144,3 +144,10 @@ body package_method cgcacgcac
     # bar
     package_changes => "bulk";
 }
+
+# Example here:
+bundle agent stigs
+{
+  vars:
+    "foo" string => "bar";
+}

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/004_comments.input.cf

@@ -133,3 +133,13 @@ package_changes => "bulk";
 # bar
 package_changes => "bulk";
 }
+
+#
+# Example here:
+#
+
+bundle agent stigs
+{
+  vars:
+    "foo" string => "bar";
+}

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/005_bundle_comments.expected.cf

@@ -104,3 +104,27 @@ bundle agent trailing_example_3
 
       # Trailing
 }
+
+bundle agent before_promise_types
+{
+  # Reports promises:
+  reports:
+    "Hello, world!";
+
+  # Classes:
+  classes:
+    "myclass" if => "foo";
+
+  # Variables:
+  # Multi line
+  vars:
+    "myvar"
+      string => "bar",
+      if => "foo";
+
+  # More reports:
+  reports:
+    "Lorem ipsum";
+
+    # Trailing comment
+}

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/005_bundle_comments.input.cf

@@ -101,3 +101,23 @@ if => "bar";
 
 # Trailing
 }
+
+bundle agent before_promise_types
+{
+# Reports promises:
+reports:
+"Hello, world!";
+# Classes:
+classes:
+"myclass" if => "foo";
+# Variables:
+# Multi line
+vars:
+"myvar"
+string => "bar",
+if => "foo";
+# More reports:
+reports:
+"Lorem ipsum";
+# Trailing comment
+}

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/006_remove_empty_comments.expected.cf

@@ -1,3 +1,6 @@
+# explanation
+#
+# one more line
 bundle agent main
 {
   # comment
@@ -22,3 +25,21 @@ bundle agent c
   reports:
     "hello";
 }
+
+bundle agent d
+{
+  reports:
+    "hello";
+
+    any::
+      "world";
+}
+
+bundle agent e
+{
+  reports:
+    "hello";
+
+    any::
+      "world";
+}

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/006_remove_empty_comments.input.cf

@@ -1,3 +1,18 @@
+#
+#
+#
+#
+#
+# explanation
+#
+#
+#
+#
+# one more line
+#
+#
+#
+#
 bundle agent main
 {
 #
@@ -28,3 +43,38 @@ bundle agent c
 reports:
 "hello";
 }
+#
+bundle agent d
+{
+#
+reports:
+#
+"hello";
+#
+any::
+#
+"world";
+}
+
+#
+#
+#
+bundle agent e
+{
+#
+#
+#
+reports:
+#
+#
+#
+"hello";
+#
+#
+#
+any::
+#
+#
+#
+"world";
+}

{cfengine-0.16.0 → cfengine-0.16.2}/tests/format/011_promises.expected.cf

@@ -505,6 +505,7 @@ bundle common services_autorun
     services_autorun|services_autorun_inputs|services_autorun_bundles::
       "inputs" slist => { "$(sys.local_libdir)/autorun.cf" };
       "bundles" slist => { "autorun" };
+
   # run loaded bundles
   reports:
     DEBUG|DEBUG_services_autorun::