From 2e354da06d5fda6d619440ee7da782172d8494ce Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Fri, 15 Nov 2024 00:24:09 -0500 Subject: [PATCH] rename to `qmdx` --- README.md | 4 ++-- qmds/__init__.py | 0 qmds/cli.py | 9 --------- {qmds => qmdx}/comm_x/__init__.py | 4 ++-- {qmds => qmdx}/diff_x/__init__.py | 4 ++-- {qmds => qmdx}/git_diff_x/__init__.py | 6 +++--- {qmds => qmdx}/utils.py | 0 setup.py | 10 +++++----- 8 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 qmds/__init__.py delete mode 100644 qmds/cli.py rename {qmds => qmdx}/comm_x/__init__.py (94%) rename {qmds => qmdx}/diff_x/__init__.py (94%) rename {qmds => qmdx}/git_diff_x/__init__.py (94%) rename {qmds => qmdx}/utils.py (100%) diff --git a/README.md b/README.md index 1e3810a..d981e40 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# qmds +# qmdx **Q**om**m**an**ds**: execute shell pipelines against multiple inputs, diff/compare/join results @@ -18,7 +18,7 @@ ## Install ```bash -pip install qmds +pip install qmdx ``` ## CLIs diff --git a/qmds/__init__.py b/qmds/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/qmds/cli.py b/qmds/cli.py deleted file mode 100644 index 7663171..0000000 --- a/qmds/cli.py +++ /dev/null @@ -1,9 +0,0 @@ -from os import environ as env - -from click import option, argument - -shell_exec_opt = option('-s', '--shell-executable', help=f'Shell to use for executing commands; defaults to $SHELL ({env.get("SHELL")})') -no_shell_opt = option('-S', '--no-shell', is_flag=True, help="Don't pass `shell=True` to Python `subprocess`es") -verbose_opt = option('-v', '--verbose', is_flag=True, help="Log intermediate commands to stderr") -exec_cmd_opt = option('-x', '--exec-cmd', 'exec_cmds', multiple=True, help='Command(s) to execute before invoking `comm`; alternate syntax to passing commands as positional arguments') -args = argument('args', metavar='[exec_cmd...] ', nargs=-1) diff --git a/qmds/comm_x/__init__.py b/qmdx/comm_x/__init__.py similarity index 94% rename from qmds/comm_x/__init__.py rename to qmdx/comm_x/__init__.py index 4a0a369..15561f6 100644 --- a/qmds/comm_x/__init__.py +++ b/qmdx/comm_x/__init__.py @@ -5,8 +5,8 @@ from click import option, command from utz import process -from qmds.cli import args, shell_exec_opt, no_shell_opt, verbose_opt, exec_cmd_opt -from qmds.utils import join_pipelines +from qmdx.cli import args, shell_exec_opt, no_shell_opt, verbose_opt, exec_cmd_opt +from qmdx.utils import join_pipelines @command('comm-x', short_help='comm two files after running them through a pipeline of other commands', no_args_is_help=True) diff --git a/qmds/diff_x/__init__.py b/qmdx/diff_x/__init__.py similarity index 94% rename from qmds/diff_x/__init__.py rename to qmdx/diff_x/__init__.py index b07f18f..5f9a8a3 100644 --- a/qmds/diff_x/__init__.py +++ b/qmdx/diff_x/__init__.py @@ -5,8 +5,8 @@ from click import option, command -from qmds.cli import args, shell_exec_opt, no_shell_opt, verbose_opt, exec_cmd_opt -from qmds.utils import join_pipelines +from qmdx.cli import args, shell_exec_opt, no_shell_opt, verbose_opt, exec_cmd_opt +from qmdx.utils import join_pipelines color_opt = option('-c', '--color', is_flag=True, help='Colorize the output') unified_opt = option('-U', '--unified', type=int, help='Number of lines of context to show (passes through to `diff`)') diff --git a/qmds/git_diff_x/__init__.py b/qmdx/git_diff_x/__init__.py similarity index 94% rename from qmds/git_diff_x/__init__.py rename to qmdx/git_diff_x/__init__.py index 8e9d912..39d1ea1 100644 --- a/qmds/git_diff_x/__init__.py +++ b/qmdx/git_diff_x/__init__.py @@ -7,9 +7,9 @@ from click import option, argument, command from utz import process -from qmds.cli import shell_exec_opt, no_shell_opt, verbose_opt, exec_cmd_opt -from qmds.diff_x import color_opt, unified_opt, ignore_whitespace_opt -from qmds.utils import join_pipelines +from qmdx.cli import shell_exec_opt, no_shell_opt, verbose_opt, exec_cmd_opt +from qmdx.diff_x import color_opt, unified_opt, ignore_whitespace_opt +from qmdx.utils import join_pipelines @command('git-diff-x', short_help='Diff a Git-tracked file at two commits (or one commit vs. current worktree), optionally passing both through another command first') diff --git a/qmds/utils.py b/qmdx/utils.py similarity index 100% rename from qmds/utils.py rename to qmdx/utils.py diff --git a/setup.py b/setup.py index 851f350..7c2e5c1 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages setup( - name='qmds', + name='qmdx', version="0.0.1", description="Qommands: execute shell pipelines against multiple inputs, diff/compare/join results", long_description=open("README.md").read(), @@ -10,14 +10,14 @@ install_requires=open("requirements.txt").read(), entry_points={ 'console_scripts': [ - 'diff-x = qmds.diff_x:main', - 'comm-x = qmds.comm_x:main', - 'git-diff-x = qmds.git_diff_x:main', + 'diff-x = qmdx.diff_x:main', + 'comm-x = qmdx.comm_x:main', + 'git-diff-x = qmdx.git_diff_x:main', ], }, license="MIT", author="Ryan Williams", author_email="ryan@runsascoded.com", author_url="https://github.com/ryan-williams", - url="https://github.com/runsascoded/qmds", + url="https://github.com/runsascoded/qmdx", )