vappman 0.9.1__tar.gz → 0.9.3__tar.gz

vappman-0.9.3/.gitignore

@@ -0,0 +1,6 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+.vscode/
+*.egg-info/
+*.tar.gz
+*.whl

{vappman-0.9.1/src/vappman.egg-info → vappman-0.9.3}/PKG-INFO

@@ -1,20 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vappman
-Version: 0.9.1
+Version: 0.9.3
 Summary: A visual wrapper for appman
-Author-email: Joe Defen <joedef@google.com>
-License: MIT
-Project-URL: Homepage, https://github.com/joedefen/vappman
-Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
 Keywords: app,installer,manager,appimages
+Author-email: Joe Defen <joedef@google.com>
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: importlib-metadata; python_version<"3.8"
 Requires-Dist: psutil>=5.9
+Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
+Project-URL: Homepage, https://github.com/joedefen/vappman
 
 # vappman
 `vappman` presents a visual (curses) interface to `appman`.
@@ -88,3 +87,4 @@ NOTES: in this example:
 
 ## Screen Recording (Intro to vappman based on v0.9)
 [![Screen Recording](https://i9.ytimg.com/vi_webp/NUHYN9_DZtA/mq3.webp?sqp=CMTu4LMG-oaymwEmCMACELQB8quKqQMa8AEB-AHqBYAC4AOKAgwIABABGEogZShRMA8=&rs=AOn4CLBaBrOpAhJkRIQQNNdCzYaqpOYl-Q)](https://www.youtube.com/watch?v=fC2EYMMcMQk)
+

vappman-0.9.3/deploy

@@ -0,0 +1,7 @@
+#!/bin/bash
+script_dir=$(dirname "$0")
+set -ex
+cd ${script_dir}
+rm -rf ./dist
+python3 -m build
+pip install -e . --break-system-packages

vappman-0.9.3/pyproject.HOWTO

@@ -0,0 +1,38 @@
+# Vappman HOWTO Develop
+
+A visual wrapper for appman.
+
+---
+
+## How to Develop
+
+### Prep Work
+Ensure necessary modules are up-to-date:
+- `sudo apt install python3-pip`
+- `sudo apt install python3-pip-whl`
+- `pip install build --break-system-packages`
+- `sudo apt install twine`
+
+Optionally, use a virtual environment:
+- `python3 -m venv venv`
+- `source venv/bin/activate` (to activate)
+- `deactivate` (to deactivate)
+
+### Running the Project
+- To run with local changes: `rm -rf ./dist && python3 -m build && pip install -e . --break-system-packages`
+- Or simply: `python3 -m vappman.main`
+- Or from the source directory: `cd src/vappman && ./main.py`
+
+---
+
+## How to Publish
+
+### Public Build and Deploy
+- **BUMP** the version in `pyproject.toml`.
+flit build && flit publish  # Will prompt for your PyPI token if not cached
+- Install or upgrade: `pipx upgrade vappman` (for Python 3.11+) or `sudo python3 -m pip install vappman` (for Python 3.10 and below).
+
+### Test Build and Deploy
+- **BUMP** the version in `pyproject.toml`.
+flit build && flit publish --repository testpypi
++ Install from TestPyPI: `sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps --break-system-packages vappman`

vappman-0.9.3/pyproject.toml

@@ -0,0 +1,34 @@
+[build-system]
+requires = ["flit_core>=3.4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "vappman"
+version = "0.9.3"
+description = "A visual wrapper for appman"
+authors = [
+    { name = "Joe Defen", email = "joedef@google.com" }
+]
+readme = "README.md"
+license = { text = "MIT" }
+requires-python = ">=3.8"
+keywords = ["app", "installer", "manager", "appimages"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX :: Linux"
+]
+dependencies = [
+    'importlib-metadata; python_version<"3.8"',
+    'psutil>=5.9',
+]
+
+[project.urls]
+"Homepage" = "https://github.com/joedefen/vappman"
+"Bug Tracker" = "https://github.com/joedefen/vappman/issues"
+
+[project.scripts]
+vappman = "vappman.main:main"
+
+[tool.flit.module]
+name = "vappman"

{vappman-0.9.1 → vappman-0.9.3}/src/vappman/main.py

@@ -80,7 +80,8 @@ class Vappman:
         command = cmd.split()
         # Run the command and capture the output
         try:
-            result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=False)
+            result = subprocess.run(command, stdout=subprocess.PIPE,
+                    text=True, encoding='utf-8', errors='ignore', check=False)
         except Exception as exc:
             Window.stop_curses()
             print(f'FAILED: {command}: {exc}')
@@ -91,12 +92,24 @@ class Vappman:
         lines = result.stdout.splitlines()
         ansi_escape_pattern = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
         rv = {}
+        prev_wd1 = None
         for line in lines:
-            line = ansi_escape_pattern.sub('', line).strip() # get clean text
+            line = ansi_escape_pattern.sub('', line) # get clean text
             if re.match(start, line):
+                line = line.strip()
                 wd1 = self.get_word1(line)
                 if wd1:
                     rv[wd1] = line
+                    prev_wd1 = wd1
+            elif prev_wd1 and line.startswith(' '):
+                line = line.strip()
+                if line:
+                    rv[prev_wd1] += ' ' + line
+                else:
+                    prev_wd1 = None
+            else:
+                prev_wd1 = None
+
         return rv
 
     @staticmethod

vappman-0.9.1/PKG-INFO

@@ -1,90 +0,0 @@
-Metadata-Version: 2.1
-Name: vappman
-Version: 0.9.1
-Summary: A visual wrapper for appman
-Author-email: Joe Defen <joedef@google.com>
-License: MIT
-Project-URL: Homepage, https://github.com/joedefen/vappman
-Project-URL: Bug Tracker, https://github.com/joedefen/vappman/issues
-Keywords: app,installer,manager,appimages
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: psutil>=5.9
-
-# vappman
-`vappman` presents a visual (curses) interface to `appman`.
-
-* Install `vappman` using `pipx install vappman`, or however you do so.
-* Prerequisites: install [ivan-hc/AppMan: AppImage package manager to install, update (for real) and manage ALL of them locally thanks to "AM", the ever-growing AUR-inspired database listing (for now) 1900+ portable apps and programs for GNU/Linux. Manage your AppImages with the ease of APT and the power of PacMan.](https://github.com/ivan-hc/AppMan) and all of its prerequisites.
-
-NOTE: `vappman` covers many capabilities of appman:
-* implicitly, (-f) files (or show installed), (-l) list available apps,
-  and (-q) search the app list
-* (-i) installing uninstalled apps
-* (-r) removing installed apps
-* (-b) backup / (-o) overwrite of installed apps
-* (-a) about (i.e., more info) for all apps
-* (-c) clean to remove unneeded files and directories
-* (-u) update installed apps; and `vappman` uses "U" for update
-       all installed apps
-
-But it does NOT cover:
-* (-d) download install script
-* (-h) help or full help for appman
-* (-H) home or set $HOME directory for apps
-* (-t) template for custom install template
-* (-v) version of appman
-* --force-latest to get the most recent stable release AND
-  all other options and unmentioned commands.
-  
-## Usage
-* Run `vappman` from the command line.
-* It presents some keys available on the top line.
-    * Use '?' to learn the navigation keys (e.g., you can use the mouse wheel,
-      arrow keys, and many `vi`-like keys)
-    * '?' also elaborates the meaning of the available keys for operations.
-    * NOTE: `ENTER` acts differently based on context:
-      * In help, it returns to the main menu.
-      * On an uninstalled app, it installs it.
-      * On an installed app, it uninstalls it.
-* Then `vappman` presents a list of installed apps, followed by available/uninstalled apps.
-    * Installed apps have prefix '✔✔✔' (i.e., three checks).
-    * Uninstalled apps have prefix '◆' (i.e., a solid diamond).
-* Enter `/` to enter a "filter" for installed/uninstalled apps, if you wish.
-    * If you enter plain ole "words", then those words must match:
-      * the start of words on the apps line (in order, but not contiguously) and/or
-      * the start of the remainder of the previous word match
-        (i.e., `/bit fight` matches `bitfighter`).
-    * Or you can enter an regular expression acceptable to python; e.g.,
-      * `^` matches the line starting with the app name
-      * `\b` matches a word boundary; and so forth.
-    * NOTES:
-      * `ESC` clears the filter and jumps to the top of the listing.
-      * Each time the filter is changed, the position jumps to the top of the listing.
-* Use `i` to install apps, and `r` to remove apps.  When you install or remove an app, `appman` drops out of `curses` mode, runs the `appman` command so you can see the result, and then prompts your to hit ENTER to return to `vappman.
-* Use `t` to "test" an installed app.  This launches a terminal emulator and then the app so you can see issues. This is not for daily use obviously, but for after install or when having unknown issues and you wish to start the investigation.
-
-## Example Screenshot (of v0.9 ... current release will vary slightly)
-![vappman-with-filter](https://github.com/joedefen/vappman/blob/main/images/vappman-with-filter.png?raw=true).
-
----
-
-NOTES: in this example:
-* keys to the left of `❚` apply to the highlighted app; keys to the right apply globally.
-* the filter is `card` so it shows app lines with words starting with `card`.
-* the reverse video, current position is on `glabels`;
-  thus if `i` (or ENTER) is typed, `appman install glabels` is run.
-* if the horizontal line (second line show) has no decorations, then you are looking
-  all the filtered apps; otherwise, the decoration suggests where you are in the
-  partial view of the filtered apps.
-* the matching installed app has the '✔✔✔' prefix.
-* the fixed top line shows mos of the available action keys (e.g., `q` quits the app)
-* use `?` to open the help screen describing all keys (including navigation)
-
-## Screen Recording (Intro to vappman based on v0.9)
-[![Screen Recording](https://i9.ytimg.com/vi_webp/NUHYN9_DZtA/mq3.webp?sqp=CMTu4LMG-oaymwEmCMACELQB8quKqQMa8AEB-AHqBYAC4AOKAgwIABABGEogZShRMA8=&rs=AOn4CLBaBrOpAhJkRIQQNNdCzYaqpOYl-Q)](https://www.youtube.com/watch?v=fC2EYMMcMQk)

vappman-0.9.1/pyproject.toml

@@ -1,97 +0,0 @@
-# HOW TO DEVELOP
-
-#
-# Prep Work (ensure need modules are up-to-date):
-#   sudo apt install python3-pip
-#   sudo apt install python3-pip-whl
-#   pip install build --break-system-packages
-#   sudo apt install twine
-#   -- antiquated way
-#      sudo pacman -Syu python-pip
-#      sudo pacman -Syu python-build
-#      sudo pacman -Syu python-twine
-#   -- antiquated way
-#      python3 -m pip install --upgrade pip
-#      python3 -m pip install --upgrade build
-#      python3 -m pip install --upgrade twine
-#
-# Optionally, `python3 -m venv venv`, and then
-#   - source env/bin/activate # to activate
-#   - deactivate # to deactivate
-# 
-# rm -rf ./dist && python3 -m build && pip install -e . --break-system-packages
-# pip-tray
-#
-#    -OR-
-# python3 -m vappman.main
-#
-#    -OR-
-# cd src/vappman && ./main.py
-#
-#    -OR-
-# src/vappman/main.py
-
-# HOW TO PUBLISH...
-# PUBLIC Build and deploy (from project directory):
-#   ## BUMP the version (below in [project])
-#   rm -rf dist; python3 -m build; ls dist/.
-#   python3 -m twine upload dist/*     # keyring --disable # may be required
-#     ## Enter __token__ and the saved TOKEN (in bitwarden)
-#   pipx upgrade pwr-tray || pipx install pwr-tray # >= python3.11
-#   --OR-- sudo python3 -m pip install pwr-tray # <= python3.10
-#   ## VISIT  https://pypi.org/project/pwr-tray and delete old versions
-#
-# TEST Build and test (from project directory):
-#   ## BUMP the version (below in [project])
-#   rm -r dist; python3 -m build
-#   python3 -m twine upload --repository testpypi dist/* # keyring --disable # may be required
-#     ## Enter __token__ and the saved TOKEN (in bitwarden)
-#   sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps --break-system-packages my-sna
-#   ## VISIT  https://test.pypi.org/project/pwr-tray and delete old versions
-
-[build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "vappman"
-version = "0.9.1"
-description = "A visual wrapper for appman"
-authors = [
-    { name = "Joe Defen", email = "joedef@google.com" }
-]
-readme = "README.md"
-license = { text = "MIT" }
-requires-python = ">=3.8"
-
-keywords = ["app", "installer", "manager", "appimages", ]
-
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: POSIX :: Linux"
-]
-dependencies = [
-    'importlib-metadata; python_version<"3.8"',
-    'psutil>=5.9',
-]
-
-[project.urls]
-"Homepage" = "https://github.com/joedefen/vappman"
-"Bug Tracker" = "https://github.com/joedefen/vappman/issues"
-
-[project.scripts]
-vappman = "vappman.main:main"
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.package-data]
-
-exclude = [
-    "__pycache__",
-]
-

vappman-0.9.1/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-

vappman-0.9.1/src/vappman.egg-info/SOURCES.txt

@@ -1,12 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-src/vappman/PowerWindow.py
-src/vappman/__init__.py
-src/vappman/main.py
-src/vappman.egg-info/PKG-INFO
-src/vappman.egg-info/SOURCES.txt
-src/vappman.egg-info/dependency_links.txt
-src/vappman.egg-info/entry_points.txt
-src/vappman.egg-info/requires.txt
-src/vappman.egg-info/top_level.txt

vappman-0.9.1/src/vappman.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

vappman-0.9.1/src/vappman.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-vappman = vappman.main:main

vappman-0.9.1/src/vappman.egg-info/requires.txt

@@ -1,4 +0,0 @@
-psutil>=5.9
-
-[:python_version < "3.8"]
-importlib-metadata

vappman-0.9.1/src/vappman.egg-info/top_level.txt

@@ -1 +0,0 @@
-vappman