spaceforge 1.0.0__tar.gz → 1.1.0__tar.gz

{spaceforge-1.0.0 → spaceforge-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spaceforge
-Version: 1.0.0
+Version: 1.1.0
 Summary: A Python framework for building Spacelift plugins
 Home-page: https://github.com/spacelift-io/plugins
 Author: Spacelift

{spaceforge-1.0.0 → spaceforge-1.1.0}/plugins/sops/plugin.yaml

@@ -137,6 +137,7 @@ contexts:
 
       set -e
 
+      export PATH="/mnt/workspace/plugins/plugin_binaries:$PATH"
       if command -v sops; then
           echo "sops is already installed."
           return

{spaceforge-1.0.0 → spaceforge-1.1.0}/plugins/wiz/plugin.yaml

@@ -255,6 +255,7 @@ contexts:
 
       set -e
 
+      export PATH="/mnt/workspace/plugins/plugin_binaries:$PATH"
       if command -v wizcli; then
           echo "wizcli is already installed."
           return

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/_version_scm.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.0'
-__version_tuple__ = version_tuple = (1, 0, 0)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)
 
-__commit_id__ = commit_id = 'g1a0174591'
+__commit_id__ = commit_id = 'g2812c2227'

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/cls.py

@@ -121,6 +121,7 @@ class Context:
         labels (Optional[List[str]]): Labels associated with the context.
         env (list): List of variables associated with the context.
         hooks (dict): Hooks associated with the context.
+        priority (optional[int]): The priority of the context, contexts with 0 priority run before contexts with 1 priority.
     """
 
     name_prefix: str
@@ -129,6 +130,7 @@ class Context:
     mounted_files: Optional[List[MountedFile]] = optional_field
     hooks: Optional[Dict[HookType, List[str]]] = optional_field
     labels: Optional[List[str]] = optional_field
+    priority: int = 0
 
 
 @pydantic_dataclass

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/generator.py

@@ -30,6 +30,41 @@ from .plugin import SpaceforgePlugin
 static_binary_directory = "/mnt/workspace/plugins/plugin_binaries"
 
 
+def _update_context_names_for_priority(contexts: List[Context]) -> List[Context]:
+    if len(contexts) <= 1:
+        return contexts
+
+    # Get unique priority values and sort them
+    priorities = sorted(set(ctx.priority for ctx in contexts))
+
+    # Create mapping from priority to letter prefix
+    priority_to_letter = {}
+
+    for i, priority in enumerate(priorities):
+        if priority == 0:
+            # Priority 0 gets 'Z' (lowest priority = furthest from A)
+            letter = "Z"
+        else:
+            # Higher priority numbers get letters closer to 'A'
+            # Reverse the mapping: higher priority index = closer to A
+            letter_index = max(0, 25 - i)  # Start from Z and work backwards
+            letter = chr(ord("A") + letter_index)
+
+        priority_to_letter[priority] = letter * 5  # Repeat 5 times
+
+    # Update context names
+    for ctx in contexts:
+        # Remove existing prefix if it starts with repeated letters
+        name = ctx.name_prefix
+        if len(name) >= 5 and name[:5].isupper() and len(set(name[:5])) == 1:
+            name = name[5:]
+
+        prefix = priority_to_letter[ctx.priority]
+        ctx.name_prefix = prefix + "-" + name
+
+    return contexts
+
+
 class PluginGenerator:
     """Generates plugin.yaml from a Python plugin class."""
 
@@ -257,29 +292,39 @@ class PluginGenerator:
         if self.plugin_class is None:
             raise ValueError("Plugin class not loaded. Call load_plugin() first.")
 
-        contexts = getattr(
-            self.plugin_class,
-            "__contexts__",
-            [
-                Context(
-                    name_prefix=self.plugin_class.__plugin_name__.lower(),
-                    description=f"Main context for {self.plugin_class.__plugin_name__}",
-                )
-            ],
-        )
+        contexts = getattr(self.plugin_class, "__contexts__", [])
 
-        if contexts[0].hooks is None:
-            contexts[0].hooks = {}
-        if contexts[0].mounted_files is None:
-            contexts[0].mounted_files = []
-        if contexts[0].env is None:
-            contexts[0].env = []
+        main_context: Optional[Context] = None
+        main_context_found = False
+        for context in contexts:
+            if context.priority == 0:
+                main_context = context
+                main_context_found = True
+                break
+
+        if main_context is None:
+            main_context = Context(
+                name_prefix=self.plugin_class.__plugin_name__.lower(),
+                description=f"Main context for {self.plugin_class.__plugin_name__}",
+            )
+
+        if main_context.hooks is None:
+            main_context.hooks = {}
+        if main_context.mounted_files is None:
+            main_context.mounted_files = []
+        if main_context.env is None:
+            main_context.env = []
 
         # Add the hooks and mounted files to the first context
-        merge(contexts[0].hooks, hooks, strategy=Strategy.TYPESAFE_ADDITIVE)
-        contexts[0].mounted_files += mounted_files
+        merge(main_context.hooks, hooks, strategy=Strategy.TYPESAFE_ADDITIVE)
+        main_context.mounted_files += mounted_files
+
+        # Ensure the main context is first
+        if not main_context_found:
+            contexts.insert(0, main_context)
 
         self._map_variables_to_parameters(contexts)
+        contexts = _update_context_names_for_priority(contexts)
 
         return contexts
 
@@ -380,6 +425,7 @@ class PluginGenerator:
                     field.name: getattr(data, field.name)
                     for field in fields(data)
                     if getattr(data, field.name) is not None
+                    and field.name != "priority"
                 }
                 return self.represent_dict(filtered_dict)
 

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/runner.py

@@ -73,11 +73,11 @@ class PluginRunner:
             return
 
         try:
-            print(f"[SPACEPY] Running hook: {hook_name}")
+            print(f"[SpaceForge] Running hook: {hook_name}")
             method()
-            print(f"[SPACEPY] Hook completed: {hook_name}")
+            print(f"[SpaceForge] Hook completed: {hook_name}")
         except Exception as e:
-            print(f"[SPACEPY] Error running hook '{hook_name}': {e}")
+            print(f"[SpaceForge] Error running hook '{hook_name}': {e}")
             raise
 
 

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/schema.json

@@ -1,7 +1,7 @@
 {
   "$defs": {
     "Context": {
-      "description": "A class to represent a context for a plugin.\n\nAttributes:\n    name_prefix (str): The name of the context, will be appended with a unique ID.\n    description (str): A description of the context.\n    labels (Optional[List[str]]): Labels associated with the context.\n    env (list): List of variables associated with the context.\n    hooks (dict): Hooks associated with the context.",
+      "description": "A class to represent a context for a plugin.\n\nAttributes:\n    name_prefix (str): The name of the context, will be appended with a unique ID.\n    description (str): A description of the context.\n    labels (Optional[List[str]]): Labels associated with the context.\n    env (list): List of variables associated with the context.\n    hooks (dict): Hooks associated with the context.\n    priority (optional[int]): The priority of the context, contexts with 0 priority run before contexts with 1 priority.",
       "properties": {
         "name_prefix": {
           "title": "Name Prefix",
@@ -84,6 +84,11 @@
             }
           ],
           "title": "Labels"
+        },
+        "priority": {
+          "default": 0,
+          "title": "Priority",
+          "type": "integer"
         }
       },
       "required": [

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/test_runner.py

@@ -170,8 +170,8 @@ class NotAPlugin:
         assert "after_plan" in getattr(runner.plugin_instance, "executed_hooks")
 
         # Verify print statements
-        mock_print.assert_any_call("[SPACEPY] Running hook: after_plan")
-        mock_print.assert_any_call("[SPACEPY] Hook completed: after_plan")
+        mock_print.assert_any_call("[SpaceForge] Running hook: after_plan")
+        mock_print.assert_any_call("[SpaceForge] Hook completed: after_plan")
 
     def test_run_hook_not_found(self) -> None:
         """Test running a hook that doesn't exist."""
