vortex-cli 4.12.0__tar.gz → 4.13.0__tar.gz

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.12.0
+Version: 4.13.0
 Summary: Vortex CLI
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vortex_cli
-version = 4.12.0
+version = 4.13.0
 description = Vortex CLI
 long_description = file: README.md
 long_description_content_type = text/markdown

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/commands/clone.py

@@ -4,6 +4,8 @@ import asyncio
 import datetime
 import logging
 import xml.etree.ElementTree as ET
+import zipfile
+from io import BytesIO
 from pathlib import Path
 from typing import Any
 
@@ -61,10 +63,14 @@ async def _aexport_app_pmx(
     timeout: int,  # noqa: ASYNC109
 ) -> int:
     ret_bytes = await server.download_designer.adownload_pmx(app_id, True, timeout)
+    with zipfile.ZipFile(BytesIO(ret_bytes)) as zip_file:
+        fname = zip_file.namelist()[0].replace(".pma", "")
+        _, group, app_name = fname.split("~")
     now = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-    output_path = output_dir / f"{now}_{server.host}_{app_id}.pmx"
+    export_name = f"{server.host}~{group}~{app_name}~{app_id}~{now}.pmx"
+    output_path = output_dir / export_name
     await asyncio.to_thread(_save_bytes, ret_bytes, output_path)
-    logger.info(f"Successfully exported {app_id} to {output_dir}")
+    logger.info(f"Successfully exported {group}/{app_name} [{app_id}] to {output_dir}")
     return 0
 
 

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/logging.py

@@ -114,7 +114,7 @@ class LoggingHandler(logging.Handler):
 
 
 @contextlib.contextmanager
-def logging_handler(verbose: bool) -> Generator[None, None, None]:
+def logging_handler(verbose: bool) -> Generator[None]:
     handler = LoggingHandler()
     httpx_logger = logging.getLogger("httpx")
     watchfiles_logger = logging.getLogger("watchfiles")

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/main.py

@@ -37,7 +37,7 @@ logger = logging.getLogger("vortex")
 
 
 @contextlib.contextmanager
-def error_handler() -> Generator[None, None, None]:
+def error_handler() -> Generator[None]:
     try:
         yield
     except (WorkspaceError, HTTPStatusError) as e:
@@ -114,7 +114,6 @@ def main(argv: Sequence[str] | None = None) -> int:
         server_name = getattr(args, "server", None)
 
         workspace = Workspace(workspace_path, args.init)
-        server = workspace.read_server_from_config(server_name)
 
         LoggingHandler.workspace = workspace
 
@@ -123,6 +122,7 @@ def main(argv: Sequence[str] | None = None) -> int:
             print(workspace.path)
             return 0
 
+        # Non server commands
         if args.command == "clean":
             return clean(workspace)
         elif args.command == "code":
@@ -131,6 +131,23 @@ def main(argv: Sequence[str] | None = None) -> int:
                 util.print_row_break()
                 remaining_args.insert(0, "--help")
             return code(workspace, remaining_args)
+        elif args.command == "docs":
+            return docs()
+
+        server = workspace.read_server_from_config(server_name)
+
+        if args.command == "log":
+            return log(
+                server,
+                args.limit,
+                args.source,
+                args.message,
+                args.errors_only,
+                args.info_only,
+                args.debug_only,
+                args.keep_alive,
+                args.delay,
+            )
         elif args.command == "config":
             return config(
                 workspace,
@@ -144,8 +161,6 @@ def main(argv: Sequence[str] | None = None) -> int:
                 list_servers=args.list_servers,
                 set=args.set,
             )
-        elif args.command == "docs":
-            return docs()
         elif args.command in ("list", "ls"):
             local_only = args.show_local_only or args.command == "ls"
             return list_(
@@ -177,18 +192,6 @@ def main(argv: Sequence[str] | None = None) -> int:
             )
         elif args.command == "watch":
             return watch(workspace, server)
-        elif args.command == "log":
-            return log(
-                server,
-                args.limit,
-                args.source,
-                args.message,
-                args.errors_only,
-                args.info_only,
-                args.debug_only,
-                args.keep_alive,
-                args.delay,
-            )
         elif args.command == "find":
             return find(
                 workspace,

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/models.py

@@ -308,6 +308,9 @@ class PuakmaApplication:
         self.id = id
         self.name = name
         self.group = group
+        # Some apps dont have a group. Adding a palce holder will
+        # allow for consistent paths locally
+        self.group_safe = group or "~"
         self.inherit_from = inherit_from
         self.template_name = template_name
         self.host = host
@@ -321,7 +324,7 @@ class PuakmaApplication:
         return self.host == other.host and self.id == other.id
 
     def __str__(self) -> str:
-        return f"{self.group}/{self.name}"
+        return f"{self.group_safe}/{self.name}"
 
     def __hash__(self) -> int:
         return hash((self.host, self.id))
@@ -329,11 +332,12 @@ class PuakmaApplication:
     @property
     def path(self) -> Path:
         # the 'puakma' application doesn't have a group
-        return Path(self.host, self.group or "_", self.name)
+        return Path(self.host, self.group_safe, self.name)
 
     @property
     def url(self) -> str:
-        return f"http://{self.host}/{self.group}/{self.name}.pma"
+        base = f"{self.host}/{self.group}" if self.group else self.host
+        return f"http://{base}/{self.name}.pma"
 
     @property
     def web_design_url(self) -> str:
@@ -648,6 +652,8 @@ class DesignPath:
             server_dir, group_dir, app_dir, design_dir, _rem = str(rel_path).split(
                 os.path.sep, maxsplit=4
             )
+
+            # path_parts =
             app_dir_path = workspace.path / server_dir / group_dir / app_dir
             self.app = PuakmaApplication.from_dir(app_dir_path)
             if must_exist and not path.exists():
@@ -661,7 +667,9 @@ class DesignPath:
         self.design_dir = design_dir
         self.fname = path.name
         self.design_name, self.ext = os.path.splitext(self.fname)
-        self.server_path = f"{self.app.group}/{self.app.name}.pma/{self.design_name}"
+        # Some apps dont have a group
+        group = f"{self.app.group}/" if self.app.group else ""
+        self.server_path = f"{group}{self.app.name}.pma/{self.design_name}"
 
     def __str__(self) -> str:
         return str(self.path)

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/soap.py

@@ -359,7 +359,7 @@ class DatabaseDesigner(_PuakmaSOAPService):
         db_conn_id: int,
         query: str,
         is_update: bool = False,
-    ) -> Generator[dict[str, Any], None, None]:
+    ) -> Generator[dict[str, Any]]:
         """Returns a Generator of dicts representing a return row"""
         operation = "executeQuery"
         params = [

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/util.py

@@ -33,7 +33,7 @@ if sys.platform == "win32":
     def _locked(
         file: IO[Any],
         blocked_cb: Callable[[], None],
-    ) -> Generator[None, None, None]:
+    ) -> Generator[None]:
         fileno = file.fileno()
         _region = 1
 
