dotlocalslashbin 0.0.11__tar.gz → 0.0.14__tar.gz

{dotlocalslashbin-0.0.11 → dotlocalslashbin-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: dotlocalslashbin
-Version: 0.0.11
+Version: 0.0.14
 Summary: Download and extract files to `~/.local/bin/`.
 Author-email: Keith Maxwell <keith.maxwell@gmail.com>
 Description-Content-Type: text/markdown
@@ -16,6 +16,7 @@ Requires-Dist: reuse ; extra == "test"
 Requires-Dist: ruff ; extra == "test"
 Requires-Dist: twine ; extra == "test"
 Requires-Dist: usort ; extra == "test"
+Requires-Dist: yamllint ; extra == "test"
 Project-URL: Home, https://github.com/maxwell-k/dotlocalslashbin/
 Provides-Extra: test
 
@@ -42,6 +43,7 @@ Optionally can:
 - invoke the target with an argument, for example `--version`
 - strip a prefix while extracting
 - ignore certain files while extracting
+- clear the cache beforehand
 
 \* if the URL is an absolute path on the local file system; it is not downloaded
 to the cache.

{dotlocalslashbin-0.0.11 → dotlocalslashbin-0.0.14}/README.md

@@ -21,6 +21,7 @@ Optionally can:
 - invoke the target with an argument, for example `--version`
 - strip a prefix while extracting
 - ignore certain files while extracting
+- clear the cache beforehand
 
 \* if the URL is an absolute path on the local file system; it is not downloaded
 to the cache.

{dotlocalslashbin-0.0.11 → dotlocalslashbin-0.0.14}/pyproject.toml

@@ -31,6 +31,7 @@ test = [
   "ruff",
   "twine",
   "usort",
+  "yamllint",
 ]
 
 [tool.ruff]

{dotlocalslashbin-0.0.11 → dotlocalslashbin-0.0.14}/src/dotlocalslashbin.py

@@ -8,7 +8,12 @@
 # ///
 """Download and extract files to `~/.local/bin/`."""
 import tarfile
-from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser, Namespace
+from argparse import (
+    ArgumentDefaultsHelpFormatter,
+    ArgumentParser,
+    BooleanOptionalAction,
+    Namespace,
+)
 from dataclasses import dataclass
 from enum import Enum
 from hashlib import file_digest
@@ -23,8 +28,9 @@ from urllib.request import urlopen
 from zipfile import ZipFile
 
 
-__version__ = "0.0.11"
+__version__ = "0.0.14"
 
+_HOME = str(Path("~").expanduser())
 _OUTPUT = Path("~/.local/bin/")
 _SHA512_LENGTH = 128
 
@@ -32,7 +38,7 @@ _SHA512_LENGTH = 128
 class _CustomNamespace(Namespace):
     output: Path
     input: Path
-    downloaded: Path
+    cache: Path
 
 
 Action = Enum("Action", ["command", "copy", "symlink", "untar", "unzip"])
@@ -48,7 +54,7 @@ class Item:
     action: Action
     downloaded: Path
     expected: str | None
-    version: str | None
+    version: str
     prefix: str
     command: str | None
     ignore: set
@@ -58,6 +64,10 @@ def main() -> int:
     """Parse command line arguments and download each file."""
     args = _parse_args()
 
+    if args.clear:
+        for path in args.cache.expanduser().iterdir():
+            path.unlink()
+
     with args.input.expanduser().open("rb") as file:
         data = load(file)
 
@@ -69,7 +79,7 @@ def main() -> int:
         item.target = Path(record.get("target", default)).expanduser()
         item.ignore = record.get("ignore", set())
         item.expected = record.get("expected", None)
-        item.version = record.get("version", None)
+        item.version = record.get("version", "")
         item.prefix = record.get("prefix", "")
         item.command = record.get("command", None)
 
@@ -79,7 +89,7 @@ def main() -> int:
             item.action = _guess_action(item)
 
         if item.url.startswith("https://"):
-            item.downloaded = args.downloaded.expanduser() / item.url.rsplit("/", 1)[1]
+            item.downloaded = args.cache.expanduser() / item.url.rsplit("/", 1)[1]
         else:
             item.downloaded = Path(item.url)
         try:
@@ -88,8 +98,9 @@ def main() -> int:
             print(f"Error {e.code} downloading {e.url}")
             return 1
 
-        arg0 = item.name if args.output == _OUTPUT else str(item.target.absolute())
-        print(" ".join(("#" if item.version else "$", arg0, item.version or "")))
+        arg0 = str(item.target.absolute())
+        prompt = "#" if item.version else "$"
+        print(" ".join((prompt, arg0.replace(_HOME, "~"), item.version)))
         if item.version:
             run([arg0, item.version], check=True)
         print()
@@ -140,9 +151,16 @@ def _parse_args() -> _CustomNamespace:
     parser.add_argument("--input", default="bin.toml", help=help_, type=Path)
     help_ = "Target directory"
     parser.add_argument("--output", default=_OUTPUT, help=help_, type=Path)
-    help_ = "Output directory"
+    help_ = "Cache directory"
     default = "~/.cache/dotlocalslashbin/"
-    parser.add_argument("--downloaded", default=default, help=help_, type=Path)
+    parser.add_argument("--cache", default=default, help=help_, type=Path)
+    help_ = "Clear the cache directory first"
+    parser.add_argument(
+        "--clear",
+        default=False,
+        action=BooleanOptionalAction,
+        help=help_,
+    )
     return parser.parse_args(namespace=_CustomNamespace())