tgit 0.8.0__tar.gz → 0.9.0__tar.gz

tgit-0.9.0/.python-version

@@ -0,0 +1 @@
+3.12.6

{tgit-0.8.0 → tgit-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tgit
-Version: 0.8.0
+Version: 0.9.0
 Summary: Tool for Git Interaction Temptation (tgit): An elegant CLI tool that simplifies and streamlines your Git workflow, making version control a breeze.
 Author-email: Jannchie <jannchie@gmail.com>
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Requires-Dist: gitpython>=3.1.43
 Requires-Dist: inquirer>=3.4.0
-Requires-Dist: openai>=1.51.0
+Requires-Dist: openai>=1.52.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=13.9.2
 Description-Content-Type: text/markdown

{tgit-0.8.0 → tgit-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tgit"
-version = "0.8.0"
+version = "0.9.0"
 description = "Tool for Git Interaction Temptation (tgit): An elegant CLI tool that simplifies and streamlines your Git workflow, making version control a breeze."
 authors = [{ name = "Jannchie", email = "jannchie@gmail.com" }]
 dependencies = [
@@ -8,7 +8,7 @@ dependencies = [
     "pyyaml>=6.0.2",
     "inquirer>=3.4.0",
     "gitpython>=3.1.43",
-    "openai>=1.51.0",
+    "openai>=1.52.0",
 ]
 readme = { content-type = "text/markdown", file = "README.md" }
 requires-python = ">= 3.11"
@@ -30,7 +30,7 @@ build-backend = "hatchling.build"
 
 [tool.rye]
 managed = true
-dev-dependencies = ["black>=24.8.0", "isort>=5.13.2"]
+dev-dependencies = ["black>=24.10.0", "isort>=5.13.2"]
 
 [tool.black]
 line-length = 160

{tgit-0.8.0 → tgit-0.9.0}/requirements-dev.lock

@@ -17,7 +17,7 @@ ansicon==1.89.0
 anyio==4.6.0
     # via httpx
     # via openai
-black==24.8.0
+black==24.10.0
 blessed==1.20.0
     # via inquirer
 certifi==2024.8.30
@@ -58,7 +58,7 @@ mdurl==0.1.2
     # via markdown-it-py
 mypy-extensions==1.0.0
     # via black
-openai==1.51.0
+openai==1.52.0
     # via tgit
 packaging==24.1
     # via black

{tgit-0.8.0 → tgit-0.9.0}/requirements.lock

@@ -51,7 +51,7 @@ markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-openai==1.51.0
+openai==1.52.0
     # via tgit
 pydantic==2.9.2
     # via openai

tgit-0.9.0/tgit/add.py

@@ -0,0 +1,13 @@
+from tgit.utils import simple_run_command
+
+
+def define_add_parser(subparsers):
+    parser_add = subparsers.add_parser("add", help="same as git add")
+    parser_add.add_argument("files", help="files to add", nargs="*")
+    parser_add.set_defaults(func=handle_add)
+
+
+def handle_add(args):
+    files = " ".join(args.files)
+    command = f"git add {files}"
+    simple_run_command(command)

{tgit-0.8.0 → tgit-0.9.0}/tgit/cli.py

@@ -4,6 +4,7 @@ import importlib.metadata
 import rich
 import rich.traceback
 
+from tgit.add import define_add_parser
 from tgit.changelog import define_changelog_parser
 from tgit.commit import define_commit_parser
 from tgit.utils import console
@@ -24,6 +25,7 @@ def main():
     define_commit_parser(subparsers)
     define_version_parser(subparsers)
     define_changelog_parser(subparsers)
+    define_add_parser(subparsers)
 
     args = parser.parse_args()
     handle(parser, args)

{tgit-0.8.0 → tgit-0.9.0}/tgit/commit.py

@@ -70,7 +70,11 @@ def get_ai_command() -> str | None:
             messages=[
                 {
                     "role": "system",
-                    "content": f"You are a git bot. You should read the diff and suggest a commit message. The type should be one of {types}. The message should in all lowercase. The message should cover all the changes in the diff.",
+                    "content": "You are a git bot. You should read the diff and suggest a commit message. "
+                    + "Only if the changes are not compatible with previous versions (change the API, break the build, etc.), you should suggest a breaking change. "
+                    + f"The type should be one of {types}. The message should in all lowercase. And it shoud be short, in just few words. "
+                    + "The scope should be short, it is better to be a single word. "
+                    + "The message should cover all the changes in the diff. It should be in present tense. If the change has many parts, you can && to separate them, and you should also shorten the message. ",
                 },
                 {"role": "user", "content": diff},
             ],

{tgit-0.8.0 → tgit-0.9.0}/tgit/utils.py

@@ -42,6 +42,15 @@ def get_commit_command(commit_type: str, commit_scope: Optional[str], commit_msg
     return f'git commit -m "{msg}"'
 
 
+def simple_run_command(command: str):
+    process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = process.communicate()
+    if stderr != b"" and process.returncode != 0:
+        sys.stderr.write(stderr.decode())
+    if stdout != b"":
+        sys.stdout.write(stdout.decode())
+
+
 def run_command(command: str):
     if settings.get("show_command", True):
         panel = Panel.fit(

{tgit-0.8.0 → tgit-0.9.0}/tgit/version.py

@@ -63,6 +63,60 @@ class VersionArgs:
     prepatch: str
     preminor: str
     premajor: str
+    recursive: bool
+
+
+class VersionChoice:
+    def __init__(self, previous_version: Version, bump: str):
+        self.previous_version = previous_version
+        self.bump = bump
+        if bump == "major":
+            self.next_version = Version(
+                major=previous_version.major + 1,
+                minor=0,
+                patch=0,
+            )
+        elif bump == "minor":
+            self.next_version = Version(
+                major=previous_version.major,
+                minor=previous_version.minor + 1,
+                patch=0,
+            )
+        elif bump == "patch":
+            self.next_version = Version(
+                major=previous_version.major,
+                minor=previous_version.minor,
+                patch=previous_version.patch + 1,
+            )
+        elif bump == "premajor":
+            self.next_version = Version(
+                major=previous_version.major + 1,
+                minor=0,
+                patch=0,
+                release="{RELEASE}",
+            )
+        elif bump == "preminor":
+            self.next_version = Version(
+                major=previous_version.major,
+                minor=previous_version.minor + 1,
+                patch=0,
+                release="{RELEASE}",
+            )
+        elif bump == "prepatch":
+            self.next_version = Version(
+                major=previous_version.major,
+                minor=previous_version.minor,
+                patch=previous_version.patch + 1,
+                release="{RELEASE}",
+            )
+        elif bump == "previous":
+            self.next_version = previous_version
+
+    def __str__(self):
+        if "next_version" in self.__dict__:
+            return f"{self.bump} ({self.next_version})"
+        else:
+            return self.bump
 
 
 def get_prev_version():
@@ -140,9 +194,10 @@ def handle_version(args: VersionArgs):
     #     return
 
     prev_version = get_current_version(verbose)
+    reclusive = args.recursive
 
     if next_version := get_next_version(args, prev_version, verbose):
-        update_version_files(next_version, verbose)
+        update_version_files(next_version, reclusive, verbose)
         execute_git_commands(args, next_version, verbose)
 
 
@@ -218,7 +273,7 @@ def get_next_version(args, prev_version, verbose):
     return next_version
 
 
-def bump_version(target, next_version):
+def bump_version(target: VersionChoice, next_version: Version):
     if target.bump in ["patch", "prepatch"]:
         next_version.patch += 1
     elif target.bump in ["minor", "preminor"]:
@@ -264,13 +319,38 @@ def get_custom_version() -> Optional[Version]:
     return Version.from_str(version)
 
 
-def update_version_files(next_version: Version, verbose: int):
+def update_version_files(next_version: Version, reclusive: bool, verbose: int):
     next_version_str = str(next_version)
 
+    current_path = os.getcwd()
     if verbose > 0:
-        current_path = os.getcwd()
         console.print(f"Current path: [cyan bold]{current_path}")
 
+    if reclusive:
+        # 获取当前目录及其子目录下，所有名称在上述列表中的文件
+        # 使用os.walk()函数，可以遍历指定目录下的所有子目录和文件
+        filenames = ["package.json", "pyproject.toml", "setup.py", "Cargo.toml", "VERSION", "VERSION.txt"]
+        for root, _, files in os.walk(current_path):
+            for file in files:
+                if file in filenames:
+                    file_path = os.path.join(root, file)
+                    if file == "package.json":
+                        update_file(file_path, r'"version":\s*".*?"', f'"version": "{next_version_str}"', verbose, show_diff=False)
+                    elif file == "pyproject.toml":
+                        update_file(file_path, r'version\s*=\s*".*?"', f'version = "{next_version_str}"', verbose, show_diff=False)
+                    elif file == "setup.py":
+                        update_file(file_path, r"version=['\"].*?['\"]", f"version='{next_version_str}'", verbose, show_diff=False)
+                    elif file == "Cargo.toml":
+                        update_file(file_path, r'version\s*=\s*".*?"', f'version = "{next_version_str}"', verbose, show_diff=False)
+                    elif file == "VERSION":
+                        update_file(file_path, None, next_version_str, verbose, show_diff=False)
+                    elif file == "VERSION.txt":
+                        update_file(file_path, None, next_version_str, verbose, show_diff=False)
+    else:
+        update_file_in_root(next_version_str, verbose)
+
+
+def update_file_in_root(next_version_str, verbose):
     update_file("package.json", r'"version":\s*".*?"', f'"version": "{next_version_str}"', verbose)
     update_file("pyproject.toml", r'version\s*=\s*".*?"', f'version = "{next_version_str}"', verbose)
     update_file("setup.py", r"version=['\"].*?['\"]", f"version='{next_version_str}'", verbose)
@@ -361,59 +441,6 @@ def execute_git_commands(args: VersionArgs, next_version: Version, verbose: int)
     run_command(commands_str)
 
 
-class VersionChoice:
-    def __init__(self, previous_version: Version, bump: str):
-        self.previous_version = previous_version
-        self.bump = bump
-        if bump == "major":
-            self.next_version = Version(
-                major=previous_version.major + 1,
-                minor=0,
-                patch=0,
-            )
-        elif bump == "minor":
-            self.next_version = Version(
-                major=previous_version.major,
-                minor=previous_version.minor + 1,
-                patch=0,
-            )
-        elif bump == "patch":
-            self.next_version = Version(
-                major=previous_version.major,
-                minor=previous_version.minor,
-                patch=previous_version.patch + 1,
-            )
-        elif bump == "premajor":
-            self.next_version = Version(
-                major=previous_version.major + 1,
-                minor=0,
-                patch=0,
-                release="{RELEASE}",
-            )
-        elif bump == "preminor":
-            self.next_version = Version(
-                major=previous_version.major,
-                minor=previous_version.minor + 1,
-                patch=0,
-                release="{RELEASE}",
-            )
-        elif bump == "prepatch":
-            self.next_version = Version(
-                major=previous_version.major,
-                minor=previous_version.minor,
-                patch=previous_version.patch + 1,
-                release="{RELEASE}",
-            )
-        elif bump == "previous":
-            self.next_version = previous_version
-
-    def __str__(self):
-        if "next_version" in self.__dict__:
-            return f"{self.bump} ({self.next_version})"
-        else:
-            return self.bump
-
-
 def define_version_parser(subparsers):
     parser_version = subparsers.add_parser("version", help="bump version of the project")
     parser_version.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity")
@@ -421,8 +448,8 @@ def define_version_parser(subparsers):
     parser_version.add_argument("--no-tag", action="store_true", help="do not create a tag")
     parser_version.add_argument("--no-push", action="store_true", help="do not push the changes")
 
-    # TODO: add option to bump all packages in the monorepo
-    # parser_version.add_argument("-r", "--recursive", action="store_true", help="bump all packages in the monorepo")
+    # add option to bump all packages in the monorepo
+    parser_version.add_argument("-r", "--recursive", action="store_true", help="bump all packages in the monorepo")
 
     # create a mutually exclusive group
     version_group = parser_version.add_mutually_exclusive_group()
@@ -435,4 +462,5 @@ def define_version_parser(subparsers):
     version_group.add_argument("-pm", "--preminor", help="preminor version", type=str)
     version_group.add_argument("-pM", "--premajor", help="premajor version", type=str)
     version_group.add_argument("version", help="version to bump to", type=str, nargs="?")
+
     parser_version.set_defaults(func=handle_version)

tgit-0.8.0/.python-version

@@ -1 +0,0 @@
-3.12.5