evm-cli 2.5.0__tar.gz → 2.6.1__tar.gz

{evm_cli-2.5.0 → evm_cli-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evm-cli
-Version: 2.5.0
+Version: 2.6.1
 Summary: A command-line tool for managing environment variables
 Author-email: EVM Tool <evm@example.com>
 License: MIT
@@ -42,7 +42,7 @@ Dynamic: license-file
 
 A powerful command-line tool for managing environment variables on macOS and Linux systems.
 
-**Version**: 2.5.0
+**Version**: 2.6.1
 
 ## Features
 
@@ -63,6 +63,7 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **History**: Operation audit log with JSONL storage
 - ✅ **Shell Completion**: bash, zsh, fish completion script generation
 - ✅ **Shell Integration**: `evm init` auto-installs `evm-load` + completion into your rc on first use
+- ✅ **Self-Upgrade**: `evm upgrade` checks PyPI and pip-installs the latest version
 - ✅ **Interactive Safety**: Confirmation prompts for destructive operations (`--force` to skip)
 - ✅ **JSON Output**: `--json` flag for structured output (agent-friendly, stdout=data, stderr=errors)
 - ✅ **Quiet Mode**: `--quiet` suppresses all human-readable output
@@ -97,6 +98,8 @@ evm/
 │   ├── _completion.py        # Shell completion generators (bash/zsh/fish)
 │   ├── _json.py              # JSON output helpers (agent-friendly)
 │   ├── _crypto.py            # HKDF + HMAC-CTR encryption module
+│   ├── _upgrade.py           # Self-upgrade: PyPI version check + pip install
+│   ├── _typing.py            # Shared typing helpers (Protocol mixins)
 │   ├── formatters.py         # Terminal output formatting
 │   └── exceptions.py         # Custom exception hierarchy (17 classes)
 ├── examples/                 # Example scripts
@@ -104,8 +107,13 @@ evm/
 │   ├── test_main.py          # Unit + integration tests
 │   ├── test_inject.py        # `evm inject` + `evm-load` tests
 │   ├── test_shell_integration.py  # `evm init` + auto-install tests
+│   ├── test_upgrade.py       # `evm upgrade` tests
 │   ├── test_io_boundary.py   # _io.py boundary tests
 │   ├── test_cli_boundary.py  # cli.py boundary tests
+│   ├── test_cli_additional.py  # cli.py additional coverage
+│   ├── test_cli_coverage.py  # cli.py coverage gap tests
+│   ├── test_main_entry.py    # `evm` entry-point tests
+│   ├── test_main_module.py   # `python -m evm` entry tests
 │   ├── test_v230_fixes.py    # v2.3.0 code review fix tests
 │   ├── test_coverage_gap.py  # Coverage gap tests (98% target)
 │   ├── test_formatters.py    # Formatter output tests
@@ -327,6 +335,8 @@ evm exec -- COMMAND        # Run with env vars
 eval "$(evm inject)"       # Load vars into current shell
 evm backup                 # Create backup
 evm validate               # Check schemas
+evm upgrade                # Upgrade to latest PyPI release
+evm upgrade --check        # Check for updates only
 ```
 
 ## Usage
@@ -600,6 +610,35 @@ evm history --limit 50
 evm history --clear
 ```
 
+### Self-Upgrade (`evm upgrade`)
+
+Check PyPI for a newer `evm` release and pip-install it in one step. Uses only the standard library — no extra dependencies.
+
+```bash
+# Check whether a newer version is available (no changes made)
+evm upgrade --check
+# exit 0 = up to date, exit 1 = update available (or network error)
+
+# Upgrade to the latest release
+evm upgrade
+#  → Upgraded from 2.5.0 to 2.6.0.
+
+# Preview the pip command without running it
+evm upgrade --dry-run
+
+# Skip the pre-check and run pip directly
+evm upgrade --force
+
+# Structured JSON output (stdout = data, stderr = errors)
+evm upgrade --check --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "latest": "2.6.0", "update_available": true}}
+
+evm upgrade --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "new_version": "2.6.0", "action": "upgraded", "upgraded": true, "message": "Upgraded from 2.5.0 to 2.6.0."}}
+```
+
+`evm upgrade` calls `pip install --upgrade evm-cli` using the **same Python interpreter** that runs `evm`, so it upgrades the correct installation. If the network is unreachable, `--check` reports `unknown` and exits 1; a plain `evm upgrade` aborts before touching pip.
+
 ### Shell Integration (`evm init`)
 
 EVM can install a shell-integration snippet into your rc file (`~/.zshrc`, `~/.bashrc`, `~/.config/fish/config.fish`). The snippet is **one line** that re-evaluates `evm init` on every shell start — so `evm-load`, tab completion, and any future integration stay in sync with the installed `evm` version automatically (no need to re-install after an upgrade).

{evm_cli-2.5.0 → evm_cli-2.6.1}/README.md

@@ -2,7 +2,7 @@
 
 A powerful command-line tool for managing environment variables on macOS and Linux systems.
 
-**Version**: 2.5.0
+**Version**: 2.6.1
 
 ## Features
 
@@ -23,6 +23,7 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **History**: Operation audit log with JSONL storage
 - ✅ **Shell Completion**: bash, zsh, fish completion script generation
 - ✅ **Shell Integration**: `evm init` auto-installs `evm-load` + completion into your rc on first use
+- ✅ **Self-Upgrade**: `evm upgrade` checks PyPI and pip-installs the latest version
 - ✅ **Interactive Safety**: Confirmation prompts for destructive operations (`--force` to skip)
 - ✅ **JSON Output**: `--json` flag for structured output (agent-friendly, stdout=data, stderr=errors)
 - ✅ **Quiet Mode**: `--quiet` suppresses all human-readable output
@@ -57,6 +58,8 @@ evm/
 │   ├── _completion.py        # Shell completion generators (bash/zsh/fish)
 │   ├── _json.py              # JSON output helpers (agent-friendly)
 │   ├── _crypto.py            # HKDF + HMAC-CTR encryption module
+│   ├── _upgrade.py           # Self-upgrade: PyPI version check + pip install
+│   ├── _typing.py            # Shared typing helpers (Protocol mixins)
 │   ├── formatters.py         # Terminal output formatting
 │   └── exceptions.py         # Custom exception hierarchy (17 classes)
 ├── examples/                 # Example scripts
@@ -64,8 +67,13 @@ evm/
 │   ├── test_main.py          # Unit + integration tests
 │   ├── test_inject.py        # `evm inject` + `evm-load` tests
 │   ├── test_shell_integration.py  # `evm init` + auto-install tests
+│   ├── test_upgrade.py       # `evm upgrade` tests
 │   ├── test_io_boundary.py   # _io.py boundary tests
 │   ├── test_cli_boundary.py  # cli.py boundary tests
+│   ├── test_cli_additional.py  # cli.py additional coverage
+│   ├── test_cli_coverage.py  # cli.py coverage gap tests
+│   ├── test_main_entry.py    # `evm` entry-point tests
+│   ├── test_main_module.py   # `python -m evm` entry tests
 │   ├── test_v230_fixes.py    # v2.3.0 code review fix tests
 │   ├── test_coverage_gap.py  # Coverage gap tests (98% target)
 │   ├── test_formatters.py    # Formatter output tests
@@ -287,6 +295,8 @@ evm exec -- COMMAND        # Run with env vars
 eval "$(evm inject)"       # Load vars into current shell
 evm backup                 # Create backup
 evm validate               # Check schemas
+evm upgrade                # Upgrade to latest PyPI release
+evm upgrade --check        # Check for updates only
 ```
 
 ## Usage
@@ -560,6 +570,35 @@ evm history --limit 50
 evm history --clear
 ```
 
+### Self-Upgrade (`evm upgrade`)
+
+Check PyPI for a newer `evm` release and pip-install it in one step. Uses only the standard library — no extra dependencies.
+
+```bash
+# Check whether a newer version is available (no changes made)
+evm upgrade --check
+# exit 0 = up to date, exit 1 = update available (or network error)
+
+# Upgrade to the latest release
+evm upgrade
+#  → Upgraded from 2.5.0 to 2.6.0.
+
+# Preview the pip command without running it
+evm upgrade --dry-run
+
+# Skip the pre-check and run pip directly
+evm upgrade --force
+
+# Structured JSON output (stdout = data, stderr = errors)
+evm upgrade --check --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "latest": "2.6.0", "update_available": true}}
+
+evm upgrade --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "new_version": "2.6.0", "action": "upgraded", "upgraded": true, "message": "Upgraded from 2.5.0 to 2.6.0."}}
+```
+
+`evm upgrade` calls `pip install --upgrade evm-cli` using the **same Python interpreter** that runs `evm`, so it upgrades the correct installation. If the network is unreachable, `--check` reports `unknown` and exits 1; a plain `evm upgrade` aborts before touching pip.
+
 ### Shell Integration (`evm init`)
 
 EVM can install a shell-integration snippet into your rc file (`~/.zshrc`, `~/.bashrc`, `~/.config/fish/config.fish`). The snippet is **one line** that re-evaluates `evm init` on every shell start — so `evm-load`, tab completion, and any future integration stay in sync with the installed `evm` version automatically (no need to re-install after an upgrade).

{evm_cli-2.5.0 → evm_cli-2.6.1}/evm/__init__.py

@@ -3,7 +3,7 @@ EVM - Environment Variable Manager
 A command-line tool for managing environment variables.
 """
 
-__version__ = "2.5.0"
+__version__ = "2.6.1"
 __author__ = "EVM Tool"
 
 from .exceptions import (

evm_cli-2.6.1/evm/_upgrade.py

@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+"""
+EVM 自升级模块
+
+通过 PyPI JSON API 检查最新版本，必要时调用 pip 升级。
+纯标准库实现（urllib + subprocess），无第三方依赖。
+"""
+
+import json
+import subprocess
+import sys
+import urllib.error
+import urllib.request
+from typing import Optional
+
+from . import __version__
+
+# pyproject.toml 中定义的 PyPI 包名
+PACKAGE_NAME = 'evm-cli'
+PYPI_JSON_URL = f'https://pypi.org/pypi/{PACKAGE_NAME}/json'
+# pip 升级命令：始终使用当前解释器的 pip 模块，避免找不到 pip
+PIP_UPGRADE_CMD = [
+    sys.executable, '-m', 'pip', 'install', '--upgrade', PACKAGE_NAME
+]
+
+_DEFAULT_TIMEOUT = 10.0
+_DEFAULT_PIP_TIMEOUT = 120.0
+
+
+def get_current_version() -> str:
+    """返回当前运行的 evm 版本"""
+    return __version__
+
+
+def fetch_latest_version(timeout: float = _DEFAULT_TIMEOUT) -> Optional[str]:
+    """向 PyPI 查询最新发布版本。
+
+    失败（网络异常 / 解析异常）时返回 None。
+    """
+    try:
+        req = urllib.request.Request(
+            PYPI_JSON_URL,
+            headers={'User-Agent': f'evm/{__version__}'},
+        )
+        with urllib.request.urlopen(req, timeout=timeout) as resp:
+            data = json.loads(resp.read().decode('utf-8'))
+        return str(data['info']['version'])
+    except (urllib.error.URLError, OSError, ValueError, KeyError):
+        return None
+
+
+def _parse_version(version: str) -> tuple[int, ...]:
+    """把 '2.5.0' 解析成 (2, 5, 0)。非数字段视为 0。"""
+    parts: list[int] = []
+    for seg in version.split('.'):
+        try:
+            parts.append(int(seg))
+        except ValueError:
+            parts.append(0)
+    return tuple(parts)
+
+
+def is_newer(remote: str, local: str) -> bool:
+    """remote 是否比 local 更新（按数字段逐段比较）"""
+    rem = _parse_version(remote)
+    loc = _parse_version(local)
+    max_len = max(len(rem), len(loc))
+    rem = rem + (0,) * (max_len - len(rem))
+    loc = loc + (0,) * (max_len - len(loc))
+    return rem > loc
+
+
+def check_for_update(
+    timeout: float = _DEFAULT_TIMEOUT,
+) -> tuple[Optional[str], Optional[bool]]:
+    """检查是否有新版本。
+
+    Returns:
+        (latest, update_available)
+        - latest: 最新版本号字符串；无法获取时为 None
+        - update_available: True=有更新, False=已最新, None=无法判定
+    """
+    latest = fetch_latest_version(timeout=timeout)
+    if latest is None:
+        return None, None
+    return latest, is_newer(latest, get_current_version())
+
+
+def perform_upgrade(
+    force: bool = False,
+    dry_run: bool = False,
+    timeout: float = _DEFAULT_PIP_TIMEOUT,
+) -> tuple[str, str, str]:
+    """执行升级。
+
+    Args:
+        force: 跳过预检查，直接运行 pip（即使可能已是最新）
+        dry_run: 仅打印将要执行的命令，不实际升级
+        timeout: pip 子进程超时秒数
+
+    Returns:
+        (action, message, new_version)
+        - action ∈ {'upgraded', 'already_latest', 'dry_run',
+                    'failed', 'network_error'}
+        - new_version 为升级后版本号；未知/未升级时为空串
+    """
+    current = get_current_version()
+
+    if not force:
+        latest, available = check_for_update()
+        if available is None:
+            return (
+                'network_error',
+                'Unable to check latest version (network unreachable or PyPI error).',
+                '',
+            )
+        if not available:
+            return 'already_latest', f'Already up to date ({current}).', current
+
+    if dry_run:
+        return (
+            'dry_run',
+            f'[DRY-RUN] Would run: {" ".join(PIP_UPGRADE_CMD)}',
+            '',
+        )
+
+    try:
+        result = subprocess.run(
+            PIP_UPGRADE_CMD,
+            capture_output=True,
+            text=True,
+            timeout=timeout,
+        )
+    except (subprocess.TimeoutExpired, OSError) as e:
+        return 'failed', f'Upgrade failed: {e}', ''
+
+    if result.returncode != 0:
+        lines = (result.stderr or result.stdout or '').strip().splitlines()
+        tail = lines[-1] if lines else ''
+        detail = f' — {tail}' if tail else ''
+        return (
+            'failed',
+            f'pip upgrade failed (exit {result.returncode}){detail}',
+            '',
+        )
+
+    # pip 成功后重新查询 PyPI，取得升级后的版本号
+    latest = fetch_latest_version()
+    new_ver = latest if latest else ''
+    if new_ver and is_newer(new_ver, current):
+        return 'upgraded', f'Upgraded from {current} to {new_ver}.', new_ver
+    return 'upgraded', f'Upgrade complete (now {new_ver or current}).', new_ver
+
+
+__all__ = [
+    'PACKAGE_NAME',
+    'PYPI_JSON_URL',
+    'PIP_UPGRADE_CMD',
+    'get_current_version',
+    'fetch_latest_version',
+    'is_newer',
+    'check_for_update',
+    'perform_upgrade',
+]

{evm_cli-2.5.0 → evm_cli-2.6.1}/evm/cli.py

@@ -28,6 +28,7 @@ import os
 import sys
 from typing import Optional
 
+from . import __version__
 from ._completion import (
     SHELL_GENERATORS,
     install_integration,
@@ -98,7 +99,7 @@ ALL_COMMANDS = [
     'search', 'rename', 'copy',
     'exec', 'loadmemory', 'inject',
     'edit', 'info', 'diff', 'expand',
-    'validate', 'history', 'schema', 'completion', 'init',
+    'validate', 'history', 'schema', 'completion', 'init', 'upgrade',
 ]
 
 
@@ -169,7 +170,10 @@ Exit Codes:
         """,
     )
 
