commitmessagegenerator 2.2.0__py3-none-any.whl → 2.5.0__py3-none-any.whl

commitmessagegenerator/cli.py

@@ -1,7 +1,15 @@
 import argparse
 import subprocess
 from .generator import gerar_mensagem_commit
-from .configure import api_key, get_configured_model, get_auto_add_setting, update_setting, get_api_key_status
+from .configure import (
+    api_key,
+    get_configured_model,
+    get_auto_add_setting,
+    update_setting,
+    get_api_key_status,
+    load_config_env,
+    resolve_env_path,
+)
 import sys
 import getpass
 
@@ -16,6 +24,11 @@ MODEL_MAP = {
 
 def configure_menu():
     """Interactive configuration menu"""
+    configure_menu_with_scope("auto")
+
+
+def configure_menu_with_scope(config_scope):
+    """Interactive configuration menu with target scope."""
     while True:
         # Get current settings
         api_set = get_api_key_status()
@@ -37,15 +50,15 @@ def configure_menu():
             print("\nExiting configuration.\n")
             break
         elif choice == "1":
-            configure_api_key()
+            configure_api_key(config_scope)
         elif choice == "2":
-            configure_model()
+            configure_model(config_scope)
         elif choice == "3":
-            configure_staging()
+            configure_staging(config_scope)
         else:
             print("\nInvalid option. Please try again.")
 
-def configure_api_key():
+def configure_api_key(config_scope):
     """Configure the API key"""
     print("\n" + "-"*40)
     print("API KEY CONFIGURATION")
@@ -59,10 +72,10 @@ def configure_api_key():
         print("\nNo changes made.")
         return
     
-    update_setting("GEMINI_API_KEY", key)
+    update_setting("GEMINI_API_KEY", key, scope=config_scope)
     print("\n✓ API Key saved successfully!")
 
-def configure_model():
+def configure_model(config_scope):
     """Configure the AI model"""
     current_model = get_configured_model()
     
@@ -87,12 +100,12 @@ def configure_model():
     
     if choice in MODEL_MAP:
         selected_model = MODEL_MAP[choice]
-        update_setting("AI_MODEL", selected_model)
+        update_setting("AI_MODEL", selected_model, scope=config_scope)
         print(f"\n✓ Model changed to: {selected_model}")
     else:
         print("\nInvalid option. No changes made.")
 
-def configure_staging():
+def configure_staging(config_scope):
     """Configure file staging behavior"""
     auto_add = get_auto_add_setting()
     
@@ -111,10 +124,10 @@ def configure_staging():
         return
     
     if choice == "1":
-        update_setting("AUTO_ADD_ALL", "true")
+        update_setting("AUTO_ADD_ALL", "true", scope=config_scope)
         print("\n✓ Set to: Auto-add all files")
     elif choice == "2":
-        update_setting("AUTO_ADD_ALL", "false")
+        update_setting("AUTO_ADD_ALL", "false", scope=config_scope)
         print("\n✓ Set to: Staged only")
     else:
         print("\nInvalid option. No changes made.")
@@ -125,14 +138,18 @@ def main():
     parser.add_argument("-cp", "--commitpush",  action="store_true", help="Commits and pushes with the generated message")
     parser.add_argument("-cf", "--configure", action="store_true", help="Configures the GEMINI_API_KEY environment variable")
     parser.add_argument("-s", "--status", action="store_true", help="Shows current configuration status")
+    parser.add_argument(
+        "--config-scope",
+        choices=["auto", "local", "global"],
+        default="auto",
+        help="Where -cf writes configuration (.env): auto, local, or global",
+    )
     args = parser.parse_args()
 
     if args.status:
-        from .configure import get_configured_model, get_auto_add_setting
         import os
-        from dotenv import load_dotenv
-        
-        load_dotenv()
+
+        env_path = load_config_env()
         key = os.getenv("GEMINI_API_KEY")
         model = get_configured_model()
         auto_add = get_auto_add_setting()
@@ -141,6 +158,10 @@ def main():
         print(f"API Key: {'✓ Set' if key else '✗ Not set'}")
         print(f"Model: {model}")
         print(f"Auto-add all files: {'✓ Yes' if auto_add else '✗ No (staged only)'}")
+        if env_path is not None:
+            print(f"Config file: {env_path}")
+        else:
+            print("Config file: not found (.env not discovered)")
         return
 
     if not args.configure:
@@ -161,7 +182,10 @@ def main():
         subprocess.run(["git", "push"])
     
     if args.configure:
-        configure_menu()
+        configure_menu_with_scope(args.config_scope)
+        configured_path = resolve_env_path()
+        if configured_path is not None:
+            print(f"\nConfiguration file in use: {configured_path}")
     
     if len(sys.argv) == 1:
         print("\nRemoving staged changes (git reset)...")

commitmessagegenerator/configure.py

@@ -1,9 +1,80 @@
 import os
+from pathlib import Path
+from dotenv import load_dotenv
 
-def update_setting(setting_name, value):
+
+GLOBAL_ENV_PATH = Path.home() / ".commitgen" / ".env"
+CONFIG_SCOPES = {"auto", "local", "global"}
+
+
+def _iter_local_env_candidates():
+    """Yield .env paths from cwd up to filesystem root."""
+    current = Path.cwd().resolve()
+    for directory in (current, *current.parents):
+        yield directory / ".env"
+
+
+def resolve_local_env_path():
+    """Resolve an existing local .env from cwd up to filesystem root."""
+    for candidate in _iter_local_env_candidates():
+        if candidate.exists():
+            return candidate
+    return None
+
+
+def resolve_env_path():
+    """Resolve the best available config file path."""
+    local_path = resolve_local_env_path()
+    if local_path is not None:
+        return local_path
+    if GLOBAL_ENV_PATH.exists():
+        return GLOBAL_ENV_PATH
+    return None
+
+
+def resolve_writable_env_path(scope="auto"):
+    """
+    Resolve where settings should be written.
+
+    scope:
+    - auto: existing local .env, then existing global .env, else new global .env
+    - local: .env in current working directory
+    - global: ~/.commitgen/.env
+    """
+    if scope not in CONFIG_SCOPES:
+        raise ValueError(f"Invalid config scope: {scope}")
+
+    if scope == "local":
+        return Path.cwd().resolve() / ".env"
+
+    if scope == "global":
+        return GLOBAL_ENV_PATH
+
+    existing_path = resolve_env_path()
+    if existing_path is not None:
+        return existing_path
+    return GLOBAL_ENV_PATH
+
+
+def load_config_env():
+    """
+    Load configuration from the resolved .env path (if found).
+    Returns the loaded path or None.
+    """
+    env_path = resolve_env_path()
+    if env_path is not None:
+        load_dotenv(dotenv_path=env_path, override=False)
+        return env_path
+    load_dotenv(override=False)
+    return None
+
+def update_setting(setting_name, value, scope="auto"):
     """Update a single setting in the .env file"""
-    if os.path.exists(".env"):
-        with open(".env", "r") as f:
+    env_path = resolve_writable_env_path(scope=scope)
+    env_path.parent.mkdir(parents=True, exist_ok=True)
+
+    if env_path.exists():
+        with open(env_path, "r", encoding="utf-8") as f:
             lines = f.readlines()
         
         found = False
@@ -19,33 +90,40 @@ def update_setting(setting_name, value):
         if not found:
             new_lines.append(f"{setting_name}={value}\n")
         
-        with open(".env", "w") as f:
+        with open(env_path, "w", encoding="utf-8") as f:
             f.writelines(new_lines)
     else:
-        with open(".env", "w") as f:
+        with open(env_path, "w", encoding="utf-8") as f:
             f.write(f"{setting_name}={value}\n")
     
-    _ensure_gitignore()
+    _ensure_gitignore(env_path)
+
+def _ensure_gitignore(env_path):
+    """Ensure .env is in .gitignore for local (non-global) config files."""
+    if env_path == GLOBAL_ENV_PATH:
+        return
 
-def _ensure_gitignore():
-    """Ensure .env is in .gitignore"""
-    if os.path.exists(".gitignore"):
-        with open(".gitignore", "r+") as outfile:
+    gitignore_path = env_path.parent / ".gitignore"
+    if gitignore_path.exists():
+        with open(gitignore_path, "r+", encoding="utf-8") as outfile:
             lines = outfile.readlines()
             env_in_gitignore = next((line for line in lines if line.strip() == ".env"), None)
             if not env_in_gitignore:
                 outfile.write("\n.env")
 
-def api_key(key, model="gemini-2.0-flash", auto_add_all=True):
+def api_key(key, model="gemini-2.0-flash", auto_add_all=True, scope="auto"):
     """Set all configuration at once (legacy function)"""
     config = {
         "GEMINI_API_KEY": key,
         "AI_MODEL": model,
         "AUTO_ADD_ALL": str(auto_add_all).lower()
     }
-    
-    if os.path.exists(".env"):
-        with open(".env", "r") as f:
+
+    env_path = resolve_writable_env_path(scope=scope)
+    env_path.parent.mkdir(parents=True, exist_ok=True)
+
+    if env_path.exists():
+        with open(env_path, "r", encoding="utf-8") as f:
             lines = f.readlines()
         
         existing_keys = set()
@@ -62,19 +140,24 @@ def api_key(key, model="gemini-2.0-flash", auto_add_all=True):
             if key_name not in existing_keys:
                 new_lines.append(f"{key_name}={value}\n")
         
-        with open(".env", "w") as f:
+        with open(env_path, "w", encoding="utf-8") as f:
             f.writelines(new_lines)
     else:
-        with open(".env", "w") as f:
+        with open(env_path, "w", encoding="utf-8") as f:
             for key_name, value in config.items():
                 f.write(f"{key_name}={value}\n")
 
-    _ensure_gitignore()
+    _ensure_gitignore(env_path)
 
 def get_api_key_status():
     """Check if API key is set"""
-    if os.path.exists(".env"):
-        with open(".env", "r") as f:
+    env_key = os.getenv("GEMINI_API_KEY")
+    if env_key:
+        return True
+
+    env_path = resolve_env_path()
+    if env_path is not None:
+        with open(env_path, "r", encoding="utf-8") as f:
             lines = f.readlines()
             api_line = next((line for line in lines if line.startswith("GEMINI_API_KEY=")), None)
             if api_line:
@@ -84,8 +167,13 @@ def get_api_key_status():
 
 def get_configured_model():
     """Get the currently configured AI model from .env file"""
-    if os.path.exists(".env"):
-        with open(".env", "r") as outfile:
+    env_model = os.getenv("AI_MODEL")
+    if env_model:
+        return env_model
+
+    env_path = resolve_env_path()
+    if env_path is not None:
+        with open(env_path, "r", encoding="utf-8") as outfile:
             lines = outfile.readlines()
             model_line = next((line for line in lines if line.startswith("AI_MODEL=")), None)
             if model_line:
@@ -94,8 +182,13 @@ def get_configured_model():
 
 def get_auto_add_setting():
     """Get the auto-add all files setting from .env file"""
-    if os.path.exists(".env"):
-        with open(".env", "r") as outfile:
+    env_auto_add = os.getenv("AUTO_ADD_ALL")
+    if env_auto_add is not None:
+        return env_auto_add.strip().lower() == "true"
+
+    env_path = resolve_env_path()
+    if env_path is not None:
+        with open(env_path, "r", encoding="utf-8") as outfile:
             lines = outfile.readlines()
             auto_add_line = next((line for line in lines if line.startswith("AUTO_ADD_ALL=")), None)
             if auto_add_line:

commitmessagegenerator/generator.py

@@ -1,11 +1,10 @@
 import os
-from dotenv import load_dotenv
 from google import genai
 from git import Repo
-from .configure import get_configured_model, get_auto_add_setting
+from .configure import get_configured_model, get_auto_add_setting, load_config_env
 
 def gerar_mensagem_commit():
-    load_dotenv()
+    load_config_env()
     key = os.getenv("GEMINI_API_KEY")
     if not key:
         raise RuntimeError("The GEMINI_API_KEY environment variable is not set.")

{commitmessagegenerator-2.2.0.dist-info → commitmessagegenerator-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commitmessagegenerator
-Version: 2.2.0
+Version: 2.5.0
 Summary: Generate commit messages with AI (Google Gemini) automatically using `git diff`.
 Author-email: Gabriel Terceiro <gcarolinoterceiro@gmail.com>
 License: MIT
@@ -35,6 +35,14 @@ pip install commitmessagegenerator
 commitgen -cf
 ```
 
+You can explicitly choose where configuration is written:
+
+```bash
+commitgen -cf --config-scope auto    # default behavior
+commitgen -cf --config-scope local   # always write .env in current directory
+commitgen -cf --config-scope global  # always write ~/.commitgen/.env
+```
+
 This opens an interactive configuration menu where you can:
 
 1. Set or update your Gemini API key
@@ -57,6 +65,14 @@ AI_MODEL=gemini-2.0-flash
 AUTO_ADD_ALL=true
 ```
 
+Config discovery order:
+
+1. `.env` in current directory
+2. `.env` in parent directories (useful when running from subfolders)
+3. Global config in `~/.commitgen/.env` (created automatically by `commitgen -cf --config-scope auto` when no local `.env` exists)
+
+Environment variables already set in your shell (e.g. `GEMINI_API_KEY`) are also respected.
+
 ## 🚀 Usage
 
 With the terminal, inside any Git repository with pending changes, run:
@@ -77,6 +93,7 @@ The command will:
 - `commitgen -c` - Generate and commit with the message
 - `commitgen -cp` - Generate, commit, and push
 - `commitgen -cf` - Configure API key, model, and file staging behavior
+- `commitgen -cf --config-scope [auto|local|global]` - Choose where `.env` is created/updated
 - `commitgen -s` - Show current configuration status
 
 ### Available Models

commitmessagegenerator-2.5.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+commitmessagegenerator/__init__.py,sha256=Wsl1vaSI5fWuK3B9MfZnPp1PxnRfTmnvW_20vgswgT0,45
+commitmessagegenerator/cli.py,sha256=bMCpefo7rmfP74NKsWOd_4VZXP5jQrIyminT6QTX24o,6603
+commitmessagegenerator/configure.py,sha256=NQgv770wiA_PrxvcKmXNdyuPaKoMV4HyIOUgw1vBjOs,6655
+commitmessagegenerator/generator.py,sha256=qc3Ot8-ZOl4v3nRJq4qcimRiFwjT9osUvGtmSpOr1mc,1614
+commitmessagegenerator-2.5.0.dist-info/licenses/LICENSE,sha256=q7KJbcPCqUAvkBuI1QNc8Kg9XPfBfnNkLN9WKwudO8U,11
+commitmessagegenerator-2.5.0.dist-info/METADATA,sha256=vuSJQtNX6ofivJXS-zL6SuEJKM_48W2DNqI3r3wOoa0,4114
+commitmessagegenerator-2.5.0.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+commitmessagegenerator-2.5.0.dist-info/entry_points.txt,sha256=VmVQY00e0SuHsTFZmOCcyN0VYCQlVnZrdZNJdUGLCVo,62
+commitmessagegenerator-2.5.0.dist-info/top_level.txt,sha256=G8wUZw8MTtvYs1WgehFVTPKqw5Td7gGedZZIQbZH1Co,23
+commitmessagegenerator-2.5.0.dist-info/RECORD,,

{commitmessagegenerator-2.2.0.dist-info → commitmessagegenerator-2.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (82.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

commitmessagegenerator-2.2.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-commitmessagegenerator/__init__.py,sha256=Wsl1vaSI5fWuK3B9MfZnPp1PxnRfTmnvW_20vgswgT0,45
-commitmessagegenerator/cli.py,sha256=IoSYuH8-Zc5YNdS6pmSg0nwo-UNufNPZb78Z76llSTk,5775
-commitmessagegenerator/configure.py,sha256=5OtQ9Y2udsIGeSztnsiFqSrcKWcm4pGKS6uyZS9-YvU,3749
-commitmessagegenerator/generator.py,sha256=c0IUPxP8A10OMokWwKYoes5gDi_-BJ0COl0Vm2ZM6ew,1624
-commitmessagegenerator-2.2.0.dist-info/licenses/LICENSE,sha256=q7KJbcPCqUAvkBuI1QNc8Kg9XPfBfnNkLN9WKwudO8U,11
-commitmessagegenerator-2.2.0.dist-info/METADATA,sha256=MBfGnghBea_1vjbxqyRD2cPISPZb7pzJ2heW2AYJv9w,3376
-commitmessagegenerator-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-commitmessagegenerator-2.2.0.dist-info/entry_points.txt,sha256=VmVQY00e0SuHsTFZmOCcyN0VYCQlVnZrdZNJdUGLCVo,62
-commitmessagegenerator-2.2.0.dist-info/top_level.txt,sha256=G8wUZw8MTtvYs1WgehFVTPKqw5Td7gGedZZIQbZH1Co,23
-commitmessagegenerator-2.2.0.dist-info/RECORD,,