git-env 0.2.0__tar.gz → 0.3.0__tar.gz

git_env-0.3.0/LICENCE

@@ -0,0 +1,7 @@
+Copyright (c) 2026 Alex Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{git_env-0.2.0 → git_env-0.3.0}/PKG-INFO

@@ -1,9 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: git-env
-Version: 0.2.0
+Version: 0.3.0
 Summary: Sync environment files across linked git worktrees
 Author: Alex Ward
 Author-email: Alex Ward <alxwrd@googlemail.com>
+License-Expression: MIT
+License-File: LICENCE
 Requires-Dist: arguably>=1.2.2
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{git_env-0.2.0 → git_env-0.3.0}/pyproject.toml

@@ -1,11 +1,13 @@
 [project]
 name = "git-env"
-version = "0.2.0"
+version = "0.3.0"
 description = "Sync environment files across linked git worktrees"
 readme = "README.md"
 authors = [
     { name = "Alex Ward", email = "alxwrd@googlemail.com" }
 ]
+license = "MIT"
+license-files = ["LICENCE"]
 requires-python = ">=3.10"
 dependencies = [
     "arguably>=1.2.2",

{git_env-0.2.0 → git_env-0.3.0}/src/git_env/config.py

@@ -6,6 +6,7 @@ local -> worktree) handled natively by `git config --get[-all]`.
 from __future__ import annotations
 
 import subprocess
+from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -89,7 +90,7 @@ def _parse_envsync_file(path: Path) -> dict[str, list[str]]:
     return values
 
 
-def _parse_bool(value: str, *, source: str) -> bool:
+def _parse_bool(value: str, source: str) -> bool:
     lowered = value.strip().lower()
     if lowered in _TRUE_VALUES:
         return True
@@ -98,7 +99,7 @@ def _parse_bool(value: str, *, source: str) -> bool:
     raise ConfigError(f"invalid boolean value for {source}: {value!r}")
 
 
-def _parse_int(value: str, *, source: str) -> int:
+def _parse_int(value: str, source: str) -> int:
     try:
         return int(value.strip())
     except ValueError as exc:
