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

commitmessagegenerator/cli.py

@@ -1,30 +1,167 @@
 import argparse
 import subprocess
 from .generator import gerar_mensagem_commit
-from .configure import api_key, get_configured_model
+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
 
+MODEL_MAP = {
+    "1": "gemini-2.0-flash",
+    "2": "gemini-1.5-flash", 
+    "3": "gemini-1.5-pro",
+    "4": "gemini-2.0-flash-exp",
+    "5": "gemini-2.5-flash",
+    "6": "gemini-2.5-pro"
+}
+
+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()
+        current_model = get_configured_model()
+        auto_add = get_auto_add_setting()
+        
+        print("\n" + "="*40)
+        print("       CONFIGURATION MENU")
+        print("="*40)
+        print(f"\n1. API Key        [{('✓ Set' if api_set else '✗ Not set')}]")
+        print(f"2. Model          [{current_model}]")
+        print(f"3. File staging   [{('Auto-add all' if auto_add else 'Staged only')}]")
+        print("\n0. Exit")
+        print("="*40)
+        
+        choice = input("\nSelect option (0-3): ").strip()
+        
+        if choice == "0" or choice == "":
+            print("\nExiting configuration.\n")
+            break
+        elif choice == "1":
+            configure_api_key(config_scope)
+        elif choice == "2":
+            configure_model(config_scope)
+        elif choice == "3":
+            configure_staging(config_scope)
+        else:
+            print("\nInvalid option. Please try again.")
+
+def configure_api_key(config_scope):
+    """Configure the API key"""
+    print("\n" + "-"*40)
+    print("API KEY CONFIGURATION")
+    print("-"*40)
+    print("Enter your Gemini API key below.")
+    print("Press Enter without typing to cancel.\n")
+    
+    key = getpass.getpass("API Key: ")
+    
+    if not key.strip():
+        print("\nNo changes made.")
+        return
+    
+    update_setting("GEMINI_API_KEY", key, scope=config_scope)
+    print("\n✓ API Key saved successfully!")
+
+def configure_model(config_scope):
+    """Configure the AI model"""
+    current_model = get_configured_model()
+    
+    print("\n" + "-"*40)
+    print("MODEL CONFIGURATION")
+    print("-"*40)
+    print(f"Current model: {current_model}\n")
+    print("Available models:")
+    print("1. gemini-2.0-flash (fast and efficient)")
+    print("2. gemini-1.5-flash (good balance)")
+    print("3. gemini-1.5-pro (highest quality, slower)")
+    print("4. gemini-2.0-flash-exp (experimental)")
+    print("5. gemini-2.5-flash (latest, fast)")
+    print("6. gemini-2.5-pro (latest, highest quality)")
+    print("\n0. Cancel")
+    
+    choice = input("\nSelect model (0-6): ").strip()
+    
+    if choice == "0" or choice == "":
+        print("\nNo changes made.")
+        return
+    
+    if choice in MODEL_MAP:
+        selected_model = MODEL_MAP[choice]
+        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(config_scope):
+    """Configure file staging behavior"""
+    auto_add = get_auto_add_setting()
+    
+    print("\n" + "-"*40)
+    print("FILE STAGING CONFIGURATION")
+    print("-"*40)
+    print(f"Current setting: {'Auto-add all files' if auto_add else 'Staged only'}\n")
+    print("1. Auto-add all files - Automatically stages all changes")
+    print("2. Staged only - Only use already staged files")
+    print("\n0. Cancel")
+    
+    choice = input("\nSelect behavior (0-2): ").strip()
+    
+    if choice == "0" or choice == "":
+        print("\nNo changes made.")
+        return
+    
+    if choice == "1":
+        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", scope=config_scope)
+        print("\n✓ Set to: Staged only")
+    else:
+        print("\nInvalid option. No changes made.")
+
 def main():
     parser = argparse.ArgumentParser(description="Gerador de mensagens de commit com IA")
     parser.add_argument("-c", "--commit", action="store_true", help="Commits with the generated message")
     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
         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()
         
         print("\nCurrent Configuration:")
         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:
@@ -45,33 +182,10 @@ def main():
         subprocess.run(["git", "push"])
     
     if args.configure:
-        print("\nPlease input your API KEY\nThis is directly set in the .env file")
-        key = getpass.getpass()
-        
-        # Model selection
-        print("\nAvailable models:")
-        print("1. gemini-2.0-flash (default, fast and efficient)")
-        print("2. gemini-1.5-flash (good balance of speed and quality)")
-        print("3. gemini-1.5-pro (highest quality, slower)")
-        print("4. gemini-2.0-flash-exp (experimental)")
-        print("5. gemini-2.5-flash (latest, fast and efficient)")
-        print("6. gemini-2.5-pro (latest, highest quality)")
-        
-        model_choice = input("\nSelect model (1-6) or press Enter for default (1): ").strip()
-        
-        model_map = {
-            "1": "gemini-2.0-flash",
-            "2": "gemini-1.5-flash", 
-            "3": "gemini-1.5-pro",
-            "4": "gemini-2.0-flash-exp",
-            "5": "gemini-2.5-flash",
-            "6": "gemini-2.5-pro"
-        }
-        
-        selected_model = model_map.get(model_choice, "gemini-2.0-flash")
-        
-        api_key(key, selected_model)
-        print(f"\nAPI KEY and model ({selected_model}) saved in .env file\n")
+        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,47 +1,196 @@
 import os
+from pathlib import Path
+from dotenv import load_dotenv
 
-def api_key(key, model="gemini-2.0-flash"):
-    if os.path.exists(".env"):
-        with open(".env", "r+") as outfile:
-            lines = outfile.readlines()
-            gemini_api_key = next((line for line in lines if line.startswith("GEMINI_API_KEY=")), None)
-            model_line = next((line for line in lines if line.startswith("AI_MODEL=")), None)
-            
-            outfile.seek(0)
-            outfile.truncate()
-            
-            # Update or add GEMINI_API_KEY
-            if gemini_api_key:
-                outfile.writelines([line if not line.startswith("GEMINI_API_KEY=") else f"GEMINI_API_KEY={key}\n" for line in lines])
-            else:
-                outfile.writelines(lines)
-                outfile.write(f"GEMINI_API_KEY={key}\n")
-            
-            # Update or add AI_MODEL
-            if model_line:
-                outfile.seek(0)
-                outfile.truncate()
-                outfile.writelines([line if not line.startswith("AI_MODEL=") else f"AI_MODEL={model}\n" for line in outfile.readlines()])
+
+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"""
+    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
+        new_lines = []
+        for line in lines:
+            key_name = line.split("=")[0] if "=" in line else None
+            if key_name == setting_name:
+                new_lines.append(f"{setting_name}={value}\n")
+                found = True
             else:
-                outfile.write(f"AI_MODEL={model}\n")
+                new_lines.append(line)
+        
+        if not found:
+            new_lines.append(f"{setting_name}={value}\n")
+        
+        with open(env_path, "w", encoding="utf-8") as f:
+            f.writelines(new_lines)
     else:
-        with open(".env", "w") as outfile:
-            outfile.write(f"GEMINI_API_KEY={key}\n")
-            outfile.write(f"AI_MODEL={model}\n")
+        with open(env_path, "w", encoding="utf-8") as f:
+            f.write(f"{setting_name}={value}\n")
+    
+    _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
 
-    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, 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()
+    }
+
+    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()
+        new_lines = []
+        for line in lines:
+            key_name = line.split("=")[0] if "=" in line else None
+            if key_name in config:
+                new_lines.append(f"{key_name}={config[key_name]}\n")
+                existing_keys.add(key_name)
+            else:
+                new_lines.append(line)
+        
+        for key_name, value in config.items():
+            if key_name not in existing_keys:
+                new_lines.append(f"{key_name}={value}\n")
+        
+        with open(env_path, "w", encoding="utf-8") as f:
+            f.writelines(new_lines)
+    else:
+        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(env_path)
+
+def get_api_key_status():
+    """Check if API key is set"""
+    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:
+                value = api_line.split("=", 1)[1].strip()
+                return bool(value)
+    return False
+
 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:
                 return model_line.split("=", 1)[1].strip()
     return "gemini-2.0-flash"  # Default fallback
+
+def get_auto_add_setting():
+    """Get the auto-add all files setting from .env file"""
+    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:
+                return auto_add_line.split("=", 1)[1].strip().lower() == "true"
+    return True  # Default: auto-add all files (current behavior)

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
+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.")
@@ -18,8 +17,12 @@ def gerar_mensagem_commit():
 
     repo = Repo(os.getcwd())
 
-    # Inclui arquivos staged (adicionados ou modificados)
-    repo.git.add(all=True)
+    # Check if auto-add is enabled
+    auto_add = get_auto_add_setting()
+    if auto_add:
+        # Automatically stage all changes
+        repo.git.add(all=True)
+    
     diff = repo.git.diff("--cached")
 
     if not diff.strip():

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commitmessagegenerator
-Version: 1.6.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,10 +35,21 @@ pip install commitmessagegenerator
 commitgen -cf
 ```
 
-This will prompt you for:
+You can explicitly choose where configuration is written:
 
-1. Your Gemini API key
-2. Your preferred AI model (with options to choose from)
+```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
+2. Change the AI model
+3. Configure file staging behavior
+
+Each option can be configured independently, and you can exit at any time without saving changes.
 
 ## Run this and type you API key to the terminal so the package creates the .env file and automatically adds it to the .gitignore
 
@@ -51,8 +62,17 @@ Create a `.env` file in the directory where you will run commitgen (usually the
 ```
 GEMINI_API_KEY=your-gemini-api-key
 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:
@@ -72,7 +92,8 @@ The command will:
 - `commitgen` - Generate commit message only
 - `commitgen -c` - Generate and commit with the message
 - `commitgen -cp` - Generate, commit, and push
-- `commitgen -cf` - Configure API key and model
+- `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
@@ -86,6 +107,15 @@ When configuring with `-cf`, you can choose from:
 5. **gemini-2.5-flash** - Latest version, fast and efficient
 6. **gemini-2.5-pro** - Latest version, highest quality
 
+### File Staging Behavior
+
+When configuring with `-cf`, you can choose how files are staged:
+
+1. **Auto-add all files** (default) - Automatically runs `git add --all` before generating the commit message
+2. **Staged only** - Only reads the diff from files you've already staged with `git add`
+
+The "staged only" option gives you more control over which changes are included in the commit message.
+
 ## 🧩 Requisites
 
 - Python 3.8 or higher

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-1.6.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-1.6.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-commitmessagegenerator/__init__.py,sha256=Wsl1vaSI5fWuK3B9MfZnPp1PxnRfTmnvW_20vgswgT0,45
-commitmessagegenerator/cli.py,sha256=7QjfbOv2DWzlQP7eCkFzsX0EI1hc9rKWuGIMjdPv6jM,3006
-commitmessagegenerator/configure.py,sha256=chWBYqPtf4pIdRM9X5VPfjhdhRXVPqrHthdKVFaEBcQ,2068
-commitmessagegenerator/generator.py,sha256=Lrw78EC_s6lfwrrSxJaeK8BJKi2gUgjob7Ms9X70V9g,1519
-commitmessagegenerator-1.6.0.dist-info/licenses/LICENSE,sha256=q7KJbcPCqUAvkBuI1QNc8Kg9XPfBfnNkLN9WKwudO8U,11
-commitmessagegenerator-1.6.0.dist-info/METADATA,sha256=99_RVdKcu_8ewRYSmFgmNBZ3dho2NQTCKbHmTX4mdso,2775
-commitmessagegenerator-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-commitmessagegenerator-1.6.0.dist-info/entry_points.txt,sha256=VmVQY00e0SuHsTFZmOCcyN0VYCQlVnZrdZNJdUGLCVo,62
-commitmessagegenerator-1.6.0.dist-info/top_level.txt,sha256=G8wUZw8MTtvYs1WgehFVTPKqw5Td7gGedZZIQbZH1Co,23
-commitmessagegenerator-1.6.0.dist-info/RECORD,,