@@ -210,7 +210,7 @@ class NotAPlugin:
 
         # Should print error message
         mock_print.assert_any_call(
-            "[SPACEPY] Error running hook 'error_hook': Test error from hook"
+            "[SpaceForge] Error running hook 'error_hook': Test error from hook"
         )
 
     def test_run_hook_multiple_hooks(self) -> None:

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge/test_runner_execution.py

@@ -61,8 +61,8 @@ class TestRunnerPlugin(SpaceforgePlugin):
         assert hasattr(runner.plugin_instance, "executed_hooks")
         assert "after_plan" in getattr(runner.plugin_instance, "executed_hooks")
 
-        mock_print.assert_any_call("[SPACEPY] Running hook: after_plan")
-        mock_print.assert_any_call("[SPACEPY] Hook completed: after_plan")
+        mock_print.assert_any_call("[SpaceForge] Running hook: after_plan")
+        mock_print.assert_any_call("[SpaceForge] Hook completed: after_plan")
 
     def test_should_print_error_when_hook_method_not_found(
         self, test_plugin_file: str
@@ -125,7 +125,7 @@ class ErrorPlugin(SpaceforgePlugin):
                 runner.run_hook("error_hook")
 
         mock_print.assert_any_call(
-            "[SPACEPY] Error running hook 'error_hook': Test error from hook"
+            "[SpaceForge] Error running hook 'error_hook': Test error from hook"
         )
 
     def test_should_execute_multiple_hooks_maintaining_state(

{spaceforge-1.0.0 → spaceforge-1.1.0}/spaceforge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spaceforge
-Version: 1.0.0
+Version: 1.1.0
 Summary: A Python framework for building Spacelift plugins
 Home-page: https://github.com/spacelift-io/plugins
 Author: Spacelift