bcmd 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

bcmd/tasks/lib.py

@@ -1,118 +1,118 @@
-import os
-import re
-from contextlib import contextmanager
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, bfile, bpath, btask
-from beni.bfunc import syncCall, textToAry
-
-from ..common import password
-from .venv import getPackageList
-
-app: Final = btask.newSubApp('lib 工具')
-
-
-@app.command()
-@syncCall
-async def tidy_dependencies(
-    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-    isWithVersion: bool = typer.Option(False, '--with-version', help='是否带版本号')
-):
-    '整理 pyproject.toml 里面的 dependencies'
-    pyprojectTomlFile = workspace_path / 'pyproject.toml'
-    btask.assertTrue(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
-    venvFile = bpath.get(workspace_path, f'.venv')
-    btask.assertTrue(venvFile.is_file(), '.venv 不存在', venvFile)
-    basePackages, lockPackages = await getPackageList(venvFile)
-    libAry = lockPackages if isWithVersion else basePackages
-    oldContent = await bfile.readText(pyprojectTomlFile)
-    ignoreLibAry = _getIgnoreLibAry(oldContent)
-    ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
-    libAry = sorted(list(set(libAry) - set(ignoreLibAry)))
-    replaceContent = '\n'.join([f"  '{x}'," for x in libAry]) + '\n' + '\n'.join([f"  # '{x}'," for x in ignoreLibAry])
-    newContent = re.sub(r'dependencies = \[(.*?)\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
-    if oldContent != newContent:
-        await bfile.writeText(pyprojectTomlFile, newContent)
-        bcolor.printYellow(pyprojectTomlFile)
-        bcolor.printMagenta(newContent)
-        return True
-    else:
-        bcolor.printGreen('无需修改依赖')
-        return False
-
-
-@app.command()
-@syncCall
-async def update_version(
-    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-    isNotCommit: bool = typer.Option(False, '--no-commit', '-d', help='是否提交git'),
-):
-    '修改 pyproject.toml 版本号'
-    file = path / 'pyproject.toml'
-    btask.assertTrue(file.is_file(), '文件不存在', file)
-    data = await bfile.readToml(file)
-    version = data['project']['version']
-    versionList = [int(x) for x in version.split('.')]
-    versionList[-1] += 1
-    newVersion = '.'.join([str(x) for x in versionList])
-    content = await bfile.readText(file)
-    if f"version = '{version}'" in content:
-        content = content.replace(f"version = '{version}'", f"version = '{newVersion}'")
-    elif f'version = "{version}"' in content:
-        content = content.replace(f'version = "{version}"', f'version = "{newVersion}"')
-    else:
-        raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
-    await bfile.writeText(file, content)
-    bcolor.printCyan(newVersion)
-    if not isNotCommit:
-        msg = f'更新版本号 {newVersion}'
-        os.system(
-            rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"{msg}"'
-        )
-    bcolor.printGreen('OK')
-
-
-@app.command()
-@syncCall
-async def build(
-    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-    isKeepBuildFiles: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
-):
-    '发布项目'
-    u, p = await password.getPypi()
-    with _useBuildPath(path, isKeepBuildFiles):
-        scriptPath = (path / './venv/Scripts')
-        os.system(f'{scriptPath / "python.exe"} -m build')
-        os.system(f'{scriptPath / "twine.exe"} upload dist/* -u {u} -p {p}')
-
-
-# ------------------------------------------------------------------------------------
-
-
-def _getIgnoreLibAry(content: str) -> list[str]:
-    '获取pyproject.toml中屏蔽的第三方库'
-    content = re.findall(r'dependencies = \[(.*?)\]', content, re.DOTALL)[0]
-    ary = textToAry(content)
-    return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])
-
-
-@contextmanager
-def _useBuildPath(workspacePath: Path, isKeepBuildFiles: bool):
-    '整理构建目录，先清空不必要的输出目录，结束后再判断是否需要再清空一次'
-
-    def removeUnusedPath():
-        bpath.remove(workspacePath / 'dist')
-        paths = bpath.listDir(workspacePath)
-        for x in paths:
-            if x.name.endswith('.egg-info'):
-                bpath.remove(x)
-
-    try:
-        with bpath.changePath(workspacePath):
-            removeUnusedPath()
-            yield
-    finally:
-        if not isKeepBuildFiles:
-            removeUnusedPath()
+import os
+import re
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, bfile, bpath, btask
+from beni.bfunc import syncCall, textToAry
+
+from ..common import password
+from .venv import getPackageList
+
+app: Final = btask.newSubApp('lib 工具')
+
+
+@app.command()
+@syncCall
+async def tidy_dependencies(
+    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    isWithVersion: bool = typer.Option(False, '--with-version', help='是否带版本号')
+):
+    '整理 pyproject.toml 里面的 dependencies'
+    pyprojectTomlFile = workspace_path / 'pyproject.toml'
+    btask.assertTrue(pyprojectTomlFile.is_file(), 'pyproject.toml 不存在', pyprojectTomlFile)
+    venvFile = bpath.get(workspace_path, f'.venv')
+    btask.assertTrue(venvFile.is_file(), '.venv 不存在', venvFile)
+    basePackages, lockPackages = await getPackageList(venvFile)
+    libAry = lockPackages if isWithVersion else basePackages
+    oldContent = await bfile.readText(pyprojectTomlFile)
+    ignoreLibAry = _getIgnoreLibAry(oldContent)
+    ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
+    libAry = sorted(list(set(libAry) - set(ignoreLibAry)))
+    replaceContent = '\n'.join([f"  '{x}'," for x in libAry]) + '\n' + '\n'.join([f"  # '{x}'," for x in ignoreLibAry])
+    newContent = re.sub(r'dependencies = \[(.*?)\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
+    if oldContent != newContent:
+        await bfile.writeText(pyprojectTomlFile, newContent)
+        bcolor.printYellow(pyprojectTomlFile)
+        bcolor.printMagenta(newContent)
+        return True
+    else:
+        bcolor.printGreen('无需修改依赖')
+        return False
+
+
+@app.command()
+@syncCall
+async def update_version(
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    isNotCommit: bool = typer.Option(False, '--no-commit', '-d', help='是否提交git'),
+):
+    '修改 pyproject.toml 版本号'
+    file = path / 'pyproject.toml'
+    btask.assertTrue(file.is_file(), '文件不存在', file)
+    data = await bfile.readToml(file)
+    version = data['project']['version']
+    versionList = [int(x) for x in version.split('.')]
+    versionList[-1] += 1
+    newVersion = '.'.join([str(x) for x in versionList])
+    content = await bfile.readText(file)
+    if f"version = '{version}'" in content:
+        content = content.replace(f"version = '{version}'", f"version = '{newVersion}'")
+    elif f'version = "{version}"' in content:
+        content = content.replace(f'version = "{version}"', f'version = "{newVersion}"')
+    else:
+        raise Exception('版本号修改失败，先检查文件中定义的版本号格式是否正常')
+    await bfile.writeText(file, content)
+    bcolor.printCyan(newVersion)
+    if not isNotCommit:
+        msg = f'更新版本号 {newVersion}'
+        os.system(
+            rf'TortoiseGitProc.exe /command:commit /path:{file} /logmsg:"{msg}"'
+        )
+    bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def build(
+    path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+    isKeepBuildFiles: bool = typer.Option(False, '--keep-build-files', '-k', help='是否保留构建文件'),
+):
+    '发布项目'
+    u, p = await password.getPypi()
+    with _useBuildPath(path, isKeepBuildFiles):
+        scriptPath = (path / './venv/Scripts')
+        os.system(f'{scriptPath / "python.exe"} -m build')
+        os.system(f'{scriptPath / "twine.exe"} upload dist/* -u {u} -p {p}')
+
+
+# ------------------------------------------------------------------------------------
+
+
+def _getIgnoreLibAry(content: str) -> list[str]:
+    '获取pyproject.toml中屏蔽的第三方库'
+    content = re.findall(r'dependencies = \[(.*?)\]', content, re.DOTALL)[0]
+    ary = textToAry(content)
+    return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])
+
+
+@contextmanager
+def _useBuildPath(workspacePath: Path, isKeepBuildFiles: bool):
+    '整理构建目录，先清空不必要的输出目录，结束后再判断是否需要再清空一次'
+
+    def removeUnusedPath():
+        bpath.remove(workspacePath / 'dist')
+        paths = bpath.listDir(workspacePath)
+        for x in paths:
+            if x.name.endswith('.egg-info'):
+                bpath.remove(x)
+
+    try:
+        with bpath.changePath(workspacePath):
+            removeUnusedPath()
+            yield
+    finally:
+        if not isKeepBuildFiles:
+            removeUnusedPath()

bcmd/tasks/math.py

@@ -1,97 +1,97 @@
-from typing import Final
-
-import typer
-from beni import bcolor, btask
-from beni.bfunc import Counter, syncCall, toFloat
-from prettytable import PrettyTable
-
-app: Final = btask.newSubApp('math 工具集')
-
-
-@app.command()
-@syncCall
-async def scale(
-    a: float = typer.Argument(..., help='原始数值'),
-    b: float = typer.Argument(..., help='原始数值'),
-    c: str = typer.Argument(..., help='数值 或 ?'),
-    d: str = typer.Argument(..., help='数值 或 ?'),
-):
-    '按比例计算数值，例子：beni math scale 1 2 3 ?'
-    if not ((c == '?') != (d == '?')):
-        return bcolor.printRed('参数C和参数D必须有且仅有一个为?')
-    print()
-    table = PrettyTable(
-        title=bcolor.yellow('按比例计算数值'),
-    )
-    if c == '?':
-        dd = toFloat(d)
-        cc = a * dd / b
-        table.add_rows([
-            ['A', a, bcolor.magenta(str(cc)), bcolor.magenta('C')],
-            ['B', b, dd, 'D'],
-        ])
-    elif d == '?':
-        cc = toFloat(c)
-        dd = b * cc / a
-        table.add_rows([
-            ['A', a, cc, 'C'],
-            ['B', b, bcolor.magenta(str(dd)), bcolor.magenta('D')],
-        ])
-    print(table.get_string(header=False))
-
-
-@app.command()
-@syncCall
-async def discount(
-    values: list[str] = typer.Argument(..., help='每组数据使用#作为分隔符，注意后面的数据不能为0，例：123#500'),
-):
-    '计算折扣，例子：beni math discount 123#500 130#550'
-    btask.assertTrue(len(values) >= 2, '至少需要提供2组数据用作比较')
-
-    class Data:
-        def __init__(self, value: str):
-            try:
-                ary = [x.strip() for x in value.strip().split('#')]
-                self.a = float(ary[0])
-                self.b = float(ary[1])
-                self.v = self.a / self.b
-                self.discount = 0.0
-            except:
-                btask.abort(f'数据格式错误', value)
-
-    datas = [Data(x) for x in values]
-    table = PrettyTable(
-        title=bcolor.yellow('计算折扣'),
-    )
-    vAry = [x.v for x in datas]
-    minV = min(vAry)
-    maxV = max(vAry)
-    for data in datas:
-        data.discount = -(maxV - data.v) / maxV
-    table.add_column(
-        '',
-        [
-            '前数据',
-            '后数据',
-            '单价',
-            '折扣',
-        ],
-    )
-    counter = Counter(-1)
-    for data in datas:
-        colorFunc = bcolor.white
-        if data.v == minV:
-            colorFunc = bcolor.green
-        elif data.v == maxV:
-            colorFunc = bcolor.red
-        columns = [
-            f'{data.a:,}',
-            f'{data.b:,}',
-            f'{data.v:,.3f}',
-            f'{data.discount * 100:+,.3f}%' if data.discount else '',
-        ]
-        table.add_column(
-            chr(65 + counter()),
-            [colorFunc(x) for x in columns],
-        )
-    print(table.get_string())
+from typing import Final
+
+import typer
+from beni import bcolor, btask
+from beni.bfunc import Counter, syncCall, toFloat
+from prettytable import PrettyTable
+
+app: Final = btask.newSubApp('math 工具集')
+
+
+@app.command()
+@syncCall
+async def scale(
+    a: float = typer.Argument(..., help='原始数值'),
+    b: float = typer.Argument(..., help='原始数值'),
+    c: str = typer.Argument(..., help='数值 或 ?'),
+    d: str = typer.Argument(..., help='数值 或 ?'),
+):
+    '按比例计算数值，例子：beni math scale 1 2 3 ?'
+    if not ((c == '?') != (d == '?')):
+        return bcolor.printRed('参数C和参数D必须有且仅有一个为?')
+    print()
+    table = PrettyTable(
+        title=bcolor.yellow('按比例计算数值'),
+    )
+    if c == '?':
+        dd = toFloat(d)
+        cc = a * dd / b
+        table.add_rows([
+            ['A', a, bcolor.magenta(str(cc)), bcolor.magenta('C')],
+            ['B', b, dd, 'D'],
+        ])
+    elif d == '?':
+        cc = toFloat(c)
+        dd = b * cc / a
+        table.add_rows([
+            ['A', a, cc, 'C'],
+            ['B', b, bcolor.magenta(str(dd)), bcolor.magenta('D')],
+        ])
+    print(table.get_string(header=False))
+
+
+@app.command()
+@syncCall
+async def discount(
+    values: list[str] = typer.Argument(..., help='每组数据使用#作为分隔符，注意后面的数据不能为0，例：123#500'),
+):
+    '计算折扣，例子：beni math discount 123#500 130#550'
+    btask.assertTrue(len(values) >= 2, '至少需要提供2组数据用作比较')
+
+    class Data:
+        def __init__(self, value: str):
+            try:
+                ary = [x.strip() for x in value.strip().split('#')]
+                self.a = float(ary[0])
+                self.b = float(ary[1])
+                self.v = self.a / self.b
+                self.discount = 0.0
+            except:
+                btask.abort(f'数据格式错误', value)
+
+    datas = [Data(x) for x in values]
+    table = PrettyTable(
+        title=bcolor.yellow('计算折扣'),
+    )
+    vAry = [x.v for x in datas]
+    minV = min(vAry)
+    maxV = max(vAry)
+    for data in datas:
+        data.discount = -(maxV - data.v) / maxV
+    table.add_column(
+        '',
+        [
+            '前数据',
+            '后数据',
+            '单价',
+            '折扣',
+        ],
+    )
+    counter = Counter(-1)
+    for data in datas:
+        colorFunc = bcolor.white
+        if data.v == minV:
+            colorFunc = bcolor.green
+        elif data.v == maxV:
+            colorFunc = bcolor.red
+        columns = [
+            f'{data.a:,}',
+            f'{data.b:,}',
+            f'{data.v:,.3f}',
+            f'{data.discount * 100:+,.3f}%' if data.discount else '',
+        ]
+        table.add_column(
+            chr(65 + counter()),
+            [colorFunc(x) for x in columns],
+        )
+    print(table.get_string())

