utils_devops 0.1.147__tar.gz → 0.1.149__tar.gz

{utils_devops-0.1.147 → utils_devops-0.1.149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.147
+Version: 0.1.149
 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.147 → utils_devops-0.1.149}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utils_devops"
-version = "0.1.147"  # Bumped for new string features + diffing
+version = "0.1.149"  # 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.147 → utils_devops-0.1.149}/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.147 → utils_devops-0.1.149}/src/utils_devops/extras/docker_ops.py

@@ -1871,6 +1871,8 @@ def _try_environment_authentication(registry: str, registry_info: Dict, logger)
         # Registry-specific (e.g., HARBOR_USER, HARBOR_PASSWORD)
         (f"{_registry_to_env(registry)}_USER", f"{_registry_to_env(registry)}_PASSWORD"),
         # Generic (e.g., DOCKER_USERNAME, DOCKER_PASSWORD)
+        ("HARBOR_USERNAME", "HARBOR_PASSWORD"),
+        ("HARBOR_USER", "HARBOR_PASSWORD"),
         ("DOCKER_USERNAME", "DOCKER_PASSWORD"),
         ("REGISTRY_USERNAME", "REGISTRY_PASSWORD"),
         ("CI_REGISTRY_USER", "CI_REGISTRY_PASSWORD"),  # GitLab CI
@@ -3649,7 +3651,6 @@ def docker_login(
         Success status
     """
     logger = logger or DEFAULT_LOGGER
-        logger = logger or DEFAULT_LOGGER
     cmd = ['docker', 'login', registry, '-u', username, '-p', password]
     if email:
         cmd.extend(['--email', email])  # Rare, mostly for old Docker Hub

{utils_devops-0.1.147 → utils_devops-0.1.149}/src/utils_devops/extras/ssh_ops.py

@@ -528,6 +528,37 @@ 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.
+    Works for both Windows and Linux remote targets.
+    """
+    if not environment:
+        return base_command
+
+    # Create a temporary script to set environment and run the command
+    env_lines = []
+    if systems.is_linux :
+        # Linux syntax: export VAR='value'
+        for key, value in environment.items():
+            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():
+            # Escape for PowerShell
+            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 ssh_execute_command(
     host: str,
     command: Union[str, List[str]],
@@ -569,10 +600,10 @@ def ssh_execute_command(
     else:
         command_str = command
     
+    
     # 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)
     
     # Add sudo
     if sudo: