mcp-souschef 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

souschef/parsers/habitat.py

@@ -205,6 +205,32 @@ def _extract_plan_exports(content: str, var_name: str) -> list[dict[str, str]]:
     return exports
 
 
+def _is_quote_blocked(
+    ch: str, in_single_quote: bool, in_double_quote: bool, in_backtick: bool
+) -> bool:
+    """Check if a quote character is blocked by other active quotes."""
+    if ch == "'":
+        return in_double_quote or in_backtick
+    if ch == '"':
+        return in_single_quote or in_backtick
+    if ch == "`":
+        return in_single_quote or in_double_quote
+    return False
+
+
+def _toggle_quote(
+    ch: str, in_single_quote: bool, in_double_quote: bool, in_backtick: bool
+) -> tuple[bool, bool, bool]:
+    """Toggle the appropriate quote state based on character."""
+    if ch == "'":
+        return not in_single_quote, in_double_quote, in_backtick
+    if ch == '"':
+        return in_single_quote, not in_double_quote, in_backtick
+    if ch == "`":
+        return in_single_quote, in_double_quote, not in_backtick
+    return in_single_quote, in_double_quote, in_backtick
+
+
 def _update_quote_state(
     ch: str,
     in_single_quote: bool,
@@ -213,18 +239,21 @@ def _update_quote_state(
     escape_next: bool,
 ) -> tuple[bool, bool, bool, bool]:
     """Update quote tracking state for shell script parsing."""
+    # Handle escape sequences
     if escape_next:
         return in_single_quote, in_double_quote, in_backtick, False
 
     if ch == "\\":
         return in_single_quote, in_double_quote, in_backtick, True
 
-    if ch == "'" and not in_double_quote and not in_backtick:
-        return not in_single_quote, in_double_quote, in_backtick, False
-    if ch == '"' and not in_single_quote and not in_backtick:
-        return in_single_quote, not in_double_quote, in_backtick, False
-    if ch == "`" and not in_single_quote and not in_double_quote:
-        return in_single_quote, in_double_quote, not in_backtick, False
+    # Handle quote characters
+    if ch in ("'", '"', "`") and not _is_quote_blocked(
+        ch, in_single_quote, in_double_quote, in_backtick
+    ):
+        single, double, backtick = _toggle_quote(
+            ch, in_single_quote, in_double_quote, in_backtick
+        )
+        return single, double, backtick, False
 
     return in_single_quote, in_double_quote, in_backtick, False
 

souschef/parsers/inspec.py

@@ -616,6 +616,50 @@ def _generate_inspec_package_checks(
     return lines
 
 
+def _generate_inspec_resource_checks(
+    resource_type: str,
+    resource_name: str,
+    properties: dict[str, Any] | None = None,
+    custom_checks: list[str] | None = None,
+) -> list[str]:
+    """
+    Generate InSpec checks for a resource using a generic pattern.
+
+    Args:
+        resource_type: InSpec resource type (e.g., 'file', 'user', 'service').
+        resource_name: Name/path of the resource.
+        properties: Optional resource properties to check.
+        custom_checks: Optional list of custom check lines.
+
+    Returns:
+        List of InSpec check lines.
+
+    """
+    lines = [f"  describe {resource_type}('{resource_name}') do"]
+
+    # Add custom checks if provided
+    if custom_checks:
+        lines.extend(custom_checks)
+    else:
+        # Default: should exist
+        lines.append(INSPEC_SHOULD_EXIST)
+
+    # Add property checks
+    if properties:
+        property_map = {
+            "mode": lambda v: f"    its('mode') {{ should cmp '{v}' }}",
+            "owner": lambda v: f"    its('owner') {{ should eq '{v}' }}",
+            "group": lambda v: f"    its('group') {{ should eq '{v}' }}",
+            "shell": lambda v: f"    its('shell') {{ should eq '{v}' }}",
+        }
+        for prop, value in properties.items():
+            if prop in property_map:
+                lines.append(property_map[prop](value))
+
+    lines.append(INSPEC_END_INDENT)
+    return lines
+
+
 def _generate_inspec_service_checks(resource_name: str) -> list[str]:
     """
     Generate InSpec checks for service resource.
@@ -627,12 +671,14 @@ def _generate_inspec_service_checks(resource_name: str) -> list[str]:
         List of InSpec check lines.
 
     """
-    return [
-        f"  describe service('{resource_name}') do",
-        "    it { should be_running }",
-        "    it { should be_enabled }",
-        INSPEC_END_INDENT,
-    ]
+    return _generate_inspec_resource_checks(
+        "service",
+        resource_name,
+        custom_checks=[
+            "    it { should be_running }",
+            "    it { should be_enabled }",
+        ],
+    )
 
 
 def _generate_inspec_file_checks(
@@ -649,15 +695,11 @@ def _generate_inspec_file_checks(
         List of InSpec check lines.
 
     """
-    lines = [f"  describe file('{resource_name}') do", INSPEC_SHOULD_EXIST]
-    if "mode" in properties:
-        lines.append(f"    its('mode') {{ should cmp '{properties['mode']}' }}")
-    if "owner" in properties:
-        lines.append(f"    its('owner') {{ should eq '{properties['owner']}' }}")
-    if "group" in properties:
-        lines.append(f"    its('group') {{ should eq '{properties['group']}' }}")
-    lines.append(INSPEC_END_INDENT)
-    return lines
+    return _generate_inspec_resource_checks(
+        "file",
+        resource_name,
+        properties=properties,
+    )
 
 
 def _generate_inspec_directory_checks(
@@ -674,15 +716,15 @@ def _generate_inspec_directory_checks(
         List of InSpec check lines.
 
     """
-    lines = [
-        f"  describe file('{resource_name}') do",
-        INSPEC_SHOULD_EXIST,
-        "    it { should be_directory }",
-    ]
-    if "mode" in properties:
-        lines.append(f"    its('mode') {{ should cmp '{properties['mode']}' }}")
-    lines.append(INSPEC_END_INDENT)
-    return lines
+    return _generate_inspec_resource_checks(
+        "file",
+        resource_name,
+        properties=properties,
+        custom_checks=[
+            INSPEC_SHOULD_EXIST,
+            "    it { should be_directory }",
+        ],
+    )
 
 
 def _generate_inspec_user_checks(
@@ -699,11 +741,11 @@ def _generate_inspec_user_checks(
         List of InSpec check lines.
 
     """
-    lines = [f"  describe user('{resource_name}') do", INSPEC_SHOULD_EXIST]
-    if "shell" in properties:
-        lines.append(f"    its('shell') {{ should eq '{properties['shell']}' }}")
-    lines.append(INSPEC_END_INDENT)
-    return lines
+    return _generate_inspec_resource_checks(
+        "user",
+        resource_name,
+        properties=properties,
+    )
 
 
 def _generate_inspec_group_checks(resource_name: str) -> list[str]:
@@ -717,11 +759,7 @@ def _generate_inspec_group_checks(resource_name: str) -> list[str]:
         List of InSpec check lines.
 
     """
-    return [
-        f"  describe group('{resource_name}') do",
-        INSPEC_SHOULD_EXIST,
-        INSPEC_END_INDENT,
-    ]
+    return _generate_inspec_resource_checks("group", resource_name)
 
 
 def _generate_inspec_from_resource(

souschef/parsers/metadata.py

@@ -45,6 +45,64 @@ def read_cookbook_metadata(path: str) -> str:
         return f"An error occurred: {e}"
 
 
+def _scan_cookbook_directory(
+    cookbook_path, dir_name: str
+) -> tuple[str, list[str]] | None:
+    """
+    Scan a single cookbook directory for files.
+
+    Args:
+        cookbook_path: Path to the cookbook root.
+        dir_name: Name of the subdirectory to scan.
+
+    Returns:
+        Tuple of (dir_name, files) if directory exists and has files, None otherwise.
+
+    """
+    dir_path = _safe_join(cookbook_path, dir_name)
+    if not dir_path.exists() or not dir_path.is_dir():
+        return None
+
+    files = [f.name for f in dir_path.iterdir() if f.is_file()]
+    return (dir_name, files) if files else None
+
+
+def _collect_cookbook_structure(cookbook_path) -> dict[str, list[str]]:
+    """
+    Collect all standard cookbook directories and their files.
+
+    Args:
+        cookbook_path: Path to the cookbook root.
+
+    Returns:
+        Dictionary mapping directory names to file lists.
+
+    """
+    structure = {}
+    common_dirs = [
+        "recipes",
+        "attributes",
+        "templates",
+        "files",
+        "resources",
+        "providers",
+        "libraries",
+        "definitions",
+    ]
+
+    for dir_name in common_dirs:
+        result = _scan_cookbook_directory(cookbook_path, dir_name)
+        if result:
+            structure[result[0]] = result[1]
+
+    # Check for metadata.rb
+    metadata_path = _safe_join(cookbook_path, METADATA_FILENAME)
+    if metadata_path.exists():
+        structure["metadata"] = [METADATA_FILENAME]
+
+    return structure
+
+
 def list_cookbook_structure(path: str) -> str:
     """
     List the structure of a Chef cookbook directory.
@@ -62,29 +120,7 @@ def list_cookbook_structure(path: str) -> str:
         if not cookbook_path.is_dir():
             return f"Error: {path} is not a directory"
 
-        structure = {}
-        common_dirs = [
-            "recipes",
-            "attributes",
-            "templates",
-            "files",
-            "resources",
-            "providers",
-            "libraries",
-            "definitions",
-        ]
-
-        for dir_name in common_dirs:
-            dir_path = _safe_join(cookbook_path, dir_name)
-            if dir_path.exists() and dir_path.is_dir():
-                files = [f.name for f in dir_path.iterdir() if f.is_file()]
-                if files:
-                    structure[dir_name] = files
-
-        # Check for metadata.rb
-        metadata_path = _safe_join(cookbook_path, METADATA_FILENAME)
-        if metadata_path.exists():
-            structure["metadata"] = [METADATA_FILENAME]
+        structure = _collect_cookbook_structure(cookbook_path)
 
         if not structure:
             return f"Warning: No standard cookbook structure found in {path}"