@@ -71,7 +71,7 @@ else:
     def _locked(
         file: IO[Any],
         blocked_cb: Callable[[], None],
-    ) -> Generator[None, None, None]:
+    ) -> Generator[None]:
         fileno = file.fileno()
         try:
             fcntl.flock(fileno, fcntl.LOCK_EX | fcntl.LOCK_NB)
@@ -94,7 +94,7 @@ def file_lock(
     path: os.PathLike[str],
     blocked_cb: Callable[[], None],
     mode: str = "a+",
-) -> Generator[IO[Any], None, None]:
+) -> Generator[IO[Any]]:
     with open(path, mode) as f:
         with _locked(f, blocked_cb):
             yield f
@@ -106,7 +106,7 @@ def execute_cmd(cmd: str, args: list[str]) -> int:
 
 
 @contextlib.contextmanager
-def clean_dir_on_failure(path: Path) -> Generator[None, None, None]:
+def clean_dir_on_failure(path: Path) -> Generator[None]:
     """Cleans up the directory when an exception is raised"""
     try:
         yield
@@ -207,22 +207,24 @@ def rmtree(path: Path) -> None:
     def _handle_race(
         func: Callable[..., Any],
         path: str,
-        exc: tuple[type[OSError], OSError, TracebackType],
+        exc: tuple[type[BaseException], BaseException, TracebackType],
     ) -> None:
         # Avoid some race conditions
         excvalue = exc[1]
-        if isinstance(excvalue, FileNotFoundError):
-            logger.debug(excvalue.strerror)
-        elif (
-            excvalue.errno == errno.ENOTEMPTY
-            and os.path.exists(path)
-            and os.path.isdir(path)
-        ):
-            logger.debug(f"Failed to remove {path}: {excvalue.strerror}. Retrying...")
-            shutil.rmtree(path)
-            logger.debug(f"Managed to remove {path}.")
-        else:
-            raise excvalue
+        if isinstance(exc, OSError):
+            if isinstance(excvalue, FileNotFoundError):
+                logger.debug(excvalue.strerror)
+            elif (
+                excvalue.errno == errno.ENOTEMPTY
+                and os.path.exists(path)
+                and os.path.isdir(path)
+            ):
+                logger.debug(
+                    f"Failed to remove {path}: {excvalue.strerror}. Retrying..."
+                )
+                shutil.rmtree(path)
+                logger.debug(f"Managed to remove {path}.")
+        raise excvalue
 
     logger.info(f"Cleaning up {path}...")
     shutil.rmtree(path, ignore_errors=False, onerror=_handle_race)

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex/workspace.py

@@ -25,12 +25,14 @@ SAMPLE_CONFIG = """\
 [dev]
 host =
 port = 80
+username =
+password =
 soap_path = system/SOAPDesigner.pma
 web_design_path = system/webdesign.pma
 puakma_db_conn_id =
 lib_path =
-username =
-password =
+java_home =
+java_environment_name =
 """
 
 
@@ -50,7 +52,7 @@ class PuakmaApplicationNotFound(WorkspaceError):
     pass
 
 
-class _CaseInsensitiveDict(dict[Any, Any]):
+class _CaseInsensitiveDict(dict[str, Any]):
     def __getitem__(self, key: Any) -> Any:
         return super().__getitem__(key.lower())
 
@@ -131,7 +133,7 @@ class Workspace:
         logger.info(f"Initialised workspace {self.path}")
 
     @contextlib.contextmanager
-    def exclusive_lock(self) -> Generator[None, None, None]:
+    def exclusive_lock(self) -> Generator[None]:
         def _blocked_cb() -> NoReturn:
             raise WorkspaceInUseError(f"The workspace '{self.path}' is already in use.")
 
@@ -140,7 +142,7 @@ class Workspace:
 
     def mkdir(self, app: PuakmaApplication, force_recreate: bool = False) -> Path:
         """
-        Creates a .PuakmaApplication.pickle file within a newly created app directory
+        Creates a .pma file within a newly created app directory
         with the format 'host/group/name' inside the workspace.
         Returns the full path to the new app directory
         """

{vortex_cli-4.12.0 → vortex_cli-4.13.0}/vortex_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.12.0
+Version: 4.13.0
 Summary: Vortex CLI
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos