dyngle 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

dyngle/__init__.py

@@ -6,6 +6,10 @@ from wizlib.ui_handler import UIHandler
 from dyngle.command import DyngleCommand
 
 
+class DyngleError(Exception):
+    pass
+
+
 class DyngleApp(WizApp):
 
     base = DyngleCommand

dyngle/__main__.py

@@ -1,4 +1,3 @@
-from . import DyngleApp
-
 if __name__ == '__main__':  # pragma: nocover
+    from . import DyngleApp
     DyngleApp.main()

dyngle/command/run_command.py

@@ -1,8 +1,11 @@
 import shlex
 import subprocess
 from wizlib.parser import WizParser
+from yaml import safe_load
 
 from dyngle.command import DyngleCommand
+from dyngle.template import Template
+from dyngle import DyngleError
 
 
 class RunCommand(DyngleCommand):
@@ -13,40 +16,32 @@ class RunCommand(DyngleCommand):
     @classmethod
     def add_args(cls, parser: WizParser):
         super().add_args(parser)
-        parser.add_argument('flow', help='Operation name to run')
+        parser.add_argument('operation', help='Operation name to run')
 
     def handle_vals(self):
         super().handle_vals()
-        if not self.provided('flow'):
-            self.flow = self.app.ui.get_input('Enter flow name: ')
 
-    def _validate_flow_exists(self, operations):
-        """Validate that the requested flow exists in configuration"""
-        if not operations:
-            raise RuntimeError('No operations configured')
-
-        if self.flow not in operations:
+    def _validate_operation_exists(self, operations):
+        """Validate that the requested operation exists in configuration"""
+        if self.operation not in operations:
             available_operations = ', '.join(operations.keys())
-            raise RuntimeError(
-                f'Operation "{self.flow}" not found. " + \
+            raise DyngleError(
+                f'Operation "{self.operation}" not found. " + \
                     f"Available operations: {available_operations}')
 
-    def _execute_task(self, task_str):
-        """Execute a single task and handle errors"""
-        task_parts = shlex.split(task_str)
-        result = subprocess.run(task_parts)
-
-        if result.returncode != 0:
-            raise RuntimeError(
-                f'Task failed with code {result.returncode}: {task_str}')
-
     @DyngleCommand.wrap
     def execute(self):
         operations = self.app.config.get('dyngle-operations')
-        self._validate_flow_exists(operations)
-
-        tasks = operations[self.flow]
-        for task_str in tasks:
-            self._execute_task(task_str)
-
-        return f'Operation "{self.flow}" completed successfully'
+        self._validate_operation_exists(operations)
+        steps = operations[self.operation]
+        data_string = self.app.stream.text
+        data = safe_load(data_string)
+        for step_template in steps:
+            step = Template(step_template).render(data)
+            parts = shlex.split(step)
+            result = subprocess.run(parts)
+            if result.returncode != 0:
+                raise DyngleError(
+                    f'Task failed with code {result.returncode}: {step}')
+
+        return f'Operation "{self.operation}" completed successfully'

dyngle/template.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+from functools import partial
+import re
+
+
+PATTERN = re.compile(r'\{\{\s*([^}]+)\s*\}\}')
+
+
+@dataclass
+class Template:
+
+    template: str
+
+    def render(self, data):
+        """Render the template with the provided data."""
+        resolver = partial(self._resolve, data=data)
+        return PATTERN.sub(resolver, self.template)
+
+    def _resolve(self, match, *, data):
+        """Resolve a single name/path from the template."""
+        path = match.group(1).strip()
+        # Try an expression first, then data
+        if False:
+            pass
+        else:
+            parts = path.split('.')
+            current = data
+            for part in parts:
+                current = current[part]
+            return current

{dyngle-0.2.0.dist-info → dyngle-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dyngle
-Version: 0.2.0
+Version: 0.3.0
 Summary: Run lightweight local workflows
 License: MIT
 Author: Steampunk Wizard

dyngle-0.3.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+dyngle/__init__.py,sha256=mgotD7qSS5tlTRCLFDD7zsUEAPNwhSlFe4yfIGtJgNI,379
+dyngle/__main__.py,sha256=pYRIwzix_AL8CdJaDDis_8yMBBWO2N72NNwkroo1dQo,95
+dyngle/command/__init__.py,sha256=1S86gbef8MYvG-TWD5JRIWzFg7qV5xKhp9QXx9zEx5c,94
+dyngle/command/run_command.py,sha256=QEdNzjqCg1YMllfiTXqeiqyWiC8QWEZYxo0giRHSGF4,1615
+dyngle/template.py,sha256=CRpcBKDM7VCz1HWNbXGTsbDDMhDvACE49X2uFT5GY1s,757
+dyngle-0.3.0.dist-info/METADATA,sha256=s7KosVT5a3a3i4f5UvDbDiKDE7FGkCy5MCxc4WobO-k,2288
+dyngle-0.3.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dyngle-0.3.0.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
+dyngle-0.3.0.dist-info/RECORD,,

dyngle-0.2.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-dyngle/__init__.py,sha256=2KD52sWHfMhk1g1wxHdnxjRtEKeYNJn7sTPkKRpSqNA,338
-dyngle/__main__.py,sha256=mXOQ5tiUi5mEfp1NG2viz5kW2DEeWg1oCPFhfXgxJ4U,92
-dyngle/command/__init__.py,sha256=1S86gbef8MYvG-TWD5JRIWzFg7qV5xKhp9QXx9zEx5c,94
-dyngle/command/run_command.py,sha256=UbkzqlrbAkxQSbN8lHBaTaV23xYmVBlGEOZTiiuARjo,1667
-dyngle-0.2.0.dist-info/METADATA,sha256=naF-xfNR-gcqrJGOOur2pM0gX5tRTwbrTcqfePuhntQ,2288
-dyngle-0.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dyngle-0.2.0.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
-dyngle-0.2.0.dist-info/RECORD,,