cfengine 0.23.3__tar.gz → 0.24.1__tar.gz

{cfengine-0.23.3 → cfengine-0.24.1}/.github/workflows/coverage.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     name: setup-python
     env:
-      PYTHON_VERSION: "3.10"
+      PYTHON_VERSION: "3.11"
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-python@v7

{cfengine-0.23.3 → cfengine-0.24.1}/.github/workflows/lint-policy-in-other-repos.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v7
         with:
-          python-version: "3.14"
+          python-version: "3.15"
       - name: Install dependencies
         working-directory: cfengine-cli
         run: |

{cfengine-0.23.3 → cfengine-0.24.1}/.github/workflows/make-check.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python ${{ matrix.python-version }}

{cfengine-0.23.3 → cfengine-0.24.1}/.github/workflows/pypi-publish.yml

@@ -51,4 +51,4 @@ jobs:
           name: release-dists
           path: dist/
       - name: Publish release distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.14.2
+        uses: pypa/gh-action-pypi-publish@v1.14.3

{cfengine-0.23.3 → cfengine-0.24.1}/.github/workflows/renovate.yml

@@ -7,12 +7,13 @@ on:
 
 jobs:
   renovate:
+    if: contains(fromJSON('["cfengine","mendersoftware","NorthernTechHQ"]'), github.repository_owner)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v7.0.1
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v46.3.7
+        uses: renovatebot/github-action@v46.3.12
         with:
           configurationFile: .github/renovate-config.js
           token: ${{ secrets.RENOVATE_TOKEN }}

{cfengine-0.23.3 → cfengine-0.24.1}/.github/workflows/update-syntax-description.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Python 3.12
         uses: actions/setup-python@v7
         with:
-          python-version: "3.14"
+          python-version: "3.15"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

{cfengine-0.23.3 → cfengine-0.24.1}/CHEATSHEET.md

@@ -1,6 +1,6 @@
 # CFEngine CLI cheatsheet
 
-Quick reference for `cfengine COMMANDS`
+Quick reference for `cfengine COMMANDS`.
 For the full command list, run `cfengine help` or `cfengine COMMAND --help`.
 
 ## Managing hosts
@@ -86,7 +86,7 @@ cfengine init --policy-set
 # Initialize an example build project for working on a custom promise type (python)
 cfengine init --promise-type
 
-# Initialize an exapmlte module project for build.cfengine.com (or internal use)
+# Initialize an example module project for build.cfengine.com (or internal use)
 cfengine init --policy-module
 
 # Initialize an example policy module that takes input data

{cfengine-0.23.3 → cfengine-0.24.1}/CLAUDE.md

@@ -48,4 +48,4 @@ We have different suites:
 - Unit tests in `tests/unit` test individual python functions.
 - Formatting tests in `tests/format` test the formatter (`cfengine format`).
 - Linting tests in `tests/lint` test the linter.
-- Shell tests in `tests/shell` tests various subcommands and the tool as a whole in an end-to-end fashion.
+- Shell tests in `tests/shell` test various subcommands and the tool as a whole in an end-to-end fashion.

{cfengine-0.23.3 → cfengine-0.24.1}/HACKING.md

@@ -16,7 +16,7 @@ If your editor does not do this automatically, you can run these tools from the
 make format
 ```
 
-## Installing from source:
+## Installing from source
 
 For developers working on CFEngine CLI, you can install it globally using pipx:
 
@@ -53,7 +53,7 @@ uv run bash tests/run-shell-tests.sh
 
 ## Releasing new versions
 
-Releases are [automated using a GH Action](https://github.com/cfengine/cfengine-cli/blob/main/.github/workflows/pypi-publish.yml)
+Releases are [automated using a GH Action](https://github.com/cfengine/cfengine-cli/blob/main/.github/workflows/pypi-publish.yml).
 We create tags and releases through the GitHub UI.
 Go to the releases section in GitHub:
 
@@ -107,7 +107,7 @@ Go through the prompts:
 https://github.com/cfengine/cfengine-cli/releases/tag/0.2.0
 ```
 
-Then check that everything went well;
+Then check that everything went well:
 
 https://github.com/cfengine/cfengine-cli/actions
 

{cfengine-0.23.3 → cfengine-0.24.1}/Makefile

@@ -7,7 +7,7 @@ venv:
 	uv sync
 
 format: venv
-	uv tool run black . --target-version py310
+	uv tool run black . --target-version py311
 	prettier . --write
 	uv run cfengine format ./
 

