rolfedh-doc-utils 0.1.27__tar.gz → 0.1.29__tar.gz

{rolfedh_doc_utils-0.1.27/rolfedh_doc_utils.egg-info → rolfedh_doc_utils-0.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rolfedh-doc-utils
-Version: 0.1.27
+Version: 0.1.29
 Summary: CLI tools for AsciiDoc documentation projects
 Author: Rolfe Dlugy-Hegwer
 License: MIT License

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/callout_lib/converter_bullets.py

@@ -59,8 +59,8 @@ class BulletListConverter:
                     user_value = f'{user_value}>'
                 term = f'`{user_value}`'
             else:
-                # This is a code line - use it as-is in backticks
-                term = f'`{code_line}`'
+                # This is a code line - strip whitespace before wrapping in backticks
+                term = f'`{code_line.strip()}`'
 
             # Collect all explanations for this group
             all_explanation_lines = []

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/callout_lib/converter_deflist.py

@@ -54,8 +54,8 @@ class DefListConverter:
                     user_value = f'{user_value}>'
                 term = f'`{user_value}`'
             else:
-                # This is a code line - use it as-is in backticks
-                term = f'`{code_line}`'
+                # This is a code line - strip whitespace before wrapping in backticks
+                term = f'`{code_line.strip()}`'
 
             # Add blank line before each term
             lines.append('')

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/callout_lib/detector.py

@@ -45,6 +45,11 @@ class CalloutDetector:
     # Pattern for callout number in code block (can appear multiple times per line)
     CALLOUT_IN_CODE = re.compile(r'<(\d+)>')
 
+    # Pattern for callout with optional preceding comment syntax
+    # Matches common comment styles: //, #, --, ;, followed by optional whitespace and <number>
+    # The comment syntax must be preceded by whitespace to avoid matching code operators
+    CALLOUT_WITH_COMMENT = re.compile(r'\s*(?://|#|--|;)\s*<\d+>|\s*<\d+>')
+
     # Pattern for callout explanation line: <1> Explanation text
     CALLOUT_EXPLANATION = re.compile(r'^<(\d+)>\s+(.+)$')
 
@@ -130,8 +135,9 @@ class CalloutDetector:
             # Look for all callout numbers on this line
             callout_matches = list(self.CALLOUT_IN_CODE.finditer(line))
             if callout_matches:
-                # Remove all callouts from the line to get the actual code
-                line_without_callouts = self.CALLOUT_IN_CODE.sub('', line).strip()
+                # Remove callouts AND preceding comment syntax from the line
+                # Use CALLOUT_WITH_COMMENT to remove both comment syntax and callout
+                line_without_callouts = self.CALLOUT_WITH_COMMENT.sub('', line).rstrip()
 
                 # Find all angle-bracket enclosed values
                 user_values = self.USER_VALUE_PATTERN.findall(line_without_callouts)
@@ -216,11 +222,11 @@ class CalloutDetector:
 
             # Add value lines with context
             if value_lines:
-                # Format: "Refers to `value`. Description..."
+                # Format: "`value`:"
                 value_text = value_lines[0] if value_lines else ""
                 # If value is code-like (contains backticks or special chars), keep it formatted
                 if value_text:
-                    all_lines.append(f"Refers to {value_text}.")
+                    all_lines.append(f"{value_text}:")
 
                 # Add additional value lines if multi-line
                 for line in value_lines[1:]:
@@ -290,11 +296,14 @@ class CalloutDetector:
         return explanations, i - 1
 
     def remove_callouts_from_code(self, content: List[str]) -> List[str]:
-        """Remove callout numbers from code block content (handles multiple callouts per line)."""
+        """
+        Remove callout numbers and preceding comment syntax from code block content.
+        Handles multiple callouts per line and various comment styles (//,  #, --, ;).
+        """
         cleaned = []
         for line in content:
-            # Remove all callout numbers and trailing whitespace
-            cleaned.append(self.CALLOUT_IN_CODE.sub('', line).rstrip())
+            # Remove all callout numbers with their preceding comment syntax
+            cleaned.append(self.CALLOUT_WITH_COMMENT.sub('', line).rstrip())
         return cleaned
 
     def validate_callouts(self, callout_groups: List[CalloutGroup], explanations: Dict[int, Callout]) -> Tuple[bool, set, set]:

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/callout_lib/table_parser.py

@@ -200,6 +200,17 @@ class TableParser:
                                 content=[part],
                                 conditionals=[]
                             ))
+
+                    # Multi-cell line completes a row - finalize it
+                    if current_row_cells:
+                        rows.append(TableRow(
+                            cells=current_row_cells.copy(),
+                            conditionals_before=conditionals_before_row.copy(),
+                            conditionals_after=conditionals_after_row.copy()
+                        ))
+                        current_row_cells = []
+                        conditionals_before_row = []
+                        conditionals_after_row = []
                 else:
                     # Single cell on this line
                     if cell_content:

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/doc_utils/format_asciidoc_spacing.py

@@ -65,9 +65,16 @@ def process_file(file_path: Path, dry_run: bool = False, verbose: bool = False)
             new_lines.append(current_line)
             in_conditional = False
             # Add blank line after conditional if needed
+            # Don't add if next line is:
+            # - a list item (starts with *, -, ., .., or numbered)
+            # - list continuation (+)
+            # - another conditional
+            # - blank
             if (next_line and
                 not re.match(r'^\s*$', next_line) and
-                not re.match(r'^(ifdef::|ifndef::|endif::)', next_line)):
+                not re.match(r'^(ifdef::|ifndef::|endif::)', next_line) and
+                not re.match(r'^(\*|\-|\.|\.\.|\d+\.)\s', next_line) and  # List items
+                not re.match(r'^\+\s*$', next_line)):  # List continuation
                 new_lines.append("")
                 changes_made = True
                 if verbose:
