vappman 2.2.0__tar.gz → 2.2.2__tar.gz

{vappman-2.2.0 → vappman-2.2.2}/PKG-INFO

@@ -1,25 +1,33 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: vappman
-Version: 2.2.0
+Version: 2.2.2
 Summary: A visual wrapper for appman
 Keywords: app,installer,manager,appimages
 Author-email: Joe Defen <joedef@google.com>
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-Expression: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
 License-File: LICENSE
-Requires-Dist: console-window == 2.1.3
+Requires-Dist: console-window == 2.2.2
+Requires-Dist: pytest>=7 ; extra == "dev"
+Requires-Dist: pytest-cov>=5 ; extra == "dev"
+Requires-Dist: ruff>=0.6 ; extra == "dev"
+Requires-Dist: build>=1.2 ; extra == "dev"
+Requires-Dist: twine>=7 ; extra == "dev"
+Requires-Dist: packaging>=26 ; extra == "dev"
 Requires-Dist: pytest>=7.0 ; extra == "test"
 Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
 Project-URL: Homepage, https://github.com/joedefen/vappman
+Provides-Extra: dev
 Provides-Extra: test
+Import-Name: vappman
 
 ## vappman
 `vappman` presents a "visual" (or TUI) interface to `appman/am`.
@@ -117,6 +125,15 @@ Run `vappman` from the command line. You will see a screen similar to this:
 * `﹫` - Database indicator (in multi-database view)
 * `>` - Currently selected app
 
+Colour reinforces these symbols, never replaces them: installed rows are
+tinted with the `HOTSWAP` role and the inline install/remove prompts with
+`DANGER`. On a terminal without colour the roles fall back to bold/reverse
+attributes, so every state remains readable.
+
+Press `T` to open the theme picker; `t` there cycles through the available
+themes and `mono` (no colour at all). The choice is remembered for the next
+run. `--theme NAME` and `--no-color` override it for a single run.
+
 #### Global Keys (Top Line)
 
 * `m` - Switch mode if using `am`, toggling between SYSTEM and USER mode
@@ -132,6 +149,7 @@ Run `vappman` from the command line. You will see a screen similar to this:
 * `_` - Toggle fancy header mode (Underline/Reverse/Off)
 * `*` - Toggle demo mode
 * `#` - Change number of backups to keep (2, 1, or -1 for infinite)
+* `T` - Open the colour-theme picker (`t` cycles there; `mono` disables colour)
 
 #### Navigation Keys
 

{vappman-2.2.0 → vappman-2.2.2}/README.md

@@ -94,6 +94,15 @@ Run `vappman` from the command line. You will see a screen similar to this:
 * `﹫` - Database indicator (in multi-database view)
 * `>` - Currently selected app
 
+Colour reinforces these symbols, never replaces them: installed rows are
+tinted with the `HOTSWAP` role and the inline install/remove prompts with
+`DANGER`. On a terminal without colour the roles fall back to bold/reverse
+attributes, so every state remains readable.
+
+Press `T` to open the theme picker; `t` there cycles through the available
+themes and `mono` (no colour at all). The choice is remembered for the next
+run. `--theme NAME` and `--no-color` override it for a single run.
+
 #### Global Keys (Top Line)
 
 * `m` - Switch mode if using `am`, toggling between SYSTEM and USER mode
@@ -109,6 +118,7 @@ Run `vappman` from the command line. You will see a screen similar to this:
 * `_` - Toggle fancy header mode (Underline/Reverse/Off)
 * `*` - Toggle demo mode
 * `#` - Change number of backups to keep (2, 1, or -1 for infinite)
+* `T` - Open the colour-theme picker (`t` cycles there; `mono` disables colour)
 
 #### Navigation Keys
 

vappman-2.2.2/pyproject.toml

