utils_devops 0.1.148__tar.gz → 0.1.150__tar.gz

{utils_devops-0.1.148 → utils_devops-0.1.150}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.148
+Version: 0.1.150
 Summary: Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools
 License: MIT
 Keywords: devops,automation,nginx,cli,jinja2,yaml,config,diff,templating,logging,docker,compose,file-ops

{utils_devops-0.1.148 → utils_devops-0.1.150}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utils_devops"
-version = "0.1.148"  # Bumped for new string features + diffing
+version = "0.1.150"  # Bumped for new string features + diffing
 description = "Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools"
 authors = ["Hamed Sheikhan <sh.sheikhan.m@gmail.com>"]
 license = "MIT"

{utils_devops-0.1.148 → utils_devops-0.1.150}/src/utils_devops/core/envs.py

@@ -1,5 +1,5 @@
 """
-Environment operations for utils_devops (env_ops module).
+Environment operations for utils_devops (envs module).
 
 Provides utilities to manage .env files and system environment variables,
 run commands with specific env settings, and safely update env files with
@@ -66,13 +66,13 @@ class EnvOpsError(Exception):
 
 
 def help() -> None:
-    """Print a short index of the env_ops API for interactive use."""
+    """Print a short index of the envs API for interactive use."""
     print(
         """
 DevOps Utils — Environment Operations Module
 Key functions:
 EnvOpsError: Custom exception for environment operations failures.
-help() -> None: Print a short index of the env_ops API for interactive use.
+help() -> None: Print a short index of the envs API for interactive use.
 
 Loading Environment Files:
 load_env_file(file_path: Union[str, Path], as_dict: bool = True) -> Union[Dict[str, str], List[str]]: Load a .env file and return a dict of key->value or list of lines.

{utils_devops-0.1.148 → utils_devops-0.1.150}/src/utils_devops/extras/ssh_ops.py

@@ -528,6 +528,71 @@ def _resolve_ssh_key(key_input: Optional[Union[str, Path]]) -> Tuple[Optional[Pa
     # **IMPORTANT**: Preserve any newlines in the content
     return None, key_input_str
 
+def _inject_environment_variables(
+    environment: Optional[Dict[str, str]] = None,
+    base_command: str = ""
+) -> str:
+    """
+    Creates a command string that safely injects environment variables.
+    """
+    if not environment:
+        return base_command
+
+    env_lines = []
+    if systems.is_linux:
+        # Linux syntax: export VAR='value'
+        for key, value in environment.items():
+            print(f"DEBUG _inject_environment_variables: key='{key}', value='{value}', type={type(value)}")  # DEBUG
+            escaped_value = value.replace("'", "'\"'\"'")
+            env_lines.append(f"export {key}='{escaped_value}'")
+        env_setup = " && ".join(env_lines)
+        prefix = f"{env_setup} && "
+    elif systems.is_windows:
+        # Windows syntax (PowerShell)
+        for key, value in environment.items():
+            print(f"DEBUG _inject_environment_variables: key='{key}', value='{value}', type={type(value)}")  # DEBUG
+            escaped_value = value.replace("'", "''").replace("`", "``")
+            env_lines.append(f"$env:{key}='{escaped_value}'")
+        env_setup = "; ".join(env_lines)
+        prefix = f"{env_setup}; "
+
+    return f"{prefix}{base_command}"
+
+def _detect_remote_os(client) -> str:
+    """
+    Detect the operating system of the remote SSH host.
+    Returns: "linux", "windows", or "unknown"
+    """
+    try:
+        # Try Linux command first
+        stdin, stdout, stderr = client.exec_command("uname -s", timeout=5)
+        output = stdout.read().decode('utf-8', errors='ignore').strip().lower()
+        if "linux" in output or "darwin" in output:
+            return "linux"
+    except:
+        pass
+    
+    try:
+        # Try Windows command
+        stdin, stdout, stderr = client.exec_command("ver", timeout=5)
+        output = stdout.read().decode('utf-8', errors='ignore').strip().lower()
+        if "windows" in output or "microsoft" in output:
+            return "windows"
+    except:
+        pass
+    
+    # Try PowerShell (Windows)
+    try:
+        stdin, stdout, stderr = client.exec_command("Get-Host", timeout=5)
+        output = stdout.read().decode('utf-8', errors='ignore').strip().lower()
+        if "powershell" in output or "windows" in output:
+            return "windows"
+    except:
+        pass
+    
+    # Default to linux (backward compatibility)
+    return "linux"
+
 def ssh_execute_command(
     host: str,
     command: Union[str, List[str]],
@@ -569,10 +634,15 @@ def ssh_execute_command(
     else:
         command_str = command
     
+    with ssh_connect(
+        host, username, password, key_file, port, **kwargs
+    ) as client:
+        # 1. DETECT REMOTE OS
+        remote_os = _detect_remote_os(client)
+    
     # Add environment variables
     if environment:
-        env_vars = " ".join([f"export {k}='{v}'" for k, v in environment.items()])
-        command_str = f"{env_vars}; {command_str}"
+        command_str = _inject_environment_variables(environment, command_str,remote_os=remote_os)
     
     # Add sudo
     if sudo: