From adec2aed844dde7f52df3f28e2c765dfe1d43d16 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Sat, 12 Jul 2025 17:11:41 +0200 Subject: [PATCH] Renamed generate commands to build --- Makefile | 8 ++++---- cli/{generate => build}/__init__.py | 0 cli/{generate => build}/defaults/__init__.py | 0 cli/{generate => build}/defaults/applications.py | 0 cli/{generate => build}/defaults/users.py | 0 cli/{generate => build}/graph.py | 0 cli/{generate => build}/role_include.py | 0 cli/{generate => build}/roles_list.py | 0 cli/{generate => build}/tree.py | 2 +- main.py | 4 ++-- tests/integration/test_circular_dependencies.py | 2 +- .../test_conditional_role_include.py | 2 +- tests/unit/cli/generate/defaults/test_applications.py | 2 +- .../cli/generate/defaults/test_applications_and_users.py | 2 +- tests/unit/cli/generate/defaults/test_users.py | 2 +- tests/unit/cli/meta/test_graph.py | 2 +- tests/unit/cli/meta/test_tree.py | 2 +- 17 files changed, 14 insertions(+), 14 deletions(-) rename cli/{generate => build}/__init__.py (100%) rename cli/{generate => build}/defaults/__init__.py (100%) rename cli/{generate => build}/defaults/applications.py (100%) rename cli/{generate => build}/defaults/users.py (100%) rename cli/{generate => build}/graph.py (100%) rename cli/{generate => build}/role_include.py (100%) rename cli/{generate => build}/roles_list.py (100%) rename cli/{generate => build}/tree.py (97%) diff --git a/Makefile b/Makefile index 047eeac5..e69c0034 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ ROLES_DIR := ./roles APPLICATIONS_OUT := ./group_vars/all/04_applications.yml -APPLICATIONS_SCRIPT := ./cli/generate/defaults/applications.py +APPLICATIONS_SCRIPT := ./cli/build/defaults/applications.py USERS_OUT := ./group_vars/all/03_users.yml -USERS_SCRIPT := ./cli/generate/defaults/users.py -INCLUDES_SCRIPT := ./cli/generate/role_include.py +USERS_SCRIPT := ./cli/build/defaults/users.py +INCLUDES_SCRIPT := ./cli/build/role_include.py INCLUDE_GROUPS := $(shell python3 main.py meta invokable_paths -s "-" --no-signal | tr '\n' ' ') @@ -27,7 +27,7 @@ clean: tree: @echo Generating Tree - python3 main.py generate tree -D 2 --no-signal + python3 main.py build tree -D 2 --no-signal build: @echo "🔧 Generating users defaults → $(USERS_OUT)…" diff --git a/cli/generate/__init__.py b/cli/build/__init__.py similarity index 100% rename from cli/generate/__init__.py rename to cli/build/__init__.py diff --git a/cli/generate/defaults/__init__.py b/cli/build/defaults/__init__.py similarity index 100% rename from cli/generate/defaults/__init__.py rename to cli/build/defaults/__init__.py diff --git a/cli/generate/defaults/applications.py b/cli/build/defaults/applications.py similarity index 100% rename from cli/generate/defaults/applications.py rename to cli/build/defaults/applications.py diff --git a/cli/generate/defaults/users.py b/cli/build/defaults/users.py similarity index 100% rename from cli/generate/defaults/users.py rename to cli/build/defaults/users.py diff --git a/cli/generate/graph.py b/cli/build/graph.py similarity index 100% rename from cli/generate/graph.py rename to cli/build/graph.py diff --git a/cli/generate/role_include.py b/cli/build/role_include.py similarity index 100% rename from cli/generate/role_include.py rename to cli/build/role_include.py diff --git a/cli/generate/roles_list.py b/cli/build/roles_list.py similarity index 100% rename from cli/generate/roles_list.py rename to cli/build/roles_list.py diff --git a/cli/generate/tree.py b/cli/build/tree.py similarity index 97% rename from cli/generate/tree.py rename to cli/build/tree.py index e1e11348..05a20934 100644 --- a/cli/generate/tree.py +++ b/cli/build/tree.py @@ -4,7 +4,7 @@ import argparse import json from typing import Dict, Any -from cli.generate.graph import build_mappings, output_graph +from cli.build.graph import build_mappings, output_graph def find_roles(roles_dir: str): diff --git a/main.py b/main.py index 8423ac1f..ab6d8be1 100755 --- a/main.py +++ b/main.py @@ -185,11 +185,11 @@ if __name__ == "__main__": Fore.CYAN )) print(color_text( - " e.g. `cymais generate defaults users` →", + " e.g. `cymais build defaults users` →", Fore.CYAN )) print(color_text( - " corresponds to `cli/generate/defaults/users.py`.", + " corresponds to `cli/build/defaults/users.py`.", Fore.CYAN )) print() diff --git a/tests/integration/test_circular_dependencies.py b/tests/integration/test_circular_dependencies.py index c1d193d3..af5efe6c 100644 --- a/tests/integration/test_circular_dependencies.py +++ b/tests/integration/test_circular_dependencies.py @@ -2,7 +2,7 @@ import os import unittest # import the functions from your CLI script -from cli.generate.role_include import build_dependency_graph, find_cycle +from cli.build.role_include import build_dependency_graph, find_cycle class TestCircularDependencies(unittest.TestCase): """ diff --git a/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py b/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py index 4f0f3a89..06a5d4b3 100644 --- a/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py +++ b/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py @@ -9,7 +9,7 @@ import yaml # Adjust path to include cli/ folder sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../..", "cli"))) -from cli.generate.role_include import build_dependency_graph, topological_sort, gen_condi_role_incl +from cli.build.role_include import build_dependency_graph, topological_sort, gen_condi_role_incl class TestGeneratePlaybook(unittest.TestCase): def setUp(self): diff --git a/tests/unit/cli/generate/defaults/test_applications.py b/tests/unit/cli/generate/defaults/test_applications.py index 73c01e78..aa791fd0 100644 --- a/tests/unit/cli/generate/defaults/test_applications.py +++ b/tests/unit/cli/generate/defaults/test_applications.py @@ -30,7 +30,7 @@ class TestGenerateDefaultApplications(unittest.TestCase): shutil.rmtree(self.temp_dir) def test_script_generates_expected_yaml(self): - script_path = Path(__file__).resolve().parent.parent.parent.parent.parent.parent / "cli/generate/defaults/applications.py" + script_path = Path(__file__).resolve().parent.parent.parent.parent.parent.parent / "cli/build/defaults/applications.py" result = subprocess.run( [ diff --git a/tests/unit/cli/generate/defaults/test_applications_and_users.py b/tests/unit/cli/generate/defaults/test_applications_and_users.py index e59f96fb..0d340ba6 100644 --- a/tests/unit/cli/generate/defaults/test_applications_and_users.py +++ b/tests/unit/cli/generate/defaults/test_applications_and_users.py @@ -45,7 +45,7 @@ class TestGenerateDefaultApplicationsUsers(unittest.TestCase): When a users.yml exists with defined users, the script should inject a 'users' mapping in the generated YAML, mapping each username to a Jinja2 reference. """ - script_path = Path(__file__).resolve().parents[5] / "cli" / "generate/defaults/applications.py" + script_path = Path(__file__).resolve().parents[5] / "cli" / "build/defaults/applications.py" result = subprocess.run([ "python3", str(script_path), "--roles-dir", str(self.roles_dir), diff --git a/tests/unit/cli/generate/defaults/test_users.py b/tests/unit/cli/generate/defaults/test_users.py index 58aaaf4a..b37af13d 100644 --- a/tests/unit/cli/generate/defaults/test_users.py +++ b/tests/unit/cli/generate/defaults/test_users.py @@ -7,7 +7,7 @@ import yaml from collections import OrderedDict # Add cli/ to import path -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../..", "cli/generate/defaults/"))) +sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../..", "cli/build/defaults/"))) import users diff --git a/tests/unit/cli/meta/test_graph.py b/tests/unit/cli/meta/test_graph.py index 09571ad6..149349c2 100644 --- a/tests/unit/cli/meta/test_graph.py +++ b/tests/unit/cli/meta/test_graph.py @@ -3,7 +3,7 @@ import tempfile import shutil import os import yaml -from cli.generate import graph +from cli.build import graph class TestGraphLogic(unittest.TestCase): diff --git a/tests/unit/cli/meta/test_tree.py b/tests/unit/cli/meta/test_tree.py index 7ca124eb..811fedea 100644 --- a/tests/unit/cli/meta/test_tree.py +++ b/tests/unit/cli/meta/test_tree.py @@ -3,7 +3,7 @@ import tempfile import shutil import os import json -from cli.generate import tree +from cli.build import tree class TestTreeMain(unittest.TestCase):