@@ -102,10 +109,13 @@ def process_file(file_path: Path, dry_run: bool = False, verbose: bool = False)
         # Check for block titles (.Title)
         elif not in_block and not in_comment_block and re.match(r'^\.[A-Z]', current_line):
             # Add blank line before block title if needed
-            if (prev_line and
+            # Don't add if inside a conditional block or if previous line is a conditional directive
+            if (not in_conditional and
+                prev_line and
                 not re.match(r'^\s*$', prev_line) and
                 not re.match(r'^=+\s+', prev_line) and
-                not re.match(r'^\[role=', prev_line)):  # Don't add if previous is heading, empty, or role block
+                not re.match(r'^\[role=', prev_line) and
+                not re.match(r'^(ifdef::|ifndef::|endif::)', prev_line)):  # Don't add if previous is conditional
                 new_lines.append("")
                 changes_made = True
                 if verbose:
@@ -117,11 +127,12 @@ def process_file(file_path: Path, dry_run: bool = False, verbose: bool = False)
         elif not in_block and re.match(r'^=+\s+', current_line):
             new_lines.append(current_line)
 
-            # Check if next line is not empty, not another heading, and not a comment block
+            # Check if next line is not empty, not another heading, not a comment block, and not a conditional
             if (next_line and
                 not re.match(r'^=+\s+', next_line) and
                 not re.match(r'^\s*$', next_line) and
-                not re.match(r'^////+$', next_line)):  # Don't add if next is comment block
+                not re.match(r'^////+$', next_line) and  # Don't add if next is comment block
+                not re.match(r'^(ifdef::|ifndef::|endif::)', next_line)):  # Don't add if next is conditional
                 new_lines.append("")
                 changes_made = True
                 if verbose:

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/doc_utils/version.py

@@ -1,7 +1,7 @@
 """Version information for doc-utils."""
 
 # This should match the version in pyproject.toml
-__version__ = "0.1.21"
+__version__ = "0.1.29"
 
 def get_version():
     """Return the current version string."""

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/doc_utils/version_check.py

@@ -141,10 +141,12 @@ def detect_install_method() -> str:
     Detect how the package was installed.
 
     Returns:
-        'pipx', 'pip', or 'unknown'
+        'pipx' or 'pip'
+
+    Note: Defaults to 'pipx' as the recommended installation method.
     """
-    # Check if running from pipx venv
-    if 'pipx' in sys.prefix:
+    # Check if running from pipx venv (standard pipx install)
+    if 'pipx' in sys.prefix.lower():
         return 'pipx'
 
     # Check PIPX_HOME environment variable
@@ -152,8 +154,17 @@ def detect_install_method() -> str:
     if pipx_home and str(Path(sys.prefix)).startswith(str(Path(pipx_home))):
         return 'pipx'
 
-    # Default to pip
-    return 'pip'
+    # Check if executable is in typical pipx bin location
+    try:
+        exe_path = Path(sys.executable)
+        if '.local/pipx' in str(exe_path):
+            return 'pipx'
+    except Exception:
+        pass
+
+    # Default to pipx as the recommended method (per CLAUDE.md guidelines)
+    # This ensures users see the recommended upgrade command even for editable installs
+    return 'pipx'
 
 
 def show_update_notification(latest_version: str, current_version: str = None):

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/doc_utils_cli.py

@@ -55,9 +55,14 @@ TOOLS = [
     },
     {
         'name': 'convert-callouts-to-deflist',
-        'description': 'Converts callout-style annotations to definition list format',
+        'description': 'Converts callouts to definition lists (batch mode)',
         'example': 'convert-callouts-to-deflist --dry-run modules/'
     },
+    {
+        'name': 'convert-callouts-interactive',
+        'description': 'Interactively converts callouts with per-block format selection',
+        'example': 'convert-callouts-interactive modules/'
+    },
 ]
 
 

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rolfedh-doc-utils"
-version = "0.1.27"
+version = "0.1.29"
 description = "CLI tools for AsciiDoc documentation projects"
 readme = "README.md"
 requires-python = ">=3.8"

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29/rolfedh_doc_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rolfedh-doc-utils
-Version: 0.1.27
+Version: 0.1.29
 Summary: CLI tools for AsciiDoc documentation projects
 Author: Rolfe Dlugy-Hegwer
 License: MIT License

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.29}/tests/test_version_check.py

@@ -26,20 +26,22 @@ class TestDetectInstallMethod:
                 assert detect_install_method() == 'pipx'
 
     def test_detect_pip(self):
-        """Test detection defaults to pip."""
+        """Test detection defaults to pipx (per project guidelines)."""
         with patch('sys.prefix', '/usr'):
             # Clear PIPX_HOME if set
             env = {k: v for k, v in os.environ.items() if k != 'PIPX_HOME'}
             with patch.dict(os.environ, env, clear=True):
-                assert detect_install_method() == 'pip'
+                # Default is now pipx to align with installation recommendations
+                assert detect_install_method() == 'pipx'
 
     def test_detect_pip_user(self):
-        """Test detection for pip --user installations."""
+        """Test detection for pip --user installations defaults to pipx."""
         with patch('sys.prefix', '/home/user/.local'):
             # Clear PIPX_HOME if set
             env = {k: v for k, v in os.environ.items() if k != 'PIPX_HOME'}
             with patch.dict(os.environ, env, clear=True):
-                assert detect_install_method() == 'pip'
+                # Default is now pipx to align with installation recommendations
+                assert detect_install_method() == 'pipx'
 
 
 class TestParseVersion: