diff --git a/.isort.cfg b/.isort.cfg index cea3788..bb1825f 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,3 +1,3 @@ [settings] -profile = "black" +profile = black line_length = 80 \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 3dfb4bc..bd0c9d6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,12 +5,24 @@ "version": "0.2.0", "configurations": [ { - "name": "Kiwi main", + "name": "kiwi-core: main", + "type": "debugpy", + "request": "launch", + "module": "kiwi_scp_core.main", + "justMyCode": true, + "env": {}, + "args": [ + "hello", + "ZA WARUDO", + ], + }, + { + "name": "kiwi: main", "type": "debugpy", "request": "launch", "module": "kiwi_scp.main", "justMyCode": true, "env": {}, - } + }, ] } \ No newline at end of file diff --git a/kiwi/poetry.lock b/kiwi/poetry.lock index d9bf9a1..d8d1a4b 100644 --- a/kiwi/poetry.lock +++ b/kiwi/poetry.lock @@ -1,5 +1,32 @@ # This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +[[package]] +name = "distlib" +version = "0.3.8" +description = "Distribution utilities" +optional = false +python-versions = "*" +files = [ + {file = "distlib-0.3.8-py2.py3-none-any.whl", hash = "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784"}, + {file = "distlib-0.3.8.tar.gz", hash = "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"}, +] + +[[package]] +name = "filelock" +version = "3.14.0" +description = "A platform independent file lock." +optional = false +python-versions = ">=3.8" +files = [ + {file = "filelock-3.14.0-py3-none-any.whl", hash = "sha256:43339835842f110ca7ae60f1e1c160714c5a6afd15a2873419ab185334975c0f"}, + {file = "filelock-3.14.0.tar.gz", hash = "sha256:6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a"}, +] + +[package.extras] +docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] +typing = ["typing-extensions (>=4.8)"] + [[package]] name = "kiwi-scp-core" version = "0.1.0" @@ -13,7 +40,43 @@ develop = true type = "directory" url = ".." +[[package]] +name = "platformdirs" +version = "4.2.1" +description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." +optional = false +python-versions = ">=3.8" +files = [ + {file = "platformdirs-4.2.1-py3-none-any.whl", hash = "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"}, + {file = "platformdirs-4.2.1.tar.gz", hash = "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf"}, +] + +[package.extras] +docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] +type = ["mypy (>=1.8)"] + +[[package]] +name = "virtualenv" +version = "20.26.1" +description = "Virtual Python Environment builder" +optional = false +python-versions = ">=3.7" +files = [ + {file = "virtualenv-20.26.1-py3-none-any.whl", hash = "sha256:7aa9982a728ae5892558bff6a2839c00b9ed145523ece2274fad6f414690ae75"}, + {file = "virtualenv-20.26.1.tar.gz", hash = "sha256:604bfdceaeece392802e6ae48e69cec49168b9c5f4a44e483963f9242eb0e78b"}, +] + +[package.dependencies] +distlib = ">=0.3.7,<1" +filelock = ">=3.12.2,<4" +platformdirs = ">=3.9.1,<5" + +[package.extras] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] + [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "a3d34500c99938adcdd197120ef1d14e13272335d82463becce1e9b26fdb1fa3" +content-hash = "907b6d40120ada0448973b8b80401a49e90f396e9d849c4565b6bd20b9a16d0f" diff --git a/kiwi/pyproject.toml b/kiwi/pyproject.toml index 8c2d88d..e18fada 100644 --- a/kiwi/pyproject.toml +++ b/kiwi/pyproject.toml @@ -10,6 +10,7 @@ readme = "README.md" [tool.poetry.dependencies] kiwi-scp-core = {path="..", develop=true} python = "^3.9" +virtualenv = "^20.26.1" [tool.poetry.scripts] kiwi = "kiwi_scp.main:main" diff --git a/kiwi/src/kiwi_scp/main.py b/kiwi/src/kiwi_scp/main.py index 44bf55a..e996885 100644 --- a/kiwi/src/kiwi_scp/main.py +++ b/kiwi/src/kiwi_scp/main.py @@ -1,9 +1,20 @@ -import kiwi_scp_core.lib +import os +import subprocess +import sys + +from virtualenv import cli_run def main() -> None: - print("Hello kiwi") - kiwi_scp_core.lib.hello() + # TODO location + if not os.access("/tmp/kiwi/bin/kiwi-core", os.X_OK): + cli_run(["/tmp/kiwi"]) + subprocess.check_call(["/tmp/kiwi/bin/python3", "-m", "pip", "install", "."]) + + try: + subprocess.check_call(["/tmp/kiwi/bin/kiwi-core", *sys.argv[1::]]) + except subprocess.CalledProcessError as exc: + sys.exit(exc.returncode) if __name__ == "__main__": diff --git a/poetry.lock b/poetry.lock index 7a499b6..f73d881 100644 --- a/poetry.lock +++ b/poetry.lock @@ -101,6 +101,30 @@ files = [ [package.extras] colors = ["colorama (>=0.4.6)"] +[[package]] +name = "markdown-it-py" +version = "3.0.0" +description = "Python port of markdown-it. Markdown parsing, done right!" +optional = false +python-versions = ">=3.8" +files = [ + {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"}, + {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"}, +] + +[package.dependencies] +mdurl = ">=0.1,<1.0" + +[package.extras] +benchmarking = ["psutil", "pytest", "pytest-benchmark"] +code-style = ["pre-commit (>=3.0,<4.0)"] +compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "mistletoe (>=1.0,<2.0)", "mistune (>=2.0,<3.0)", "panflute (>=2.3,<3.0)"] +linkify = ["linkify-it-py (>=1,<3)"] +plugins = ["mdit-py-plugins"] +profiling = ["gprof2dot"] +rtd = ["jupyter_sphinx", "mdit-py-plugins", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"] +testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] + [[package]] name = "mccabe" version = "0.7.0" @@ -112,6 +136,17 @@ files = [ {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, ] +[[package]] +name = "mdurl" +version = "0.1.2" +description = "Markdown URL utilities" +optional = false +python-versions = ">=3.7" +files = [ + {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, + {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, +] + [[package]] name = "mypy-extensions" version = "1.0.0" @@ -161,6 +196,34 @@ docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx- test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] type = ["mypy (>=1.8)"] +[[package]] +name = "psutil" +version = "5.9.8" +description = "Cross-platform lib for process and system monitoring in Python." +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +files = [ + {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"}, + {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"}, + {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"}, + {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"}, + {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"}, + {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"}, + {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"}, + {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"}, + {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"}, + {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"}, + {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"}, + {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"}, + {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"}, + {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"}, + {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"}, + {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"}, +] + +[package.extras] +test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] + [[package]] name = "pycodestyle" version = "2.11.1" @@ -183,6 +246,50 @@ files = [ {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"}, ] +[[package]] +name = "pygments" +version = "2.17.2" +description = "Pygments is a syntax highlighting package written in Python." +optional = false +python-versions = ">=3.7" +files = [ + {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, + {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, +] + +[package.extras] +plugins = ["importlib-metadata"] +windows-terminal = ["colorama (>=0.4.6)"] + +[[package]] +name = "rich" +version = "13.7.1" +description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" +optional = false +python-versions = ">=3.7.0" +files = [ + {file = "rich-13.7.1-py3-none-any.whl", hash = "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222"}, + {file = "rich-13.7.1.tar.gz", hash = "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"}, +] + +[package.dependencies] +markdown-it-py = ">=2.2.0" +pygments = ">=2.13.0,<3.0.0" + +[package.extras] +jupyter = ["ipywidgets (>=7.5.1,<9)"] + +[[package]] +name = "shellingham" +version = "1.5.4" +description = "Tool to Detect Surrounding Shell" +optional = false +python-versions = ">=3.7" +files = [ + {file = "shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686"}, + {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"}, +] + [[package]] name = "tomli" version = "2.0.1" @@ -194,6 +301,23 @@ files = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] +[[package]] +name = "typer" +version = "0.12.3" +description = "Typer, build great CLIs. Easy to code. Based on Python type hints." +optional = false +python-versions = ">=3.7" +files = [ + {file = "typer-0.12.3-py3-none-any.whl", hash = "sha256:070d7ca53f785acbccba8e7d28b08dcd88f79f1fbda035ade0aecec71ca5c914"}, + {file = "typer-0.12.3.tar.gz", hash = "sha256:49e73131481d804288ef62598d97a1ceef3058905aa536a1134f90891ba35482"}, +] + +[package.dependencies] +click = ">=8.0.0" +rich = ">=10.11.0" +shellingham = ">=1.3.0" +typing-extensions = ">=3.7.4.3" + [[package]] name = "typing-extensions" version = "4.11.0" @@ -208,4 +332,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "4a9120abe8e3e31f72c4a2554d20acded5c1da5a81d3169bbd6ec50b45dd16cb" +content-hash = "b3d5cf565fd5d5c41bb418931b7f261e1789b11adfc7ae929968295027b85ab5" diff --git a/pyproject.toml b/pyproject.toml index d870c03..5e078e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,12 +8,17 @@ maintainers = [] [tool.poetry.dependencies] python = "^3.9" +typer = "^0.12.3" +psutil = "^5.9.8" [tool.poetry.group.dev.dependencies] black = "^24.4.2" flake8 = "^7.0.0" isort = "^5.13.2" +[tool.poetry.scripts] +kiwi-core = "kiwi_scp_core.main:main" + [build-system] build-backend = "poetry.core.masonry.api" requires = ["poetry-core"] diff --git a/src/kiwi_scp_core/app.py b/src/kiwi_scp_core/app.py new file mode 100644 index 0000000..78618fa --- /dev/null +++ b/src/kiwi_scp_core/app.py @@ -0,0 +1,25 @@ +from typing import Annotated + +import typer + +from . import subcommand + +app = typer.Typer( + no_args_is_help=True, + rich_markup_mode="rich", +) +app.add_typer(subcommand.cmd) + + +@app.command() +def hello(target: Annotated[str, typer.Argument()] = "World"): + print(f"Hello {target}") + + +@app.command() +def greet(name: str): + """ + [bold green]Greeting[/bold green] :sparkles: + """ + + print(f"Hi {name}!") diff --git a/src/kiwi_scp_core/lib.py b/src/kiwi_scp_core/lib.py deleted file mode 100644 index d10b8bd..0000000 --- a/src/kiwi_scp_core/lib.py +++ /dev/null @@ -1,2 +0,0 @@ -def hello() -> None: - print("Hello kiwi-core") diff --git a/src/kiwi_scp_core/main.py b/src/kiwi_scp_core/main.py new file mode 100644 index 0000000..c29cbb0 --- /dev/null +++ b/src/kiwi_scp_core/main.py @@ -0,0 +1,27 @@ +import sys + +import psutil + +from . import app + + +def called_by_kiwi() -> bool: + if (parent := psutil.Process().parent()) is None: + return False + if len(cmdline := parent.cmdline()) < 2: + return False + if not cmdline[1].endswith("/kiwi"): + return False + + return True + + +def main() -> None: + if called_by_kiwi(): + sys.argv[0] = "kiwi" + + app.app() + + +if __name__ == "__main__": + main() diff --git a/src/kiwi_scp_core/subcommand.py b/src/kiwi_scp_core/subcommand.py new file mode 100644 index 0000000..5fa47bf --- /dev/null +++ b/src/kiwi_scp_core/subcommand.py @@ -0,0 +1,17 @@ +import typer + +cmd = typer.Typer( + name="subcommand", + no_args_is_help=True, + rich_markup_mode="rich", +) + + +@cmd.command() +def foo(): + print("hoppsåamen!") + + +@cmd.command() +def bar(): + print("bimbam")