flyshell 1.2.6__tar.gz → 1.2.8__tar.gz

{flyshell-1.2.6/src/flyshell.egg-info → flyshell-1.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.2.6
+Version: 1.2.8
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.2.6 → flyshell-1.2.8}/src/flyshell/builtin/fs.py

@@ -83,7 +83,7 @@ class FsDel(BaseCmd):
                     return (0, "\nAll non-auth system data purged successfully.\n")
                 return (1, "\nAction cancelled.\n")
             case _:
-                return (1, f"\nCommand Error: Unknown target '{target}'.\n")
+                return (1, f"\nCommand Error: Unknown target '{target}'\n")
 
 
 class FsInfo(BaseCmd):

flyshell-1.2.8/src/flyshell/builtin/pkg.py

@@ -0,0 +1,60 @@
+# src\flyshell\builtin\pkg.py
+
+from typing import List, Tuple
+from flyshell.abstract.base_cmd import BaseCmd
+from flyshell.abstract.parent_cmd import ParentCmd
+from flyshell.core import env
+
+
+class PkgApi(BaseCmd):
+    name: str = "api"
+    description: str = "View configured package/plugin API keys"
+    min_args: int = 1
+    options: str = "'add'/'del'/'edit'/'view', then package name and key name details"
+    aliases: List[str] = ["keys"]
+
+    def execute(self, args: List[str]) -> Tuple[int, str]:
+        arg = args[0]
+        remaining_args = args[1:]
+        match arg:
+            case "add" | "edit":
+                if len(remaining_args) < 3:
+                    return (
+                        1,
+                        "\nCommand Error: Define a package name, a key name and a value.\n",
+                    )
+                plugin_name = remaining_args[0]
+                key_name = remaining_args[1]
+                val = " ".join(remaining_args[2:])
+                code, output = env.set_plugin_api_key(plugin_name, key_name, val)
+                return (code, f"\n{output}\n")
+            case "del" | "rm":
+                if len(remaining_args) < 2:
+                    return (
+                        1,
+                        "\nCommand Error: define a package name and a key name for deletion.\n",
+                    )
+                plugin_name = remaining_args[0]
+                key_name = remaining_args[1]
+                code, output = env.remove_plugin_api_key(plugin_name, key_name)
+                return (code, f"\n{output}\n")
+            case "view":
+                if not remaining_args:
+                    code, output = env.get_all_keys()
+                else:
+                    package_name = remaining_args[0]
+                    code, output = env.get_plugin_keys_formatted(package_name)
+                return (code, f"\n{output}\n")
+            case _:
+                return (1, f"\nCommand Error: Unknown target '{arg}'\n")
+
+
+class Pkg(ParentCmd):
+    name: str = "pkg"
+    description: str = "Manage Flyshell packages, plugins, and dependencies"
+    aliases: List[str] = ["package"]
+
+    def get_subcommands(self) -> List[BaseCmd]:
+        return [
+            PkgApi(),
+        ]

{flyshell-1.2.6 → flyshell-1.2.8}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 131
-VERSION = "1.2.6"
+BUILD = 133
+VERSION = "1.2.8"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.2.6 → flyshell-1.2.8}/src/flyshell/core/env.py

@@ -1,4 +1,4 @@
-# src/flyshell/core/env.py
+# src\flyshell\core\env.py
 
 from pathlib import Path
 from flyshell import constants as c
@@ -127,3 +127,70 @@ def get_plugin_keys_formatted(target_name: str) -> tuple[int, str]:
         if k_lower not in seen_keys:
             lines.append(f"{orig_k} = {val} [Optional/Extra]")
     return (0, "\n".join(lines))
