vortex-cli 4.11.1__tar.gz → 4.12.1__tar.gz

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.11.1
+Version: 4.12.1
 Summary: Vortex CLI
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
@@ -70,23 +70,16 @@ While it is possible to use without it, this software has been purposefully desi
    soap_path = system/SOAPDesigner.pma
    default = server1 ; Useful when you have multiple definitions
 
+
    [server1] ; This can be called whatever you want and can be referenced using the '--server' flag
    host = example.com
    port = 8080 ; we can overwrite the DEFAULT value
    puakma_db_conn_id = 13
    username = myuser ; Optional - Prompted at runtime if not provided
    password = mypassword ; Optional - Prompted at runtime if not provided
-   ```
-
-4. Setup the [Visual Studio Code Workspace](https://code.visualstudio.com/docs/editor/workspaces) to use the same Java version as your server in /path/to/workspace/.vscode/vortex.code-workspace under "settings", for example:
-   ```
-   "java.configuration.runtimes": [
-      {
-         "default": true,
-         "name": "JavaSE-1.8",
-         "path": "/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home"
-      }
-   ]
+   lib_path = ; additional jars that should be included in the classpath
+   java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
+   java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html
    ```
 
 ## Usage

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/README.md

@@ -47,23 +47,16 @@ While it is possible to use without it, this software has been purposefully desi
    soap_path = system/SOAPDesigner.pma
    default = server1 ; Useful when you have multiple definitions
 
+
    [server1] ; This can be called whatever you want and can be referenced using the '--server' flag
    host = example.com
    port = 8080 ; we can overwrite the DEFAULT value
    puakma_db_conn_id = 13
    username = myuser ; Optional - Prompted at runtime if not provided
    password = mypassword ; Optional - Prompted at runtime if not provided
-   ```
-
-4. Setup the [Visual Studio Code Workspace](https://code.visualstudio.com/docs/editor/workspaces) to use the same Java version as your server in /path/to/workspace/.vscode/vortex.code-workspace under "settings", for example:
-   ```
-   "java.configuration.runtimes": [
-      {
-         "default": true,
-         "name": "JavaSE-1.8",
-         "path": "/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home"
-      }
-   ]
+   lib_path = ; additional jars that should be included in the classpath
+   java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
+   java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html
    ```
 
 ## Usage

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/setup.cfg

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

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/vortex/commands/clone.py

@@ -63,7 +63,6 @@ async def _aexport_app_pmx(
     ret_bytes = await server.download_designer.adownload_pmx(app_id, True, timeout)
     now = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
     output_path = output_dir / f"{now}_{server.host}_{app_id}.pmx"
-
     await asyncio.to_thread(_save_bytes, ret_bytes, output_path)
     logger.info(f"Successfully exported {app_id} to {output_dir}")
     return 0

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/vortex/logging.py

@@ -71,13 +71,12 @@ class LoggingHandler(logging.Handler):
     @classmethod
     def log_to_file_and_exit(cls, exc: Exception, ret_code: int) -> NoReturn:
         with contextlib.ExitStack() as ctx:
-            if cls.workspace is not None:
+            if cls.workspace is not None and sys.stdout.isatty():
                 cls.workspace.logs_dir.mkdir(exist_ok=True)
                 log_file_path = cls.workspace.logs_dir / "vortex.log"
                 cls._output_msg(f"Check the log at {log_file_path}")
                 log: IO[bytes] = ctx.enter_context(open(log_file_path, "wb"))
             else:
-                cls._output_msg("Failed to write to log file. No Workspace set.")
                 log = sys.stdout.buffer
 
             error_msg = f"{type(exc).__name__}:\n{exc}"

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/vortex/main.py

@@ -81,11 +81,6 @@ def main(argv: Sequence[str] | None = None) -> int:
         action="store_true",
         help="Initialise the workspace and config files, if they don't already exist",
     )
-    parser.add_argument(
-        "--no-spin",
-        action="store_true",
-        help="Disable the spinner",
-    )
 
     command_parser = parser.add_subparsers(dest="command")
     cli.add_list_parser(command_parser)

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/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 =
 """
 
 
@@ -305,7 +307,7 @@ class Workspace:
                     "path": str(dir),
                     "name": str(PuakmaApplication.from_dir(dir)),
                 }
-                for dir in self.listdir()
+                for dir in self.listdir(server)
             ]
         )
         folder_settings = {"folders": folders}
@@ -314,17 +316,27 @@ class Workspace:
         settings: dict[str, Any] = workspace_settings.get("settings", {})
         puakma_path = os.path.join(os.path.dirname(__file__), "lib", "puakma.jar")
         referenced_libs = [puakma_path, os.path.join("zlib", "**", "*.jar")]
+        java_runtimes: list[dict[str, Any]] = [{}]
         if server is not None:
             config = configparser.ConfigParser()
             config.read(self.server_config_file)
             server_libs = config.get(server.name, "lib_path", fallback=None)
             if server_libs:
                 referenced_libs.extend(server_libs.split(","))
+            java_home = config.get(server.name, "java_home", fallback=None)
+            java_environment_name = config.get(
+                server.name, "java_environment_name", fallback=None
+            )
+            if java_home and java_environment_name:
+                java_runtimes = [
+                    {"default": True, "path": java_home, "name": java_environment_name}
+                ]
 
         java_project_settings = {
             "java.project.sourcePaths": DesignType.source_dirs(),
             "java.project.outputPath": "zbin",
             "java.project.referencedLibraries": referenced_libs,
+            "java.configuration.runtimes": java_runtimes,
         }
         settings.update(java_project_settings)
 

{vortex_cli-4.11.1 → vortex_cli-4.12.1}/vortex_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.11.1
+Version: 4.12.1
 Summary: Vortex CLI
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
@@ -70,23 +70,16 @@ While it is possible to use without it, this software has been purposefully desi
    soap_path = system/SOAPDesigner.pma
    default = server1 ; Useful when you have multiple definitions
 
+
    [server1] ; This can be called whatever you want and can be referenced using the '--server' flag
    host = example.com
    port = 8080 ; we can overwrite the DEFAULT value
    puakma_db_conn_id = 13
    username = myuser ; Optional - Prompted at runtime if not provided
    password = mypassword ; Optional - Prompted at runtime if not provided
-   ```
-
-4. Setup the [Visual Studio Code Workspace](https://code.visualstudio.com/docs/editor/workspaces) to use the same Java version as your server in /path/to/workspace/.vscode/vortex.code-workspace under "settings", for example:
-   ```
-   "java.configuration.runtimes": [
-      {
-         "default": true,
-         "name": "JavaSE-1.8",
-         "path": "/Library/Java/JavaVirtualMachines/temurin-8.jdk/Contents/Home"
-      }
-   ]
+   lib_path = ; additional jars that should be included in the classpath
+   java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
+   java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html
    ```
 
 ## Usage