bcmd/tasks/mirror.py

@@ -1,46 +1,46 @@
-from __future__ import annotations
-
-import platform
-from typing import Final
-
-import typer
-from beni import bcolor, bfile, bpath, btask
-from beni.bfunc import syncCall
-
-app: Final = btask.app
-
-
-@app.command()
-@syncCall
-async def mirror(
-    disabled: bool = typer.Option(False, '--disabled', '-d', help="是否禁用"),
-):
-    '设置镜像'
-
-    # 根据不同的系统平台
-    match platform.system():
-        case 'Windows':
-            file = bpath.user('pip/pip.ini')
-        case 'Linux':
-            file = bpath.user('.pip/pip.conf')
-        case _:
-            btask.abort('暂时不支持该平台', platform.system())
-            return
-
-    if disabled:
-        bpath.remove(file)
-        bcolor.printRed('删除文件', file)
-    else:
-        content = _content.strip()
-        await bfile.writeText(file, content)
-        bcolor.printYellow(file)
-        bcolor.printMagenta(content)
-    bcolor.printGreen('OK')
-
-
-# ------------------------------------------------------------------------------------
-
-_content = '''
-[global]
-index-url = https://mirrors.aliyun.com/pypi/simple
-'''
+from __future__ import annotations
+
+import platform
+from typing import Final
+
+import typer
+from beni import bcolor, bfile, bpath, btask
+from beni.bfunc import syncCall
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def mirror(
+    disabled: bool = typer.Option(False, '--disabled', '-d', help="是否禁用"),
+):
+    '设置镜像'
+
+    # 根据不同的系统平台
+    match platform.system():
+        case 'Windows':
+            file = bpath.user('pip/pip.ini')
+        case 'Linux':
+            file = bpath.user('.pip/pip.conf')
+        case _:
+            btask.abort('暂时不支持该平台', platform.system())
+            return
+
+    if disabled:
+        bpath.remove(file)
+        bcolor.printRed('删除文件', file)
+    else:
+        content = _content.strip()
+        await bfile.writeText(file, content)
+        bcolor.printYellow(file)
+        bcolor.printMagenta(content)
+    bcolor.printGreen('OK')
+
+
+# ------------------------------------------------------------------------------------
+
+_content = '''
+[global]
+index-url = https://mirrors.aliyun.com/pypi/simple
+'''