@@ -116,36 +117,20 @@ def _resolve_multi(
     return list(default)
 
 
-def _resolve_bool(
-    config_key: str, envsync: dict[str, list[str]], envsync_key: str, default: bool, cwd: Path
-) -> bool:
+def _resolve(
+    config_key: str,
+    envsync: dict[str, list[str]],
+    envsync_key: str,
+    default: str | bool | int,
+    cwd: Path,
+    parse: Callable[[str, str], str | bool | int] | None = None,
+) -> str | bool | int:
     value = _git_config_get(config_key, cwd)
     if value is not None:
-        return _parse_bool(value, source=config_key)
+        return parse(value, config_key) if parse else value
     if envsync_key in envsync:
-        return _parse_bool(envsync[envsync_key][-1], source=f".envsync:{envsync_key}")
-    return default
-
-
-def _resolve_int(
-    config_key: str, envsync: dict[str, list[str]], envsync_key: str, default: int, cwd: Path
-) -> int:
-    value = _git_config_get(config_key, cwd)
-    if value is not None:
-        return _parse_int(value, source=config_key)
-    if envsync_key in envsync:
-        return _parse_int(envsync[envsync_key][-1], source=f".envsync:{envsync_key}")
-    return default
-
-
-def _resolve_str(
-    config_key: str, envsync: dict[str, list[str]], envsync_key: str, default: str, cwd: Path
-) -> str:
-    value = _git_config_get(config_key, cwd)
-    if value is not None:
-        return value
-    if envsync_key in envsync:
-        return envsync[envsync_key][-1]
+        raw = envsync[envsync_key][-1]
+        return parse(raw, f".envsync:{envsync_key}") if parse else raw
     return default
 
 
@@ -164,17 +149,13 @@ def load_config(primary_root: Path) -> SyncConfig:
     exclude = _resolve_multi(
         "env.sync.exclude", envsync, "exclude", DEFAULT_EXCLUDE, primary_root
     )
-    follow_symlinks = _resolve_bool(
-        "env.sync.followSymlinks",
-        envsync,
-        "followSymlinks",
-        DEFAULT_FOLLOW_SYMLINKS,
-        primary_root,
+    follow_symlinks = _resolve(
+        "env.sync.followSymlinks", envsync, "followSymlinks", DEFAULT_FOLLOW_SYMLINKS, primary_root, _parse_bool
     )
-    max_file_size = _resolve_int(
-        "env.sync.maxFileSize", envsync, "maxFileSize", DEFAULT_MAX_FILE_SIZE, primary_root
+    max_file_size = _resolve(
+        "env.sync.maxFileSize", envsync, "maxFileSize", DEFAULT_MAX_FILE_SIZE, primary_root, _parse_int
     )
-    on_conflict = _resolve_str(
+    on_conflict = _resolve(
         "env.sync.onConflict", envsync, "onConflict", DEFAULT_ON_CONFLICT, primary_root
     )
     if on_conflict not in VALID_ON_CONFLICT:
@@ -182,15 +163,15 @@ def load_config(primary_root: Path) -> SyncConfig:
             f"invalid env.sync.onConflict value: {on_conflict!r}"
             f" (expected one of {sorted(VALID_ON_CONFLICT)})"
         )
-    backup = _resolve_bool(
-        "env.sync.backup", envsync, "backup", DEFAULT_BACKUP, primary_root
+    backup = _resolve(
+        "env.sync.backup", envsync, "backup", DEFAULT_BACKUP, primary_root, _parse_bool
     )
 
     return SyncConfig(
         patterns=tuple(patterns),
         exclude=tuple(exclude),
-        follow_symlinks=follow_symlinks,
-        max_file_size=max_file_size,
-        on_conflict=on_conflict,
-        backup=backup,
+        follow_symlinks=bool(follow_symlinks),
+        max_file_size=int(max_file_size),  # type: ignore[arg-type]
+        on_conflict=str(on_conflict),
+        backup=bool(backup),
     )

{git_env-0.2.0 → git_env-0.3.0}/src/git_env/discovery.py

@@ -32,10 +32,6 @@ class DiscoveredFile:
     absolute_path: Path
     """Absolute path to the file (symlink target if followed)."""
 
-    size: int
-
-    is_symlink: bool
-
 
 @dataclass(frozen=True)
 class DiscoveryWarning:
@@ -195,8 +191,6 @@ def discover_env_files(
                 DiscoveredFile(
                     relative_path=rel_path,
                     absolute_path=abs_path,
-                    size=stat_result.st_size,
-                    is_symlink=is_symlink,
                 )
             )
 

{git_env-0.2.0 → git_env-0.3.0}/src/git_env/repo.py

@@ -9,6 +9,12 @@ from dataclasses import dataclass
 from pathlib import Path
 
 
+@dataclass(frozen=True)
+class ShellResult:
+    ok: bool
+    out: str
+
+
 class RepoError(Exception):
     """Raised when the current location is not a usable linked worktree.
 
@@ -33,20 +39,7 @@ class Repository:
     """Absolute path to the current (linked) worktree's root directory."""
 
 
-def _git(*args: str, cwd: Path | None = None) -> str:
-    try:
-        result = subprocess.run(
-            ["git", *args],
-            cwd=cwd,
-            capture_output=True,
-            text=True,
-        )
-    except FileNotFoundError as exc:
-        raise RepoError("git executable not found on PATH") from exc
-    return result.stdout.strip()
-
-
-def _git_ok(*args: str, cwd: Path | None = None) -> tuple[bool, str]:
+def _git(*args: str, cwd: Path | None = None) -> ShellResult:
     try:
         result = subprocess.run(
             ["git", *args],
@@ -56,7 +49,7 @@ def _git_ok(*args: str, cwd: Path | None = None) -> tuple[bool, str]:
         )
     except FileNotFoundError as exc:
         raise RepoError("git executable not found on PATH") from exc
-    return result.returncode == 0, result.stdout.strip()
+    return ShellResult(ok=result.returncode == 0, out=result.stdout.strip())
 
 
 def detect_repository(cwd: Path | None = None) -> Repository:
@@ -69,21 +62,21 @@ def detect_repository(cwd: Path | None = None) -> Repository:
     """
     cwd = (cwd or Path.cwd()).resolve()
 
-    inside_ok, inside_out = _git_ok("rev-parse", "--is-inside-work-tree", cwd=cwd)
-    bare_ok, bare_out = _git_ok("rev-parse", "--is-bare-repository", cwd=cwd)
+    inside = _git("rev-parse", "--is-inside-work-tree", cwd=cwd)
+    bare = _git("rev-parse", "--is-bare-repository", cwd=cwd)
 
     # A bare repo has no work tree, so --is-inside-work-tree reports "false" (not
     # an error) even when we *are* inside a git dir. Check bare-ness first so that
     # case gets its own message instead of the generic "not inside a worktree" one.
-    if bare_ok and bare_out == "true":
+    if bare.ok and bare.out == "true":
         raise RepoError("bare repositories are not supported")
 
-    if not inside_ok or inside_out != "true":
+    if not inside.ok or inside.out != "true":
         raise RepoError("not inside a git worktree")
 
-    git_dir = Path(_git("rev-parse", "--path-format=absolute", "--git-dir", cwd=cwd))
+    git_dir = Path(_git("rev-parse", "--path-format=absolute", "--git-dir", cwd=cwd).out)
     git_common_dir = Path(
-        _git("rev-parse", "--path-format=absolute", "--git-common-dir", cwd=cwd)
+        _git("rev-parse", "--path-format=absolute", "--git-common-dir", cwd=cwd).out
     )
 
     if git_dir.resolve() == git_common_dir.resolve():
@@ -95,7 +88,7 @@ def detect_repository(cwd: Path | None = None) -> Repository:
 
     primary_root = git_common_dir.resolve().parent
     worktree_root = Path(
-        _git("rev-parse", "--path-format=absolute", "--show-toplevel", cwd=cwd)
+        _git("rev-parse", "--path-format=absolute", "--show-toplevel", cwd=cwd).out
     ).resolve()
 
     _check_pwd_within_worktree(worktree_root)

{git_env-0.2.0 → git_env-0.3.0}/src/git_env/shell_completions.py

@@ -30,15 +30,11 @@ class CompletionTarget:
     enable_snippet: str
 
 
-def _xdg_data_home() -> Path:
-    return Path(os.environ.get("XDG_DATA_HOME") or Path.home() / ".local" / "share")
-
-
 def completion_target(shell: str) -> CompletionTarget:
     """Resolve the standard user-level install path and rc snippet for `shell`."""
     home = Path.home()
     if shell == "bash":
-        path = _xdg_data_home() / "bash-completion" / "completions" / "git-env"
+        path = Path(os.environ.get("XDG_DATA_HOME") or home / ".local" / "share") / "bash-completion" / "completions" / "git-env"
         snippet = f'source "{path}"'
     elif shell == "zsh":
         path = home / ".zsh" / "completions" / "_git-env"