ethspecify 0.1.3__py3-none-any.whl → 0.2.0__py3-none-any.whl

ethspecify/cli.py

@@ -1,34 +1,205 @@
 import argparse
+import json
 import os
+import sys
+
+from .core import grep, replace_spec_tags, get_pyspec, get_latest_fork
+
+
+def process(args):
+    """Process all spec tags."""
+    project_dir = os.path.abspath(os.path.expanduser(args.path))
+    if not os.path.isdir(project_dir):
+        print(f"Error: The directory {repr(project_dir)} does not exist.")
+        return 1
+
+    for f in grep(project_dir, r"<spec\b.*?>", args.exclude):
+        print(f"Processing file: {f}")
+        replace_spec_tags(f)
+
+    return 0
+
+
+def list_tags(args):
+    """List all available tags for a specific fork and preset."""
+    # Get the specification data
+    pyspec = get_pyspec()
+    fork = args.fork
+    preset = args.preset
+
+    # Validate that the fork exists
+    if fork not in pyspec[preset]:
+        print(f"Error: Fork '{fork}' not found in {preset} preset")
+        available_forks = list(pyspec[preset].keys())
+        print(f"Available forks: {', '.join(available_forks)}")
+        return 1
+
+    # Format output based on requested format
+    if args.format == "json":
+        result = {
+            "fork": fork,
+            "preset": preset,
+            "tags": {
+                "functions": list(pyspec[preset][fork]['functions'].keys()),
+                "constant_vars": list(pyspec[preset][fork]['constant_vars'].keys()),
+                "custom_types": list(pyspec[preset][fork]['custom_types'].keys()),
+                "ssz_objects": list(pyspec[preset][fork]['ssz_objects'].keys()),
+                "dataclasses": list(pyspec[preset][fork]['dataclasses'].keys()),
+                "preset_vars": list(pyspec[preset][fork]['preset_vars'].keys()),
+                "config_vars": list(pyspec[preset][fork]['config_vars'].keys()),
+            }
+        }
+        print(json.dumps(result, indent=2))
+    else:
+        # Plain text output
+        print(f"Available tags for {fork} fork ({preset} preset):")
+        maybe_fork = f' fork="{fork}"' if fork != get_latest_fork() else ""
+
+        print("\nFunctions:")
+        for fn_name in sorted(pyspec[preset][fork]['functions'].keys()):
+            if args.search is None or args.search.lower() in fn_name.lower():
+                print(f"  <spec fn=\"{fn_name}\"{maybe_fork} />")
+
+        print("\nConstants:")
+        for const_name in sorted(pyspec[preset][fork]['constant_vars'].keys()):
+            if args.search is None or args.search.lower() in const_name.lower():
+                print(f"  <spec constant_var=\"{const_name}\"{maybe_fork} />")
+
+        print("\nCustom Types:")
+        for type_name in sorted(pyspec[preset][fork]['custom_types'].keys()):
+            if args.search is None or args.search.lower() in type_name.lower():
+                print(f"  <spec custom_type=\"{type_name}\"{maybe_fork} />")
+
+        print("\nSSZ Objects:")
+        for obj_name in sorted(pyspec[preset][fork]['ssz_objects'].keys()):
+            if args.search is None or args.search.lower() in obj_name.lower():
+                print(f"  <spec ssz_object=\"{obj_name}\"{maybe_fork} />")
+
+        print("\nDataclasses:")
+        for class_name in sorted(pyspec[preset][fork]['dataclasses'].keys()):
+            if args.search is None or args.search.lower() in class_name.lower():
+                print(f"  <spec dataclass=\"{class_name}\"{maybe_fork} />")
+
+        print("\nPreset Variables:")
+        for var_name in sorted(pyspec[preset][fork]['preset_vars'].keys()):
+            if args.search is None or args.search.lower() in var_name.lower():
+                print(f"  <spec preset_var=\"{var_name}\"{maybe_fork} />")
+
+        print("\nConfig Variables:")
+        for var_name in sorted(pyspec[preset][fork]['config_vars'].keys()):
+            if args.search is None or args.search.lower() in var_name.lower():
+                print(f"  <spec config_var=\"{var_name}\"{maybe_fork} />")
+
+    return 0
+
+
+def list_forks(args):
+    """List all available forks."""
+    pyspec = get_pyspec()
+    preset = args.preset
+
+    if preset not in pyspec:
+        print(f"Error: Preset '{preset}' not found.")
+        print(f"Available presets: {', '.join(pyspec.keys())}")
+        return 1
+
+    forks = sorted(
+        pyspec[preset].keys(),
+        # Put phase0 at the top & EIP feature forks at the bottom
+        key=lambda x: (x != "phase0", x.startswith("eip"), x)
+    )
+
+    if args.format == "json":
+        result = {
+            "preset": preset,
+            "forks": forks
+        }
+        print(json.dumps(result, indent=2))
+    else:
+        print(f"Available forks for {preset} preset:")
+        for fork in forks:
+            print(f"  {fork}")
+
+    return 0
 
