entangled-cli 2.1.2__tar.gz → 2.1.4__tar.gz

{entangled_cli-2.1.2 → entangled_cli-2.1.4}/PKG-INFO

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

{entangled_cli-2.1.2 → entangled_cli-2.1.4}/entangled/filedb.py

@@ -20,7 +20,7 @@ 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()
+    content = s.replace("\r", "").rstrip().encode()
     return hashlib.sha256(content).hexdigest()
 
 
@@ -111,9 +111,9 @@ class FileDB:
         logging.debug("Writing FileDB")
         raw = {
             "version": __version__,
-            "files": [stat.to_json() for stat in self._files.values()],
-            "source": list(map(str, self._source)),
-            "target": list(map(str, self._target)),
+            "files": sorted([stat.to_json() for stat in self._files.values()], key=lambda s: s["path"]),
+            "source": list(sorted(map(str, self._source))),
+            "target": list(sorted(map(str, self._target))),
         }
         json.dump(raw, open(FileDB.path(), "w"), indent=2, sort_keys=True)
 

{entangled_cli-2.1.2 → entangled_cli-2.1.4}/entangled/transaction.py

@@ -75,6 +75,13 @@ class Create(Action):
         return f"create `{self.target}`"
 
 
+def assure_final_newline(str) -> str:
+    if str[-1] != "\n":
+        return str + "\n"
+    else:
+        return str
+
+
 @dataclass
 class Write(Action):
     content: str
@@ -96,7 +103,7 @@ class Write(Action):
         tmp_dir = Path() / ".entangled" / "tmp"
         tmp_dir.mkdir(exist_ok=True, parents=True)
         with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=tmp_dir) as f:
-            f.write(self.content)
+            f.write(assure_final_newline(self.content))
             # Flush and sync contents to disk
             f.flush()
             if self.mode is not None:

{entangled_cli-2.1.2 → entangled_cli-2.1.4}/pyproject.toml

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