git-sanity 2.0.0__tar.gz → 2.0.2__tar.gz

{git-sanity-2.0.0 → git-sanity-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git-sanity
-Version: 2.0.0
+Version: 2.0.2
 Summary: Manage multiple git repos with sanity
 Home-page: https://github.com/yuqiaoyu/git-sanity
 Author: yuqiaoyu

{git-sanity-2.0.0 → git-sanity-2.0.2}/setup.py

@@ -3,10 +3,13 @@
 """
 
 from setuptools import setup, find_packages
+from src.git_sanity import __prog_name__
+from src.git_sanity import __version__
+from src.git_sanity import __author__
 
 setup(
-    name="git-sanity",
-    version="2.0.0",
+    name=__prog_name__,
+    version=__version__,
     package_dir={"":"src"},
     packages=find_packages(where="src"),
     license="MIT",
@@ -16,7 +19,7 @@ setup(
     url="https://github.com/yuqiaoyu/git-sanity",
     platforms=["linux", "osx", "win32"],
     keywords=["git", "manage multiple repositories", "cui", "command-line"],
-    author="yuqiaoyu",
+    author=__author__,
     author_email="yu_junqiang@qq.com",
     entry_points={"console_scripts": ["git-sanity = git_sanity.__main__:main"]},
     python_requires="~=3.10",

{git-sanity-2.0.0 → git-sanity-2.0.2}/src/git_sanity/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
 __prog_name__ = "git-sanity"
-__version__ = "1.0.0"
+__version__ = "2.0.2"
 __author__ = "yuqiaoyu"
 __config_root_dir__ = "." + __prog_name__
 __config_file_name__ = __prog_name__ + "_config.json"

{git-sanity-2.0.0 → git-sanity-2.0.2}/src/git_sanity/__main__.py

@@ -9,6 +9,7 @@ from git_sanity.sync import sync_impl
 from git_sanity.switch import switch_impl
 from git_sanity.branch import branch_impl
 from git_sanity.push import push_impl
+from git_sanity.command import command_impl
 
 def main():
     logging.info("New Run ==================================================")
@@ -61,6 +62,11 @@ def main():
     prog_push.add_argument("-f", "--force", dest="force", action='store_true', help="force updates")
     prog_push.set_defaults(func=push_impl)
 
+    prog_command = subparsers.add_parser("command", description="Execute user-defined commands", help="execute user-defined commands")
+    prog_command.add_argument("-c", "--command", dest="command_name", help="execute 'command_name'")
+    prog_command.add_argument("-l", "--list", dest="list", action='store_true', help="list all user-defined commands")
+    prog_command.set_defaults(func=command_impl)
+
     args = prog.parse_args()
     logging.debug("command args={}".format(args))
     if "func" in args:

git-sanity-2.0.2/src/git_sanity/command.py

@@ -0,0 +1,32 @@
+import logging
+import os
+from git_sanity import __config_root_dir__
+from git_sanity import __config_file_name__
+from git_sanity.utils import run
+from git_sanity.utils import get_config_dir
+from git_sanity.utils import load_user_config
+from git_sanity.utils import get_user_config
+
+def list_commands():
+    logging.info("user-defined commands:")
+    config_root_dir = os.path.join(get_config_dir(), __config_root_dir__)
+    for command in get_user_config(load_user_config(), "commands"):
+        print(command)
+
+
+def execute_command(command_name):
+    config_root_dir = os.path.join(get_config_dir(), __config_root_dir__)
+    for command in get_user_config(load_user_config(), "commands"):
+        if command_name in command:
+            run(command[command_name], workspace=config_root_dir)
+            break
+    else:
+        logging.error("the command `{}` is not defined in {}:commands.".format(command_name, os.path.join(config_root_dir, __config_file_name__)))
+        exit(1)
+
+
+def command_impl(args):
+    if args.list:
+        list_commands()
+    else:
+        execute_command(args.command_name)

{git-sanity-2.0.0 → git-sanity-2.0.2}/src/git_sanity/init.py

@@ -30,6 +30,10 @@ default_config = {
                 "<!--project_name, default=[]-->"
             ]
         }
+    ],
+    "commands" : [
+        {"<!--command_name-->": ["<!--command and command args-->"]},
+        {"<!--test-->": ["<!-- ls -->", "<!-- -l -->"]}
     ]
 }
 

{git-sanity-2.0.0 → git-sanity-2.0.2}/src/git_sanity/utils.py

@@ -26,9 +26,6 @@ def run(command, workspace="./", env=os.environ, capture_output=False):
     Examples:
         >>> run(["ls", "-l"], capture_output=True)
         ('total 8\n-rw-r--r-- 1 user group 1234 Jan 1 12:34 file.txt', '')
-        
-        >>> run("ls -l", capture_output=False)
-        True
     """
     logging.debug("(cwd:{}) Running: {}".format(workspace, command))
     result = subprocess.run(

{git-sanity-2.0.0 → git-sanity-2.0.2}/src/git_sanity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git-sanity
-Version: 2.0.0
+Version: 2.0.2
 Summary: Manage multiple git repos with sanity
 Home-page: https://github.com/yuqiaoyu/git-sanity
 Author: yuqiaoyu

{git-sanity-2.0.0 → git-sanity-2.0.2}/src/git_sanity.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ src/git_sanity/__init__.py
 src/git_sanity/__main__.py
 src/git_sanity/branch.py
 src/git_sanity/clone.py
+src/git_sanity/command.py
 src/git_sanity/init.py
 src/git_sanity/push.py
 src/git_sanity/switch.py