-    parser.add_argument('--version', action='version', version='%(prog)s 2.3.0')
+    parser.add_argument(
+        '--version', action='version',
+        version=f'%(prog)s {__version__}',
+    )
     parser.add_argument('-v', '--verbose', action='store_true',
                         help='Show detailed version information')
     parser.add_argument('--env-file',
@@ -416,6 +420,17 @@ Exit Codes:
         help='Report whether integration is installed (exit 0=yes, 1=no)',
     )
 
+    # upgrade: 检查并升级到 PyPI 上的最新版本
+    up_p = _sp(
+        'upgrade',
+        help='Check for and install the latest evm version from PyPI',
+    )
+    up_p.add_argument(
+        '--check', action='store_true',
+        help='Only check for updates; report and exit '
+             '(0=up-to-date, 1=update available)',
+    )
+
     return parser
 
 
@@ -456,8 +471,8 @@ def main(argv: Optional[list[str]] = None) -> int:
         parser.print_help()
         return 0
 
-    # 自动安装 shell 集成（跳过 init/completion 自身，避免递归/噪声）
-    if args.command not in ('init', 'completion'):
+    # 自动安装 shell 集成（跳过 init/completion/upgrade 自身，避免递归/噪声）
+    if args.command not in ('init', 'completion', 'upgrade'):
         _ensure_shell_integration(quiet)
 
     dry_run = getattr(args, 'dry_run', False)
