bcmd 0.2.8__tar.gz → 0.4.6__tar.gz

{bcmd-0.2.8 → bcmd-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.2.8
+Version: 0.4.6
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

bcmd-0.4.6/bcmd/common/func.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+
+from beni import btask
+
+
+def checkFileOrNotExists(file: Path):
+    btask.check(file.is_file() or not file.exists(), f'必须是文件 {file}')
+
+
+def checkPathOrNotExists(folder: Path):
+    btask.check(folder.is_dir() or not folder.exists(), f'必须是目录 {folder}')

bcmd-0.4.6/bcmd/resources/project/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "files.exclude": {
+        ".pytest_cache": true,
+        "**/__pycache__": true,
+        ".gitignore": true,
+        ".venv": true,
+        ".venv-lock": true,
+        "venv": true,
+    },
+    "python.defaultInterpreterPath": "${workspaceFolder}/venv/Scripts/python.exe",
+}

{bcmd-0.2.8/bcmd/resources/project/src → bcmd-0.4.6/bcmd/resources/project}/.vscode/tasks.json

@@ -7,7 +7,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:commit",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -25,7 +25,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:revert",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -43,7 +43,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:sync",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {
@@ -52,7 +52,7 @@
             "command": "TortoiseGitProc.exe",
             "args": [
                 "/command:log",
-                "/path:${workspaceFolder}/../",
+                "/path:${workspaceFolder}/",
             ],
         },
         {

{bcmd-0.2.8 → bcmd-0.4.6}/bcmd/tasks/lib.py

@@ -7,7 +7,8 @@ import typer
 from beni import bcolor, bfile, bpath, btask
 from beni.bfunc import syncCall
 
-from bcmd.common import password
+from ..common import password
+from .venv import getPackageList
 
 app: Final = btask.newSubApp('lib 工具')
 
@@ -23,10 +24,10 @@ async def tidy_dependencies(
         workspace_path = Path.cwd()
     pyprojectTomlFile = workspace_path / 'pyproject.toml'
     btask.check(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
-    targetVenvFileName = 'venv.lock' if with_version else 'venv.list'
-    targetVenvFile = bpath.get(workspace_path, f'./../{targetVenvFileName}')
-    btask.check(targetVenvFile.is_file(), '文件不存在', targetVenvFile)
-    libAry = (await bfile.readText(targetVenvFile)).strip().replace('\r\n', '\n').split('\n')
+    venvFile = bpath.get(workspace_path, f'.venv')
+    btask.check(venvFile.is_file(), '.venv 不存在', venvFile)
+    basePackages, lockPackages = await getPackageList(venvFile)
+    libAry = lockPackages if with_version else basePackages
     oldContent = await bfile.readText(pyprojectTomlFile)
     ignoreLibAry = _getIgnoreLibAry(oldContent)
     ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
@@ -79,7 +80,7 @@ async def update_version(
 @app.command()
 @syncCall
 async def build(
-    src_path: Path = typer.Argument(None, help='src 路径'),
+    workspace_path: Path = typer.Argument(None, help='workspace 路径'),
     keep_build_files: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
 ):
     '发布项目'
@@ -87,22 +88,21 @@ async def build(
     # 获取用户名和密码
     u, p = await password.getPypi()
 
-    if not src_path:
-        src_path = Path.cwd()
-    src_path = src_path.resolve()
+    if not workspace_path:
+        workspace_path = Path.cwd()
+    workspace_path = workspace_path.resolve()
 
     def removeUnusedPath():
-        bpath.remove(src_path / 'dist')
-        paths = bpath.listDir(src_path)
+        bpath.remove(workspace_path / 'dist')
+        paths = bpath.listDir(workspace_path)
         for x in paths:
             if x.name.endswith('.egg-info'):
                 bpath.remove(x)
 
     try:
-        with bpath.changePath(src_path):
+        with bpath.changePath(workspace_path):
             removeUnusedPath()
-            scriptPath = (src_path / './../venv/Scripts').resolve()
-            os.system(f'{scriptPath / "pip.exe"} install setuptools -U -i https://mirrors.aliyun.com/pypi/simple')
+            scriptPath = (workspace_path / './venv/Scripts').resolve()
             os.system(f'{scriptPath / "python.exe"} -m build')
             os.system(f'{scriptPath / "twine.exe"} upload dist/* -u {u} -p {p}')
     finally:

{bcmd-0.2.8 → bcmd-0.4.6}/bcmd/tasks/proxy.py

@@ -17,7 +17,7 @@ async def proxy(
     port: int = typer.Option(15236, help="代理服务器端口"),
 ):
     '生成终端设置代理服务器的命令'
-    processNameAry = []
+    processNameAry:list[str] = []
     process = psutil.Process().parent()
     while process:
         processNameAry.append(process.name())

bcmd-0.4.6/bcmd/tasks/venv.py

@@ -0,0 +1,183 @@
+import importlib.resources
+import os
+import platform
+import re
+import sys
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bexecute, bfile, bhttp, bpath, btask
+from beni.bfunc import syncCall
+from beni.btype import Null
+from prettytable import PrettyTable
+
+from bcmd.common import password
+from bcmd.common.func import checkFileOrNotExists, checkPathOrNotExists
+
+from . import bin
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def venv(
+    packages: list[str] = typer.Argument(None),
+    path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
+    isOfficial: bool = typer.Option(False, '--official', help='是否使用官方地址安装（https://pypi.org/simple）'),
+    isNewProject: bool = typer.Option(False, '--new-project', help='是否新建项目'),
+    isForceBase: bool = typer.Option(False, '--force-base', help='是否强制使用基础库去安装'),
+    isFullBase: bool = typer.Option(False, '--full-base', help='是否先清空venv目录再使用基础库去安装'),
+):
+    'python 虚拟环境配置'
+    btask.check(not (isForceBase == isFullBase == True), '不能同时使用 --force-base 和 --full-base')
+    path = path or Path(os.getcwd())
+    binPath = path / 'bin'
+    binListFile = bpath.get(path, 'bin.list')
+    venvPath = bpath.get(path, 'venv')
+    checkPathOrNotExists(venvPath)
+    venvFile = bpath.get(path, '.venv')
+    checkFileOrNotExists(venvFile)
+    await _inputQiniuPassword(binListFile, binPath)
+    if isFullBase:
+        bpath.remove(venvPath)
+        btask.check(not venvPath.exists(), f'无法删除 venv 目录 {venvPath}')
+    packages = packages or []
+    for i in range(len(packages)):
+        package = packages[i]
+        if package.endswith('==now'):
+            ary = package.split('==')
+            packages[i] = f'{ary[0]}=={await _getPackageLatestVersion(ary[0])}'
+    if not venvPath.exists():
+        await bexecute.run(f'python -m venv {venvPath}')
+    if not venvFile.exists():
+        await bfile.writeText(venvFile, '')
+    basePackages, lockPackages = await getPackageList(venvFile)
+    if isForceBase or isFullBase:
+        installPackages = _mergePackageList(basePackages, packages)
+    else:
+        installPackages = _mergePackageList(lockPackages or basePackages, packages)
+    installPackages = sorted(list(set(installPackages)))
+    if sys.platform.startswith('win'):
+        pip = bpath.get(venvPath, 'Scripts/pip.exe')
+    else:
+        pip = bpath.get(venvPath, 'bin/pip')
+    await _pipInstall(pip, installPackages, isOfficial)
+    with bpath.useTempFile() as tempFile:
+        await bexecute.run(f'{pip} freeze > {tempFile}')
+        basePackages = _mergePackageList(basePackages, packages)
+        lockPackages = (await bfile.readText(tempFile)).strip().split('\n')
+        await updatePackageList(venvFile, basePackages, lockPackages)
+
+    # 下载 bin 文件
+    if binListFile.exists():
+        bin.download(
+            names=Null,
+            file=binListFile,
+            output=binPath,
+        )
+    # 新建项目
+    if isNewProject:
+        with importlib.resources.path('bcmd.resources', 'project') as sourceProjectPath:
+            for p in bpath.listPath(sourceProjectPath):
+                bpath.copy(p, path / p.name)
+    bcolor.printGreen('OK')
+
+
+async def _pipInstall(pip: Path, installPackages: list[str], disabled_mirror: bool):
+    python = pip.with_stem('python')
+    btask.check(python.is_file(), f'无法找到指定文件 {python}')
+    btask.check(pip.is_file(), f'无法找到指定文件 {pip}')
+    indexUrl = '-i https://pypi.org/simple' if disabled_mirror else ''
+    with bpath.useTempFile() as file:
+        await bfile.writeText(file, '\n'.join(installPackages))
+        table = PrettyTable()
+        table.add_column(
+            bcolor.yellow('#'),
+            [x + 1 for x in range(len(installPackages))],
+        )
+        table.add_column(
+            bcolor.yellow('安装库'),
+            [x for x in installPackages],
+            'l',
+        )
+        print(table.get_string())
+
+        btask.check(
+            not await bexecute.run(f'{python} -m pip install --upgrade pip {indexUrl}'),
+            '更新 pip 失败',
+        )
+        btask.check(
+            not await bexecute.run(f'{pip} install -r {file} {indexUrl}'),
+            '执行失败',
+        )
+
+
+async def _getPackageDict(venvFile: Path):
+    content = await bfile.readText(venvFile)
+    pattern = r'\[\[ (.*?) \]\]\n(.*?)(?=\n\[\[|\Z)'
+    matches: list[tuple[str, str]] = re.findall(pattern, content.strip(), re.DOTALL)
+    return {match[0]: [line.strip() for line in match[1].strip().split('\n') if line.strip()] for match in matches}
+
+
+_baseName: Final[str] = 'venv'
+
+
+def _getLockName():
+    systemName = platform.system()
+    return f'{_baseName}-{systemName}'
+
+
+async def getPackageList(venvFile: Path):
+    result = await _getPackageDict(venvFile)
+    lockName = _getLockName()
+    return result.get(_baseName, []), result.get(lockName, [])
+
+
+async def updatePackageList(venvFile: Path, packages: list[str], lockPackages: list[str]):
+    packageDict = await _getPackageDict(venvFile)
+    lockName = _getLockName()
+    packages.sort(key=lambda x: x.lower())
+    lockPackages.sort(key=lambda x: x.lower())
+    packageDict[_baseName] = packages
+    packageDict[lockName] = lockPackages
+    content = '\n'.join([f'\n[[ {key} ]]\n{'\n'.join(value)}' for key, value in packageDict.items()]).strip()
+    await bfile.writeText(venvFile, content)
+
+
+async def _getPackageLatestVersion(package: str):
+    '获取指定包的最新版本'
+    data = await bhttp.getJson(
+        f'https://pypi.org/pypi/{package}/json'
+    )
+    return data['info']['version']
+
+
+def _mergePackageList(basePackages: list[str], addPackages: list[str]):
+    basePackagesDict = {_getPackageName(x): x for x in basePackages}
+    addPackagesDict = {_getPackageName(x): x for x in addPackages}
+    packagesDict = basePackagesDict | addPackagesDict
+    return sorted([x for x in packagesDict.values()])
+
+
+def _getPackageName(package: str):
+    if '==' in package:
+        package = package.split('==')[0]
+    elif '>' in package:
+        package = package.split('>')[0]
+    elif '<' in package:
+        package = package.split('<')[0]
+    package = package.strip()
+    if package.startswith('#'):
+        package = package.replace('#', '', 1).strip()
+    return package
+
+
+async def _inputQiniuPassword(binListFile: Path, binPath: Path) -> None:
+    '根据需要输入七牛云密码'
+    if binListFile.exists():
+        aaSet = set([x.strip() for x in (await bfile.readText(binListFile)).strip().split('\n') if x.strip()])
+        bbSet = set([x.name for x in bpath.listFile(binPath)])
+        if aaSet != bbSet:
+            await password.getQiniu()

{bcmd-0.2.8 → bcmd-0.4.6}/bcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcmd
-Version: 0.2.8
+Version: 0.4.6
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

{bcmd-0.2.8 → bcmd-0.4.6}/bcmd.egg-info/SOURCES.txt

@@ -10,12 +10,13 @@ bcmd.egg-info/entry_points.txt
 bcmd.egg-info/requires.txt
 bcmd.egg-info/top_level.txt
 bcmd/common/__init__.py
+bcmd/common/func.py
 bcmd/common/password.py
 bcmd/resources/project/.gitignore
-bcmd/resources/project/src/main.py
-bcmd/resources/project/src/.vscode/launch.json
-bcmd/resources/project/src/.vscode/settings.json
-bcmd/resources/project/src/.vscode/tasks.json
+bcmd/resources/project/main.py
+bcmd/resources/project/.vscode/launch.json
+bcmd/resources/project/.vscode/settings.json
+bcmd/resources/project/.vscode/tasks.json
 bcmd/tasks/__init__.py
 bcmd/tasks/bin.py
 bcmd/tasks/code.py

{bcmd-0.2.8 → bcmd-0.4.6}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.2.8'
+version = '0.4.6'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']

bcmd-0.2.8/bcmd/resources/project/src/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "files.exclude": {
-        ".pytest_cache": true,
-        "**/__pycache__": true,
-    },
-    "python.defaultInterpreterPath": "${workspaceFolder}/../venv/Scripts/python.exe",
-}

bcmd-0.2.8/bcmd/tasks/venv.py

@@ -1,128 +0,0 @@
-import importlib.resources
-import os
-import sys
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bexecute, bfile, bhttp, binput, bpath, btask
-from beni.bfunc import syncCall
-from beni.btype import Null
-
-from bcmd.common import password
-
-from . import bin
-
-app: Final = btask.app
-
-
-@app.command()
-@syncCall
-async def venv(
-    packages: list[str] = typer.Argument(None),
-    path: Path = typer.Option(None, '--path', '-p', help='指定路径，默认当前目录'),
-    disabled_mirror: bool = typer.Option(False, '--disabled-mirror', '-d', help='是否禁用镜像'),
-    new_project: bool = typer.Option(False, '--new-project', '-n', help='是否新建项目'),
-    quiet: bool = typer.Option(False, '--quiet', '-q', help='是否安静模式'),
-):
-    'python 虚拟环境配置'
-    path = path or Path(os.getcwd())
-    binPath = path / 'bin'
-    binListFile = bpath.get(path, 'bin.list')
-    await _inputQiniuPassword(binListFile, binPath)
-    packages = packages or []
-    for i in range(len(packages)):
-        package = packages[i]
-        if package.endswith('==now'):
-            ary = package.split('==')
-            packages[i] = f'{ary[0]}=={await _getPackageLatestVersion(ary[0])}'
-    venvPath = bpath.get(path, 'venv')
-    assertPath(venvPath)
-    if not venvPath.exists() and not quiet:
-        await binput.confirm('指定目录为非venv目录，是否确认新创建？')
-    if not venvPath.exists():
-        await bexecute.run(f'python -m venv {venvPath}')
-    venvLockFile = bpath.get(path, 'venv.lock')
-    assertFile(venvLockFile)
-    venvListFile = bpath.get(path, 'venv.list')
-    assertFile(venvListFile)
-    if not venvListFile.exists():
-        await bfile.writeText(venvListFile, '')
-    await tidyVenvFile(venvListFile, packages)
-    if venvLockFile.exists():
-        await tidyVenvFile(venvLockFile, packages)
-        targetFile = venvLockFile
-    else:
-        targetFile = venvListFile
-    if sys.platform.startswith('win'):
-        pip = bpath.get(venvPath, 'Scripts/pip.exe')
-    else:
-        pip = bpath.get(venvPath, 'bin/pip')
-    await pipInstall(pip, targetFile, disabled_mirror)
-    await bexecute.run(f'{pip} freeze > {venvLockFile}')
-    # 下载 bin 文件
-    if binListFile.exists():
-        bin.download(
-            names=Null,
-            file=binListFile,
-            output=binPath,
-        )
-    # 新建项目
-    if new_project:
-        with bpath.changePath(path):
-            await bexecute.run('beni venv --quiet')
-        with importlib.resources.path('bcmd.resources', 'project') as sourceProjectPath:
-            for p in bpath.listDir(sourceProjectPath):
-                bpath.copy(p, path / p.name)
-    bcolor.printGreen('OK')
-
-
-async def pipInstall(pip: Path, file: Path, disabled_mirror: bool):
-    python = pip.with_stem('python')
-    btask.check(python.is_file(), '无法找到指定文件', python)
-    btask.check(pip.is_file(), '无法找到指定文件', pip)
-    indexUrl = '-i https://pypi.org/simple' if disabled_mirror else ''
-    btask.check(not await bexecute.run(f'{python} -m pip install --upgrade pip {indexUrl}'), '更新 pip 失败')
-    btask.check(not await bexecute.run(f'{pip} install -r {file} {indexUrl}'), '执行失败')
-
-
-async def tidyVenvFile(file: Path, packages: list[str]):
-    packageNames = [getPackageName(x) for x in packages]
-    ary = (await bfile.readText(file)).strip().replace('\r', '').split('\n')
-    ary = list(filter(lambda x: getPackageName(x) not in packageNames, ary))
-    ary.extend(packages)
-    ary.sort()
-    await bfile.writeText(file, '\n'.join(ary).strip())
-
-
-def getPackageName(value: str):
-    sep_ary = ['>', '<', '=']
-    for sep in sep_ary:
-        if sep in value:
-            return value.split(sep)[0]
-    return value
-
-
-def assertFile(file: Path):
-    btask.check(file.is_file() or not file.exists(), '必须是文件', file)
-
-
-def assertPath(folder: Path):
-    btask.check(folder.is_dir() or not folder.exists(), '必须是目录', folder)
-
-
-async def _getPackageLatestVersion(package: str):
-    '获取指定包的最新版本'
-    data = await bhttp.getJson(
-        f'https://pypi.org/pypi/{package}/json'
-    )
-    return data['info']['version']
-
-
-async def _inputQiniuPassword(binListFile: Path, binPath: Path) -> None:
-    '根据需要输入七牛云密码'
-    if binListFile.exists():
-        aaSet = set([x.strip() for x in (await bfile.readText(binListFile)).strip().split('\n') if x.strip()])
-        bbSet = set([x.name for x in bpath.listFile(binPath)])
-        if aaSet != bbSet:
-            await password.getQiniu()