compshare-cli 0.3.0__tar.gz → 0.3.1__tar.gz

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compshare-cli
-Version: 0.3.0
+Version: 0.3.1
 Summary: Command-line client for CompShare GPU compute
 Author: CompShare
 License-Expression: Apache-2.0
@@ -35,7 +35,7 @@ Dynamic: license-file
 - 可通过 `compshare feedback` 反馈 CLI 问题和建议
 - 基于官方 [`ucloud-sdk-python3`](https://github.com/ucloud/ucloud-sdk-python3)
 
-当前版本：`0.3.0`，要求 Python 3.9 或更高版本。
+当前版本：`0.3.1`，要求 Python 3.9 或更高版本。
 
 ## 安装
 
@@ -54,12 +54,23 @@ source .venv/bin/activate
 python -m pip install -e '.[dev]'
 ```
 
-Windows 激活虚拟环境时使用：
+Windows PowerShell 中可先激活虚拟环境，再直接调用 `compshare`：
 
 ```powershell
 .\.venv\Scripts\Activate.ps1
+compshare -h
+compshare config --name default
 ```
 
+不激活虚拟环境时，使用 PowerShell 调用运算符 `&` 直接执行虚拟环境内的入口：
+
+```powershell
+& '.\.venv\Scripts\compshare.exe' -h
+& '.\.venv\Scripts\compshare.exe' config --name default
+```
+
+PowerShell 会把单引号中的路径解析为字符串，所以带参数执行时不能省略 `&`。路径包含空格时必须保留引号；从当前目录运行可执行文件时要使用 `.\` 前缀。若 `Activate.ps1` 被本机执行策略拦截，可直接使用上述不激活的写法，无需修改系统策略。
+
 ## 配置
 
 ```bash

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/README.md

@@ -10,7 +10,7 @@
 - 可通过 `compshare feedback` 反馈 CLI 问题和建议
 - 基于官方 [`ucloud-sdk-python3`](https://github.com/ucloud/ucloud-sdk-python3)
 
-当前版本：`0.3.0`，要求 Python 3.9 或更高版本。
+当前版本：`0.3.1`，要求 Python 3.9 或更高版本。
 
 ## 安装
 
@@ -29,12 +29,23 @@ source .venv/bin/activate
 python -m pip install -e '.[dev]'
 ```
 
-Windows 激活虚拟环境时使用：
+Windows PowerShell 中可先激活虚拟环境，再直接调用 `compshare`：
 
 ```powershell
 .\.venv\Scripts\Activate.ps1
+compshare -h
+compshare config --name default
 ```
 
+不激活虚拟环境时，使用 PowerShell 调用运算符 `&` 直接执行虚拟环境内的入口：
+
+```powershell
+& '.\.venv\Scripts\compshare.exe' -h
+& '.\.venv\Scripts\compshare.exe' config --name default
+```
+
+PowerShell 会把单引号中的路径解析为字符串，所以带参数执行时不能省略 `&`。路径包含空格时必须保留引号；从当前目录运行可执行文件时要使用 `.\` 前缀。若 `Activate.ps1` 被本机执行策略拦截，可直接使用上述不激活的写法，无需修改系统策略。
+
 ## 配置
 
 ```bash

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "compshare-cli"
-version = "0.3.0"
+version = "0.3.1"
 description = "Command-line client for CompShare GPU compute"
 readme = "README.md"
 requires-python = ">=3.9"

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/src/compshare_cli/__init__.py

@@ -1,3 +1,3 @@
 """CompShare command-line client."""
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/src/compshare_cli/commands/doctor.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import platform
 import shutil
 import stat
 import sys
@@ -61,7 +62,18 @@ def run(state: Runtime) -> None:
         )
     )
 
-    if store.path.exists():
+    if store.path.exists() and platform.system() == "Windows":
+        checks.append(
+            _check(
+                "Permissions",
+                "Warning",
+                tr(
+                    "Config {path}: Windows ACLs apply; POSIX permission check skipped.",
+                    path=store.path,
+                ),
+            )
+        )
+    elif store.path.exists():
         file_mode = stat.S_IMODE(store.path.stat().st_mode)
         directory_mode = stat.S_IMODE(store.path.parent.stat().st_mode)
         permissions_ok = file_mode & 0o077 == 0 and directory_mode & 0o077 == 0

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/src/compshare_cli/i18n.py

@@ -618,6 +618,9 @@ ZH_TRANSLATIONS: Dict[str, str] = {
     "Config {path}: file {file_mode}, directory {directory_mode}": (
         "配置 {path}：文件权限 {file_mode}，目录权限 {directory_mode}"
     ),
+    "Config {path}: Windows ACLs apply; POSIX permission check skipped.": (
+        "配置 {path}：由 Windows ACL 管理访问权限，已跳过 POSIX 权限位检查"
+    ),
     "Using environment credentials": "正在使用环境变量凭证",
     "Config file does not exist: {path}": "配置文件不存在：{path}",
     "Connected; {count} availability zones returned.": "连接成功，返回 {count} 个可用区。",

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/src/compshare_cli/ssh.py

@@ -40,6 +40,10 @@ class PasswordAutomationUnavailable(RuntimeError):
     """Raised when the current terminal cannot safely automate an SSH password."""
 
 
+def _is_windows() -> bool:
+    return os.name == "nt"
+
+
 def _password_authentication(argv: List[str], *, command_mode: bool = False) -> List[str]:
     executable = os.path.basename(argv[0]).casefold()
     if executable not in {"ssh", "ssh.exe"}:
@@ -133,7 +137,7 @@ def scp_upload_command(
 
 
 def _askpass_executable() -> str:
-    name = "compshare-ssh-askpass.exe" if os.name == "nt" else "compshare-ssh-askpass"
+    name = "compshare-ssh-askpass.exe" if _is_windows() else "compshare-ssh-askpass"
     sibling = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), name)
     if os.path.isfile(sibling) and os.access(sibling, os.X_OK):
         return sibling
