crackerjack 0.8.13__py3-none-any.whl → 0.8.15__py3-none-any.whl

crackerjack/crackerjack.py

@@ -3,7 +3,7 @@ import re
 import sys
 import typing as t
 from pathlib import Path
-from subprocess import run as shell
+from subprocess import run as execute
 
 from acb.actions.encode import dump, load
 from aioconsole import ainput, aprint
@@ -17,7 +17,7 @@ class Config(BaseModel):
     pre_commit_path: t.Optional[Path] = None
     git_path: t.Optional[Path] = None
     pdm_path: t.Optional[Path] = None
-    zshenv_path: t.Optional[Path] = None
+    zsh_path: t.Optional[Path] = None
 
 
 class Crackerjack(BaseModel, arbitrary_types_allowed=True):
@@ -90,12 +90,12 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
                         "crackerjack", self.pkg_name
                     )
                 )
-            shell([str(self.config.git_path), "add", config])
+            execute([str(self.config.git_path), "add", config])
 
     async def run_interactive(self, hook: str) -> None:
         success: bool = False
         while not success:
-            fail = shell(
+            fail = execute(
                 [str(self.config.pre_commit_path), "run", hook.lower(), "--all-files"]
             )
             if fail.returncode > 0:
@@ -108,21 +108,21 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
 
     async def update_pkg_configs(self) -> None:
         await self.copy_configs()
-        installed_pkgs = shell(
+        installed_pkgs = execute(
             [str(self.config.pdm_path), "list", "--freeze"],
             capture_output=True,
             text=True,
         ).stdout.splitlines()
         if not len([pkg for pkg in installed_pkgs if "pre-commit" in pkg]):
             print('Installing "pre-commit"...')
-            shell([str(self.config.pdm_path), "self", "add", "keyring"])
-            shell([str(self.config.pdm_path), "config", "python.use_venv", "false"])
-            shell([str(self.config.git_path), "init"])
-            shell([str(self.config.git_path), "branch", "-m", "main"])
-            shell([str(self.config.git_path), "add", "pyproject.toml"])
-            shell([str(self.config.git_path), "add", "pdm.lock"])
-            shell([str(self.config.pre_commit_path), "install"])
-            shell(
+            execute([str(self.config.pdm_path), "self", "add", "keyring"])
+            execute([str(self.config.pdm_path), "config", "python.use_venv", "false"])
+            execute([str(self.config.git_path), "init"])
+            execute([str(self.config.git_path), "branch", "-m", "main"])
+            execute([str(self.config.git_path), "add", "pyproject.toml"])
+            execute([str(self.config.git_path), "add", "pdm.lock"])
+            execute([str(self.config.pre_commit_path), "install"])
+            execute(
                 [str(self.config.git_path), "config", "advice.addIgnoredFile", "false"]
             )
         await self.update_pyproject_configs()
@@ -137,15 +137,16 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
             raise SystemExit("\nPlease configure '.crackerjack.yaml' and try again\n")
 
     async def run_pre_commit(self) -> None:
-        check_all = shell([str(self.config.pre_commit_path), "run", "--all-files"])
+        check_all = execute([str(self.config.pre_commit_path), "run", "--all-files"])
         if check_all.returncode > 0:
-            check_all = shell([str(self.config.pre_commit_path), "run", "--all-files"])
+            check_all = execute(
+                [str(self.config.pre_commit_path), "run", "--all-files"]
+            )
             if check_all.returncode > 0:
                 await aprint("\n\nPre-commit failed. Please fix errors.\n")
                 raise SystemExit()
 
     async def process(self, options: t.Any) -> None:
-        await self.load_config()
         imp_dir = self.pkg_path / "__pypackages__" / self.config.python_version / "lib"
         sys.path.append(str(imp_dir))
         self.pkg_name = underscore(self.pkg_path.stem.lower())
@@ -154,22 +155,22 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
         await aprint("\nCrackerjacking...\n")
         if not options.do_not_update_configs:
             await self.update_pkg_configs()
-            shell([str(self.config.pdm_path), "install"])
+            execute([str(self.config.pdm_path), "install"])
         if self.pkg_path.stem == "crackerjack" and options.update_precommit:
-            shell([str(self.config.pre_commit_path), "autoupdate"])
+            execute([str(self.config.pre_commit_path), "autoupdate"])
         if options.interactive:
             for hook in ("refurb", "bandit", "pyright"):
                 await self.run_interactive(hook)
         await self.run_pre_commit()
         for option in (options.publish, options.bump):
             if option:
-                shell([str(self.config.pdm_path), "bump", option])
+                execute([str(self.config.pdm_path), "bump", option])
                 break
         if options.publish:
-            shell([str(self.config.pdm_path), "publish"])
+            execute([str(self.config.pdm_path), "publish"])
         if options.commit:
             commit_msg = await ainput("\nCommit message: ")
-            shell(
+            execute(
                 [
                     str(self.config.git_path),
                     "commit",
@@ -180,10 +181,16 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
                     ".",
                 ]
             )
-            shell([str(self.config.git_path), "push", "origin", "main"])
+            execute([str(self.config.git_path), "push", "origin", "main"])
         await aprint("\nCrackerjack complete!\n")
 
     async def run(self, options: t.Any) -> None:
+        await self.load_config()
+        execute(
+            'eval "$(pdm --pep582)"',
+            shell=True,  # noqa
+            executable=str(self.config.zsh_path),
+        )
         process = asyncio.create_task(self.process(options))
         await process
 

crackerjack/pyproject.toml

@@ -57,6 +57,8 @@ exclude-deps = [
     "pre-commit",
     "pytest",
     "pdm",
+    "pyfiglet",
+    "pyyaml",
 ]
 
 [tool.refurb]
@@ -71,7 +73,9 @@ skips = [
     "B311",
     "B403",
     "B404",
+    "B602",
     "B603",
+    "B607",
 ]
 
 [tool.pyright]
@@ -98,7 +102,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "Crackerjack"
-version = "0.8.12"
+version = "0.8.14"
 description = "Crackerjack code style"
 requires-python = ">=3.12"
 readme = "README.md"
@@ -111,7 +115,7 @@ keywords = [
 ]
 classifiers = [
     "Environment :: Console",
-    "Operating System :: OS Independent",
+    "Operating System :: POSIX",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.12",
     "Development Status :: 4 - Beta",

{crackerjack-0.8.13.dist-info → crackerjack-0.8.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Crackerjack
-Version: 0.8.13
+Version: 0.8.15
 Summary: Crackerjack code style
 Keywords: black,ruff,mypy,creosote,refurb
 Home-page: https://github.com/lesleslie/crackerjack
@@ -8,7 +8,7 @@ Author-Email: lesleslie <les@wedgwoodwebworks.com>
 Maintainer-Email: lesleslie <les@wedgwoodwebworks.com>
 License: BSD-3-Clause
 Classifier: Environment :: Console
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 4 - Beta

{crackerjack-0.8.13.dist-info → crackerjack-0.8.15.dist-info}/RECORD

@@ -1,6 +1,6 @@
-crackerjack-0.8.13.dist-info/METADATA,sha256=ZW7A7UKC_No5QNnxiI8rRwPqQerpNGYp0RPQHOniwmU,7762
-crackerjack-0.8.13.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-crackerjack-0.8.13.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.8.15.dist-info/METADATA,sha256=5Hvu4l7ktEF5l6sF9VM256Thmrntp2HCvian13i9EcY,7753
+crackerjack-0.8.15.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+crackerjack-0.8.15.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=7qePRaD8q-U6oV3gvgAcwFF8GudcRGAWf-Z-0IDqMaE,207
 crackerjack/.libcst.codemod.yaml,sha256=a8DlErRAIPV1nE6QlyXPAzTOgkB24_spl2E9hphuf5s,772
 crackerjack/.pre-commit-config.yaml,sha256=GuSMQqO36mziS_UpHxsW6HA9udY0LIZLe8Ai2vMN5iQ,2167
@@ -22,10 +22,10 @@ crackerjack/.ruff_cache/0.5.7/1493622539551733492,sha256=pSocPQAUIr0jKWiGFCL-guo
 crackerjack/.ruff_cache/0.5.7/6231957614044513175,sha256=cpMwivWK0bqQ1V4WO_D1Q-aZarbhf-r4sk4Po8oXZc4,224
 crackerjack/.ruff_cache/0.5.7/9932762556785938009,sha256=OrAu-VJZI4ctEycJEplrzI2qXzgaxE5TPvj6IFVQSdw,224
 crackerjack/.ruff_cache/0.6.0/11982804814124138945,sha256=2lznSj8cCUgunSBia8roQ-Cj5TBFiSoe0wIl7cDAiY8,224
-crackerjack/.ruff_cache/0.6.0/12055761203849489982,sha256=AevZgasE3KEhREvp-T9d5xyBYt7QnNIPelA8e4GTzNw,224
+crackerjack/.ruff_cache/0.6.0/12055761203849489982,sha256=mGzYAukLYQmayZDp4bfHzWpif-GH48e9xi-CMcQDPrM,224
 crackerjack/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
 crackerjack/__init__.py,sha256=AuglbbJHkUJ2GdvyT0ca35ntexo1RkT2V6DgypoFeEk,121
 crackerjack/__main__.py,sha256=W0KSo35_rmj_p4Zr2Q6FAvojiiPTmh5kjlggVNcOdac,1766
-crackerjack/crackerjack.py,sha256=Aqnn9ExIG8XLq0Sdv0gBdSzsROpYAUZdt2xwWf4ohAU,8226
-crackerjack/pyproject.toml,sha256=kUHrvPhmolNgUn3bLdXMasmTJs0_MmjSuoWz4g8H7-s,2928
-crackerjack-0.8.13.dist-info/RECORD,,
+crackerjack/crackerjack.py,sha256=aoknG7btKND58d0Gb1Hde02NME7J64r7wvwV2TmxZDo,8440
+crackerjack/pyproject.toml,sha256=e-QI18nH4YO72uF3b489H8-NoKv8-GBD6T8XRcZL4mc,2973
+crackerjack-0.8.15.dist-info/RECORD,,