From 191e41bbe97899ccbf7e44712011c4848adb4b84 Mon Sep 17 00:00:00 2001
From: Scott Sorell <scott.sorell@gmail.com>
Date: Sat, 3 Oct 2026 14:38:14 -0600
Subject: [PATCH] Adjusting folder to compose-services so we don't get confused
 with the argo folder

---
 composectl.py            |  6 +++---
 tests/test_composectl.py | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/composectl.py b/composectl.py
index 1eb7d0c..3167c92 100644
--- a/composectl.py
+++ b/composectl.py
@@ -58,7 +58,7 @@ def build_compose_command(
 
 def discover_compose_files(root: Path) -> list[Path]:
     """Return compose files under the services directory."""
-    services_dir = root / "compose-services"
+    services_dir = root / "services"
     if not services_dir.exists():
         return []
 
@@ -67,7 +67,7 @@ def discover_compose_files(root: Path) -> list[Path]:
 
 def discover_stack_names(root: Path) -> list[str]:
     """Infer stack names from the services directory layout."""
-    services_dir = root / "compose-services"
+    services_dir = root / "services"
     if not services_dir.exists():
         return []
 
@@ -135,7 +135,7 @@ def main() -> int:
     failure_count = 0
 
     for stack_name in stack_names:
-        compose_file = args.compose_file or Path(f"compose-services/{stack_name}/compose.yaml")
+        compose_file = args.compose_file or Path(f"services/{stack_name}/compose.yaml")
         project_name = args.project_name or f"{stack_name}_services"
 
         if args.action == "refresh":
diff --git a/tests/test_composectl.py b/tests/test_composectl.py
index cf30a48..6ccdf50 100644
--- a/tests/test_composectl.py
+++ b/tests/test_composectl.py
@@ -26,7 +26,7 @@ class ComposeCtlTests(unittest.TestCase):
     def test_build_compose_command_uses_selected_runtime(self):
         cmd = build_compose_command(
             runtime="podman",
-            compose_file=Path("compose-services/media_rhel1/compose.yaml"),
+            compose_file=Path("services/media_rhel1/compose.yaml"),
             project_name="media_rhel1_services",
             action="up",
         )
@@ -36,7 +36,7 @@ class ComposeCtlTests(unittest.TestCase):
                 "podman",
                 "compose",
                 "-f",
-                "compose-services/media_rhel1/compose.yaml",
+                "services/media_rhel1/compose.yaml",
                 "-p",
                 "media_rhel1_services",
                 "up",
@@ -47,8 +47,8 @@ class ComposeCtlTests(unittest.TestCase):
 
     def test_discover_compose_files_finds_existing_stacks(self):
         stack_files = discover_compose_files(Path("."))
-        self.assertIn(Path("compose-services/media_nas1/compose.yaml"), stack_files)
-        self.assertIn(Path("compose-services/media_rhel1/compose.yaml"), stack_files)
+        self.assertIn(Path("services/media_nas1/compose.yaml"), stack_files)
+        self.assertIn(Path("services/media_rhel1/compose.yaml"), stack_files)
 
     def test_discover_stack_names_returns_inferred_stack_names(self):
         stack_names = discover_stack_names(Path("."))
@@ -58,22 +58,22 @@ class ComposeCtlTests(unittest.TestCase):
     def test_build_update_commands_returns_full_stack_refresh_sequence(self):
         commands = build_update_commands(
             runtime="podman",
-            compose_file=Path("compose-services/media_rhel1/compose.yaml"),
+            compose_file=Path("services/media_rhel1/compose.yaml"),
             project_name="media_rhel1_services",
         )
         self.assertEqual(
             commands,
             [
-                ["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "config"],
-                ["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "pull"],
-                ["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "up", "-d", "--remove-orphans"],
+                ["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "config"],
+                ["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "pull"],
+                ["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "up", "-d", "--remove-orphans"],
             ],
         )
 
     def test_build_update_commands_can_include_image_prune(self):
         commands = build_update_commands(
             runtime="docker",
-            compose_file=Path("compose-services/media_nas1/compose.yaml"),
+            compose_file=Path("services/media_nas1/compose.yaml"),
             project_name="media_nas1_services",
             prune=True,
         )
@@ -82,7 +82,7 @@ class ComposeCtlTests(unittest.TestCase):
     def test_build_compose_command_can_validate_configuration(self):
         command = build_compose_command(
             runtime="docker",
-            compose_file=Path("compose-services/media_nas1/compose.yaml"),
+            compose_file=Path("services/media_nas1/compose.yaml"),
             project_name="media_nas1_services",
             action="config",
         )