ry-tool 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

ry_tool/executor.py

@@ -9,9 +9,12 @@ import subprocess
 import sys
 import os
 import json
+import yaml
 from typing import Dict, Any, List, Optional
 from dataclasses import dataclass
 from io import StringIO
+from pathlib import Path
+import ry_tool.utils  # Import ry_tool modules
 
 
 @dataclass
@@ -59,17 +62,19 @@ class Executor:
         Returns:
             ExecutionResult
         """
-        # Merge environment
-        env = step.get('env', {})
+        # Merge environment - extra_env takes precedence
+        env = {}
         if extra_env:
             env.update(extra_env)
+        if step.get('env'):
+            env.update(step['env'])
         
         if 'shell' in step:
             return self.execute_shell(step['shell'], env, 
                                     interactive=step.get('interactive', False),
                                     capture_file=step.get('_capture_file'))
         elif 'python' in step:
-            return self.execute_python(step['python'])
+            return self.execute_python(step['python'], extra_env=env)
         elif 'subprocess' in step:
             return self.execute_subprocess(step['subprocess'])
         elif 'ruby' in step:
@@ -203,7 +208,7 @@ class Executor:
                 returncode=1
             )
     
-    def execute_python(self, code: str) -> ExecutionResult:
+    def execute_python(self, code: str, extra_env: Dict[str, str] = None) -> ExecutionResult:
         """
         Execute Python code with context.
         
@@ -230,15 +235,45 @@ class Executor:
         original_env = safe_copy(self.context.get('env'), {})
         original_captured = safe_copy(self.context.get('captured'), {})
         
+        # Set up Python path from environment
+        # This allows library code to import from lib/ directories
+        if extra_env and 'PYTHONPATH' in extra_env:
+            for path in extra_env['PYTHONPATH'].split(':'):
+                if path and path not in sys.path:
+                    sys.path.insert(0, path)
+        
+        # Also add library directory if provided
+        if extra_env and 'RY_LIBRARY_DIR' in extra_env:
+            lib_path = os.path.join(extra_env['RY_LIBRARY_DIR'], 'lib')
+            if os.path.exists(lib_path) and lib_path not in sys.path:
+                sys.path.insert(0, lib_path)
+            
+            # Add all sibling library lib/ directories for cross-library imports
+            # This allows e.g., uv library to import from git library
+            libraries_root = os.path.dirname(extra_env['RY_LIBRARY_DIR'])
+            if os.path.exists(libraries_root):
+                for item in os.listdir(libraries_root):
+                    sibling_lib = os.path.join(libraries_root, item, 'lib')
+                    if os.path.isdir(sibling_lib) and sibling_lib not in sys.path:
+                        sys.path.insert(0, sibling_lib)
+        
+        # Merge environment variables into env dict
+        merged_env = safe_copy(self.context.get('env'), {})
+        if extra_env:
+            merged_env.update(extra_env)
+        
         # Prepare execution environment with mutable references
         exec_globals = {
             'sys': sys,
             'os': os,
             'subprocess': subprocess,
             'json': json,
+            'yaml': yaml,
+            'Path': Path,
+            'ry_tool': ry_tool,  # Make ry_tool module available
             'flags': safe_copy(self.context.get('flags'), {}),
             'arguments': safe_copy(self.context.get('arguments'), {}),
-            'env': safe_copy(self.context.get('env'), {}),
+            'env': merged_env,
             'captured': safe_copy(self.context.get('captured'), {}),
             'remaining_args': self.context.get('remaining_args', []),
             'positionals': safe_copy(self.context.get('positionals'), []),

{ry_tool-1.0.1.dist-info → ry_tool-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ry-tool
-Version: 1.0.1
+Version: 1.1.0
 Summary: Pure YAML command orchestrator - CI/CD for humans
 Author: Fredrik Angelsen
 Author-email: Fredrik Angelsen <fredrikangelsen@gmail.com>

{ry_tool-1.0.1.dist-info → ry_tool-1.1.0.dist-info}/RECORD

@@ -3,14 +3,14 @@ ry_tool/__main__.py,sha256=fbQGeI2WWTZrLUI7LToOfAV5JckzB_El64i0zjqOouI,138
 ry_tool/_cli.py,sha256=8gZ-c1FlerAZ5e0K4v7Mv2GafMLiGAcv-3ET8oHmMdQ,7693
 ry_tool/app.py,sha256=TjMCQDZ5QkqKiAqUViGe84T6d6Deb67jnRRFAmEk15w,15997
 ry_tool/context.py,sha256=elDiqty6Fssq-74ra8twtzKfolQ154xLj2ECwZbzcy4,9743
-ry_tool/executor.py,sha256=XiwWKl1YMa0zgok4C6beuxAWDVhEs2i1gL_vxPlNbcA,17199
+ry_tool/executor.py,sha256=hQOnL9Ii_scsFtOzLOE1MfYA5_fDbq2H9ATsBcGymc0,18867
 ry_tool/installer.py,sha256=cFnEROvpfIjMkpZF4AzRU4bHDNneJBMk5gRXP5jJgqE,5712
 ry_tool/loader.py,sha256=Ce1-M3uJ554_H1M8j1ZFTXPE8dxSvFXR6l88utM9zHc,9809
 ry_tool/matcher.py,sha256=fg857FoF2CjLsUvJl2vaeRHHHGx6A8vraI1fnddOKN4,7458
 ry_tool/parser.py,sha256=c9cNsXf1kdWpmXH3IVdejlePIrZWmJDdnh3mQlAyPmI,9253
 ry_tool/template.py,sha256=uEvc70vA7NZ3qKemsddTnYFKhdc2sEf-5uytd2wPiBk,10094
 ry_tool/utils.py,sha256=TpJz7DSkyJewzyDPUsQXI9awDgMbE6nC__DRbUYNQpw,13762
-ry_tool-1.0.1.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
-ry_tool-1.0.1.dist-info/entry_points.txt,sha256=z2YdpRoOA9Kk0Sg26A6Eu6PrwdJLQ22dxdZqHnhWYNo,45
-ry_tool-1.0.1.dist-info/METADATA,sha256=d2x2ZdUHzX6gHW-zVhJ-4kdu9KBuziKrosqdNms29tE,2612
-ry_tool-1.0.1.dist-info/RECORD,,
+ry_tool-1.1.0.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+ry_tool-1.1.0.dist-info/entry_points.txt,sha256=z2YdpRoOA9Kk0Sg26A6Eu6PrwdJLQ22dxdZqHnhWYNo,45
+ry_tool-1.1.0.dist-info/METADATA,sha256=HVGbK34HUa9Pv2lbCPVWfp_p4zQxNUlDIRd41HhmoNk,2612
+ry_tool-1.1.0.dist-info/RECORD,,