entangled-cli 2.0.0b4__tar.gz → 2.0.0b5__tar.gz

{entangled_cli-2.0.0b4 → entangled_cli-2.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entangled-cli
-Version: 2.0.0b4
+Version: 2.0.0b5
 Summary: Literate Programming toolbox
 Home-page: https://entangled.github.io/
 License: Apache 2
@@ -10,11 +10,10 @@ Requires-Python: >=3.11,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
-Provides-Extra: rich
 Requires-Dist: argh (>=0.28.1,<0.29.0)
 Requires-Dist: filelock (>=3.12.0,<4.0.0)
 Requires-Dist: mawk (>=0.1.4,<0.2.0)
-Requires-Dist: rich (>=13.3.5,<14.0.0) ; extra == "rich"
+Requires-Dist: rich (>=13.3.5,<14.0.0)
 Requires-Dist: watchdog (>=3.0.0,<4.0.0)
 Project-URL: Repository, https://github.com/entangled/entangled.py
 Description-Content-Type: text/markdown

{entangled_cli-2.0.0b4 → entangled_cli-2.0.0b5}/entangled/filedb.py

@@ -16,6 +16,14 @@ from .version import __version__
 from .utility import normal_relative, ensure_parent
 
 
+def hexdigest(s: str) -> str:
+    """Creates a MD5 hash digest from a string. Before hashing, the string has
+    linefeed `\\r` characters and trailing newlines removed, and the string
+    is encoded as UTF-8."""
+    content = s.replace("\r", "").rstrip("\n").encode()
+    return hashlib.sha256(content).hexdigest()
+
+
 @dataclass
 class FileStat:
     path: Path
@@ -26,10 +34,10 @@ class FileStat:
     @staticmethod
     def from_path(path: Path, deps: Optional[list[Path]]):
         stat = os.stat(path)
-        with open(path, "rb") as f:
-            hash = hashlib.sha256(f.read())
+        with open(path, "r") as f:
+            digest = hexdigest(f.read())
         return FileStat(
-            path, deps, datetime.fromtimestamp(stat.st_mtime), hash.hexdigest()
+            path, deps, datetime.fromtimestamp(stat.st_mtime), digest
         )
 
     def __lt__(self, other: FileStat) -> bool:
@@ -136,9 +144,7 @@ class FileDB:
         return self._files.keys()
 
     def check(self, path: Path, content: str) -> bool:
-        return (
-            hashlib.sha256(content.encode()).hexdigest() == self._files[path].hexdigest
-        )
+        return hexdigest(content) == self._files[path].hexdigest
 
     @staticmethod
     def initialize() -> FileDB:

{entangled_cli-2.0.0b4 → entangled_cli-2.0.0b5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "entangled-cli"
-version = "2.0.0-beta-4"
+version = "2.0.0-beta-5"
 description = "Literate Programming toolbox"
 repository = "https://github.com/entangled/entangled.py"
 homepage = "https://entangled.github.io/"
@@ -17,7 +17,7 @@ mawk = "^0.1.4"           # use mawk as line parsing engine
 watchdog = "^3.0.0"       # file watching
 filelock = "^3.12.0"      # file lock for json db
 argh = "^0.28.1"
-rich = { version = "^13.3.5", optional = true }
+rich = "^13.3.5"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.3.1"
@@ -29,9 +29,6 @@ mkdocs-material = "^9.1.13"
 mkdocstrings = {extras = ["python"], version = "^0.21.2"}
 twine = "^4.0.2"
 
-[tool.poetry.extras]
-rich = ["rich"]
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"