plsqlwks 0.1.0__tar.gz → 0.1.1__tar.gz

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plsqlwks
-Version: 0.1.0
+Version: 0.1.1
 Summary: An ncurses SQL and PL/SQL workspace for Oracle databases.
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -8,7 +8,6 @@ Classifier: Topic :: Database
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: oracledb>=2.0
-Requires-Dist: platformdirs>=4.0
 Provides-Extra: dev
 Requires-Dist: build>=1.2; extra == "dev"
 Requires-Dist: mypy>=1.10; extra == "dev"

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/plsqlwks/__init__.py

@@ -1,3 +1,3 @@
 """ncurses SQL and PL/SQL workspace."""
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/plsqlwks/config/__init__.py

@@ -9,8 +9,6 @@ import stat
 import tempfile
 from typing import Sequence
 
-from platformdirs import user_config_path, user_data_path
-
 from .loader import DEFAULT_DSN, load_config
 from .models import AppConfig, SessionTab
 from .paths import (
@@ -28,6 +26,8 @@ from .paths import (
     resolve_password_file,
     resolve_workspace,
     source_workspace_dir,
+    user_config_path,
+    user_data_path,
 )
 from .session import (
     SESSION_TAB_PATH_PATTERN,

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/plsqlwks/config/paths.py

@@ -3,8 +3,7 @@ from __future__ import annotations
 import os
 from pathlib import Path
 import stat
-
-from platformdirs import user_config_path, user_data_path
+import sys
 
 
 APP_NAME = "plsqlwks"
@@ -47,6 +46,107 @@ def is_legacy_source_workspace(path: Path) -> bool:
     return (path.parent / SOURCE_CHECKOUT_MARKER).is_file() and is_legacy_workspace(path)
 
 
+def user_config_path(
+    appname: str | None = None,
+    appauthor: str | bool | None = None,
+    version: str | None = None,
+    roaming: bool = False,
+    ensure_exists: bool = False,
+) -> Path:
+    return _user_path(
+        appname,
+        appauthor=appauthor,
+        version=version,
+        roaming=roaming,
+        ensure_exists=ensure_exists,
+        kind="config",
+    )
+
+
+def user_data_path(
+    appname: str | None = None,
+    appauthor: str | bool | None = None,
+    version: str | None = None,
+    roaming: bool = False,
+    ensure_exists: bool = False,
+) -> Path:
+    return _user_path(
+        appname,
+        appauthor=appauthor,
+        version=version,
+        roaming=roaming,
+        ensure_exists=ensure_exists,
+        kind="data",
+    )
+
+
+def _user_path(
+    appname: str | None,
+    *,
+    appauthor: str | bool | None,
+    version: str | None,
+    roaming: bool,
+    ensure_exists: bool,
+    kind: str,
+) -> Path:
+    path = _user_path_root(kind, roaming=roaming)
+    if appname:
+        if sys.platform == "win32" and appauthor is not False:
+            author = appauthor if isinstance(appauthor, str) and appauthor else appname
+            path /= author
+        path /= appname
+        if version:
+            path /= version
+    if ensure_exists:
+        path.mkdir(parents=True, exist_ok=True)
+    return path
+
+
+def _user_path_root(kind: str, *, roaming: bool) -> Path:
+    if sys.platform == "win32":
+        known_folder = _windows_known_folder(roaming=roaming)
+        if known_folder is not None:
+            return known_folder
+        environment_name = "APPDATA" if roaming else "LOCALAPPDATA"
+        configured = _environment_path(environment_name)
+        if configured is not None:
+            return configured
+        folder = "Roaming" if roaming else "Local"
+        return _home_path() / "AppData" / folder
+    if sys.platform == "darwin":
+        return _home_path() / "Library" / "Application Support"
+    environment_name = "XDG_CONFIG_HOME" if kind == "config" else "XDG_DATA_HOME"
+    configured = _environment_path(environment_name)
+    if configured is not None:
+        return configured
+    suffix = (".config",) if kind == "config" else (".local", "share")
+    return _home_path().joinpath(*suffix)
+
+
+def _environment_path(name: str) -> Path | None:
+    value = nonblank_environment_value(name)
+    return Path(value) if value is not None else None
+
+
+def _windows_known_folder(*, roaming: bool) -> Path | None:
+    if os.name != "nt":
+        return None
+    try:
+        import ctypes
+
+        buffer = ctypes.create_unicode_buffer(260)
+        shell32 = getattr(getattr(ctypes, "windll"), "shell32")
+        csidl = 26 if roaming else 28
+        result = shell32.SHGetFolderPathW(None, csidl, None, 0, buffer)
+    except (AttributeError, OSError):
+        return None
+    return Path(buffer.value) if result == 0 and buffer.value else None
+
+
+def _home_path() -> Path:
+    return Path.home()
+
+
 def platform_workspace_dir() -> Path:
     return user_data_path(APP_NAME, appauthor=False)
 

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/plsqlwks.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plsqlwks
-Version: 0.1.0
+Version: 0.1.1
 Summary: An ncurses SQL and PL/SQL workspace for Oracle databases.
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -8,7 +8,6 @@ Classifier: Topic :: Database
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: oracledb>=2.0
-Requires-Dist: platformdirs>=4.0
 Provides-Extra: dev
 Requires-Dist: build>=1.2; extra == "dev"
 Requires-Dist: mypy>=1.10; extra == "dev"

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/plsqlwks.egg-info/requires.txt

@@ -1,5 +1,4 @@
 oracledb>=2.0
-platformdirs>=4.0
 
 [dev]
 build>=1.2

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/pyproject.toml

@@ -10,7 +10,6 @@ readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "oracledb>=2.0",
-    "platformdirs>=4.0",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/tests/test_config_workspace.py

@@ -51,6 +51,120 @@ def test_config_facade_reexports_owning_module_symbols():
     assert config_module.save_session_tabs is session.save_session_tabs
 
 
+def test_user_paths_use_xdg_locations_on_linux(monkeypatch, tmp_path):
+    config_home = tmp_path / "xdg-config"
+    data_home = tmp_path / "xdg-data"
+    monkeypatch.setattr(config_paths.sys, "platform", "linux")
+    monkeypatch.setenv("XDG_CONFIG_HOME", str(config_home))
+    monkeypatch.setenv("XDG_DATA_HOME", str(data_home))
+
+    assert config_paths.user_config_path("worksheet", appauthor=False) == config_home / "worksheet"
+    assert config_paths.user_data_path("worksheet", appauthor=False) == data_home / "worksheet"
+    assert config_paths.platform_config_dir() == config_home / "plsqlwks"
+    assert config_paths.platform_workspace_dir() == data_home / "plsqlwks"
+
+
+@pytest.mark.parametrize("blank_value", ["", " ", "\t  "])
+def test_blank_xdg_locations_fall_back_to_linux_home(monkeypatch, tmp_path, blank_value):
+    home = tmp_path / "home"
+    monkeypatch.setattr(config_paths.sys, "platform", "linux")
+    monkeypatch.setattr(config_paths, "_home_path", lambda: home)
+    monkeypatch.setenv("XDG_CONFIG_HOME", blank_value)
+    monkeypatch.setenv("XDG_DATA_HOME", blank_value)
+
+    assert config_paths.user_config_path("worksheet") == home / ".config" / "worksheet"
+    assert config_paths.user_data_path("worksheet") == home / ".local" / "share" / "worksheet"
+
+
+def test_user_paths_use_application_support_on_macos(monkeypatch, tmp_path):
+    home = tmp_path / "home"
+    monkeypatch.setattr(config_paths.sys, "platform", "darwin")
+    monkeypatch.setattr(config_paths, "_home_path", lambda: home)
+    monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "ignored-config"))
+    monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "ignored-data"))
+
+    expected = home / "Library" / "Application Support" / "worksheet"
+    assert config_paths.user_config_path("worksheet") == expected
+    assert config_paths.user_data_path("worksheet") == expected
+
+
+def test_user_paths_use_windows_local_roaming_author_and_version(monkeypatch, tmp_path):
+    local = tmp_path / "Local"
+    roaming = tmp_path / "Roaming"
+    monkeypatch.setattr(config_paths.sys, "platform", "win32")
+    monkeypatch.setenv("LOCALAPPDATA", str(local))
+    monkeypatch.setenv("APPDATA", str(roaming))
+
+    data_path = config_paths.user_data_path(
+        "worksheet",
+        appauthor="Acme",
+        version="2",
+        ensure_exists=True,
+    )
+
+    assert data_path == local / "Acme" / "worksheet" / "2"
+    assert data_path.is_dir()
+    assert config_paths.user_data_path("worksheet") == local / "worksheet" / "worksheet"
+    assert config_paths.user_config_path("worksheet", appauthor=False) == local / "worksheet"
+    assert config_paths.user_config_path("worksheet", appauthor=False, roaming=True) == roaming / "worksheet"
+    assert config_paths.platform_config_dir() == local / "plsqlwks"
+    assert config_paths.platform_workspace_dir() == local / "plsqlwks"
+
+
+def test_blank_windows_locations_fall_back_to_platform_home(monkeypatch, tmp_path):
+    home = tmp_path / "home"
+    roaming = tmp_path / "Roaming"
+    monkeypatch.setattr(config_paths.sys, "platform", "win32")
+    monkeypatch.setattr(config_paths, "_home_path", lambda: home)
+    monkeypatch.setenv("LOCALAPPDATA", "  ")
+    monkeypatch.setenv("APPDATA", str(roaming))
+
+    assert config_paths.user_data_path("worksheet", appauthor=False) == home / "AppData" / "Local" / "worksheet"
+    assert config_paths.user_data_path("worksheet", appauthor=False, roaming=True) == roaming / "worksheet"
+
+    monkeypatch.setenv("APPDATA", "\t")
+
+    assert config_paths.user_data_path("worksheet", appauthor=False) == home / "AppData" / "Local" / "worksheet"
+    assert config_paths.user_config_path("worksheet", appauthor=False, roaming=True) == (
+        home / "AppData" / "Roaming" / "worksheet"
+    )
+
+
+def test_windows_locations_use_known_folder_fallback(monkeypatch, tmp_path):
+    local = tmp_path / "KnownLocal"
+    roaming = tmp_path / "KnownRoaming"
+    monkeypatch.setattr(config_paths.sys, "platform", "win32")
+    monkeypatch.setattr(
+        config_paths,
+        "_windows_known_folder",
+        lambda *, roaming: (tmp_path / "KnownRoaming") if roaming else (tmp_path / "KnownLocal"),
+    )
+    monkeypatch.setenv("LOCALAPPDATA", "")
+    monkeypatch.setenv("APPDATA", "")
+
+    assert config_paths.user_data_path("worksheet", appauthor=False) == local / "worksheet"
+    assert config_paths.user_data_path("worksheet", appauthor=False, roaming=True) == roaming / "worksheet"
+
+
+def test_user_path_environment_values_remain_literal_and_overrides_expand_home(monkeypatch, tmp_path):
+    home = tmp_path / "home"
+    monkeypatch.setattr(config_paths.sys, "platform", "linux")
+    monkeypatch.setenv("HOME", str(home))
+    monkeypatch.setenv("XDG_CONFIG_HOME", "~/xdg-config")
+    monkeypatch.setenv("XDG_DATA_HOME", "~/xdg-data")
+    monkeypatch.setenv("ORACLE_PASSWORD_FILE", "~/secrets/orapass")
+
+    workspace, config_file, warnings = config_paths.resolve_workspace("~/oracle-work")
+    password_file, _ = config_paths.resolve_password_file(home / "unused-config")
+
+    assert config_paths.user_config_path("worksheet") == Path("~/xdg-config/worksheet")
+    assert config_paths.user_data_path("worksheet") == Path("~/xdg-data/worksheet")
+    assert workspace == home / "oracle-work"
+    assert config_file == home / "oracle-work" / "config.ini"
+    assert warnings == ()
+    assert password_file == home / "secrets" / "orapass"
+
+
 def test_load_config_uses_environment_overrides(monkeypatch, tmp_path):
     password_file = tmp_path / "secret.txt"
     workspace = tmp_path / "workspace"