@@ -193,7 +197,9 @@ def _run_with_askpass(command: List[str], password: str) -> int:
 
 def connect_with_password(argv: List[str], password: str) -> int:
     """Run SSH interactively and answer its first password prompt."""
-    if os.name == "nt" or not sys.stdin.isatty() or not sys.stdout.isatty():
+    if _is_windows():
+        return _run_with_askpass(_password_authentication(argv), password)
+    if not sys.stdin.isatty() or not sys.stdout.isatty():
         raise PasswordAutomationUnavailable
 
     try:

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/src/compshare_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compshare-cli
-Version: 0.3.0
+Version: 0.3.1
 Summary: Command-line client for CompShare GPU compute
 Author: CompShare
 License-Expression: Apache-2.0
@@ -35,7 +35,7 @@ Dynamic: license-file
 - 可通过 `compshare feedback` 反馈 CLI 问题和建议
 - 基于官方 [`ucloud-sdk-python3`](https://github.com/ucloud/ucloud-sdk-python3)
 
-当前版本：`0.3.0`，要求 Python 3.9 或更高版本。
+当前版本：`0.3.1`，要求 Python 3.9 或更高版本。
 
 ## 安装
 
@@ -54,12 +54,23 @@ source .venv/bin/activate
 python -m pip install -e '.[dev]'
 ```
 
-Windows 激活虚拟环境时使用：
+Windows PowerShell 中可先激活虚拟环境，再直接调用 `compshare`：
 
 ```powershell
 .\.venv\Scripts\Activate.ps1
+compshare -h
+compshare config --name default
 ```
 
+不激活虚拟环境时，使用 PowerShell 调用运算符 `&` 直接执行虚拟环境内的入口：
+
+```powershell
+& '.\.venv\Scripts\compshare.exe' -h
+& '.\.venv\Scripts\compshare.exe' config --name default
+```
+
+PowerShell 会把单引号中的路径解析为字符串，所以带参数执行时不能省略 `&`。路径包含空格时必须保留引号；从当前目录运行可执行文件时要使用 `.\` 前缀。若 `Activate.ps1` 被本机执行策略拦截，可直接使用上述不激活的写法，无需修改系统策略。
+
 ## 配置
 
 ```bash

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/tests/test_cli.py

@@ -1463,3 +1463,27 @@ def test_doctor_is_read_only_and_json(monkeypatch, tmp_path) -> None:
     payload = json.loads(result.stdout)
     assert payload["ok"] is True
     assert {item["Check"] for item in payload["checks"]} >= {"Credentials", "API", "ssh"}
+
+
+def test_doctor_does_not_treat_windows_mode_bits_as_posix_permissions(
+    monkeypatch, tmp_path
+) -> None:
+    path = tmp_path / "config.json"
+    path.write_text("{}", encoding="utf-8")
+    monkeypatch.setenv("COMPSHARE_CONFIG_FILE", str(path))
+    monkeypatch.setenv("COMPSHARE_PUBLIC_KEY", "public")
+    monkeypatch.setenv("COMPSHARE_PRIVATE_KEY", "private")
+    monkeypatch.setattr(doctor_module.platform, "system", lambda: "Windows")
+    monkeypatch.setattr(
+        doctor_module,
+        "call_captured",
+        lambda state, action, params: ({"ZoneInfo": [{"Zone": "cn-a-01"}]}, None),
+    )
+
+    result = runner.invoke(cli.app, ["--json", "doctor"])
+
+    assert result.exit_code == 0, result.output
+    payload = json.loads(result.stdout)
+    permissions = next(item for item in payload["checks"] if item["Check"] == "Permissions")
+    assert permissions["Status"] == "Warning"
+    assert "Windows ACL" in permissions["Detail"]

{compshare_cli-0.3.0 → compshare_cli-0.3.1}/tests/test_ssh.py

@@ -73,6 +73,39 @@ def test_connect_with_password_requires_an_interactive_terminal(monkeypatch) ->
         raise AssertionError("expected PasswordAutomationUnavailable")
 
 
+def test_connect_with_password_uses_askpass_on_windows(monkeypatch) -> None:
+    calls = []
+    monkeypatch.setattr(ssh, "_is_windows", lambda: True)
+    monkeypatch.setattr(
+        ssh,
+        "_run_with_askpass",
+        lambda argv, password: calls.append((argv, password)) or 23,
+    )
+
+    exit_code = ssh.connect_with_password(
+        ["ssh", "-p", "2222", "root@example.invalid"],
+        "instance-secret",
+    )
+
+    assert exit_code == 23
+    argv, password = calls[0]
+    assert argv == [
+        "ssh",
+        "-o",
+        "PreferredAuthentications=password,keyboard-interactive",
+        "-o",
+        "PubkeyAuthentication=no",
+        "-o",
+        "NumberOfPasswordPrompts=1",
+        "-o",
+        "StrictHostKeyChecking=accept-new",
+        "-p",
+        "2222",
+        "root@example.invalid",
+    ]
+    assert password == "instance-secret"
+
+
 def test_execute_with_password_uses_askpass_without_password_in_argv(monkeypatch) -> None:
     calls = []
     monkeypatch.delenv(ssh._ASKPASS_PASSWORD_FILE_ENV, raising=False)