-from .core import grep, replace_spec_tags
 
 def main():
     parser = argparse.ArgumentParser(
         description="Process files containing <spec> tags."
     )
-    parser.add_argument(
+
+    # Create subparsers for different commands
+    subparsers = parser.add_subparsers(dest="command", help="Command to execute")
+
+    # Parser for 'process' command
+    process_parser = subparsers.add_parser("process", help="Process spec tags in files")
+    process_parser.set_defaults(func=process)
+    process_parser.add_argument(
         "--path",
         type=str,
         help="Directory to search for files containing <spec> tags",
         default=".",
     )
-    parser.add_argument(
+    process_parser.add_argument(
         "--exclude",
         action="append",
         help="Exclude paths matching this regex",
         default=[],
     )
-    args = parser.parse_args()
 
-    project_dir = os.path.abspath(os.path.expanduser(args.path))
-    if not os.path.isdir(project_dir):
-        print(f"Error: The directory '{project_dir}' does not exist.")
-        exit(1)
+    # Parser for 'list-tags' command
+    list_tags_parser = subparsers.add_parser("list-tags", help="List available specification tags")
+    list_tags_parser.set_defaults(func=list_tags)
+    list_tags_parser.add_argument(
+        "--fork",
+        type=str,
+        help="Fork to list tags for",
+        default=get_latest_fork(),
+    )
+    list_tags_parser.add_argument(
+        "--preset",
+        type=str,
+        help="Preset to use (mainnet or minimal)",
+        default="mainnet",
+    )
+    list_tags_parser.add_argument(
+        "--format",
+        type=str,
+        choices=["text", "json"],
+        default="text",
+        help="Output format (text or json)",
+    )
+    list_tags_parser.add_argument(
+        "--search",
+        type=str,
+        help="Filter tags by search term",
+        default=None,
+    )
+
+    # Parser for 'list-forks' command
+    list_forks_parser = subparsers.add_parser("list-forks", help="List available forks")
+    list_forks_parser.set_defaults(func=list_forks)
+    list_forks_parser.add_argument(
+        "--preset",
+        type=str,
+        help="Preset to use (mainnet or minimal)",
+        default="mainnet",
+    )
+    list_forks_parser.add_argument(
+        "--format",
+        type=str,
+        choices=["text", "json"],
+        default="text",
+        help="Output format (text or json)",
+    )
+
+    # Default to 'process' if no args are provided
+    if len(sys.argv) == 1:
+        sys.argv.insert(1, "process")
+
+    args = parser.parse_args()
+    exit(args.func(args))
 
-    for f in grep(project_dir, r"<spec\b.*?>", args.exclude):
-        print(f"Processing file: {f}")
-        replace_spec_tags(f)
 
 if __name__ == "__main__":
-    main()
+    main()

ethspecify/core.py

@@ -197,6 +197,16 @@ def get_spec(attributes, preset, fork):
         raise Exception("invalid spec tag")
     return spec
 
+def get_latest_fork():
+    """A helper function to get the latest non-eip fork."""
+    pyspec = get_pyspec()
+    forks = sorted(
+        pyspec["mainnet"].keys(),
+        key=lambda x: (x != "phase0", x.startswith("eip"), x)
+    )
+    for fork in reversed(forks):
+        if not fork.startswith("eip"):
+            return fork
 
 def parse_common_attributes(attributes):
     try:
@@ -207,7 +217,7 @@ def parse_common_attributes(attributes):
     try:
         fork = attributes["fork"]
     except KeyError:
-        raise Exception(f"Missing fork attribute")
+        fork = get_latest_fork()
 
     try:
         style = attributes["style"]
@@ -287,12 +297,28 @@ def replace_spec_tags(file_path):
         new_opening += f' hash="{hash_value}">'
         return new_opening
 
+    def rebuild_self_closing_tag(attributes, hash_value):
+        # Build a self-closing tag from attributes, forcing a single space before the slash.
+        new_tag = "<spec"
+        for key, val in attributes.items():
+            if key != "hash":
+                new_tag += f' {key}="{val}"'
+        new_tag += f' hash="{hash_value}" />'
+        return new_tag
+
     def replacer(match):
         # Always use the tag text from whichever group matched:
         if match.group("self") is not None:
             original_tag_text = match.group("self")
         else:
             original_tag_text = match.group("long")
+        # Determine the original opening tag (ignore inner content)
+        if match.group("self") is not None:
+            original_tag_text = match.group("self")
+        else:
+            long_tag_text = match.group("long")
+            opening_tag_match = re.search(r'<spec\b[^>]*>', long_tag_text)
+            original_tag_text = opening_tag_match.group(0) if opening_tag_match else long_tag_text
 
         attributes = extract_attributes(original_tag_text)
         print(f"spec tag: {attributes}")
@@ -301,18 +327,11 @@ def replace_spec_tags(file_path):
         hash_value = hashlib.sha256(spec.encode('utf-8')).hexdigest()[:8]
 
         if style == "hash":
-            # For hash style, output a self-closing tag.
-            if 'hash="' in original_tag_text:
-                updated_tag = re.sub(
-                    r'(hash=")[^"]*(")',
-                    lambda m: f'{m.group(1)}{hash_value}{m.group(2)}',
-                    original_tag_text
-                )
-            else:
-                updated_tag = re.sub(r'\s*/>$', f' hash="{hash_value}" />', original_tag_text)
+            # Rebuild a fresh self-closing tag.
+            updated_tag = rebuild_self_closing_tag(attributes, hash_value)
             return updated_tag
         else:
-            # For full/diff styles, always rebuild as a long (paired) tag.
+            # For full/diff styles, rebuild as a long (paired) tag.
             new_opening = rebuild_opening_tag(attributes, hash_value)
             spec_content = get_spec_item(attributes)
             prefix = content[:match.start()].splitlines()[-1]

{ethspecify-0.1.3.dist-info → ethspecify-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ethspecify
-Version: 0.1.3
+Version: 0.2.0
 Summary: A utility for processing Ethereum specification tags.
 Home-page: https://github.com/jtraglia/ethspecify
 Author: Justin Traglia
@@ -18,6 +18,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

ethspecify-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+ethspecify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ethspecify/cli.py,sha256=73NnY6-xvFcxMnpeZ1LqvU02EiNiPx5jOor1KPERenk,6903
+ethspecify/core.py,sha256=tkkuBXXJtjWZOSvrpohaFa89VsiocgdAm9QrB55dtGE,12963
+ethspecify-0.2.0.dist-info/licenses/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
+ethspecify-0.2.0.dist-info/METADATA,sha256=wE94OOQKuoZL8hGliq93NX7LQRLsU5eGbtD380J1kzc,8812
+ethspecify-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ethspecify-0.2.0.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
+ethspecify-0.2.0.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
+ethspecify-0.2.0.dist-info/RECORD,,

{ethspecify-0.1.3.dist-info → ethspecify-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ethspecify-0.1.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-ethspecify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ethspecify/cli.py,sha256=TTKmSGUkuRdYlYS6t-cpVXpdpSKsYCWvmRDy8DcC10E,882
-ethspecify/core.py,sha256=pUybFZnO8nDDQ-7tQjxbUjQHFTV4PEGFWJTyR3gy0hM,12194
-ethspecify-0.1.3.dist-info/LICENSE,sha256=Awxsr73mm9YMBVhBYnzeI7bNdRd-bH6RDtO5ItG0DaM,1071
-ethspecify-0.1.3.dist-info/METADATA,sha256=JI4igGfL54P1EEmtIG-54A1SV5mrhxIbCCOs2WufJmQ,8790
-ethspecify-0.1.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ethspecify-0.1.3.dist-info/entry_points.txt,sha256=09viGkCg9J3h0c9BFRN-BKaJUEaIc4JyULNgBP5EL_g,51
-ethspecify-0.1.3.dist-info/top_level.txt,sha256=0klaMvlVyOkXW09fwZTijJpdybITEp2c9zQKV5v30VM,11
-ethspecify-0.1.3.dist-info/RECORD,,