vortex-cli 4.18.1__tar.gz → 4.18.3__tar.gz

{vortex_cli-4.18.1/vortex_cli.egg-info → vortex_cli-4.18.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: vortex_cli
-Version: 4.18.1
+Version: 4.18.3
 Summary: Vortex CLI
 Author-email: Jordan Amos <jordan.amos@gmail.com>
 License: MIT License

{vortex_cli-4.18.1 → vortex_cli-4.18.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortex_cli"
-version = "4.18.1"
+version = "4.18.3"
 description = "Vortex CLI"
 requires-python = ">=3.10"
 readme = { file = "README.md", content-type = "text/markdown" }

{vortex_cli-4.18.1 → vortex_cli-4.18.3}/vortex/commands/new.py

@@ -336,7 +336,6 @@ def _new_keyword(
     values: list[str],
 ) -> int:
     app = workspace.lookup_app(server, app_id)
-
     with server as s:
         keyword_id = s.app_designer.save_keyword(app.id, -1, name, values)
     logger.info(f"Created Keyword '{name}' [{keyword_id}]")
@@ -344,7 +343,7 @@ def _new_keyword(
 
 
 def new(workspace: Workspace, server: PuakmaServer, args: argparse.Namespace) -> int:
-    if args.subcommand == "object":
+    if args.subcommand in ("obj", "object"):
         if args.update_ids:
             return _update_objects(
                 workspace,
@@ -382,7 +381,7 @@ def new(workspace: Workspace, server: PuakmaServer, args: argparse.Namespace) ->
             args.template,
             args.description,
         )
-    elif args.subcommand == "keyword":
+    elif args.subcommand in ("kw", "keyword"):
         return _new_keyword(
             workspace,
             server,

{vortex_cli-4.18.1 → vortex_cli-4.18.3}/vortex/commands/watch.py

@@ -80,7 +80,7 @@ class WorkspaceWatcher:
         self.server = server
         self.spinner = spinner
         self.filter = _WorkspaceFilter(workspace, server)
-        self._func_dispatch = {
+        self._dispatch_change = {
             Change.modified: self._update_design,
             Change.added: self._create_design,
             Change.deleted: self._delete_design,
@@ -158,7 +158,7 @@ class WorkspaceWatcher:
         # Do this synchronously since we will be prompting the user for confirmation
         for args in changes:
             change, design_path, _ = args
-            task = asyncio.create_task(self._func_dispatch[change](*args))
+            task = asyncio.create_task(self._dispatch_change[change](*args))
             try:
                 await task
             except asyncio.CancelledError as e:
@@ -235,6 +235,7 @@ class WorkspaceWatcher:
         # design_source = base64.b64encode(design_type.source_template(name)).decode()
         obj = DesignObject(-1, name, app, design_type, content_type, "", "")
 
+        upload_source = False
         if design_type.is_java_type:
             obj.design_source = design_type.source_template(name)
             obj.save(self.workspace)

{vortex_cli-4.18.1 → vortex_cli-4.18.3}/vortex/workspace.py

@@ -272,31 +272,9 @@ class Workspace:
         except (configparser.Error, ValueError) as e:
             _error(f"Error reading server from config: {str(e)}")
 
-    def update_vscode_settings(
-        self, server: PuakmaServer | None = None, reset: bool = False
-    ) -> None:
-        """
-        Updates or creates the vortex.code-workspace file inside the .vscode directory
-        """
-
-        def _reset() -> dict[Any, Any]:
-            if not self.vscode_dir.exists():
-                self.vscode_dir.mkdir()
-            return {}
-
-        if reset:
-            workspace_settings = _reset()
-        else:
-            try:
-                with open(self.code_workspace_file) as f:
-                    workspace_settings = json.load(f)
-            except FileNotFoundError:
-                workspace_settings = _reset()
-            except json.JSONDecodeError as e:
-                logger.error(f"Error parsing {self.code_workspace_file}: {e}")
-                return
-
-        # Folder settings
+    def _get_vscode_folder_settings(
+        self, server: PuakmaServer | None = None
+    ) -> dict[str, list[dict[str, str]]]:
         vortex_dirs = [self.vscode_dir, self.config_dir, self.exports_dir]
         if self.logs_dir.is_dir():
             vortex_dirs.append(self.logs_dir)
@@ -310,10 +288,12 @@ class Workspace:
                 for dir_ in self.listdir(server)
             ]
         )
-        folder_settings = {"folders": folders}
+        return {"folders": folders}
 
-        # Java project settings
-        settings: dict[str, Any] = workspace_settings.get("settings", {})
+    def _get_vscode_java_settings(
+        self,
+        server: PuakmaServer | None = None,
+    ) -> dict[str, Any]:
         # Get the packaged puakma-*.jar file
         # Assumes only 1 file in the /lib directory
         lib_dir = os.path.join(os.path.dirname(__file__), "lib")
@@ -337,13 +317,41 @@ class Workspace:
                 java_runtimes = [
                     {"default": True, "path": java_home, "name": java_environment_name}
                 ]
-
-        java_project_settings = {
+        return {
             "java.project.sourcePaths": DesignType.source_dirs(),
             "java.project.outputPath": "zbin",
             "java.project.referencedLibraries": referenced_libs,
             "java.configuration.runtimes": java_runtimes,
         }
+
+    def update_vscode_settings(
+        self, server: PuakmaServer | None = None, reset: bool = False
+    ) -> None:
+        """
+        Updates or creates the vortex.code-workspace file inside the .vscode directory
+        """
+
+        def _reset() -> dict[Any, Any]:
+            if not self.vscode_dir.exists():
+                self.vscode_dir.mkdir()
+            return {}
+
+        if reset:
+            workspace_settings = _reset()
+        else:
+            try:
+                with open(self.code_workspace_file) as f:
+                    workspace_settings = json.load(f)
+            except FileNotFoundError:
+                workspace_settings = _reset()
+            except json.JSONDecodeError as e:
+                logger.error(f"Error parsing {self.code_workspace_file}: {e}")
+                return
+
+        folder_settings = self._get_vscode_folder_settings(server)
+
+        settings: dict[str, Any] = workspace_settings.get("settings", {})
+        java_project_settings = self._get_vscode_java_settings(server)
         settings.update(java_project_settings)
 
         # Extension reccommendation settings

{vortex_cli-4.18.1 → vortex_cli-4.18.3/vortex_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: vortex_cli
-Version: 4.18.1
+Version: 4.18.3
 Summary: Vortex CLI
 Author-email: Jordan Amos <jordan.amos@gmail.com>
 License: MIT License

{vortex_cli-4.18.1 → vortex_cli-4.18.3}/vortex_cli.egg-info/SOURCES.txt

@@ -32,7 +32,6 @@ vortex/commands/log.py
 vortex/commands/new.py
 vortex/commands/watch.py
 vortex/docs/Blackbook.pdf
-vortex/lib/puakma-6.0.37.jar
 vortex_cli.egg-info/PKG-INFO
 vortex_cli.egg-info/SOURCES.txt
 vortex_cli.egg-info/dependency_links.txt

{vortex_cli-4.18.1 → vortex_cli-4.18.3}/vortex/commands/grep.py

@@ -24,13 +24,6 @@ def grep(
     output_paths: bool = False,
     include_resources: bool = False,
 ) -> int:
-    if design_types is None:
-        design_types = [
-            t
-            for t in DesignType
-            if t != DesignType.ERROR and (t != DesignType.RESOURCE or include_resources)
-        ]
-
     if app_ids:
         apps = [workspace.lookup_app(server, id_) for id_ in app_ids]
     else:
@@ -42,6 +35,13 @@ def grep(
         )
         return 0
 
+    if design_types is None:
+        design_types = [
+            t
+            for t in DesignType
+            if t != DesignType.ERROR and (t != DesignType.RESOURCE or include_resources)
+        ]
+
     objs = [
         obj
         for app in apps