smart-commit-tool 1.0.0__tar.gz → 1.1.0__tar.gz

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-commit-tool
-Version: 1.0.0
+Version: 1.1.0
 Summary: Automated pre-push workflow manager with built-in code quality enforcement and smart branch protection.
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -12,6 +12,11 @@ Description-Content-Type: text/markdown
 
 [English](README.md) | [Русский](README.ru.md)
 
+[![PyPI version](https://img.shields.io/pypi/v/smart-commit-tool?color=blue&logo=pypi&logoColor=white)](https://pypi.org/project/smart-commit-tool/)
+[![Python Version](https://img.shields.io/badge/python-3.8+-blue?logo=python&logoColor=white)](https://pypi.org/project/smart-commit-tool/)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![GitHub stars](https://img.shields.io/github/stars/mokinprokin/smart_commit?style=social)](https://github.com/mokinprokin/smart_commit/stargazers)
+
 **Smart Commit** is a universal CLI tool designed to streamline and secure your Git workflow. It orchestrates linting, testing, committing, and pushing into a single, bulletproof operation.
 
 **The Golden Rule:** If your tests fail, your code doesn't ship.
@@ -86,6 +91,7 @@ smart-commit
 4. **Optimized Push**: Automatically handles `add` and `commit`. If the remote branch has moved forward, it helps you `rebase` to ensure a linear, clean history.
 
 ---
+![Демонстрация smart-commit](assets/demonstration.gif)
 
 ## 📄 License
 Distributed under the MIT License. Feel free to use, modify, and share!

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/README.md

@@ -2,6 +2,11 @@
 
 [English](README.md) | [Русский](README.ru.md)
 
+[![PyPI version](https://img.shields.io/pypi/v/smart-commit-tool?color=blue&logo=pypi&logoColor=white)](https://pypi.org/project/smart-commit-tool/)
+[![Python Version](https://img.shields.io/badge/python-3.8+-blue?logo=python&logoColor=white)](https://pypi.org/project/smart-commit-tool/)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![GitHub stars](https://img.shields.io/github/stars/mokinprokin/smart_commit?style=social)](https://github.com/mokinprokin/smart_commit/stargazers)
+
 **Smart Commit** is a universal CLI tool designed to streamline and secure your Git workflow. It orchestrates linting, testing, committing, and pushing into a single, bulletproof operation.
 
 **The Golden Rule:** If your tests fail, your code doesn't ship.
@@ -76,6 +81,7 @@ smart-commit
 4. **Optimized Push**: Automatically handles `add` and `commit`. If the remote branch has moved forward, it helps you `rebase` to ensure a linear, clean history.
 
 ---
+![Демонстрация smart-commit](assets/demonstration.gif)
 
 ## 📄 License
 Distributed under the MIT License. Feel free to use, modify, and share!

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/README.ru.md

@@ -75,6 +75,7 @@ smart-commit
 4. **Умный Push**: Инструмент сам сделает `add`, `commit` и отправит код. Если на сервере появились новые изменения, он предложит сделать `rebase`, чтобы история оставалась чистой.
 
 ---
+![Демонстрация smart-commit](assets/demonstration.gif)
 
 ## 📄 Лицензия
 Распространяется под лицензией **MIT**. Пользуйтесь, меняйте и делитесь с друзьями!

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "smart-commit-tool"
-version = "1.0.0"
+version = "1.1.0"
 description = "Automated pre-push workflow manager with built-in code quality enforcement and smart branch protection."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -17,7 +17,7 @@ dependencies = [
 smart-commit = "smart_commit.cli:main"
 
 [tool.smart_commit]
-repository_url = "https://github.com/mokinprokin/smart_commit.git"
+repository_url = "https://github.com/mokinprokin/SmartCommit.git"
 commands = ["ruff check ."]
 protected_branches = ["main", "master", "prod", "release"]
 

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/src/smart_commit/cli.py

@@ -27,7 +27,7 @@ def main():
 
         current_branch = GitService.get_current_branch()
         branch = args.branch or current_branch
-
+        GitService.switch_branch(branch)
         if branch in protected_branches:
             Console.warning(
                 f"You are pushing directly to a protected branch: '{branch}'."

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/src/smart_commit/services/git.py

@@ -28,6 +28,29 @@ class GitService:
     def get_current_branch(cls) -> str:
         return cls._run(["git", "branch", "--show-current"]).stdout.strip()
 
+    @classmethod
+    def switch_branch(cls, branch: str):
+        """Safely switches to the target branch or creates it."""
+        current = cls.get_current_branch()
+        if current != branch:
+            Console.info(f"🌿 Switching branch: {current} ➔ {branch}")
+            has_commits = cls._run(["git", "rev-parse", "HEAD"]).returncode == 0
+
+            if not has_commits:
+                res = cls._run(["git", "branch", "-M", branch])
+            else:
+                res = cls._run(["git", "checkout", "-B", branch])
+
+            if res.returncode != 0:
+                error_msg = res.stderr.strip() or res.stdout.strip()
+                raise GitOperationError(f"Failed to switch branch: {error_msg}")
+
+    @classmethod
+    def has_any_changes(cls) -> bool:
+        """Checks if there are any staged, unstaged, or untracked changes."""
+        res = cls._run(["git", "status", "--porcelain"])
+        return bool(res.stdout.strip())
+
     @classmethod
     def has_staged_changes(cls) -> bool:
         """Checks if there are files already in the staging area."""
@@ -53,12 +76,15 @@ class GitService:
 
     @classmethod
     def commit(cls, message: str):
+        """Commits changes and extracts Git output if it fails."""
         res = cls._run(["git", "commit", "-m", message])
         if res.returncode != 0:
-            raise GitOperationError("Commit failed. Ensure you have changes to commit.")
+            error_msg = res.stderr.strip() or res.stdout.strip()
+            raise GitOperationError(f"Commit failed. Git says:\n{error_msg}")
 
     @classmethod
     def push_with_retry(cls, branch: str):
+        """Pushes to remote, attempting a pull --rebase if rejected."""
         Console.info(f"Pushing to branch: {branch}...")
         res = cls._run(["git", "push", "-u", "origin", branch])
 
@@ -71,11 +97,14 @@ class GitService:
         pull_res = cls._run(["git", "pull", "origin", branch, "--rebase"])
 
         if pull_res.returncode != 0:
+            error_msg = pull_res.stderr.strip() or pull_res.stdout.strip()
             raise GitOperationError(
-                "🛑 Rebase conflict detected! Please resolve manually and run again."
+                f"🛑 Rebase conflict detected!\nGit says: {error_msg}"
             )
 
         Console.success("Sync successful. Retrying push...")
         push_retry = cls._run(["git", "push", "-u", "origin", branch])
+
         if push_retry.returncode != 0:
-            raise GitOperationError("Final push failed after rebase.")
+            error_msg = push_retry.stderr.strip() or push_retry.stdout.strip()
+            raise GitOperationError(f"Final push failed after rebase:\n{error_msg}")

{smart_commit_tool-1.0.0 → smart_commit_tool-1.1.0}/src/smart_commit/services/security.py

@@ -13,6 +13,7 @@ __pycache__/
 venv/
 env/
 .env*
+*.env
 !.env.example
 .vscode/
 .idea/
@@ -39,16 +40,20 @@ node_modules/
     @classmethod
     def check_env_leaks(cls):
         """
-        Scans for .env* files and uses Git to check if they are ignored.
+        Scans for .env files (e.g. .env.local, .test.env, prod.env)
+        and uses Git to check if they are ignored.
         Prevents accidental leaks of secrets.
         """
         Console.info("🛡️ Scanning for potential secret leaks (.env files)...")
 
+        raw_files = set(Path(".").rglob(".env*")) | set(Path(".").rglob("*.env"))
+
         env_files = [
             f
-            for f in Path(".").rglob(".env*")
-            if not any(
-                part in ["venv", ".venv", "env", "node_modules", ".git"]
+            for f in raw_files
+            if f.is_file()
+            and not any(
+                part in ["venv", ".venv", "env", "node_modules", ".git", "__pycache__"]
                 for part in f.parts
             )
         ]