tgit 0.5.2__tar.gz → 0.7.0__tar.gz

{tgit-0.5.2 → tgit-0.7.0}/.gitignore

@@ -3,3 +3,4 @@ dist
 *.egg-info
 *.egg
 __pycache__
+.DS_Store

{tgit-0.5.2 → tgit-0.7.0}/.vscode/settings.json

@@ -1,8 +1,4 @@
 {
-    "black-formatter.args": [
-        "--line-length",
-        "160"
-    ],
     "[python]": {
         "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.formatOnSave": true,

tgit-0.7.0/CHANGELOG.md

@@ -0,0 +1,135 @@
+## v0.6.1
+
+[v0.6.0...v0.6.1](https://github.com/Jannchie/tgit/compare/v0.6.0...v0.6.1)
+
+### :adhesive_bandage: Fixes
+
+- **changelog**: simplify sort by scope logic and validate diff before AI command - By [Jannchie](mailto:panjianqi@preferred.jp) in [32dd4e3](https://github.com/Jannchie/tgit/commit/32dd4e3)
+
+### :wrench: Chores
+
+- update gitignore, vscode settings, and pyproject.toml - By [Jannchie](mailto:panjianqi@preferred.jp) in [103271e](https://github.com/Jannchie/tgit/commit/103271e)
+
+## v0.6.0
+
+[v0.5.2...v0.6.0](https://github.com/Jannchie/tgit/compare/v0.5.2...v0.6.0)
+
+### :sparkles: Features
+
+- **version**: introduce auto-detection of version bump based on commit types - By [Jannchie](mailto:panjianqi@preferred.jp) in [910107f](https://github.com/Jannchie/tgit/commit/910107f)
+
+### :art: Refactors
+
+- extract git commit range logic into separate function for better readability - By [Jannchie](mailto:panjianqi@preferred.jp) in [44f9c94](https://github.com/Jannchie/tgit/commit/44f9c94)
+
+## v0.5.2
+
+[v0.5.1...v0.5.2](https://github.com/Jannchie/tgit/compare/v0.5.1...v0.5.2)
+
+### :adhesive_bandage: Fixes
+
+- **commit**: correct commit message formatting and emoji usage - By [Jannchie](mailto:panjianqi@preferred.jp) in [34b58a9](https://github.com/Jannchie/tgit/commit/34b58a9)
+
+## v0.5.1
+
+[v0.5.0...v0.5.1](https://github.com/Jannchie/tgit/compare/v0.5.0...v0.5.1)
+
+### :sparkles: Features
+
+- **commit**: add rich print for missing commit message - By [Jannchie](mailto:panjianqi@preferred.jp) in [686cf4a](https://github.com/Jannchie/tgit/commit/686cf4a)
+
+## v0.5.0
+
+[v0.4.3...v0.5.0](https://github.com/Jannchie/tgit/compare/v0.4.3...v0.5.0)
+
+### :sparkles: Features
+
+- **tgit**: add ai-powered commit message suggestion using openai - By [Jannchie](mailto:panjianqi@preferred.jp) in [93299f1](https://github.com/Jannchie/tgit/commit/93299f1)
+
+## v0.4.3
+
+[v0.4.2...v0.4.3](https://github.com/Jannchie/tgit/compare/v0.4.2...v0.4.3)
+
+### :art: Refactors
+
+- **version**: make the code clearer - By [Jianqi Pan](mailto:jannchie@gmail.com) in [68d626e](https://github.com/Jannchie/tgit/commit/68d626e)
+
+### :memo: Documentation
+
+- add codetime badge - By [Jianqi Pan](mailto:jannchie@gmail.com) in [984b9d3](https://github.com/Jannchie/tgit/commit/984b9d3)
+
+## v0.4.2
+
+[v0.4.1...v0.4.2](https://github.com/Jannchie/tgit/compare/v0.4.1...v0.4.2)
+
+### :adhesive_bandage: Fixes
+
+- **depeendencies**: need python 3.11 because of tomllib - By [Jianqi Pan](mailto:jannchie@gmail.com) in [d7b3c0a](https://github.com/Jannchie/tgit/commit/d7b3c0a)
+
+## v0.4.1
+
+[v0.4.0...v0.4.1](https://github.com/Jannchie/tgit/compare/v0.4.0...v0.4.1)
+
+### :adhesive_bandage: Fixes
+
+- **depeendencies**: add gitpython as dependencies - By [Jianqi Pan](mailto:jannchie@gmail.com) in [51bbcb1](https://github.com/Jannchie/tgit/commit/51bbcb1)
+
+## v0.4.0
+
+[v0.3.0...v0.4.0](https://github.com/Jannchie/tgit/compare/v0.3.0...v0.4.0)
+
+### :sparkles: Features
+
+- **changelog**: implement basic changelog features - By [Jianqi Pan](mailto:jannchie@gmail.com) in [cf623c6](https://github.com/Jannchie/tgit/commit/cf623c6)
+
+### :adhesive_bandage: Fixes
+
+- **changelog**: check whether the latest commit has a tag - By [Jianqi Pan](mailto:jannchie@gmail.com) in [310a306](https://github.com/Jannchie/tgit/commit/310a306)
+
+### :memo: Documentation
+
+- add readme - By [Jianqi Pan](mailto:jannchie@gmail.com) in [1b31cbf](https://github.com/Jannchie/tgit/commit/1b31cbf)
+
+### :wrench: Chores
+
+- **build**: use poetry - By [Jianqi Pan](mailto:jannchie@gmail.com) in [656de25](https://github.com/Jannchie/tgit/commit/656de25)
+- **version**: clean the useless code - By [Jianqi Pan](mailto:jannchie@gmail.com) in [0c24d69](https://github.com/Jannchie/tgit/commit/0c24d69)
+
+## v0.3.0
+
+[v0.2.2...v0.3.0](https://github.com/Jannchie/tgit/compare/v0.2.2...v0.3.0)
+
+### :sparkles: Features
+
+- **version**: update more version files - By [Jianqi Pan](mailto:jannchie@gmail.com) in [3a87374](https://github.com/Jannchie/tgit/commit/3a87374)
+- add gitt as a alias - By [Jianqi Pan](mailto:jannchie@gmail.com) in [bacd8fe](https://github.com/Jannchie/tgit/commit/bacd8fe)
+
+### :wrench: Chores
+
+- **commit**: do not show type choices because they are too long - By [Jianqi Pan](mailto:jannchie@gmail.com) in [886ed07](https://github.com/Jannchie/tgit/commit/886ed07)
+- **scripts**: update build script - By [Jianqi Pan](mailto:jannchie@gmail.com) in [89702cd](https://github.com/Jannchie/tgit/commit/89702cd)
+
+## v0.2.2
+
+[v0.2.1...v0.2.2](https://github.com/Jannchie/tgit/compare/v0.2.1...v0.2.2)
+
+### :adhesive_bandage: Fixes
+
+- **commit**: add tag - By [Jianqi Pan](mailto:jannchie@gmail.com) in [8ea1e80](https://github.com/Jannchie/tgit/commit/8ea1e80)
+
+## v0.2.1
+
+[0c6d5b32aad9f01678b114120e7530dfebf4fb85...v0.2.1](https://github.com/Jannchie/tgit/compare/0c6d5b32aad9f01678b114120e7530dfebf4fb85...v0.2.1)
+
+### :sparkles: Features
+
+- **commit**: enable emoji settings - By [Jianqi Pan](mailto:jannchie@gmail.com) in [6acd0dc](https://github.com/Jannchie/tgit/commit/6acd0dc)
+- **version**: detect version from file or git tags - By [Jianqi Pan](mailto:jannchie@gmail.com) in [5b4d4aa](https://github.com/Jannchie/tgit/commit/5b4d4aa)
+
+### :adhesive_bandage: Fixes
+
+- **commit**: push tag - By [Jianqi Pan](mailto:jannchie@gmail.com) in [35c96a8](https://github.com/Jannchie/tgit/commit/35c96a8)
+
+### :wrench: Chores
+
+- **format**: use sourcery - By [Jianqi Pan](mailto:jannchie@gmail.com) in [03f2078](https://github.com/Jannchie/tgit/commit/03f2078)

{tgit-0.5.2 → tgit-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tgit
-Version: 0.5.2
+Version: 0.7.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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Version Control
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Requires-Dist: gitpython
 Requires-Dist: inquirer
 Requires-Dist: openai>=1.51.0

{tgit-0.5.2 → tgit-0.7.0}/pyproject.toml

@@ -1,17 +1,11 @@
 [project]
 name = "tgit"
-version = "0.5.2"
+version = "0.7.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 = [
-    "rich",
-    "PyYAML",
-    "inquirer",
-    "gitpython",
-    "openai>=1.51.0",
-]
+dependencies = ["rich", "PyYAML", "inquirer", "gitpython", "openai>=1.51.0"]
 readme = "README.md"
-requires-python = ">= 3.8"
+requires-python = ">= 3.11"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
@@ -30,7 +24,10 @@ build-backend = "hatchling.build"
 
 [tool.rye]
 managed = true
-dev-dependencies = []
+dev-dependencies = ["black>=24.8.0", "isort>=5.13.2"]
+
+[tool.black]
+line-length = 160
 
 [tool.hatch.metadata]
 allow-direct-references = true
@@ -38,6 +35,5 @@ allow-direct-references = true
 [tool.hatch.build.targets.wheel]
 packages = ["tgit"]
 
-
 [project.scripts]
 tgit = "tgit:cli.main"

{tgit-0.5.2 → tgit-0.7.0}/requirements-dev.lock

@@ -15,11 +15,14 @@ annotated-types==0.7.0
 anyio==4.6.0
     # via httpx
     # via openai
+black==24.8.0
 blessed==1.20.0
     # via inquirer
 certifi==2024.8.30
     # via httpcore
     # via httpx
+click==8.1.7
+    # via black
 distro==1.9.0
     # via openai
 editor==1.6.6
@@ -39,14 +42,23 @@ idna==3.10
     # via httpx
 inquirer==3.4.0
     # via tgit
+isort==5.13.2
 jiter==0.5.0
     # via openai
 markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
+mypy-extensions==1.0.0
+    # via black
 openai==1.51.0
     # via tgit
+packaging==24.1
+    # via black
+pathspec==0.12.1
+    # via black
+platformdirs==4.3.6
+    # via black
 pydantic==2.9.2
     # via openai
 pydantic-core==2.23.4

{tgit-0.5.2 → tgit-0.7.0}/tgit/changelog.py

@@ -41,6 +41,16 @@ def define_changelog_parser(subparsers):
     parser_changelog.add_argument("-f", "--from", help="From hash/tag", type=str, dest="from_raw")
     parser_changelog.add_argument("-t", "--to", help="To hash/tag", type=str, dest="to_raw")
     parser_changelog.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity", dest="verbose")
+    parser_changelog.add_argument(
+        "-o",
+        "--output",
+        help="output file",
+        type=str,
+        dest="output",
+        nargs="?",  # 表示参数值是可选的
+        const="CHANGELOG.md",
+        default=None,
+    )
     parser_changelog.add_argument("path", help="repository path", type=str, nargs="?", default=".")
     parser_changelog.set_defaults(func=handle_changelog)
 
@@ -51,6 +61,7 @@ class ChangelogArgs:
     to_raw: str
     verbose: int
     path: str
+    output: str
 
 
 def get_simple_hash(repo: git.Repo, hash, length=7):
@@ -202,7 +213,7 @@ def generate_changelog(commits_by_type: dict[str, list[TGITCommit]], from_ref: s
             title = f"### {names[i]}\n\n"
             out_str += title
             # Sort commits by scope, if scope is None, put it to last
-            commits.sort(key=lambda c: "zzzzz" if c.scope is None else c.scope)
+            commits.sort(key=lambda c: c.scope or "zzzzz")
             for commit in commits:
 
                 authors_str = format_names([f"[{a.name}](mailto:{a.email})" for a in commit.authors])
@@ -217,22 +228,32 @@ 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
+
+    if args.output:
+        output_file = open(args.output, "w")
+        # 获取所有 tags
         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)
+        # 获取第一个 commit
+        first_commit = get_first_commit_hash(repo)
+        points = [first_commit] + [tag.name for tag in tags]
+        points.reverse()
+        changelogs = ""
+        for i in range(len(points) - 1):
+            to_ref = points[i]
+            from_ref = points[i + 1]
+            changelog = get_changelog_by_range(repo, from_ref, to_ref)
+            changelogs += changelog
+        output_file.write(changelogs.strip("\n") + "\n")
+    from_raw = args.from_raw
+    to_raw = args.to_raw
+
+    from_ref, to_ref = get_git_commits_range(repo, from_raw, to_raw)
+    changelog = get_changelog_by_range(repo, from_ref, to_ref)
+    print()
+    print(changelog)
+
 
+def get_changelog_by_range(repo: git.Repo, from_ref: str, to_ref: str):
     try:
         origin_url = repo.remote().url
         remote_uri = get_remote_uri(origin_url)
@@ -240,8 +261,22 @@ def handle_changelog(args: ChangelogArgs):
         warnings.warn("Origin not found, some of the link generation functions could not be enabled.")
         remote_uri = None
 
-    tgit_commits = get_commits(repo, from_hash, to_hash)
+    tgit_commits = get_commits(repo, from_ref, to_ref)
     commits_by_type = group_commits_by_type(tgit_commits)
-    changelog = generate_changelog(commits_by_type, from_ref, to_ref, remote_uri)
-    print()
-    print(changelog)
+    return generate_changelog(commits_by_type, from_ref, to_ref, remote_uri)
+
+
+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)
+
+    return from_ref, to_ref

{tgit-0.5.2 → tgit-0.7.0}/tgit/commit.py

@@ -51,12 +51,15 @@ class CommitData(BaseModel):
     is_breaking: bool
 
 
-def get_ai_command():
+def get_ai_command() -> str | None:
     client = OpenAI()
     # 获取用户执行该脚本所在的目录
     current_dir = os.getcwd()
     repo = git.Repo(current_dir, search_parent_directories=True)
-    diff = repo.git.diff("HEAD")
+    diff = repo.git.diff("--cached")
+    if not diff:
+        print("[yellow]No changes to commit, please add some changes before using AI[/yellow]")
+        return
     types = "|".join(commit_type)
     chat_completion = client.beta.chat.completions.parse(
         messages=[
@@ -82,6 +85,8 @@ def handle_commit(args: CommitArgs):
 
     if args.ai:
         command = get_ai_command()
+        if not command:
+            return
     else:
         messages = args.message
         if len(messages) == 0:

{tgit-0.5.2 → tgit-0.7.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_ref, to_ref = get_git_commits_range(repo, None, None)
+    tgit_commits = get_commits(repo, from_ref, to_ref)
+    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,
                 ),
             ]