tgit 0.5.0__tar.gz → 0.6.0__tar.gz

{tgit-0.5.0 → tgit-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tgit
-Version: 0.5.0
+Version: 0.6.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

{tgit-0.5.0 → tgit-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tgit"
-version = "0.5.0"
+version = "0.6.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 = [

{tgit-0.5.0 → tgit-0.6.0}/tgit/changelog.py

@@ -217,21 +217,10 @@ def generate_changelog(commits_by_type: dict[str, list[TGITCommit]], from_ref: s
 
 def handle_changelog(args: ChangelogArgs):
     repo = git.Repo(args.path)
-    from_ref = resolve_from_ref(repo, args.from_raw)
-    to_ref = "HEAD" if args.to_raw is None else args.to_raw
-    if to_ref == "HEAD":
-        latest_commit = repo.head.commit
-        tags = repo.tags
-        latest_commit_tags = [tag for tag in tags if tag.commit == latest_commit]
-        if latest_commit_tags:
-            to_ref = from_ref
-            from_ref = get_tag_by_idx(repo, -2)
-            if from_ref is None:
-                from_ref = get_first_commit_hash(repo)
-        else:
-            warnings.warn("HEAD is not a tag, changelog will be generated from the last tag to HEAD.")
-    from_hash = ref_to_hash(repo, from_ref)
-    to_hash = ref_to_hash(repo, to_ref)
+    from_raw = args.from_raw
+    to_raw = args.to_raw
+    print(from_raw, to_raw)
+    from_ref, to_ref, from_hash, to_hash = get_git_commits_range(repo, from_raw, to_raw)
 
     try:
         origin_url = repo.remote().url
@@ -245,3 +234,20 @@ def handle_changelog(args: ChangelogArgs):
     changelog = generate_changelog(commits_by_type, from_ref, to_ref, remote_uri)
     print()
     print(changelog)
+
+
+def get_git_commits_range(repo: git.Repo, from_raw: str, to_raw: str):
+    from_ref = resolve_from_ref(repo, from_raw)
+    to_ref = "HEAD" if to_raw is None else to_raw
+    if to_ref == "HEAD":
+        latest_commit = repo.head.commit
+        tags = repo.tags
+        latest_commit_tags = [tag for tag in tags if tag.commit == latest_commit]
+        if latest_commit_tags:
+            to_ref = from_ref
+            from_ref = get_tag_by_idx(repo, -2)
+            if from_ref is None:
+                from_ref = get_first_commit_hash(repo)
+    from_hash = ref_to_hash(repo, from_ref)
+    to_hash = ref_to_hash(repo, to_ref)
+    return from_ref, to_ref, from_hash, to_hash

{tgit-0.5.0 → tgit-0.6.0}/tgit/commit.py

@@ -7,6 +7,7 @@ from typing import Optional
 import git
 from openai import OpenAI
 from pydantic import BaseModel
+from rich import print
 
 from tgit.settings import settings
 from tgit.utils import get_commit_command, run_command, type_emojis
@@ -23,7 +24,11 @@ def define_commit_parser(subparsers: argparse._SubParsersAction):
         commit_type.append(data.get("type"))
 
     parser_commit = subparsers.add_parser("commit", help="commit changes following the conventional commit format")
-    parser_commit.add_argument("message", help="commit message", type=str, nargs="*")
+    parser_commit.add_argument(
+        "message",
+        help="commit message, the first word should be the type, if the message is more than two parts, the second part should be the scope",
+        nargs="*",
+    )
     parser_commit.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity")
     parser_commit.add_argument("-e", "--emoji", action="store_true", help="use emojis")
     parser_commit.add_argument("-b", "--breaking", action="store_true", help="breaking change")
@@ -66,7 +71,7 @@ def get_ai_command():
         response_format=CommitData,
     )
     resp = chat_completion.choices[0].message.parsed
-    return get_commit_command(resp.type, resp.scope, resp.msg, type_emojis.get(resp.type), resp.is_breaking)
+    return get_commit_command(resp.type, resp.scope, resp.msg, settings.get("commit", {}).get("emoji", False), resp.is_breaking)
 
 
 def handle_commit(args: CommitArgs):
@@ -79,6 +84,9 @@ def handle_commit(args: CommitArgs):
         command = get_ai_command()
     else:
         messages = args.message
+        if len(messages) == 0:
+            print("Please provide a commit message, or use --ai to generate by AI")
+            return
         commit_type = messages[0]
         if len(messages) > 2:
             commit_scope = messages[1]

{tgit-0.5.0 → tgit-0.6.0}/tgit/utils.py

@@ -36,7 +36,7 @@ def get_commit_command(commit_type: str, commit_scope: Optional[str], commit_msg
     if commit_scope is None:
         msg = f"{commit_type}{breaking_str}: {commit_msg}"
     else:
-        msg = f"{commit_type}{breaking_str}({commit_scope}): {commit_msg}"
+        msg = f"{commit_type}({commit_scope}){breaking_str}: {commit_msg}"
     if use_emoji:
         msg = f"{type_emojis.get(commit_type, ':wrench:' )} {msg}"
     return f'git commit -m "{msg}"'

{tgit-0.5.0 → tgit-0.6.0}/tgit/version.py

@@ -7,9 +7,11 @@ from dataclasses import dataclass
 from difflib import Differ
 from typing import Optional
 
+import git
 import inquirer
 from rich.panel import Panel
 
+from tgit.changelog import get_commits, get_git_commits_range, group_commits_by_type
 from tgit.settings import settings
 from tgit.utils import console, get_commit_command, run_command
 
@@ -123,13 +125,22 @@ def get_prev_version():
     return Version(major=0, minor=0, patch=0)
 
 
+def get_default_bump_by_commits_dict(commits_by_type: dict[str, list[git.Commit]]) -> str:
+    if commits_by_type.get("breaking"):
+        return "major"
+    elif commits_by_type.get("feat"):
+        return "minor"
+    return "patch"
+
+
 def handle_version(args: VersionArgs):
     verbose = args.verbose
 
-    # 注释掉的部分
-    # check_uncommitted_changes(verbose)
+    # if not check_uncommitted_changes(verbose):
+    #     return
 
     prev_version = get_current_version(verbose)
+
     if next_version := get_next_version(args, prev_version, verbose):
         update_version_files(next_version, verbose)
         execute_git_commands(args, next_version, verbose)
@@ -158,16 +169,27 @@ def get_current_version(verbose: int) -> Optional[Version]:
 
 
 def get_next_version(args, prev_version, verbose):
+
+    repo = git.Repo(os.getcwd())
+    _, _, from_hash, to_hash = get_git_commits_range(repo, None, None)
+    tgit_commits = get_commits(repo, from_hash, to_hash)
+    commits_by_type = group_commits_by_type(tgit_commits)
+    default_bump = get_default_bump_by_commits_dict(commits_by_type)
+
+    choices = [VersionChoice(prev_version, bump) for bump in ["patch", "minor", "major", "prepatch", "preminor", "premajor", "previous", "custom"]]
+    default_choice = next((choice for choice in choices if choice.bump == default_bump), None)
     next_version = deepcopy(prev_version)
+
+    console.print(f"Auto bump based on commits: [cyan bold]{default_bump}")
+
     if not any([args.version, args.patch, args.minor, args.major, args.prepatch, args.preminor, args.premajor]):
         ans = inquirer.prompt(
             [
                 inquirer.List(
                     "target",
                     message="Select the version to bump to",
-                    choices=[
-                        VersionChoice(prev_version, bump) for bump in ["patch", "minor", "major", "prepatch", "preminor", "premajor", "previous", "custom"]
-                    ],
+                    choices=choices,
+                    default=default_choice,
                     carousel=True,
                 ),
             ]