@@ -1004,6 +1019,72 @@ def _cmd_init(mgr, args, dry_run, force, json_mode, quiet):
     return 0
 
 
+def _cmd_upgrade(mgr, args, dry_run, force, json_mode, quiet):
+    """处理 upgrade 命令 —— 检查并升级到最新版本
+
+    - `evm upgrade`          检查并在有新版本时通过 pip 升级
+    - `evm upgrade --check`  仅检查，不升级（0=已最新，1=有更新）
+    - `--dry-run`           预览将要执行的 pip 命令
+    - `--force`             跳过预检查，直接运行 pip
+    """
+    from . import _upgrade
+
+    current = _upgrade.get_current_version()
+
+    if getattr(args, 'check', False):
+        latest, available = _upgrade.check_for_update()
+        if available is None:
+            msg = (
+                'Unable to check latest version '
+                '(network unreachable or PyPI error).'
+            )
+            if json_mode:
+                json_error(msg, 1, quiet)
+            elif not quiet:
+                print(f"Current version: {current}")
+                print("Latest version:  unknown (unable to reach PyPI)")
+            return 1
+        if json_mode:
+            json_output(
+                {
+                    'current': current,
+                    'latest': latest,
+                    'update_available': available,
+                },
+                quiet,
+            )
+        elif not quiet:
+            print(f"Current version: {current}")
+            print(f"Latest version:  {latest}")
+            if available:
+                print("Update available!  Run `evm upgrade` to install.")
+            else:
+                print("Already up to date.")
+        return 0 if not available else 1
+
+    action, msg, new_ver = _upgrade.perform_upgrade(
+        force=force, dry_run=dry_run
+    )
+    ok = action in ('upgraded', 'already_latest', 'dry_run')
+    if json_mode:
+        if ok:
+            json_output(
+                {
+                    'current': current,
+                    'new_version': new_ver,
+                    'action': action,
+                    'upgraded': action == 'upgraded',
+                    'message': msg,
+                },
+                quiet,
+            )
+        else:
+            json_error(msg, 1, quiet)
+    elif not quiet:
+        print(msg)
+    return 0 if ok else 1
+
+
 def _ensure_shell_integration(quiet: bool) -> None:
     """在任意 evm 命令启动时检查并自动安装 shell 集成。
 
@@ -1066,6 +1147,7 @@ COMMAND_HANDLERS = {
     'schema': _cmd_schema,
     'completion': _cmd_completion,
     'init': _cmd_init,
+    'upgrade': _cmd_upgrade,
 }
 
 

{evm_cli-2.5.0 → evm_cli-2.6.1}/evm/manager.py

@@ -507,6 +507,8 @@ class EnvironmentManager(IOMixin, GroupMixin, HistoryMixin, SchemaMixin):
 
     def info(self) -> dict[str, object]:
         """返回工具元信息"""
+        from . import __version__
+
         groups = self.list_groups()
         total_vars = len(self._env_vars)
         secret_count = sum(
@@ -519,7 +521,7 @@ class EnvironmentManager(IOMixin, GroupMixin, HistoryMixin, SchemaMixin):
         )
 
         return {
-            'version': '2.3.0',
+            'version': __version__,
             'author': 'EVM Tool',
             'license': 'MIT',
             'python': sys.version.split()[0],

{evm_cli-2.5.0 → evm_cli-2.6.1}/evm_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evm-cli
-Version: 2.5.0
+Version: 2.6.1
 Summary: A command-line tool for managing environment variables
 Author-email: EVM Tool <evm@example.com>
 License: MIT
@@ -42,7 +42,7 @@ Dynamic: license-file
 
 A powerful command-line tool for managing environment variables on macOS and Linux systems.
 
-**Version**: 2.5.0
+**Version**: 2.6.1
 
 ## Features
 
@@ -63,6 +63,7 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **History**: Operation audit log with JSONL storage
 - ✅ **Shell Completion**: bash, zsh, fish completion script generation
 - ✅ **Shell Integration**: `evm init` auto-installs `evm-load` + completion into your rc on first use
+- ✅ **Self-Upgrade**: `evm upgrade` checks PyPI and pip-installs the latest version
 - ✅ **Interactive Safety**: Confirmation prompts for destructive operations (`--force` to skip)
 - ✅ **JSON Output**: `--json` flag for structured output (agent-friendly, stdout=data, stderr=errors)
 - ✅ **Quiet Mode**: `--quiet` suppresses all human-readable output
@@ -97,6 +98,8 @@ evm/
 │   ├── _completion.py        # Shell completion generators (bash/zsh/fish)
 │   ├── _json.py              # JSON output helpers (agent-friendly)
 │   ├── _crypto.py            # HKDF + HMAC-CTR encryption module
+│   ├── _upgrade.py           # Self-upgrade: PyPI version check + pip install
+│   ├── _typing.py            # Shared typing helpers (Protocol mixins)
 │   ├── formatters.py         # Terminal output formatting
 │   └── exceptions.py         # Custom exception hierarchy (17 classes)
 ├── examples/                 # Example scripts
@@ -104,8 +107,13 @@ evm/
 │   ├── test_main.py          # Unit + integration tests
 │   ├── test_inject.py        # `evm inject` + `evm-load` tests
 │   ├── test_shell_integration.py  # `evm init` + auto-install tests
+│   ├── test_upgrade.py       # `evm upgrade` tests
 │   ├── test_io_boundary.py   # _io.py boundary tests
 │   ├── test_cli_boundary.py  # cli.py boundary tests
+│   ├── test_cli_additional.py  # cli.py additional coverage
+│   ├── test_cli_coverage.py  # cli.py coverage gap tests
+│   ├── test_main_entry.py    # `evm` entry-point tests
+│   ├── test_main_module.py   # `python -m evm` entry tests
 │   ├── test_v230_fixes.py    # v2.3.0 code review fix tests
 │   ├── test_coverage_gap.py  # Coverage gap tests (98% target)
 │   ├── test_formatters.py    # Formatter output tests
@@ -327,6 +335,8 @@ evm exec -- COMMAND        # Run with env vars
 eval "$(evm inject)"       # Load vars into current shell
 evm backup                 # Create backup
 evm validate               # Check schemas
+evm upgrade                # Upgrade to latest PyPI release
+evm upgrade --check        # Check for updates only
 ```
 
 ## Usage
@@ -600,6 +610,35 @@ evm history --limit 50
 evm history --clear
 ```
 
+### Self-Upgrade (`evm upgrade`)
+
+Check PyPI for a newer `evm` release and pip-install it in one step. Uses only the standard library — no extra dependencies.
+
+```bash
+# Check whether a newer version is available (no changes made)
+evm upgrade --check
+# exit 0 = up to date, exit 1 = update available (or network error)
+
+# Upgrade to the latest release
+evm upgrade
+#  → Upgraded from 2.5.0 to 2.6.0.
+
+# Preview the pip command without running it
+evm upgrade --dry-run
+
+# Skip the pre-check and run pip directly
+evm upgrade --force
+
+# Structured JSON output (stdout = data, stderr = errors)
+evm upgrade --check --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "latest": "2.6.0", "update_available": true}}
+
+evm upgrade --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "new_version": "2.6.0", "action": "upgraded", "upgraded": true, "message": "Upgraded from 2.5.0 to 2.6.0."}}
+```
+
+`evm upgrade` calls `pip install --upgrade evm-cli` using the **same Python interpreter** that runs `evm`, so it upgrades the correct installation. If the network is unreachable, `--check` reports `unknown` and exits 1; a plain `evm upgrade` aborts before touching pip.
+
 ### Shell Integration (`evm init`)
 
 EVM can install a shell-integration snippet into your rc file (`~/.zshrc`, `~/.bashrc`, `~/.config/fish/config.fish`). The snippet is **one line** that re-evaluates `evm init` on every shell start — so `evm-load`, tab completion, and any future integration stay in sync with the installed `evm` version automatically (no need to re-install after an upgrade).

{evm_cli-2.5.0 → evm_cli-2.6.1}/evm_cli.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ evm/_io.py
 evm/_json.py
 evm/_schema.py
 evm/_typing.py
+evm/_upgrade.py
 evm/cli.py
 evm/exceptions.py
 evm/formatters.py
@@ -34,4 +35,5 @@ tests/test_main.py
 tests/test_main_entry.py
 tests/test_main_module.py
 tests/test_shell_integration.py
+tests/test_upgrade.py
 tests/test_v230_fixes.py

evm_cli-2.6.1/tests/test_upgrade.py

@@ -0,0 +1,488 @@
+#!/usr/bin/env python3
+"""
+evm upgrade 命令测试
+
+覆盖：
+- evm._upgrade 模块的纯函数（版本比较、PyPI 查询、升级执行）
+- cli.py 的 evm upgrade 命令（--check / --dry-run / --json / --quiet / --force）
+- upgrade 命令不触发 shell 集成自动安装
+"""
+
+import json
+import subprocess
+import urllib.error
+from unittest.mock import patch
+
+import pytest
+
+from evm import __version__, _upgrade
+from evm.cli import main
+
+# ══════════════════════════════════════════════════════════════
+# 辅助
+# ══════════════════════════════════════════════════════════════
+
+class _FakeUrllibResponse:
+    """模拟 urllib.request.urlopen 返回的上下文管理器"""
+
+    def __init__(self, payload: bytes):
+        self._payload = payload
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *exc):
+        return False
+
+    def read(self) -> bytes:
+        return self._payload
+
+
+def _pypi_payload(version: str) -> bytes:
+    return json.dumps({'info': {'version': version}}).encode('utf-8')
+
+
+def _env_file(tmp_path):
+    return str(tmp_path / 'env.json')
+
+
+# ══════════════════════════════════════════════════════════════
+# 纯函数单元测试
+# ══════════════════════════════════════════════════════════════
+
+class TestVersionCompare:
+    """_parse_version / is_newer"""
+
+    @pytest.mark.parametrize('remote,local,expected', [
+        ('2.6.0', '2.5.0', True),
+        ('2.5.0', '2.5.0', False),
+        ('2.4.0', '2.5.0', False),
+        ('2.5.1', '2.5.0', True),
+        ('3.0.0', '2.9.9', True),
+        ('2.5', '2.5.0', False),       # 短版本补零后相等
+        ('2.5.0.1', '2.5.0', True),    # 多一段更新
+        ('2.5.0', '2.5.0.1', False),
+    ])
+    def test_is_newer(self, remote, local, expected):
+        assert _upgrade.is_newer(remote, local) is expected
+
+    def test_parse_version_non_numeric_segments_become_zero(self):
+        assert _upgrade._parse_version('1.2.x') == (1, 2, 0)
+        assert _upgrade._parse_version('1') == (1,)
+
+
+class TestGetCurrentVersion:
+    def test_returns_package_version(self):
+        assert _upgrade.get_current_version() == __version__
+
+
+# ══════════════════════════════════════════════════════════════
+# fetch_latest_version — 网络层
+# ══════════════════════════════════════════════════════════════
+
+class TestFetchLatestVersion:
+    def test_success_returns_version(self):
+        with patch('evm._upgrade.urllib.request.urlopen') as mock_open:
+            mock_open.return_value = _FakeUrllibResponse(_pypi_payload('9.9.9'))
+            assert _upgrade.fetch_latest_version() == '9.9.9'
+
+    def test_url_error_returns_none(self):
+        with patch('evm._upgrade.urllib.request.urlopen',
+                   side_effect=urllib.error.URLError('boom')):
+            assert _upgrade.fetch_latest_version() is None
+
+    def test_oserror_returns_none(self):
+        with patch('evm._upgrade.urllib.request.urlopen',
+                   side_effect=OSError('boom')):
+            assert _upgrade.fetch_latest_version() is None
+
+    def test_bad_json_returns_none(self):
+        with patch('evm._upgrade.urllib.request.urlopen') as mock_open:
+            mock_open.return_value = _FakeUrllibResponse(b'not json')
+            assert _upgrade.fetch_latest_version() is None
+
+    def test_missing_version_key_returns_none(self):
+        with patch('evm._upgrade.urllib.request.urlopen') as mock_open:
+            mock_open.return_value = _FakeUrllibResponse(b'{"info": {}}')
+            assert _upgrade.fetch_latest_version() is None
+
+
+# ══════════════════════════════════════════════════════════════
+# check_for_update
+# ══════════════════════════════════════════════════════════════
+
+class TestCheckForUpdate:
+    def test_update_available(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        latest, available = _upgrade.check_for_update()
+        assert latest == '9.9.9'
+        assert available is True
+
+    def test_already_latest(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        latest, available = _upgrade.check_for_update()
+        assert latest == __version__
+        assert available is False
+
+    def test_network_unavailable(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: None)
+        latest, available = _upgrade.check_for_update()
+        assert latest is None
+        assert available is None
+
+
+# ══════════════════════════════════════════════════════════════
+# perform_upgrade — 子进程层
+# ══════════════════════════════════════════════════════════════
+
+def _completed(returncode=0, stdout='', stderr=''):
+    return subprocess.CompletedProcess(
+        args=['pip'], returncode=returncode,
+        stdout=stdout, stderr=stderr,
+    )
+
+
+class TestPerformUpgrade:
+    def test_already_latest(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        action, msg, new_ver = _upgrade.perform_upgrade()
+        assert action == 'already_latest'
+        assert __version__ in msg
+        assert new_ver == __version__
+
+    def test_network_error(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: None)
+        action, msg, new_ver = _upgrade.perform_upgrade()
+        assert action == 'network_error'
+        assert new_ver == ''
+
+    def test_dry_run_with_update(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        action, msg, new_ver = _upgrade.perform_upgrade(dry_run=True)
+        assert action == 'dry_run'
+        assert '[DRY-RUN]' in msg
+        assert 'pip' in msg
+        assert new_ver == ''
+
+    def test_dry_run_force_skips_check(self, monkeypatch):
+        # force=True 应跳过 check_for_update，直接 dry-run
+        called = {'check': False}
+
+        def fake_check(timeout=10.0):
+            called['check'] = True
+            return None, None
+
+        monkeypatch.setattr(_upgrade, 'check_for_update', fake_check)
+        action, msg, new_ver = _upgrade.perform_upgrade(force=True, dry_run=True)
+        assert action == 'dry_run'
+        assert called['check'] is False
+
+    def test_upgrade_success(self, monkeypatch):
+        # 第一次 fetch（预检查）返回更新版本，第二次（升级后）也返回该版本
+        versions = iter(['9.9.9', '9.9.9'])
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: next(versions))
+        monkeypatch.setattr(_upgrade.subprocess, 'run',
+                            lambda *a, **kw: _completed(returncode=0))
+        action, msg, new_ver = _upgrade.perform_upgrade()
+        assert action == 'upgraded'
+        assert '9.9.9' in msg
+        assert new_ver == '9.9.9'
+
+    def test_upgrade_pip_failure(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        monkeypatch.setattr(_upgrade.subprocess, 'run',
+                            lambda *a, **kw: _completed(
+                                returncode=1, stderr='nope'))
+        action, msg, new_ver = _upgrade.perform_upgrade()
+        assert action == 'failed'
+        assert 'exit 1' in msg
+        assert 'nope' in msg
+        assert new_ver == ''
+
+    def test_upgrade_oserror(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+
+        def raise_oserror(*a, **kw):
+            raise OSError('pip missing')
+
+        monkeypatch.setattr(_upgrade.subprocess, 'run', raise_oserror)
+        action, msg, new_ver = _upgrade.perform_upgrade()
+        assert action == 'failed'
+        assert 'pip missing' in msg
+
+    def test_upgrade_timeout(self, monkeypatch):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+
+        def raise_timeout(*a, **kw):
+            raise subprocess.TimeoutExpired(cmd='pip', timeout=1)
+
+        monkeypatch.setattr(_upgrade.subprocess, 'run', raise_timeout)
+        action, msg, new_ver = _upgrade.perform_upgrade()
+        assert action == 'failed'
+
+    def test_force_runs_pip_without_precheck(self, monkeypatch):
+        called = {'check': False, 'pip': False}
+
+        def fake_check(timeout=10.0):
+            called['check'] = True
+            return None, None
+
+        def fake_run(*a, **kw):
+            called['pip'] = True
+            return _completed(returncode=0)
+
+        monkeypatch.setattr(_upgrade, 'check_for_update', fake_check)
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        monkeypatch.setattr(_upgrade.subprocess, 'run', fake_run)
+        action, msg, new_ver = _upgrade.perform_upgrade(force=True)
+        assert action == 'upgraded'
+        assert called['check'] is False
+        assert called['pip'] is True
+
+
+# ══════════════════════════════════════════════════════════════
+# CLI: evm upgrade --check
+# ══════════════════════════════════════════════════════════════
+
+class TestCmdUpgradeCheck:
+    """evm upgrade --check 子命令"""
+
+    def test_check_up_to_date(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade', '--check'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        assert 'Already up to date.' in out
+        assert __version__ in out
+
+    def test_check_update_available(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade', '--check'])
+        out, _ = capsys.readouterr()
+        assert code == 1
+        assert 'Update available!' in out
+        assert '9.9.9' in out
+
+    def test_check_network_error(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: None)
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade', '--check'])
+        out, _ = capsys.readouterr()
+        assert code == 1
+        assert 'unknown' in out
+
+    def test_check_json_up_to_date(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        code = main(['--json', '--env-file', _env_file(tmp_path),
+                     'upgrade', '--check'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        data = json.loads(out)
+        assert data['status'] == 'ok'
+        assert data['data']['current'] == __version__
+        assert data['data']['update_available'] is False
+
+    def test_check_json_update_available(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        code = main(['--json', '--env-file', _env_file(tmp_path),
+                     'upgrade', '--check'])
+        out, _ = capsys.readouterr()
+        assert code == 1
+        data = json.loads(out)
+        assert data['data']['update_available'] is True
+        assert data['data']['latest'] == '9.9.9'
+
+    def test_check_json_network_error(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: None)
+        code = main(['--json', '--env-file', _env_file(tmp_path),
+                     'upgrade', '--check'])
+        out, err = capsys.readouterr()
+        assert code == 1
+        assert out == ''
+        data = json.loads(err)
+        assert data['status'] == 'error'
+
+    def test_check_quiet_no_output(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        code = main(['--quiet', '--env-file', _env_file(tmp_path),
+                     'upgrade', '--check'])
+        out, _ = capsys.readouterr()
+        assert code == 1
+        assert out == ''
+
+
+# ══════════════════════════════════════════════════════════════
+# CLI: evm upgrade（实际升级 / dry-run）
+# ══════════════════════════════════════════════════════════════
+
+class TestCmdUpgrade:
+    """evm upgrade（非 --check）"""
+
+    def test_dry_run(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        ran = {'pip': False}
+
+        def fake_run(*a, **kw):
+            ran['pip'] = True
+            return _completed(returncode=0)
+
+        monkeypatch.setattr(_upgrade.subprocess, 'run', fake_run)
+        code = main(['--env-file', _env_file(tmp_path),
+                     'upgrade', '--dry-run'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        assert '[DRY-RUN]' in out
+        assert 'pip' in out
+        assert ran['pip'] is False  # dry-run 不能真正调用 pip
+
+    def test_already_latest(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        ran = {'pip': False}
+
+        def fake_run(*a, **kw):
+            ran['pip'] = True
+            return _completed(returncode=0)
+
+        monkeypatch.setattr(_upgrade.subprocess, 'run', fake_run)
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        assert 'Already up to date' in out
+        assert ran['pip'] is False  # 已最新则不调用 pip
+
+    def test_upgrade_success(self, capsys, monkeypatch, tmp_path):
+        versions = iter(['9.9.9', '9.9.9'])
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: next(versions))
+        monkeypatch.setattr(_upgrade.subprocess, 'run',
+                            lambda *a, **kw: _completed(returncode=0))
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        assert 'Upgraded' in out
+        assert '9.9.9' in out
+
+    def test_upgrade_pip_failure(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        monkeypatch.setattr(_upgrade.subprocess, 'run',
+                            lambda *a, **kw: _completed(
+                                returncode=1, stderr='permission denied'))
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade'])
+        out, _ = capsys.readouterr()
+        assert code == 1
+        assert 'failed' in out.lower()
+
+    def test_upgrade_network_error(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: None)
+        code = main(['--env-file', _env_file(tmp_path), 'upgrade'])
+        out, _ = capsys.readouterr()
+        assert code == 1
+        assert 'Unable' in out
+
+    def test_force_skips_precheck(self, capsys, monkeypatch, tmp_path):
+        called = {'check': False, 'pip': False}
+
+        def fake_check(timeout=10.0):
+            called['check'] = True
+            return None, None
+
+        def fake_run(*a, **kw):
+            called['pip'] = True
+            return _completed(returncode=0)
+
+        monkeypatch.setattr(_upgrade, 'check_for_update', fake_check)
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        monkeypatch.setattr(_upgrade.subprocess, 'run', fake_run)
+        code = main(['--env-file', _env_file(tmp_path),
+                     'upgrade', '--force'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        assert called['check'] is False
+        assert called['pip'] is True
+
+    def test_upgrade_json_success(self, capsys, monkeypatch, tmp_path):
+        versions = iter(['9.9.9', '9.9.9'])
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: next(versions))
+        monkeypatch.setattr(_upgrade.subprocess, 'run',
+                            lambda *a, **kw: _completed(returncode=0))
+        code = main(['--json', '--env-file', _env_file(tmp_path), 'upgrade'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        data = json.loads(out)
+        assert data['status'] == 'ok'
+        assert data['data']['action'] == 'upgraded'
+        assert data['data']['upgraded'] is True
+        assert data['data']['new_version'] == '9.9.9'
+
+    def test_upgrade_json_failure(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: '9.9.9')
+        monkeypatch.setattr(_upgrade.subprocess, 'run',
+                            lambda *a, **kw: _completed(returncode=1))
+        code = main(['--json', '--env-file', _env_file(tmp_path), 'upgrade'])
+        out, err = capsys.readouterr()
+        assert code == 1
+        assert out == ''
+        data = json.loads(err)
+        assert data['status'] == 'error'
+
+    def test_upgrade_quiet_no_output(self, capsys, monkeypatch, tmp_path):
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        code = main(['--quiet', '--env-file', _env_file(tmp_path), 'upgrade'])
+        out, _ = capsys.readouterr()
+        assert code == 0
+        assert out == ''
+
+
+# ══════════════════════════════════════════════════════════════
+# upgrade 不触发 shell 集成自动安装
+# ══════════════════════════════════════════════════════════════
+
+class TestUpgradeSkipsAutoInstall:
+    """evm upgrade 命令自身不应触发 shell 集成自动安装"""
+
+    def test_no_auto_install_on_check(self, capsys, monkeypatch, tmp_path):
+        from evm._completion import is_integration_installed
+        monkeypatch.setenv('HOME', str(tmp_path))
+        monkeypatch.setenv('SHELL', '/bin/zsh')
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        main(['--env-file', _env_file(tmp_path), 'upgrade', '--check'])
+        _, err = capsys.readouterr()
+        assert 'Installed' not in err
+        assert not is_integration_installed('zsh')
+
+    def test_no_auto_install_on_upgrade(self, capsys, monkeypatch, tmp_path):
+        from evm._completion import is_integration_installed
+        monkeypatch.setenv('HOME', str(tmp_path))
+        monkeypatch.setenv('SHELL', '/bin/zsh')
+        monkeypatch.setattr(_upgrade, 'fetch_latest_version',
+                            lambda timeout=10.0: __version__)
+        main(['--env-file', _env_file(tmp_path), 'upgrade'])
+        _, err = capsys.readouterr()
+        assert 'Installed' not in err
+        assert not is_integration_installed('zsh')