Merge pull request #182 from figsoda/escape

fix escaping for non-toplevel attributes
Mic92 · Aug 6, 2023 · f56f553 · f56f553
2 parents e10a733 + fd07282
commit f56f553
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/nix_update/options.py b/nix_update/options.py
@@ -29,4 +29,4 @@ class Options:
     extra_flags: List[str] = field(default_factory=list)
 
     def __post_init__(self) -> None:
-        self.escaped_attribute = json.dumps(self.attribute)
+        self.escaped_attribute = ".".join(map(json.dumps, self.attribute.split(".")))
diff --git a/tests/test_cargo_lock_expand.py b/tests/test_cargo_lock_expand.py
@@ -8,7 +8,7 @@
 def test_main(helpers: conftest.Helpers) -> None:
     with helpers.testpkgs(init_git=True) as path:
         main(
-            ["--file", str(path), "--commit", "cargoLockExpand", "--version", "v0.3.8"]
+            ["--file", str(path), "--commit", "cargoLock.expand", "--version", "v0.3.8"]
         )
         subprocess.run(
             [
@@ -19,7 +19,7 @@ def test_main(helpers: conftest.Helpers) -> None:
                 "nix-command",
                 "-f",
                 path,
-                "cargoLockExpand.cargoDeps",
+                "cargoLock.expand.cargoDeps",
             ],
             check=True,
             text=True,
@@ -32,6 +32,7 @@ def test_main(helpers: conftest.Helpers) -> None:
             check=True,
         ).stdout.strip()
         print(diff)
+        assert "cargoLock.expand: 0.3.7 -> 0.3.8"
         assert "Cargo.lock" in diff
         assert '+source = "git+' in diff
         assert "outputHashes" in diff

diff --git a/tests/test_cargo_lock_update.py b/tests/test_cargo_lock_update.py
@@ -12,7 +12,7 @@ def test_main(helpers: conftest.Helpers) -> None:
                 "--file",
                 str(path),
                 "--commit",
-                "cargoLockUpdate",
+                "cargoLock.update",
                 "--version",
                 "v0.0.255",
             ]
@@ -26,7 +26,7 @@ def test_main(helpers: conftest.Helpers) -> None:
                 "nix-command",
                 "-f",
                 path,
-                "cargoLockUpdate.cargoDeps",
+                "cargoLock.update.cargoDeps",
             ],
             check=True,
             text=True,

diff --git a/tests/testpkgs/default.nix b/tests/testpkgs/default.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { } }:
 {
-  cargoLockExpand = pkgs.callPackage ./cargo-lock-expand { };
-  cargoLockUpdate = pkgs.callPackage ./cargo-lock-update { };
+  cargoLock.expand = pkgs.callPackage ./cargo-lock-expand { };
+  cargoLock.update = pkgs.callPackage ./cargo-lock-update { };
   crate = pkgs.callPackage ./crate.nix { };
   gitea = pkgs.callPackage ./gitea.nix { };
   github = pkgs.callPackage ./github.nix { };