@@ -0,0 +1,88 @@
+[build-system]
+# 3.12 is the first flit_core that understands the PEP 639 license expression
+# and `license-files` declared below; older backends reject them.
+requires = ["flit_core>=3.12"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "vappman"
+# `vappman/__init__.py:__version__` is the single source of truth.  Flit reads
+# it at build time, so `bless` can rewrite a throwaway X.Y.Z.99.N in a copy
+# without touching the tree.
+dynamic = ["version"]
+description = "A visual wrapper for appman"
+authors = [
+    { name = "Joe Defen", email = "joedef@google.com" }
+]
+readme = "README.md"
+# SPDX expression (PEP 639) rather than the deprecated table form: this is what
+# puts `License-Expression: MIT` in the core metadata, which is also why the
+# legacy `License :: ...` classifier below must not come back.
+license = "MIT"
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+keywords = ["app", "installer", "manager", "appimages"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Operating System :: POSIX :: Linux"
+]
+dependencies = [
+    'console-window == 2.2.2',
+]
+
+[project.urls]
+"Homepage" = "https://github.com/joedefen/vappman"
+"Bug Tracker" = "https://github.com/joedefen/vappman/issues"
+
+[project.scripts]
+vappman = "vappman.main:main"
+
+[project.optional-dependencies]
+test = ["pytest>=7.0"]
+# The release gate (`./bless`) runs ruff, compileall and pytest with coverage,
+# then builds, inspects, `twine check`s and smoke-installs the artifacts.  Those
+# tools must live in the interpreter that runs bless, and twine/packaging must
+# be new enough to validate Metadata 2.5 from flit_core 3.12.
+dev = [
+    "pytest>=7",
+    "pytest-cov>=5",
+    "ruff>=0.6",
+    "build>=1.2",
+    "twine>=7",
+    "packaging>=26",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-ra"
+
+[tool.coverage.run]
+source = ["vappman"]
+
+[tool.coverage.report]
+# Set just below the measured number when the shared gate was adopted.  Raise
+# it as the suite grows; never lower it to make a commit pass.
+fail_under = 35
+
+[tool.bless]
+# The default is the pair, written out here so the branch model is visible
+# where the rest of this project's identity lives.  `publish` aligns `dev`
+# with `main` before tagging, and pushes both.
+branches = ["main", "dev"]
+
+[tool.ruff]
+# Keep the lint gate identical on every machine: no global/user config can
+# change which rules the gate enforces.  The selection below is deliberately
+# the conservative, version-stable core; a stricter ratchet can be adopted
+# later without changing bless.
+target-version = "py310"
+line-length = 100
+extend-exclude = ["build", "dist", ".venv"]
+
+[tool.ruff.lint]
+select = ["E4", "E7", "E9", "F"]

vappman-2.2.2/vappman/Appearance.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""The appearance preferences for vappman.
+
+Colour is decoration, never information.  Every role degrades to an attribute
+(or to plain text) when the terminal has no colour, so the installed markers
+(``✔``/``🔒``), the ``S``/``U`` flags and the ``⚠️`` prompts always remain
+readable on a monochrome terminal.
+
+The role ids are ``console_window.Theme``'s semantic pairs rather than literal
+colour numbers.  console-window installs those pairs at startup and re-installs
+them whenever a theme is applied, so changing the active theme recolours the
+whole UI without an edit to any draw code.
+
+The role-to-attribute mapping, the process-wide switch and the forgiving lookup
+live in :mod:`console_window.appearance`, and are re-exported here.  Keeping one
+switch matters: the library's theme picker paints its swatches through that
+layer, so a vappman-local copy would leave the picker in colour while the rest
+of the UI went mono.
+
+``mono`` is vappman's own no-colour pseudo-theme: console-window's
+``dark-mono``/``light-mono`` are still colour themes, so the true monochrome
+appearance is "colour off" rather than a library theme.  It is part of the
+picker's rotation but is not a library theme.
+"""
+
+import os
+
+from console_window import Theme
+from console_window.appearance import (
+    MONO_ROLES, colors_enabled, semantic_attr, set_colors_enabled,
+)
+
+# Explicit re-exports: the appearance API is read from this module by vappman.
+__all__ = [
+    'MONO_ROLES', 'MONO_THEME', 'appearance_choices', 'appearance_label',
+    'colors_enabled', 'resolve_ui_prefs', 'semantic_attr',
+    'set_colors_enabled',
+]
+
+# vappman's pseudo-theme: no colour at all, only attributes.
+MONO_THEME = 'mono'
+
+
+def appearance_choices():
+    """Every appearance the picker cycles, in order.
+
+    console-window's themes come first (in ``Theme.THEMES`` order), then
+    vappman's no-colour pseudo-theme, so one cycle always reaches ``mono``.
+    """
+    return list(Theme.list_all()) + [MONO_THEME]
+
+
+def appearance_label(theme, colors):
+    """The name to show for the live appearance."""
+    if not colors:
+        return MONO_THEME
+    return theme or 'default'
+
+
+def resolve_ui_prefs(cli_theme=None, no_color=False, saved_theme='',
+                     saved_colors=True, environ=None):
+    """Starting ``(theme, colors)`` from the flag, the environment and the prefs.
+
+    Precedence, highest first: an explicit ``--theme`` / ``--no-color``, the
+    ``NO_COLOR`` convention (any non-empty value disables colour), then the
+    remembered choice.  An explicit ``--theme`` is a statement of intent, so it
+    re-enables colour even when the saved choice was ``mono`` (unless
+    ``--no-color`` says otherwise); an unknown theme name falls back to
+    console-window's ``default``.
+
+    ``theme`` is ``''`` for the library default.  The special value ``mono``
+    forces ``colors`` off and is reported as ``theme=''``: there is no library
+    theme to install, because mono is the attribute mapping in this module.
+    """
+    env = os.environ if environ is None else environ
+    if cli_theme:
+        if cli_theme == MONO_THEME:
+            return '', False
+        return Theme.resolve(cli_theme), not no_color
+    theme = '' if saved_theme in (None, MONO_THEME) else Theme.resolve(saved_theme)
+    colors = bool(saved_colors) and saved_theme != MONO_THEME
+    if env.get('NO_COLOR') or no_color:
+        colors = False
+    return theme, colors

{vappman-2.2.0 → vappman-2.2.2}/vappman/AppmanLauncher.py

@@ -14,7 +14,6 @@
 import os
 import subprocess
 import shutil
-import glob
 from pathlib import Path
 from typing import Optional, List
 

{vappman-2.2.0 → vappman-2.2.2}/vappman/AppmanVars.py

@@ -76,7 +76,8 @@ class AppmanVars:
         """Locates the user's appman directory via config file."""
         try:
             config_file = self._config_base / "appman" / "appman-config"
-            if not config_file.exists(): return None
+            if not config_file.exists():
+                return None
             raw_path = config_file.read_text(encoding='utf-8').strip()
             path_obj = Path(raw_path)
             if not path_obj.is_absolute():

{vappman-2.2.0 → vappman-2.2.2}/vappman/PersistentState.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import json
-import os
 from pathlib import Path
 
 class PersistentState:
@@ -20,7 +19,18 @@ class PersistentState:
         self.load()
 
     def load(self):
-        """Loads state from JSON, validating keys and types."""
+        """Loads state from JSON, merging it over the defaults.
+
+        A file written by an older version is missing keys the software has
+        since added, and one written by a newer version may carry keys this
+        version does not know.  Both are normal, not corruption: known keys are
+        honoured after a type check, unknown keys are dropped, and missing keys
+        keep their defaults.  The merged result is written back, so the next run
+        sees a complete file (a one-time, in-place migration).
+
+        Only unreadable JSON, a document that is not an object, or a type
+        mismatch for a known key still resets everything to the defaults.
+        """
         if not self._config_file.exists():
             self.save()
             return
@@ -29,24 +39,32 @@ class PersistentState:
             with open(self._config_file, 'r', encoding='utf-8') as f:
                 data = json.load(f)
 
-            # Validation logic
-            # 1. Check if keys match identically
-            if set(data.keys()) != set(self._defaults.keys()):
-                raise ValueError("Key sets do not match.")
+            if not isinstance(data, dict):
+                raise ValueError("State file is not an object.")
 
-            # 2. Check if types match the defaults
+            # Start from the defaults so keys an older file did not have keep
+            # their value; validate only the keys this version actually knows.
+            merged = dict(self._defaults)
             for key, value in data.items():
-                if type(value) != type(self._defaults[key]):
+                if key not in self._defaults:
+                    continue  # a key from a newer version: drop it on save
+                if type(value) is not type(self._defaults[key]):
                     raise TypeError(f"Type mismatch for {key}.")
-
-            # If valid, update the object attributes
-            for key, value in data.items():
-                setattr(self, key, value)
+                merged[key] = value
 
         except (json.JSONDecodeError, ValueError, TypeError) as e:
             print(f"Invalid state file ({e}). Reverting to defaults.")
             self._reset_to_defaults()
             self.save()
+            return
+
+        for key, value in merged.items():
+            setattr(self, key, value)
+
+        # Persist the merge only when the file differed from it (old file
+        # missing keys, or a file with keys this version drops).
+        if merged != data:
+            self.save()
 
     def _reset_to_defaults(self):
         """Internal helper to reset attributes to original defaults."""

{vappman-2.2.0 → vappman-2.2.2}/vappman/Prerequisites.py

@@ -10,10 +10,8 @@
 # pylint: disable=line-too-long,protected-access,invalid-name
 
 import sys
-import re
 import shutil
 import subprocess
-from types import SimpleNamespace
 
 class Prerequisites:
     """ Detect / install prereqs """
@@ -63,7 +61,7 @@ class Prerequisites:
         pm_name, install_cmd_template = self.detect_package_manager()
 
         if not pm_name:
-            print(f'\nERROR: Cannot find supported package manager.')
+            print('\nERROR: Cannot find supported package manager.')
             print(f'Missing dependencies: {", ".join(sorted(missing))}')
             print('Please install them manually using your system package manager.')
             return False
@@ -74,7 +72,7 @@ class Prerequisites:
             print(f'\n⚠️  Missing dependencies: {", ".join(packages)}')
             print(f'\nDetected package manager: {pm_name}')
 
-            response = input(f'\nInstall missing dependencies? [y/N]: ').strip().lower()
+            response = input('\nInstall missing dependencies? [y/N]: ').strip().lower()
 
             if response not in ('y', 'yes'):
                 print('Installation cancelled.')
@@ -96,7 +94,7 @@ class Prerequisites:
                     print('  - Check for problematic PPAs in /etc/apt/sources.list.d/')
                     print('  - Remove outdated PPAs that block apt operations')
                 return False
-            print(f'\n✅ Dependencies installed successfully!')
+            print('\n✅ Dependencies installed successfully!')
             return True
         except Exception as exc:
             print(f'\n❌ Installation failed: {exc}')
@@ -143,7 +141,7 @@ class Prerequisites:
             if result.returncode != 0:
                 print(f'\n❌ AM installation failed with exit code {result.returncode}')
                 return False
-            print(f'\n✅ AM/appman installed successfully!')
+            print('\n✅ AM/appman installed successfully!')
             return True
         except Exception as exc:
             print(f'\n❌ AM installation failed: {exc}')
@@ -229,7 +227,7 @@ class Prerequisites:
             print(f'\n⚠️  Optional dependencies missing: {", ".join(sorted(missing_optional))}')
             print('    Some features may not work without these packages.')
 
-            response = input(f'\nInstall optional dependencies? [y/N]: ').strip().lower()
+            response = input('\nInstall optional dependencies? [y/N]: ').strip().lower()
             if response in ('y', 'yes'):
                 if not self.install_dependencies(packages_needed, skip_prompt=True):
                     optional_install_failed = True

{vappman-2.2.0 → vappman-2.2.2}/vappman/VappmanListCache.py

@@ -168,7 +168,8 @@ class AppCacheManager:
             self.apps, self.apps_by_key, self.dbs = apps, apps_by_key, databases
 
     def refresh_background(self):
-        if self.runner and self.runner.is_running(): return
+        if self.runner and self.runner.is_running():
+            return
         os.makedirs(self.config_dir, exist_ok=True)
         self.runner = CommandRunner([self.binary, "list", "--all"], self.list_file)
         self.runner.start()
@@ -177,7 +178,8 @@ class AppCacheManager:
         if not os.path.exists(self.list_file):
             # print("[Cache] No file found. Fetching initial list...")
             self.refresh_background()
-            while self.runner.is_running(): time.sleep(0.1)
+            while self.runner.is_running():
+                time.sleep(0.1)
             print('... got initial app list ... continuing up ...')
             self._parse_now()
         else:
@@ -210,7 +212,7 @@ if __name__ == "__main__":
     dup_count = sum(1 for entries in apps.values() if len(entries) > 1)
     total_entries = sum(len(entries) for entries in apps.values())
 
-    print(f"Initial Load:")
+    print("Initial Load:")
     print(f"  - {len(apps)} unique app names")
     print(f"  - {total_entries} total entries")
     print(f"  - {dup_count} app names with duplicates")

vappman-2.2.2/vappman/__init__.py

@@ -0,0 +1,3 @@
+"""vappman -- a visual wrapper for appman."""
+
+__version__ = "2.2.2"