entangled-cli 2.0.3__tar.gz → 2.0.5__tar.gz

{entangled_cli-2.0.3 → entangled_cli-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entangled-cli
-Version: 2.0.3
+Version: 2.0.5
 Summary: Literate Programming toolbox
 Home-page: https://entangled.github.io/
 License: Apache 2

{entangled_cli-2.0.3 → entangled_cli-2.0.5}/entangled/document.py

@@ -57,11 +57,17 @@ class ReferenceMap:
         default_factory=lambda: defaultdict(list)
     )
     targets: set[str] = field(default_factory=set)
+    alias: dict[str, str] = field(default_factory=dict)
 
     def names(self) -> Iterable[str]:
         return self.index.keys()
 
     def by_name(self, n: str) -> Iterable[CodeBlock]:
+        if n not in self.index and n not in self.alias:
+            raise AttributeError(name=n, obj=self)
+        if n not in self.index:
+            return self.by_name(self.alias[n])
+
         return (self.map[r] for r in self.index[n])
 
     def new_id(self, filename: str, name: str) -> ReferenceId:

{entangled_cli-2.0.3 → entangled_cli-2.0.5}/entangled/markdown_reader.py

@@ -130,6 +130,12 @@ class MarkdownReader(mawk.RuleSet):
             self.reference_map[ref] = code
             if target_file is not None:
                 self.reference_map.targets.add(target_file)
+
+            # when both target_file and block_id are given,
+            # make an alias
+            if target_file is not None and block_id is not None:
+                self.reference_map.alias[target_file] = block_id
+
             self.content.append(ref)
             self.current_content = []
 

{entangled_cli-2.0.3 → entangled_cli-2.0.5}/entangled/status.py

@@ -5,6 +5,17 @@ from itertools import chain
 from pathlib import Path
 
 
+def safe_glob(pattern):
+    """The `glob` method of `Path` raises a FileNotFound error when
+    there are rapid changes in the filesystem.
+
+    `safe_glob` catches this error and returns an empty list instead."""
+    try:
+        return Path().glob(pattern)
+    except FileNotFoundError:
+        return []
+
+
 def find_watch_dirs():
     """List all directories that contain files that need watching."""
     input_file_list = list_input_files()
@@ -16,9 +27,9 @@ def find_watch_dirs():
 
 def list_input_files():
     """List all input files."""
-    include_file_list = chain.from_iterable(map(Path().glob, config.watch_list))
+    include_file_list = chain.from_iterable(map(safe_glob, config.watch_list))
     exclude_file_list = list(
-        chain.from_iterable(map(Path().glob, config.ignore_list))
+        chain.from_iterable(map(safe_glob, config.ignore_list))
     )
     return [path for path in include_file_list if not path in exclude_file_list]
 

{entangled_cli-2.0.3 → entangled_cli-2.0.5}/entangled/tangle.py

@@ -119,6 +119,9 @@ def tangle_ref(
     if annotation is None:
         annotation = config.annotation
 
+    if ref_name in refs.alias:
+        ref_name = refs.alias[ref_name]
+
     if ref_name not in refs:
         raise KeyError(ref_name)
     v = _visited or Visitor()

{entangled_cli-2.0.3 → entangled_cli-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "entangled-cli"
-version = "2.0.3"
+version = "2.0.5"
 description = "Literate Programming toolbox"
 repository = "https://github.com/entangled/entangled.py"
 homepage = "https://entangled.github.io/"