zora-cli 0.2__tar.gz → 0.2.1__tar.gz

{zora_cli-0.2 → zora_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zora-cli
-Version: 0.2
+Version: 0.2.1
 Summary: Cryptographically secure generator of random keys with tons of options and customizations.
 Author: zscopuv
 License: ZORA SOURCE-AVAILABLE LICENSE
@@ -229,7 +229,7 @@ Dynamic: license-file
 
 # ![Logo](https://i.ibb.co/21JfnbBZ/zora.jpg)
 
-> **Early release (`v0.2`)**
+> **Early release (`v0.2.1`)**
 
 Zora is a command-line tool for generating random keys using Python's
 cryptographically secure `secrets` module by default.
@@ -349,7 +349,7 @@ zora --version
 Example:
 
 ```text
-zora 0.2.0
+zora 0.1.2
 ```
 
 ---
@@ -394,6 +394,8 @@ to display all available presets.
 
 ## Basic
 
+> `@@` → literal `@`
+
 | Preset     | Characters              |
 | ---------- | ----------------------- |
 | `@digits`  | `0-9`                   |
@@ -1260,7 +1262,7 @@ MAJOR.MINOR.PATCH
 For example:
 
 ```text
-v0.2.0
+v0.1.3
 ```
 
 The `0.x` versions indicate that the CLI and features may still change

{zora_cli-0.2 → zora_cli-0.2.1}/README.md

@@ -1,6 +1,6 @@
 # ![Logo](https://i.ibb.co/21JfnbBZ/zora.jpg)
 
-> **Early release (`v0.2`)**
+> **Early release (`v0.2.1`)**
 
 Zora is a command-line tool for generating random keys using Python's
 cryptographically secure `secrets` module by default.
@@ -120,7 +120,7 @@ zora --version
 Example:
 
 ```text
-zora 0.2.0
+zora 0.1.2
 ```
 
 ---
@@ -165,6 +165,8 @@ to display all available presets.
 
 ## Basic
 
+> `@@` → literal `@`
+
 | Preset     | Characters              |
 | ---------- | ----------------------- |
 | `@digits`  | `0-9`                   |
@@ -1031,7 +1033,7 @@ MAJOR.MINOR.PATCH
 For example:
 
 ```text
-v0.2.0
+v0.1.3
 ```
 
 The `0.x` versions indicate that the CLI and features may still change

{zora_cli-0.2 → zora_cli-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "zora-cli"
-version = "0.2"
+version = "0.2.1"
 description = "Cryptographically secure generator of random keys with tons of options and customizations."
 readme = "README.md"
 requires-python = ">=3.9"

{zora_cli-0.2 → zora_cli-0.2.1}/tests/test_charset.py

@@ -86,6 +86,27 @@ def test_build_mixed_preset_and_literals():
 
     assert zora.charset == "0123456789XYZ"
 
+def test_build_literal_at_character():
+    zora = make_zora("@@")
+
+    zora.build_charset()
+
+    assert zora.charset == "@"
+
+
+def test_build_escaped_at_adjacent_to_preset():
+    zora = make_zora("@@@digits")
+
+    zora.build_charset()
+
+    assert zora.charset == "@0123456789"
+
+
+def test_build_invalid_unescaped_preset_name():
+    zora = make_zora("@doesnotexist")
+
+    with pytest.raises(SystemExit):
+        zora.build_charset()
 
 def test_build_preset_and_literals_with_duplicates():
     zora = make_zora("@digits123")
@@ -151,7 +172,7 @@ def test_build_multiple_same_presets():
     assert zora.charset == "0123456789"
 
 
-def test_unknown_preset_raises_system_exit():
+def test_invalid_unescaped_preset_name():
     zora = make_zora("@doesnotexist")
 
     with pytest.raises(SystemExit):

{zora_cli-0.2 → zora_cli-0.2.1}/tests/test_timer.py

@@ -97,17 +97,6 @@ def test_show_timer_displays_hours(monkeypatch, capsys):
 
     assert "1h 1m 5s elapsed" in output
 
-def test_show_timer_quiet_suppresses_output(capsys):
-    zora = make_zora(quiet=True)
-
-    zora.start_timer()
-    zora.show_timer()
-
-    output = capsys.readouterr().out
-
-    assert output == ""
-    assert not hasattr(zora, "elapsed")
-
 
 def test_show_timer_without_start_does_not_crash(capsys):
     zora = make_zora()

zora_cli-0.2.1/zora/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.1"

{zora_cli-0.2 → zora_cli-0.2.1}/zora/cli.py

@@ -103,21 +103,21 @@ class Zora:
         charset = ""
 
         while value:
-            if value.startswith("@"):
+            if value.startswith("@@"):
+                charset += "@"
+                value = value[2:]
+            elif value.startswith("@"):
                 value = value[1:]
-
                 matches = [
                     name for name in CHARSETS
                     if value.startswith(name)
                 ]
-
                 if not matches:
                     self.parser.error(f"unknown charset preset near: @{value}")
 
                 name = max(matches, key=len)
                 charset += CHARSETS[name]
                 value = value[len(name):]
-
             else:
                 charset += value[0]
                 value = value[1:]
@@ -301,8 +301,6 @@ class Zora:
         """
         Stops the timer and prints elapsed time
         """
-        if self.args.quiet:
-            return
 
         if not hasattr(self, "time_start"):
             print("Timer has not been started properly.")

{zora_cli-0.2 → zora_cli-0.2.1}/zora_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zora-cli
-Version: 0.2
+Version: 0.2.1
 Summary: Cryptographically secure generator of random keys with tons of options and customizations.
 Author: zscopuv
 License: ZORA SOURCE-AVAILABLE LICENSE
@@ -229,7 +229,7 @@ Dynamic: license-file
 
 # ![Logo](https://i.ibb.co/21JfnbBZ/zora.jpg)
 
-> **Early release (`v0.2`)**
+> **Early release (`v0.2.1`)**
 
 Zora is a command-line tool for generating random keys using Python's
 cryptographically secure `secrets` module by default.
@@ -349,7 +349,7 @@ zora --version
 Example:
 
 ```text
-zora 0.2.0
+zora 0.1.2
 ```
 
 ---
@@ -394,6 +394,8 @@ to display all available presets.
 
 ## Basic
 
+> `@@` → literal `@`
+
 | Preset     | Characters              |
 | ---------- | ----------------------- |
 | `@digits`  | `0-9`                   |
@@ -1260,7 +1262,7 @@ MAJOR.MINOR.PATCH
 For example:
 
 ```text
-v0.2.0
+v0.1.3
 ```
 
 The `0.x` versions indicate that the CLI and features may still change

zora_cli-0.2/zora/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2"