bcmd/tasks/project.py

@@ -1,34 +1,34 @@
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bcolor, binput, bpath, btask
-from beni.bfunc import syncCall
-
-from ..common.func import useResources
-from .venv import add as venvAdd
-
-app: Final = btask.app
-
-
-@app.command('project')
-@syncCall
-async def _(
-    path: Path = typer.Option(Path.cwd(), '--path', help='workspace 路径'),
-):
-    '生成新项目'
-
-    # 检查目标路径是否合法
-    if path.exists():
-        if not path.is_dir():
-            bcolor.printRed('目标路径不是一个目录', path)
-            return
-        elif list(bpath.get(path).glob('*')):
-            bcolor.printRed('目标路径不是空目录', path)
-            return
-
-    bcolor.printYellow(path)
-    await binput.confirm('即将在此路径生成新项目，是否继续？')
-    venvAdd(['benimang'], path)
-    with useResources('project') as sourceProjectPath:
-        bpath.copyOverwrite(sourceProjectPath, path)
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bcolor, binput, bpath, btask
+from beni.bfunc import syncCall
+
+from ..common.func import useResources
+from .venv import add as venvAdd
+
+app: Final = btask.app
+
+
+@app.command('project')
+@syncCall
+async def _(
+    path: Path = typer.Option(Path.cwd(), '--path', help='workspace 路径'),
+):
+    '生成新项目'
+
+    # 检查目标路径是否合法
+    if path.exists():
+        if not path.is_dir():
+            bcolor.printRed('目标路径不是一个目录', path)
+            return
+        elif list(bpath.get(path).glob('*')):
+            bcolor.printRed('目标路径不是空目录', path)
+            return
+
+    bcolor.printYellow(path)
+    await binput.confirm('即将在此路径生成新项目，是否继续？')
+    venvAdd(['benimang==now'], path)
+    with useResources('project') as sourceProjectPath:
+        bpath.copyOverwrite(sourceProjectPath, path)