From 63fe7c07ea71169292cbb47849af81215d8da7c1 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Tue, 8 Aug 2023 16:28:48 -0500
Subject: [PATCH] refactor: update pep722 reference implementation

---
 examples/pep722.py | 10 +++++++---
 src/viv/viv.py     | 34 +++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/examples/pep722.py b/examples/pep722.py
index a367d2d..2b28e70 100755
--- a/examples/pep722.py
+++ b/examples/pep722.py
@@ -1,9 +1,13 @@
 #!/usr/bin/env -S viv run -s
 # In order to run, this script needs the following 3rd party libraries
 #
-## Script Dependencies:
-##    requests
-##    rich
+# Script Dependencies:
+#    requests
+#    rich     # Needed for the output
+#
+#    # Not needed - just to show that fragments in URLs do not
+#    # get treated as comments
+#    pip @ https://github.com/pypa/pip/archive/1.3.1.zip#sha1=2e15a2d4e7e9f394a9c7a6c905c6a239402a6442
 
 import requests
 from rich.pretty import pprint
diff --git a/src/viv/viv.py b/src/viv/viv.py
index 8747905..eea317e 100755
--- a/src/viv/viv.py
+++ b/src/viv/viv.py
@@ -55,7 +55,7 @@ from typing import (
 from urllib.error import HTTPError
 from urllib.request import urlopen
 
-__version__ = "23.8a2-8-g95531c3-dev"
+__version__ = "23.8a2-9-g7a0f3d6-dev"
 
 
 class Spinner:
@@ -1138,15 +1138,27 @@ def _read_metadata_block(txt: str) -> Generator[Tuple[str, str, List[str]], None
             yield block_type, extra, block_data
 
 
-def deps_block(txt: str) -> List[str]:
-    return list(
-        (
-            req
-            for block_type, extra, block_data in _read_metadata_block(txt)
-            for req in block_data
-            if block_type == "Script Dependencies"
-        )
-    )
+DEPENDENCY_BLOCK_MARKER = r"(?i)^#\s+script\s+dependencies:\s*$"
+
+
+def read_dependency_block(txt: str) -> List[str]:
+    lines = iter(txt.splitlines())
+    for line in lines:
+        if re.match(DEPENDENCY_BLOCK_MARKER, line):
+            for line in lines:
+                if not line.startswith("#"):
+                    break
+                # Remove comments. An inline comment is introduced by
+                # a hash, which must be preceded and followed by a
+                # space. The initial hash will be skipped as it has
+                # no space before it.
+                line = line.split(" # ", maxsplit=1)[0]
+                line = line[1:].strip()
+                if not line:
+                    continue
+                # let pip handle the requirement errors
+                yield line
+            break
 
 
 def _parse_date(txt: str) -> datetime:
@@ -1641,7 +1653,7 @@ class Viv:
                 script_text = fetch_script(script)
 
             viv_used = uses_viv(script_text)
-            deps = deps_block(script_text)
+            deps = list(read_dependency_block(script_text))
 
             if viv_used and deps:
                 error(