rtl-aid 0.2.0__tar.gz → 0.2.2__tar.gz

{rtl_aid-0.2.0/src/rtl_aid.egg-info → rtl_aid-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtl-aid
-Version: 0.2.0
+Version: 0.2.2
 Summary: CI-native documentation layer for RTL projects
 Author: vishwaksen-1
 License-Expression: MIT

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rtl-aid"
-version = "0.2.0"
+version = "0.2.2"
 description = "CI-native documentation layer for RTL projects"
 readme = "README.md"
 requires-python = ">=3.7"

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/src/rtl_aid/__init__.py

@@ -1,4 +1,4 @@
 from .core import VerilogWikiParser
 
-__version__ = "0.1.0"
+__version__ = "0.2.2"
 __all__ = ["VerilogWikiParser"]

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/src/rtl_aid/cli.py

@@ -1,8 +1,15 @@
 import argparse
+from . import __version__
 from .core import VerilogWikiParser
 
 def main():
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(prog="rtldoc")
+
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"%(prog)s {__version__}"
+    )
 
     group = parser.add_mutually_exclusive_group(required=True)
     
@@ -49,9 +56,15 @@ def main():
     parser.add_argument(
         "--json-graph",
         action="store_true",
-        help="Generate dependency graph as JSON (graph.json) in output directory"
+        help="Generate dependency graph as JSON (graph.json)"
     )
-    
+
+    parser.add_argument(
+        "--json-graph-dir",
+        metavar="DIR",
+        help="Directory to write graph.json (only used with --json-graph; default: output directory)"
+    )
+
     parser.add_argument(
         "--exclude",
         nargs="+",
@@ -74,6 +87,7 @@ def main():
         verbose=args.v,
         ci=args.ci,
         json_graph=args.json_graph,
+        json_graph_dir=args.json_graph_dir,
         print_errors=args.print_errors,
         exclude=args.exclude,
         dry_run=args.dry_run,

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/src/rtl_aid/core.py

@@ -52,7 +52,7 @@ def _eval_ast_node(node):
 
 
 class VerilogWikiParser(object):
-    def __init__(self, paths, verbose=0, ci=False, json_graph=False, print_errors=False, exclude=None, dry_run=False):
+    def __init__(self, paths, verbose=0, ci=False, json_graph=False, json_graph_dir=None, print_errors=False, exclude=None, dry_run=False):
         self.paths = paths
         self.modules = {}
         self.called_by = {}
@@ -60,6 +60,7 @@ class VerilogWikiParser(object):
         self.verbose = verbose
         self.ci = ci
         self.json_graph = json_graph
+        self.json_graph_dir = json_graph_dir
         self.print_errors = print_errors
         self.exclude = exclude or []
         self.issues = []
@@ -436,9 +437,13 @@ class VerilogWikiParser(object):
                 "called_by": self.called_by.get(m, [])
             }
 
-        path = os.path.join(out_dir, "graph.json")
-        with open(path, "w") as f:
-            json.dump(graph, f, indent=2)
+        graph_dir = self.json_graph_dir if self.json_graph_dir else out_dir
+        if not self.dry_run:
+            os.makedirs(graph_dir, exist_ok=True)
+        path = os.path.join(graph_dir, "graph.json")
+        if not self.dry_run:
+            with open(path, "w") as f:
+                json.dump(graph, f, indent=2)
 
     # -------------------------
     # CI VALIDATION

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/src/rtl_aid/lint.py

@@ -4,6 +4,7 @@ import sys
 import os
 import argparse
 import shutil
+from . import __version__
 
 
 def _get_verilator_version():
@@ -203,6 +204,16 @@ def tag_file(filepath, issues, lint_cmd):
     new_headers = []
     if "// lint-test:" not in full_content:
         new_headers.append(f"// lint-test: {lint_cmd_str}\n")
+    else:
+        # Update existing lint-test line with the new command
+        new_lines = []
+        for line in lines[:insert_idx]:
+            if line.strip().startswith("// lint-test:"):
+                new_lines.append(f"// lint-test: {lint_cmd_str}\n")
+            else:
+                new_lines.append(line)
+        lines = new_lines + lines[insert_idx:]
+
     if "// tb-test:" not in full_content:
         new_headers.append("// tb-test: tba\n")
 
@@ -218,6 +229,11 @@ def main():
         prog="rtllint",
         description="Run verilator lint on Verilog files and tag warnings inline"
     )
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"%(prog)s {__version__}"
+    )
     parser.add_argument(
         "file",
         nargs="+",
@@ -255,7 +271,7 @@ def main():
             print(f"Error: {filepath}: file not found", file=sys.stderr)
             continue
 
-        output, cmd = _run_lint(filepath, args.include_dirs)
+        output, _ = _run_lint(filepath, args.include_dirs)
         issues = parse_lint_output(output, filepath)
 
         with open(filepath) as f:
@@ -274,13 +290,19 @@ def main():
             continue
 
         any_issues = True
+        # Build rtllint command for tagging
+        rtllint_cmd = ["rtllint"]
+        for d in args.include_dirs:
+            rtllint_cmd.append(f"-I{d}")
+        rtllint_cmd.append(filepath)
+
         if args.dry_run:
             print(f"\n{filepath}: {len(issues)} issue(s) would be tagged:")
             for ln, (warning_id, msg) in sorted(issues.items()):
                 tag = f"[{warning_id}] " if warning_id else ""
                 print(f"  Line {ln}: {tag}{msg}")
         else:
-            tag_file(filepath, issues, cmd)
+            tag_file(filepath, issues, rtllint_cmd)
             print(f"{filepath}: tagged {len(issues)} issue(s)")
 
     sys.exit(1 if any_issues else 0)

{rtl_aid-0.2.0 → rtl_aid-0.2.2/src/rtl_aid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtl-aid
-Version: 0.2.0
+Version: 0.2.2
 Summary: CI-native documentation layer for RTL projects
 Author: vishwaksen-1
 License-Expression: MIT

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/tests/test_core.py

@@ -3,6 +3,7 @@ from tests.core.test_parsing import *  # noqa: F401,F403
 from tests.core.test_ci import *  # noqa: F401,F403
 from tests.core.test_markdown import *  # noqa: F401,F403
 from tests.core.test_gaps import *  # noqa: F401,F403
+from tests.core.test_json_graph_dir import *  # noqa: F401,F403
 
 if __name__ == "__main__":
     import unittest

{rtl_aid-0.2.0 → rtl_aid-0.2.2}/tests/test_lint.py

@@ -4,6 +4,7 @@ from tests.lint.test_tag_file import *  # noqa: F401,F403
 from tests.lint.test_include_dirs import *  # noqa: F401,F403
 from tests.lint.test_gaps import *  # noqa: F401,F403
 from tests.lint.test_verilator_integration import *  # noqa: F401,F403
+from tests.lint.test_rtllint_command_tagging import *  # noqa: F401,F403
 
 if __name__ == "__main__":
     import unittest