vappman 0.9.1__tar.gz → 0.9.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.9.1
+Version: 0.9.2
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT

{vappman-0.9.1 → vappman-0.9.2}/pyproject.toml

@@ -20,7 +20,6 @@
 #   - deactivate # to deactivate
 # 
 # rm -rf ./dist && python3 -m build && pip install -e . --break-system-packages
-# pip-tray
 #
 #    -OR-
 # python3 -m vappman.main
@@ -37,17 +36,17 @@
 #   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
+#   pipx upgrade vappman || pipx install vappman # >= python3.11
+#   --OR-- sudo python3 -m pip install vappman # <= python3.10
+#   ## VISIT  https://pypi.org/project/vappman 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
+#   sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps --break-system-packages vappman
+#   ## VISIT  https://test.pypi.org/project/vappman and delete old versions
 
 [build-system]
 requires = ["setuptools>=42", "wheel"]
@@ -55,7 +54,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vappman"
-version = "0.9.1"
+version = "0.9.2"
 description = "A visual wrapper for appman"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

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

@@ -91,12 +91,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 → vappman-0.9.2/src/vappman.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vappman
-Version: 0.9.1
+Version: 0.9.2
 Summary: A visual wrapper for appman
 Author-email: Joe Defen <joedef@google.com>
 License: MIT