{plsqlwks-0.1.0 → plsqlwks-0.1.1}/tests/test_packaging.py

@@ -17,11 +17,16 @@ ROOT = Path(__file__).resolve().parents[1]
 
 def test_pyproject_declares_runtime_package_and_console_script():
     data = tomllib.loads((ROOT / "pyproject.toml").read_text(encoding="utf-8"))
+    requirements = {
+        line.strip().lower()
+        for line in (ROOT / "requirements.txt").read_text(encoding="utf-8").splitlines()
+        if line.strip() and not line.lstrip().startswith("#")
+    }
 
     assert data["project"]["name"] == "plsqlwks"
     assert data["project"]["scripts"]["plsqlwks"] == "plsqlwks.ui:main"
-    assert "oracledb>=2.0" in data["project"]["dependencies"]
-    assert "platformdirs>=4.0" in data["project"]["dependencies"]
+    assert data["project"]["dependencies"] == ["oracledb>=2.0"]
+    assert requirements == {"oracledb>=2.0"}
     assert {"build>=1.2", "mypy>=1.10", "pytest>=8.0", "ruff>=0.8", "wheel>=0.43"} <= set(
         data["project"]["optional-dependencies"]["dev"]
     )
@@ -53,6 +58,8 @@ def test_built_wheel_contains_runtime_package_only(tmp_path):
 
     with zipfile.ZipFile(wheel) as archive:
         names = archive.namelist()
+        metadata_name = next(name for name in names if name.endswith(".dist-info/METADATA"))
+        metadata = archive.read(metadata_name).decode("utf-8")
 
     expected_ui_modules = {
         "__init__.py",
@@ -104,6 +111,8 @@ def test_built_wheel_contains_runtime_package_only(tmp_path):
     assert any(name == "plsqlwks/db/__init__.py" for name in names)
     assert "plsqlwks/db.py" not in names
     assert any(name.endswith(".dist-info/METADATA") for name in names)
+    assert "Requires-Dist: oracledb>=2.0" in metadata
+    assert "requires-dist: platformdirs" not in metadata.lower()
     assert not any(name.startswith("tests/") for name in names)
     assert not any(name.startswith("tools/") for name in names)
     assert not any(name.startswith("workspace/") for name in names)