{cfengine-0.23.3 → cfengine-0.24.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.23.3
+Version: 0.24.1
 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
@@ -685,22 +685,20 @@ Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Distributed Computing
 Classifier: Topic :: System :: Systems Administration
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: cf-remote>=0.9.7
+Requires-Dist: cf-remote>=0.9.8
 Requires-Dist: cfbs>=5.8.1
 Requires-Dist: tree-sitter-cfengine>=1.1.12
 Requires-Dist: tree-sitter>=0.26.0
 Requires-Dist: markdown-it-py>=4.2.0
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: pydantic>=2.13.5
+Requires-Dist: pydantic>=2.14.3
 
 # CFEngine command line interface (CLI)
 

{cfengine-0.23.3 → cfengine-0.24.1}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=84.0.0", "setuptools-scm>=10.3.4"]
+requires = ["setuptools>=84.2.1", "setuptools-scm>=10.3.4"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -8,15 +8,15 @@ dynamic = ["version"]
 description = "Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
-    "cf-remote>=0.9.7",
+    "cf-remote>=0.9.8",
     "cfbs>=5.8.1",
     "tree-sitter-cfengine>=1.1.12",
     "tree-sitter>=0.26.0",
     "markdown-it-py>=4.2.0",
     "pyyaml>=6.0.3",
-    "pydantic>=2.13.5",
+    "pydantic>=2.14.3",
 ]
 classifiers = [
   "Development Status :: 3 - Alpha",
@@ -27,12 +27,10 @@ classifiers = [
   "Topic :: Software Development :: Build Tools",
   "Topic :: System :: Distributed Computing",
   "Topic :: System :: Systems Administration",
-  "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
 
@@ -54,7 +52,7 @@ venv = ".venv"
 
 [dependency-groups]
 dev = [
-    "flake8>=7.4.1",
-    "pytest>=9.1.1",
-    "coverage; python_version >= '3.10'",
+    "flake8>=7.5.0",
+    "pytest>=9.2.0",
+    "coverage",
 ]

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.23.3
+Version: 0.24.1
 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
@@ -685,22 +685,20 @@ Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Distributed Computing
 Classifier: Topic :: System :: Systems Administration
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: cf-remote>=0.9.7
+Requires-Dist: cf-remote>=0.9.8
 Requires-Dist: cfbs>=5.8.1
 Requires-Dist: tree-sitter-cfengine>=1.1.12
 Requires-Dist: tree-sitter>=0.26.0
 Requires-Dist: markdown-it-py>=4.2.0
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: pydantic>=2.13.5
+Requires-Dist: pydantic>=2.14.3
 
 # CFEngine command line interface (CLI)
 

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine.egg-info/SOURCES.txt

@@ -164,9 +164,11 @@ tests/shell/006-test-fail.sh
 tests/shell/007-test-container.sh
 tests/shell/008-cfbs-index.sh
 tests/unit/__init__.py
+tests/unit/test_cfengine_wrapper.py
 tests/unit/test_changelog.py
 tests/unit/test_deps.py
 tests/unit/test_format.py
+tests/unit/test_initialize_project.py
 tests/unit/test_lint_csv.py
 tests/unit/test_lint_yml.py
 tests/unit/test_paths.py

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine.egg-info/requires.txt

@@ -1,7 +1,7 @@
-cf-remote>=0.9.7
+cf-remote>=0.9.8
 cfbs>=5.8.1
 tree-sitter-cfengine>=1.1.12
 tree-sitter>=0.26.0
 markdown-it-py>=4.2.0
 pyyaml>=6.0.3
-pydantic>=2.13.5
+pydantic>=2.14.3

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine.egg-info/scm_file_list.json

@@ -157,9 +157,11 @@
     "tests/shell/007-test-container.sh",
     "tests/shell/008-cfbs-index.sh",
     "tests/unit/__init__.py",
+    "tests/unit/test_cfengine_wrapper.py",
     "tests/unit/test_changelog.py",
     "tests/unit/test_deps.py",
     "tests/unit/test_format.py",
+    "tests/unit/test_initialize_project.py",
     "tests/unit/test_lint_csv.py",
     "tests/unit/test_lint_yml.py",
     "tests/unit/test_paths.py",

cfengine-0.24.1/src/cfengine.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.24.1",
+  "distance": 0,
+  "node": "g2b0930cd8f4617a8eae983c711288514361e4330",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-06"
+}

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine_cli/cfengine_wrapper/arg_parse.py

@@ -8,6 +8,8 @@ from cf_remote.args import (
     add_spawn_args,
     add_destroy_args,
     add_connect_args,
+    add_list_args,
+    add_download_args,
 )
 
 
@@ -20,6 +22,15 @@ def _add_index_arg(parser: argparse.ArgumentParser):
     )
 
 
+def _add_version_arg(parser: argparse.ArgumentParser):
+    parser.add_argument(
+        "--version",
+        "-V",
+        help="Specify version",
+        type=str,
+    )
+
+
 def parse_wrapper_args(subp: argparse._SubParsersAction):
     update_parser = subp.add_parser(
         "update",
@@ -39,7 +50,7 @@ def parse_wrapper_args(subp: argparse._SubParsersAction):
     remove_parser.add_argument(
         "module",
         nargs="+",
-        help="Module(s) for which to remove",
+        help="Module(s) to remove",
     )
 
     add_parser = subp.add_parser(
@@ -50,7 +61,7 @@ def parse_wrapper_args(subp: argparse._SubParsersAction):
     add_parser.add_argument(
         "module",
         nargs="+",
-        help="Module(s) for which to add",
+        help="Module(s) to add",
     )
     _add_index_arg(add_parser)
     search_parser = subp.add_parser(
@@ -61,7 +72,7 @@ def parse_wrapper_args(subp: argparse._SubParsersAction):
     search_parser.add_argument(
         "module",
         nargs="+",
-        help="Module(s) for which to lookup",
+        help="Module(s) to look up",
     )
     _add_index_arg(search_parser)
 
@@ -153,14 +164,25 @@ def parse_wrapper_args(subp: argparse._SubParsersAction):
         help="Install CFEngine on the given hosts",
         description="A wrapper around the cf-remote `install` function",
     )
-    install_parser.add_argument(
-        "--version",
-        "-V",
-        help="Specify version",
-        type=str,
-    )
+    _add_version_arg(install_parser)
     add_install_args(install_parser)
 
+    list_parser = subp.add_parser(
+        "list",
+        help="List CFEngine packages available for download",
+        description="A wrapper around the cf-remote `list` function",
+    )
+    _add_version_arg(list_parser)
+    add_list_args(list_parser)
+
+    download_parser = subp.add_parser(
+        "download",
+        help="Download CFEngine packages",
+        description="A wrapper around the cf-remote `download` function",
+    )
+    _add_version_arg(download_parser)
+    add_download_args(download_parser)
+
     uninstall_parser = subp.add_parser(
         "uninstall",
         help="Uninstall CFEngine on the given hosts",

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine_cli/cfengine_wrapper/cfengine_commands.py

@@ -31,6 +31,7 @@ from cfengine_cli.cfengine_wrapper.cfengine_objects import (
 )
 from cfengine_cli.cfengine_wrapper.cfengine_utils import (
     extract_agent_file,
+    has_known_hubs,
     prompt_two_options,
     prompt_yes_no,
     require_executable,
@@ -197,7 +198,7 @@ def report(
         for agent in clients:
             rc = _refresh_agent(agent)
             if rc != 0:
-                log.error(f"Refresh failed on {agent.label})")
+                log.error(f"Refresh failed on {agent.label}")
                 errors += 1
 
     for hub in hubs:
@@ -206,7 +207,7 @@ def report(
         client_ips = [client.location.split("@", 1)[1] for client in clients]
         rc = _query_hub_delta(hub.hub, client_ips)
         if rc != 0:
-            log.error(f"Hub refresh failed on {hub.label})")
+            log.error(f"Hub refresh failed on {hub.label}")
             errors += 1
 
     if errors > 0:
@@ -219,9 +220,37 @@ def setup_code(target: str | None = None) -> int:
     return hub.run("--new-setup-code")
 
 
+def _policy_changed_since_build() -> bool:
+    """True if there is no build, or project files changed since the last one."""
+    tarball = os.path.join("out", "masterfiles.tgz")
+    if not os.path.isfile(tarball):
+        return True
+    built_at = os.path.getmtime(tarball)
+    for root, dirs, files in os.walk("."):
+        # Skip build output and hidden entries (.git, editor state, ...)
+        dirs[:] = [d for d in dirs if d[0] != "." and (root, d) != (".", "out")]
+        for name in files:
+            path = os.path.join(root, name)
+            if name[0] != "." and os.path.getmtime(path) > built_at:
+                return True
+    return False
+
+
 def run(*args, target: str | None = None) -> int:
     agent = require_executable("cf-agent", target)
     if not args:
+        if (
+            is_cfbs_repo()
+            and has_known_hubs()
+            and _policy_changed_since_build()
+            and prompt_yes_no(
+                "The policy set has changed since it was last built. "
+                "Build and deploy it before running?"
+            )
+        ):
+            rc = build_command() or deploy_command(None, None)
+            if rc != 0:
+                return rc
         return agent.run("-KIf update.cf", "-KI")
 
     resolved = []
@@ -249,6 +278,10 @@ def build(hub=None, non_interactive=False) -> int:
     rc = build_command()
     if rc != 0:
         return rc
+    if not hub and not has_known_hubs():
+        # Nothing to deploy to, so don't ask. Mirrors the check cf-remote's
+        # deploy does (it errors with "No hub to deploy to" in this case).
+        return 0
     if prompt_yes_no(
         "Deploy the built policy set now?",
         default=True,

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine_cli/cfengine_wrapper/cfengine_objects.py

@@ -72,12 +72,13 @@ class Executable:
             result = subprocess.run(args)
             return result.returncode
 
-        full_command = f"{self.path} {command}"
+        # Include stderr, so cf-promises errors (e.g. duplicate bundle) are shown
+        full_command = f"{self.path} {command} 2>&1"
         log.info(f"Executing command {full_command} on {self.location}")
         output = run_command(self.location, full_command, sudo=True)
         if (
             output is None
-        ):  # TODO: Test this, I've had some policy failing but returning output instead or error-code (I think)
+        ):  # TODO: Test this, I've had some policy failing but returning output instead of error-code (I think)
             # Error already logged in run_command
             return 1
         if output:

{cfengine-0.23.3 → cfengine-0.24.1}/src/cfengine_cli/cfengine_wrapper/cfengine_utils.py

@@ -90,6 +90,11 @@ def _known_hosts(role_filter=None) -> Iterator[tuple[str, list[str]]]:
             yield host_id, aliases
 
 
+def has_known_hubs() -> bool:
+    """True if cf-remote knows about any saved/spawned hub (without connecting)."""
+    return any(True for _ in _known_hosts("hub"))
+
+
 @lru_cache(maxsize=None)
 def _host_info(host: str):
     try:
@@ -106,7 +111,17 @@ def _hosts_with_info(role_filter=None):
             yield host, aliases, data
 
 
-_Id = namedtuple("_Id", "location aliases")
+class _Id(namedtuple("_Id", "location aliases")):
+    @property
+    def label(self) -> str:
+        if self.aliases and self.location != "localhost":
+            return f"{self.aliases[0]} ({self.location})"
+        return self.location
+
+
+def known_hub_locations() -> list[str]:
+    """ "user@ip" of every hub cf-remote knows about (without connecting)."""
+    return [host for host, _ in _known_hosts("hub")]
 
 
 def _identities(binary_name: str) -> Iterator[_Id]:
@@ -148,11 +163,13 @@ def _find_all_paired() -> list[Installation]:
 
 
 def _prompt_choice(candidates, description):
+    """Numbered prompt; pressing Enter picks the first candidate."""
     print(f"Multiple installations of {description} found:")
     for i, c in enumerate(candidates, 1):
         print(f"  {i}) {c.label}")
     while True:
-        choice = input(f"Select which to use [1-{len(candidates)}]: ").strip()
+        choice = input(f"Select which to use [1-{len(candidates)}, default 1]: ")
+        choice = choice.strip() or "1"
         if choice.isdigit() and 1 <= int(choice) <= len(candidates):
             return candidates[int(choice) - 1]
         print("Invalid selection, try again.")
@@ -211,6 +228,27 @@ def _select(candidates, description, target: str | None = None):
     return _prompt_choice(candidates, description)
 
 
+def _select_without_connecting(name: str) -> Executable:
+    """Only connects to the chosen host. Hubs first, so Enter picks a hub."""
+    hubs = set(known_hub_locations())
+    remote = [i for i in _identities(name) if i.location != "localhost"]
+    local = [_Id("localhost", ["localhost", "local"])] if _find_local_path(name) else []
+    ordered = (
+        [i for i in remote if i.location in hubs]
+        + local
+        + [i for i in remote if i.location not in hubs]
+    )
+    if not ordered:
+        raise UserError(
+            f"Could not find {name} locally or on any configured remote host."
+        )
+    ident = ordered[0] if len(ordered) == 1 else _prompt_choice(ordered, name)
+    chosen = _resolve(name, ident)
+    if chosen is None:
+        raise UserError(f"{ident.label} is unreachable or lacks {name}.")
+    return chosen
+
+
 def require_executable(name: str, target: str | None = None) -> Executable:
     if isinstance(target, list):
         if len(target) > 1:
@@ -239,7 +277,7 @@ def require_executable(name: str, target: str | None = None) -> Executable:
             candidates[0] if len(candidates) == 1 else _prompt_choice(candidates, name)
         )
     else:
-        chosen = _select(_find_all(name), name)
+        chosen = _select_without_connecting(name)
 
     log.info(
         f"Using {'local' if chosen.is_local else 'remote'} installation of {name} ({chosen.label})"