+
+
+def set_plugin_api_key(plugin_name: str, key_name: str, value: str) -> tuple[int, str]:
+    if not plugin_name or not key_name:
+        return (1, "Command Error: Both plugin name and key name are required.")
+    target_key = f"{plugin_name.strip().lower()}_{key_name.strip().upper()}"
+    clean_val = value.strip().strip("\"'")
+    env_path = get_env_path()
+    try:
+        env_path.parent.mkdir(parents=True, exist_ok=True)
+        if not env_path.exists():
+            env_path.touch()
+        lines = env_path.read_text(encoding="utf-8").splitlines()
+        updated = False
+        new_lines = []
+        for line in lines:
+            stripped = line.strip()
+            if stripped and not stripped.startswith("#") and "=" in stripped:
+                k, _ = stripped.split("=", 1)
+                clean_k = k.strip().replace("[", "").replace("]", "")
+                if clean_k.lower() == target_key.lower():
+                    new_lines.append(f"{target_key}={clean_val}")
+                    updated = True
+                    continue
+            new_lines.append(line)
+        if not updated:
+            new_lines.append(f"{target_key}={clean_val}")
+        env_path.write_text("\n".join(new_lines) + "\n", encoding="utf-8")
+        action = "Updated" if updated else "Added"
+        return (0, f"SUCCESS! {action} key '{target_key}'")
+
+    except Exception as e:
+        return (1, f"File Error: Failed to write to '{env_path}': {e}")
+
+
+def remove_plugin_api_key(plugin_name: str, key_name: str) -> tuple[int, str]:
+    if not plugin_name or not key_name:
+        return (1, "Command Error: Both plugin name and key name are required.")
+    target_key = f"{plugin_name.strip().lower()}_{key_name.strip().lower()}"
+    env_path = get_env_path()
+    if not env_path.exists():
+        return (
+            1,
+            f"File Config Error: Environment file not found at '{env_path}'",
+        )
+    try:
+        lines = env_path.read_text(encoding="utf-8").splitlines()
+        new_lines = []
+        found = False
+        for line in lines:
+            stripped = line.strip()
+            if stripped and not stripped.startswith("#") and "=" in stripped:
+                k, _ = stripped.split("=", 1)
+                clean_k = k.strip().replace("[", "").replace("]", "").lower()
+                if clean_k == target_key:
+                    found = True
+                    continue
+            new_lines.append(line)
+        if not found:
+            return (
+                1,
+                f"Command Error: Key '{target_key}' not found in '{env_path.name}'",
+            )
+        env_path.write_text("\n".join(new_lines) + "\n", encoding="utf-8")
+        return (0, f"SUCCESS! Removed key '{target_key}' from Flyshell environment.")
+    except Exception as e:
+        return (1, f"File Error: Failed to update '{env_path}': {e}")

{flyshell-1.2.6 → flyshell-1.2.8/src/flyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.2.6
+Version: 1.2.8
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.2.6 → flyshell-1.2.8}/tests/test_pkg.py

@@ -36,7 +36,7 @@ def test_pkg_unknown_subcommand():
 def test_pkg_api_all_keys(mock_env_file):
     mock_env_file.write_text("dummy_token=123\n")
     parent = pkg.Pkg()
-    code, msg = parent.execute(["api"])
+    code, msg = parent.execute(["api", "view"])
     assert code == 0
     assert "dummy_token = 123" in msg
 
@@ -44,7 +44,7 @@ def test_pkg_api_all_keys(mock_env_file):
 def test_pkg_api_plugin_keys(mock_env_file):
     mock_env_file.write_text("weather_key=secret\nother_key=skip\n")
     parent = pkg.Pkg()
-    code, msg = parent.execute(["api", "weather"])
+    code, msg = parent.execute(["api", "view", "weather"])
     assert code == 0
     assert "key = secret" in msg
     assert "other_key" not in msg

flyshell-1.2.6/src/flyshell/builtin/pkg.py

@@ -1,33 +0,0 @@
-# src\flyshell\builtin\pkg.py
-
-from typing import List, Tuple
-from flyshell.abstract.base_cmd import BaseCmd
-from flyshell.abstract.parent_cmd import ParentCmd
-from flyshell.core import env
-
-
-class PkgApi(BaseCmd):
-    name: str = "api"
-    description: str = "View configured package/plugin API keys"
-    min_args: int = 0
-    options: str = "Package name"
-    aliases: List[str] = ["keys"]
-
-    def execute(self, args: List[str]) -> Tuple[int, str]:
-        if not args:
-            code, output = env.get_all_keys()
-        else:
-            package_name = args[0]
-            code, output = env.get_plugin_keys_formatted(package_name)
-        return (code, f"\n{output}\n")
-
-
-class Pkg(ParentCmd):
-    name: str = "pkg"
-    description: str = "Manage Flyshell packages, plugins, and dependencies"
-    aliases: List[str] = ["package"]
-
-    def get_subcommands(self) -> List[BaseCmd]:
-        return [
-            PkgApi(),
-        ]