bcmd 0.5.5__tar.gz → 0.5.7__tar.gz

bcmd-0.5.7/MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include bcmd/resources *
+prune test

{bcmd-0.5.5 → bcmd-0.5.7}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.5
+Version: 0.5.7
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
 Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10
-Requires-Dist: benimang==0.7.5
+Requires-Dist: benimang==0.7.12
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd/tasks/__init__.py

@@ -12,4 +12,5 @@ from . import mirror
 from . import project
 from . import proxy
 from . import time
+from . import upgrade
 from . import venv

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd/tasks/code.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 from pathlib import Path
 from typing import Final
 
@@ -112,14 +113,18 @@ async def to_lf(
         '.pytest_cache',
         '__pycache__',
     ]
+    path = path or Path(os.getcwd())
     files = bpath.listFile(path, True)
     # 剔除子目录是这些的文件 .git venv ...
     files = [x for x in files if not any([y in x.parts for y in ignoreSubDirs])]
 
     async def convertFile(file: Path):
         try:
-            await bfile.toLf(file)
-            print(file)
+            content = await bfile.readText(file)
+            if '\r\n' in content:
+                content = content.replace('\r\n', '\n')
+                await bfile.writeText(file, content)
+                printYellow(file)
         except:
             pass
 

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd/tasks/lib.py

@@ -32,7 +32,7 @@ async def tidy_dependencies(
     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)
+    newContent = re.sub(r'dependencies = \[(.*?)\n\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
     if oldContent != newContent:
         await bfile.writeText(pyprojectTomlFile, newContent)
         bcolor.printYellow(pyprojectTomlFile)
@@ -93,7 +93,7 @@ async def build(
 
 def _getIgnoreLibAry(content: str) -> list[str]:
     '获取pyproject.toml中屏蔽的第三方库'
-    content = re.findall(r'dependencies = \[(.*?)\]', content, re.DOTALL)[0]
+    content = re.findall(r'dependencies = \[(.*?)\n\]', content, re.DOTALL)[0]
     ary = textToAry(content)
     return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])
 

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd/tasks/proxy.py

@@ -30,7 +30,7 @@ async def proxy(
     elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
         template = powerShellTemplate
 
-    btask.assertTrue(template, '不支持当前终端（{processNameAry}）')
+    btask.assertTrue(template, f'不支持当前终端（{processNameAry}）')
     lineAry = textToAry(template.format(port))
     msg = '\n'.join(lineAry)
     bcolor.printMagenta('\r\n' + msg)

bcmd-0.5.7/bcmd/tasks/upgrade.py

@@ -0,0 +1,18 @@
+from typing import Final
+
+import pyperclip
+from beni import bcolor, btask
+from beni.bfunc import syncCall
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def upgrade():
+    '使用 pipx 官方源更新 bcmd 到最新版本'
+    cmd = 'pipx upgrade bcmd -i https://pypi.org/simple'
+    pyperclip.copy(cmd + '\n')
+    bcolor.printGreen(cmd)
+    bcolor.printGreen('已复制到剪贴板（需要手动执行）')
+    bcolor.printGreen('OK')

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd/tasks/venv.py

@@ -37,6 +37,7 @@ async def install_benimang(
     path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
 ):
     '更新 benimang 库，强制使用官方源'
+    path = path or Path(os.getcwd())
     pip = getPipFile(path)
     await brun.run(f'{pip} install benimang -U -i https://pypi.org/simple', isPrint=True)
     await _venv(

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.5
+Version: 0.5.7
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
 Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10
-Requires-Dist: benimang==0.7.5
+Requires-Dist: benimang==0.7.12
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd.egg-info/SOURCES.txt

@@ -31,4 +31,5 @@ bcmd/tasks/mirror.py
 bcmd/tasks/project.py
 bcmd/tasks/proxy.py
 bcmd/tasks/time.py
+bcmd/tasks/upgrade.py
 bcmd/tasks/venv.py

{bcmd-0.5.5 → bcmd-0.5.7}/bcmd.egg-info/requires.txt

@@ -1,4 +1,4 @@
-benimang==0.7.5
+benimang==0.7.12
 build
 cryptography
 pathspec

{bcmd-0.5.5 → bcmd-0.5.7}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.5.5'
+version = '0.5.7'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']
@@ -12,7 +12,7 @@ maintainers = [{ name = 'Beni Mang', email = 'benimang@126.com' }]
 
 
 dependencies = [
-  'benimang==0.7.5',
+  'benimang==0.7.12',
   'build',
   'cryptography',
   'pathspec',
@@ -22,6 +22,9 @@ dependencies = [
   'qiniu',
   'twine',
   'typer',
+  # 'pytest',
+  # 'pytest-asyncio',
+  # 'pytest-order',
   # 'setuptools',
 ]
 

bcmd-0.5.5/MANIFEST.in

@@ -1 +0,0 @@
-recursive-include bcmd/resources *