vocker 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

vocker/system.py

@@ -16,8 +16,9 @@ import typing as ty
 
 import atomicwrites
 import attr
+import marshmallow as ma
+import marshmallow.fields as maf
 import platformdirs
-import strictyaml as sy
 import structlog
 
 from . import dedup as de, multihash as mh, image as im
@@ -40,10 +41,6 @@ def validate_local_repo_name(name: str) -> None:
         raise ValueError(f"invalid repo name: {name!r}")
 
 
-def cget(x, *args):
-    return x.value.get(*args)
-
-
 @attr.s(eq=False, hash=False)
 class RemoteRepository:
     uri: str = attr.ib()
@@ -73,7 +70,8 @@ class _Remotes(MutableMapping[str, RemoteRepository]):
         return self.system._config["remote_repositories"]
 
     def __getitem__(self, k):
-        d = self._data[k].data
+        d = self._data[k]
+        d.pop("comment", None)
         return RemoteRepository(**d)
 
     def __setitem__(self, k, v: RemoteRepository | None):
@@ -90,21 +88,25 @@ class _Remotes(MutableMapping[str, RemoteRepository]):
         self[k] = None
 
     def __iter__(self):
-        return iter(x.value for x in self._data.value)
+        return iter(x for x in self._data)
 
     def __len__(self, k, v):
-        return len(self._data.value)
+        return len(self._data)
+
+
+class _SchemaWithComment(ma.Schema):
+    class Meta:
+        unknown = ma.RAISE
+
+    comment = maf.Field(allow_none=True, data_key="#", required=False)
 
 
-config_schema = sy.EmptyDict() | sy.MapCombined(
-    {
-        sy.Optional("remote_repositories"): (
-            sy.EmptyDict() | sy.MapPattern(sy.Str(), sy.Map({"uri": sy.Str()}))
-        ),
-    },
-    sy.Str(),
-    sy.Any(),
-)
+class SchemaRemoteRepository(_SchemaWithComment):
+    uri = maf.String(required=True)
+
+
+class SchemaConfig(_SchemaWithComment):
+    remote_repositories = maf.Dict(maf.String(), maf.Nested(SchemaRemoteRepository, required=False))
 
 
 class ImageType(enum.Enum):
@@ -112,18 +114,16 @@ class ImageType(enum.Enum):
 
 
 @attr.s(eq=False, hash=False)
-class StrictYamlFileWithCaching:
+class JSONFileWithCaching:
     path: Path = attr.ib()
-    schema = attr.ib(default=None)
+    schema: ma.Schema = attr.ib(default=None)
     _mtime = None
     _document = None
 
     @property
     def document(self):
         if (mtime := (p := self.path).stat().st_mtime_ns) != self._mtime:
-            self._document = doc = sy.load(
-                p.read_bytes().decode("utf-8"), schema=self.schema, label=str(self.path)
-            )
+            self._document = doc = self.schema.load(json.loads(p.read_bytes()))
             self._mtime = mtime
         else:
             doc = self._document
@@ -134,7 +134,7 @@ class StrictYamlFileWithCaching:
         with atomicwrites.atomic_write(
             str(self.path), mode="wt", overwrite=True, encoding="utf-8", newline="\n"
         ) as fp:
-            fp.write(new_value.as_yaml())
+            json.dump(self.schema.dump(new_value), fp, indent=2)
         self._document = new_value
 
 
@@ -418,13 +418,13 @@ class System:
 
         self.path_repo_local.mkdir(exist_ok=True, parents=True)
 
-        config_path = self.path_base / "config.yaml"
-        cfg = StrictYamlFileWithCaching(config_path, schema=config_schema)
+        config_path = self.path_base / "vocker.json"
+        cfg = JSONFileWithCaching(config_path, schema=SchemaConfig())
         try:
             cfg.document
         except FileNotFoundError:
             config_path.parent.mkdir(exist_ok=True, parents=True)
-            config_path.write_bytes(b"")
+            config_path.write_bytes(b"{}")
             cfg.document
         self._config_file = cfg
         self._init_config()
@@ -433,10 +433,17 @@ class System:
         c = self._config
         modified = False
 
-        if cget(c, k := "remote_repositories") is None:
+        if c.get(k := "remote_repositories") is None:
             c[k] = {}
             modified = True
 
+        if c.get(k := "comment") is None:
+            c[k] = [
+                "Since JSON doesn't allow comments, you can place them inside the '#' key inside",
+                "most of the dictionaries.",
+            ]
+            modified = True
+
         if modified:
             self._config_write(c)
 

{vocker-0.1.0.dist-info → vocker-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vocker
-Version: 0.1.0
+Version: 0.2.0
 Summary: Docker-like manager for virtualenvs
 Author-email: Eduard Christian Dumitrescu <eduard.c.dumitrescu@gmail.com>
 License: General Public License v3
@@ -18,7 +18,6 @@ Requires-Dist: platformdirs
 Requires-Dist: sansio_tools>=1.0.0
 Requires-Dist: sqlalchemy_boltons>=2.4.0
 Requires-Dist: SQLAlchemy
-Requires-Dist: strictyaml
 Requires-Dist: structlog
 Requires-Dist: cbor2
 Provides-Extra: zstandard

{vocker-0.1.0.dist-info → vocker-0.2.0.dist-info}/RECORD

@@ -7,13 +7,13 @@ vocker/image.py,sha256=lewNLLiXnd_N1CSs4gnYFEj-d5RkIBiPQiN8hNL2fIs,28181
 vocker/integer_to_path.py,sha256=5ghlupk9VLzXLtcfwnVEVFxtBxyT8A_ooV8-2EAnoFw,1433
 vocker/multihash.py,sha256=-VhksUBam6N01fICtTg_TJrJcEIHJrYVKzkD1B_bdfI,8760
 vocker/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vocker/system.py,sha256=kw0-0vxE5jjHjnE1kzhDZB_YdzA5kBDLeU0TdudnJgg,24416
+vocker/system.py,sha256=S7ZhqaUJilPl4tiO2XHxf0tR3Uw_HJXfvvx5j-QV7Ug,24766
 vocker/util.py,sha256=bQcMzscMPaiBC4PGV9_clTOLDTJHuqa6l6o2thQJeU8,3223
 vocker/util_models.py,sha256=2bN5eousF92oH7BAv1ZFoyh6iqNAnJ_niiclp2_RaHI,395
 vocker/repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vocker/repo/compression.py,sha256=l2g1e6SaugpqORbg3zwRM1zwlEXedbYOihm5nDpCejU,6442
 vocker/repo/io.py,sha256=7oUDd2vag300hRJe72VcfGVAtWDIxtMd-5pY6I_z_Fs,25250
-vocker-0.1.0.dist-info/METADATA,sha256=P9TNrszsFyA2Q3HItjFoMeKdeCALldVmbu4VCxwv_KE,3879
-vocker-0.1.0.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-vocker-0.1.0.dist-info/top_level.txt,sha256=5x7g7T2L44UKODxVZ4vmWjxDnnruxaZ5yloYi0wLoUg,7
-vocker-0.1.0.dist-info/RECORD,,
+vocker-0.2.0.dist-info/METADATA,sha256=l_sFYB7OlQVrvlACM7Y3jQ95BlLtU9iTZSyj9mHYFzA,3853
+vocker-0.2.0.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+vocker-0.2.0.dist-info/top_level.txt,sha256=5x7g7T2L44UKODxVZ4vmWjxDnnruxaZ5yloYi0wLoUg,7
+vocker-0.2.0.dist-info/RECORD,,