devcommit 0.1.4.6__tar.gz → 0.1.4.7__tar.gz

{devcommit-0.1.4.6 → devcommit-0.1.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devcommit
-Version: 0.1.4.6
+Version: 0.1.4.7
 Summary: AI-powered git commit message generator
 License: GNU GENERAL PUBLIC LICENSE
                                 Version 3, 29 June 2007
@@ -721,24 +721,27 @@ A command-line AI tool for autocommits.
 
 ## Installation
 
-1. **Install DevCommit**  
-   
+1. **Install DevCommit**
+
    **Option 1: Using pip (local installation)**
+
    ```bash
    pip install devcommit
    ```
-   
+
    **Option 2: Using pipx (global installation, recommended)**
+
    ```bash
    # Install pipx if you don't have it
    python3 -m pip install --user pipx
    python3 -m pipx ensurepath
-   
+
    # Install DevCommit globally
    pipx install devcommit
    ```
+
    > **💡 Why pipx?** pipx installs CLI tools in isolated environments, preventing dependency conflicts while making them globally available.
-   
+
    **All AI providers are included by default!** ✅ Gemini, OpenAI, Groq, Anthropic, Ollama, and Custom API support.
 
 2. **Set Up Configuration (Required: API Key)**  
@@ -747,19 +750,21 @@ A command-line AI tool for autocommits.
    **Priority Order:** `.dcommit` file → Environment Variables → Defaults
 
    ### Option 1: Environment Variables (Quickest)
+
    ```bash
    # Using Gemini (default)
    export GEMINI_API_KEY='your-api-key-here'
-   
+
    # Or using Groq (recommended for free tier)
    export AI_PROVIDER='groq'
    export GROQ_API_KEY='your-groq-key'
-   
+
    # Add to ~/.bashrc or ~/.zshrc for persistence
    echo "export GEMINI_API_KEY='your-key'" >> ~/.bashrc
    ```
 
    ### Option 2: .dcommit File (Home Directory)
+
    ```bash
    cat > ~/.dcommit << 'EOF'
    GEMINI_API_KEY = your-api-key-here
@@ -772,6 +777,7 @@ A command-line AI tool for autocommits.
    ```
 
    ### Option 3: .dcommit File (Virtual Environment)
+
    ```bash
    mkdir -p $VIRTUAL_ENV/config
    cat > $VIRTUAL_ENV/config/.dcommit << 'EOF'
@@ -797,6 +803,7 @@ devcommit
 ### Basic Usage
 
 - **Stage all changes and commit:**
+
   ```bash
   devcommit --stageAll
   ```
@@ -823,6 +830,7 @@ You can set your preferred commit mode in the `.dcommit` configuration file usin
 #### Command-Line Usage
 
 - **Interactive mode (auto):** When you have changes in multiple directories, DevCommit will automatically ask if you want to:
+
   - Create one commit for all changes (global commit)
   - Create separate commits per directory
 
@@ -834,10 +842,40 @@ You can set your preferred commit mode in the `.dcommit` configuration file usin
   ```
 
 When using directory-based commits, you can:
+
 1. Select which directories to commit (use Space to select, Enter to confirm)
 2. For each selected directory, review and choose a commit message
 3. Each directory gets its own commit with AI-generated messages based on its changes
 
+### Commit Specific Files or Folders
+
+DevCommit allows you to commit specific files or folders. This is useful when you want to commit only certain changes without affecting other staged files.
+
+**Usage:**
+
+```bash
+# Commit specific files (must be staged first)
+git add file1.py file2.py
+devcommit --files file1.py file2.py
+
+# Stage and commit specific files in one command
+devcommit --stageAll --files file1.py file2.py
+
+# Commit specific folders (must be staged first)
+git add src/ tests/
+devcommit --files src/ tests/
+
+# Short form
+devcommit -s -f file1.py file2.py
+```
+
+When using `--files` or `-f`:
+
+- Without `--stageAll`: Only commits files that are already staged (filters staged files to match specified paths)
+- With `--stageAll`: Stages the specified files/folders and then commits them
+- AI generates commit messages based on changes in those files
+- Works with both individual files and entire directories
+
 ### Additional Options
 
 - `--excludeFiles` or `-e`: Exclude specific files from the diff
@@ -845,6 +883,8 @@ When using directory-based commits, you can:
 - `--commitType` or `-t`: Specify the type of commit (e.g., conventional)
 - `--stageAll` or `-s`: Stage all changes before committing
 - `--directory` or `-d`: Force directory-based commits
+- `--files` or `-f`: Stage and commit specific files or folders (can specify multiple)
+- `--push` or `-p`: Push commits to remote after committing
 
 ### Examples
 
@@ -857,24 +897,40 @@ devcommit --commitType conventional
 
 # Exclude lock files
 devcommit --excludeFiles package-lock.json yarn.lock
+
+# Stage and commit specific files
+devcommit --files file1.py file2.py
+
+# Stage and commit specific folders
+devcommit --files src/ tests/
+
+# Stage and commit multiple files and folders at once
+devcommit --files src/ file1.py tests/ config.json
+
+# Commit and push
+devcommit --push
+
+# Commit specific files and push
+devcommit --files file1.py file2.py --push
 ```
 
 ## AI Provider Support
 
 DevCommit now supports **multiple AI providers**! Choose from:
 
-| Provider | Free Tier | Speed | Quality | Get API Key |
-|----------|-----------|-------|---------|-------------|
-| 🆓 **Gemini** | 15 req/min, 1M/day | Fast | Good | [Get Key](https://aistudio.google.com/app/apikey) |
-| ⚡ **Groq** | Very generous | **Fastest** | Good | [Get Key](https://console.groq.com/keys) |
-| 🤖 **OpenAI** | $5 trial | Medium | **Best** | [Get Key](https://platform.openai.com/api-keys) |
-| 🧠 **Anthropic** | Limited trial | Medium | Excellent | [Get Key](https://console.anthropic.com/) |
-| 🏠 **Ollama** | **Unlimited** | Medium | Good | [Install](https://ollama.ai/) |
-| 🔧 **Custom** | Varies | Varies | Varies | Your server |
+| Provider         | Free Tier          | Speed       | Quality   | Get API Key                                       |
+| ---------------- | ------------------ | ----------- | --------- | ------------------------------------------------- |
+| 🆓 **Gemini**    | 15 req/min, 1M/day | Fast        | Good      | [Get Key](https://aistudio.google.com/app/apikey) |
+| ⚡ **Groq**      | Very generous      | **Fastest** | Good      | [Get Key](https://console.groq.com/keys)          |
+| 🤖 **OpenAI**    | $5 trial           | Medium      | **Best**  | [Get Key](https://platform.openai.com/api-keys)   |
+| 🧠 **Anthropic** | Limited trial      | Medium      | Excellent | [Get Key](https://console.anthropic.com/)         |
+| 🏠 **Ollama**    | **Unlimited**      | Medium      | Good      | [Install](https://ollama.ai/)                     |
+| 🔧 **Custom**    | Varies             | Varies      | Varies    | Your server                                       |
 
 ### Quick Setup Examples
 
 **Using Groq (Recommended for free tier):**
+
 ```bash
 export AI_PROVIDER=groq
 export GROQ_API_KEY='your-groq-api-key'
@@ -882,6 +938,7 @@ devcommit
 ```
 
 **Using Ollama (Local, no API key needed):**
+
 ```bash
 # Install Ollama: https://ollama.ai/
 ollama pull llama3
@@ -890,6 +947,7 @@ devcommit
 ```
 
 **Using Custom API:**
+
 ```bash
 export AI_PROVIDER=custom
 export CUSTOM_API_URL='http://localhost:8000/v1'
@@ -904,8 +962,8 @@ All configuration can be set via **environment variables** or **`.dcommit` file*
 
 ### AI Provider Settings
 
-| Variable | Description | Default | Options |
-|----------|-------------|---------|---------|
+| Variable      | Description             | Default  | Options                                                     |
+| ------------- | ----------------------- | -------- | ----------------------------------------------------------- |
 | `AI_PROVIDER` | Which AI service to use | `gemini` | `gemini`, `openai`, `groq`, `anthropic`, `ollama`, `custom` |
 
 ### Provider-Specific Settings
@@ -949,21 +1007,23 @@ All configuration can be set via **environment variables** or **`.dcommit` file*
 
 ### General Settings
 
-| Variable | Description | Default | Options |
-|----------|-------------|---------|---------|
-| `LOCALE` | Language for commit messages | `en-US` | Any locale code (e.g., `en`, `es`, `fr`) |
-| `MAX_NO` | Number of commit message suggestions | `1` | Any positive integer |
-| `COMMIT_TYPE` | Style of commit messages | `general` | `general`, `conventional`, etc. |
-| `COMMIT_MODE` | Default commit strategy | `auto` | `auto`, `directory`, `global` |
-| `EXCLUDE_FILES` | Files to exclude from diff | `package-lock.json, pnpm-lock.yaml, yarn.lock, *.lock` | Comma-separated file patterns |
-| `MAX_TOKENS` | Maximum tokens for AI response | `8192` | Any positive integer |
+| Variable        | Description                          | Default                                                | Options                                  |
+| --------------- | ------------------------------------ | ------------------------------------------------------ | ---------------------------------------- |
+| `LOCALE`        | Language for commit messages         | `en-US`                                                | Any locale code (e.g., `en`, `es`, `fr`) |
+| `MAX_NO`        | Number of commit message suggestions | `1`                                                    | Any positive integer                     |
+| `COMMIT_TYPE`   | Style of commit messages             | `general`                                              | `general`, `conventional`, etc.          |
+| `COMMIT_MODE`   | Default commit strategy              | `auto`                                                 | `auto`, `directory`, `global`            |
+| `EXCLUDE_FILES` | Files to exclude from diff           | `package-lock.json, pnpm-lock.yaml, yarn.lock, *.lock` | Comma-separated file patterns            |
+| `MAX_TOKENS`    | Maximum tokens for AI response       | `8192`                                                 | Any positive integer                     |
 
 ### Configuration Priority
+
 1. **`.dcommit` file** (highest priority)
 2. **Environment variables**
 3. **Built-in defaults** (lowest priority)
 
 ### Using Environment Variables
+
 ```bash
 # Basic setup with Gemini (default)
 export GEMINI_API_KEY='your-api-key-here'
@@ -978,6 +1038,7 @@ export GROQ_API_KEY='your-groq-key'
 ```
 
 ### Using .dcommit File
+
 See `.dcommit.example` for a complete configuration template with all providers.
 
 **Note:** The `.dcommit` file is **optional**. DevCommit will work with just environment variables!

{devcommit-0.1.4.6 → devcommit-0.1.4.7}/README.md

@@ -16,24 +16,27 @@ A command-line AI tool for autocommits.
 
 ## Installation
 
-1. **Install DevCommit**  
-   
+1. **Install DevCommit**
+
    **Option 1: Using pip (local installation)**
+
    ```bash
    pip install devcommit
    ```
-   
+
    **Option 2: Using pipx (global installation, recommended)**
+
    ```bash
    # Install pipx if you don't have it
    python3 -m pip install --user pipx
    python3 -m pipx ensurepath
-   
+
    # Install DevCommit globally
    pipx install devcommit
    ```
+
    > **💡 Why pipx?** pipx installs CLI tools in isolated environments, preventing dependency conflicts while making them globally available.
-   
+
    **All AI providers are included by default!** ✅ Gemini, OpenAI, Groq, Anthropic, Ollama, and Custom API support.
 
 2. **Set Up Configuration (Required: API Key)**  
@@ -42,19 +45,21 @@ A command-line AI tool for autocommits.
    **Priority Order:** `.dcommit` file → Environment Variables → Defaults
 
    ### Option 1: Environment Variables (Quickest)
+
    ```bash
    # Using Gemini (default)
    export GEMINI_API_KEY='your-api-key-here'
-   
+
    # Or using Groq (recommended for free tier)
    export AI_PROVIDER='groq'
    export GROQ_API_KEY='your-groq-key'
-   
+
    # Add to ~/.bashrc or ~/.zshrc for persistence
    echo "export GEMINI_API_KEY='your-key'" >> ~/.bashrc
    ```
 
    ### Option 2: .dcommit File (Home Directory)
+
    ```bash
    cat > ~/.dcommit << 'EOF'
    GEMINI_API_KEY = your-api-key-here
@@ -67,6 +72,7 @@ A command-line AI tool for autocommits.
    ```
 
    ### Option 3: .dcommit File (Virtual Environment)
+
    ```bash
    mkdir -p $VIRTUAL_ENV/config
    cat > $VIRTUAL_ENV/config/.dcommit << 'EOF'
@@ -92,6 +98,7 @@ devcommit
 ### Basic Usage
 
 - **Stage all changes and commit:**
+
   ```bash
   devcommit --stageAll
   ```
@@ -118,6 +125,7 @@ You can set your preferred commit mode in the `.dcommit` configuration file usin
 #### Command-Line Usage
 
 - **Interactive mode (auto):** When you have changes in multiple directories, DevCommit will automatically ask if you want to:
+
   - Create one commit for all changes (global commit)
   - Create separate commits per directory
 
@@ -129,10 +137,40 @@ You can set your preferred commit mode in the `.dcommit` configuration file usin
   ```
 
 When using directory-based commits, you can:
+
 1. Select which directories to commit (use Space to select, Enter to confirm)
 2. For each selected directory, review and choose a commit message
 3. Each directory gets its own commit with AI-generated messages based on its changes
 
+### Commit Specific Files or Folders
+
+DevCommit allows you to commit specific files or folders. This is useful when you want to commit only certain changes without affecting other staged files.
+
+**Usage:**
+
+```bash
+# Commit specific files (must be staged first)
+git add file1.py file2.py
+devcommit --files file1.py file2.py
+
+# Stage and commit specific files in one command
+devcommit --stageAll --files file1.py file2.py
+
+# Commit specific folders (must be staged first)
+git add src/ tests/
+devcommit --files src/ tests/
+
+# Short form
+devcommit -s -f file1.py file2.py
+```
+
+When using `--files` or `-f`:
+
+- Without `--stageAll`: Only commits files that are already staged (filters staged files to match specified paths)
+- With `--stageAll`: Stages the specified files/folders and then commits them
+- AI generates commit messages based on changes in those files
+- Works with both individual files and entire directories
+
 ### Additional Options
 
 - `--excludeFiles` or `-e`: Exclude specific files from the diff
@@ -140,6 +178,8 @@ When using directory-based commits, you can:
 - `--commitType` or `-t`: Specify the type of commit (e.g., conventional)
 - `--stageAll` or `-s`: Stage all changes before committing
 - `--directory` or `-d`: Force directory-based commits
+- `--files` or `-f`: Stage and commit specific files or folders (can specify multiple)
+- `--push` or `-p`: Push commits to remote after committing
 
 ### Examples
 
@@ -152,24 +192,40 @@ devcommit --commitType conventional
 
 # Exclude lock files
 devcommit --excludeFiles package-lock.json yarn.lock
+
+# Stage and commit specific files
+devcommit --files file1.py file2.py
+
+# Stage and commit specific folders
+devcommit --files src/ tests/
+
+# Stage and commit multiple files and folders at once
+devcommit --files src/ file1.py tests/ config.json
+
+# Commit and push
+devcommit --push
+
+# Commit specific files and push
+devcommit --files file1.py file2.py --push
 ```
 
 ## AI Provider Support
 
 DevCommit now supports **multiple AI providers**! Choose from:
 
-| Provider | Free Tier | Speed | Quality | Get API Key |
-|----------|-----------|-------|---------|-------------|
-| 🆓 **Gemini** | 15 req/min, 1M/day | Fast | Good | [Get Key](https://aistudio.google.com/app/apikey) |
-| ⚡ **Groq** | Very generous | **Fastest** | Good | [Get Key](https://console.groq.com/keys) |
-| 🤖 **OpenAI** | $5 trial | Medium | **Best** | [Get Key](https://platform.openai.com/api-keys) |
-| 🧠 **Anthropic** | Limited trial | Medium | Excellent | [Get Key](https://console.anthropic.com/) |
-| 🏠 **Ollama** | **Unlimited** | Medium | Good | [Install](https://ollama.ai/) |
-| 🔧 **Custom** | Varies | Varies | Varies | Your server |
+| Provider         | Free Tier          | Speed       | Quality   | Get API Key                                       |
+| ---------------- | ------------------ | ----------- | --------- | ------------------------------------------------- |
+| 🆓 **Gemini**    | 15 req/min, 1M/day | Fast        | Good      | [Get Key](https://aistudio.google.com/app/apikey) |
+| ⚡ **Groq**      | Very generous      | **Fastest** | Good      | [Get Key](https://console.groq.com/keys)          |
+| 🤖 **OpenAI**    | $5 trial           | Medium      | **Best**  | [Get Key](https://platform.openai.com/api-keys)   |
+| 🧠 **Anthropic** | Limited trial      | Medium      | Excellent | [Get Key](https://console.anthropic.com/)         |
+| 🏠 **Ollama**    | **Unlimited**      | Medium      | Good      | [Install](https://ollama.ai/)                     |
+| 🔧 **Custom**    | Varies             | Varies      | Varies    | Your server                                       |
 
 ### Quick Setup Examples
 
 **Using Groq (Recommended for free tier):**
+
 ```bash
 export AI_PROVIDER=groq
 export GROQ_API_KEY='your-groq-api-key'
@@ -177,6 +233,7 @@ devcommit
 ```
 
 **Using Ollama (Local, no API key needed):**
+
 ```bash
 # Install Ollama: https://ollama.ai/
 ollama pull llama3
@@ -185,6 +242,7 @@ devcommit
 ```
 
 **Using Custom API:**
+
 ```bash
 export AI_PROVIDER=custom
 export CUSTOM_API_URL='http://localhost:8000/v1'
@@ -199,8 +257,8 @@ All configuration can be set via **environment variables** or **`.dcommit` file*
 
 ### AI Provider Settings
 
-| Variable | Description | Default | Options |
-|----------|-------------|---------|---------|
+| Variable      | Description             | Default  | Options                                                     |
+| ------------- | ----------------------- | -------- | ----------------------------------------------------------- |
 | `AI_PROVIDER` | Which AI service to use | `gemini` | `gemini`, `openai`, `groq`, `anthropic`, `ollama`, `custom` |
 
 ### Provider-Specific Settings
@@ -244,21 +302,23 @@ All configuration can be set via **environment variables** or **`.dcommit` file*
 
 ### General Settings
 
-| Variable | Description | Default | Options |
-|----------|-------------|---------|---------|
-| `LOCALE` | Language for commit messages | `en-US` | Any locale code (e.g., `en`, `es`, `fr`) |
-| `MAX_NO` | Number of commit message suggestions | `1` | Any positive integer |
-| `COMMIT_TYPE` | Style of commit messages | `general` | `general`, `conventional`, etc. |
-| `COMMIT_MODE` | Default commit strategy | `auto` | `auto`, `directory`, `global` |
-| `EXCLUDE_FILES` | Files to exclude from diff | `package-lock.json, pnpm-lock.yaml, yarn.lock, *.lock` | Comma-separated file patterns |
-| `MAX_TOKENS` | Maximum tokens for AI response | `8192` | Any positive integer |
+| Variable        | Description                          | Default                                                | Options                                  |
+| --------------- | ------------------------------------ | ------------------------------------------------------ | ---------------------------------------- |
+| `LOCALE`        | Language for commit messages         | `en-US`                                                | Any locale code (e.g., `en`, `es`, `fr`) |
+| `MAX_NO`        | Number of commit message suggestions | `1`                                                    | Any positive integer                     |
+| `COMMIT_TYPE`   | Style of commit messages             | `general`                                              | `general`, `conventional`, etc.          |
+| `COMMIT_MODE`   | Default commit strategy              | `auto`                                                 | `auto`, `directory`, `global`            |
+| `EXCLUDE_FILES` | Files to exclude from diff           | `package-lock.json, pnpm-lock.yaml, yarn.lock, *.lock` | Comma-separated file patterns            |
+| `MAX_TOKENS`    | Maximum tokens for AI response       | `8192`                                                 | Any positive integer                     |
 
 ### Configuration Priority
+
 1. **`.dcommit` file** (highest priority)
 2. **Environment variables**
 3. **Built-in defaults** (lowest priority)
 
 ### Using Environment Variables
+
 ```bash
 # Basic setup with Gemini (default)
 export GEMINI_API_KEY='your-api-key-here'
@@ -273,6 +333,7 @@ export GROQ_API_KEY='your-groq-key'
 ```
 
 ### Using .dcommit File
+
 See `.dcommit.example` for a complete configuration template with all providers.
 
 **Note:** The `.dcommit` file is **optional**. DevCommit will work with just environment variables!

{devcommit-0.1.4.6 → devcommit-0.1.4.7}/devcommit/main.py

@@ -12,7 +12,9 @@ from rich.console import Console
 from devcommit.app.gemini_ai import generateCommitMessage
 from devcommit.utils.git import (KnownError, assert_git_repo,
                                  get_detected_message, get_diff_for_files,
-                                 get_staged_diff, group_files_by_directory)
+                                 get_files_from_paths, get_staged_diff,
+                                 group_files_by_directory, has_commits_to_push,
+                                 push_to_remote, stage_files)
 from devcommit.utils.logger import Logger, config
 from devcommit.utils.parser import CommitFlag, parse_arguments
 
@@ -67,10 +69,90 @@ def main(flags: CommitFlag = None):
         console.print(f"[dim]Provider:[/dim] [bold magenta]{provider}[/bold magenta] [dim]│[/dim] [dim]Model:[/dim] [bold magenta]{model}[/bold magenta]")
         console.print()
 
+        # Handle staging
+        push_files_list = []
+        if flags["files"] and len(flags["files"]) > 0:
+            
+            # Get the list of files from paths first
+            try:
+                push_files_list = get_files_from_paths(flags["files"])
+                if not push_files_list:
+                    raise KnownError("No files found in the specified paths")
+            except KnownError as e:
+                raise e
+            except Exception as e:
+                raise KnownError(f"Failed to get files from paths: {str(e)}")
+        
         if flags["stageAll"]:
-            stage_changes(console)
-
-        staged = detect_staged_files(console, flags["excludeFiles"])
+            if push_files_list:
+                # Stage specific files/folders only
+                console.print("[bold cyan]📦 Staging specific files/folders...[/bold cyan]")
+                console.print(f"[dim]Found {len(push_files_list)} file(s) to stage[/dim]")
+                for file in push_files_list:
+                    console.print(f"  [cyan]▸[/cyan] [white]{file}[/white]")
+                
+                stage_files(push_files_list)
+                console.print("[bold green]✅ Files staged successfully[/bold green]\n")
+            else:
+                # Stage all changes
+                stage_changes(console)
+                console.print("[bold green]✅ All changes staged successfully[/bold green]\n")
+
+        # Get staged files
+        if push_files_list and len(push_files_list) > 0:
+            if flags["stageAll"]:
+                # If --files was used with --stageAll, we already staged those files
+                # Create a staged dict with only those files
+                staged = {
+                    "files": push_files_list,
+                    "diff": get_diff_for_files(push_files_list, flags["excludeFiles"])
+                }
+                if not staged["diff"]:
+                    raise KnownError("No changes found in the specified files/folders")
+                
+                console.print(f"\n[bold green]✅ {get_detected_message(staged['files'])}[/bold green]")
+                console.print("[dim]" + "─" * 60 + "[/dim]")
+                for file in staged["files"]:
+                    console.print(f"  [cyan]▸[/cyan] [white]{file}[/white]")
+                console.print("[dim]" + "─" * 60 + "[/dim]")
+            else:
+                # If --files was used without --stageAll, filter staged files to only those specified
+                # First, get all staged files (this will error if nothing is staged)
+                all_staged = get_staged_diff(flags["excludeFiles"])
+                if not all_staged:
+                    raise KnownError(
+                        "No staged changes found. Stage your changes manually, or "
+                        "automatically stage specific files with the `--stageAll --files` flag."
+                    )
+                
+                # Filter to only include files that match the specified paths
+                filtered_files = []
+                for staged_file in all_staged["files"]:
+                    # Check if this staged file is in our push_files_list
+                    if staged_file in push_files_list:
+                        filtered_files.append(staged_file)
+                
+                if not filtered_files:
+                    raise KnownError(
+                        f"None of the specified files/folders are staged. "
+                        f"Please stage them first with 'git add' or use '--stageAll --files'"
+                    )
+                
+                # Create a staged dict with only the filtered files
+                staged = {
+                    "files": filtered_files,
+                    "diff": get_diff_for_files(filtered_files, flags["excludeFiles"])
+                }
+                if not staged["diff"]:
+                    raise KnownError("No changes found in the specified files/folders")
+                
+                console.print(f"\n[bold green]✅ {get_detected_message(staged['files'])}[/bold green]")
+                console.print("[dim]" + "─" * 60 + "[/dim]")
+                for file in staged["files"]:
+                    console.print(f"  [cyan]▸[/cyan] [white]{file}[/white]")
+                console.print("[dim]" + "─" * 60 + "[/dim]")
+        else:
+            staged = detect_staged_files(console, flags["excludeFiles"])
         
         # Determine commit strategy
         # Priority: CLI flag > config (file or env) > interactive prompt
@@ -91,19 +173,28 @@ def main(flags: CommitFlag = None):
             if len(grouped) > 1:
                 use_per_directory = prompt_commit_strategy(console, grouped)
         
+        # Track if any commits were made
+        commit_made = False
         if use_per_directory:
-            process_per_directory_commits(console, staged, flags)
+            commit_made = process_per_directory_commits(console, staged, flags)
         else:
-            process_global_commit(console, flags)
+            commit_made = process_global_commit(console, flags)
         
-        # Print stylish completion message
-        console.print()
-        console.print("╭" + "─" * 60 + "╮", style="bold green")
-        console.print("│" + " " * 60 + "│", style="bold green")
-        console.print("│" + "     ✨ [bold white]All commits completed successfully![/bold white] ✨     ".ljust(68) + "│", style="bold green")
-        console.print("│" + " " * 60 + "│", style="bold green")
-        console.print("╰" + "─" * 60 + "╯", style="bold green")
-        console.print()
+        # Handle push if requested and a commit was actually made
+        if flags.get("push", False) and commit_made:
+            push_changes(console)
+        elif flags.get("push", False) and not commit_made:
+            console.print("\n[bold yellow]⚠️  No commits were made, skipping push[/bold yellow]\n")
+        
+        # Print stylish completion message only if commits were made
+        if commit_made:
+            console.print()
+            console.print("╭" + "─" * 60 + "╮", style="bold green")
+            console.print("│" + " " * 60 + "│", style="bold green")
+            console.print("│" + "     ✨ [bold white]All commits completed successfully![/bold white] ✨     ".ljust(68) + "│", style="bold green")
+            console.print("│" + " " * 60 + "│", style="bold green")
+            console.print("╰" + "─" * 60 + "╯", style="bold green")
+            console.print()
 
     except KeyboardInterrupt:
         console.print("\n\n[bold yellow]⚠️  Operation cancelled by user[/bold yellow]\n")
@@ -274,6 +365,43 @@ def commit_changes(console, commit, raw_argv):
     console.print("\n[bold green]✅ Committed successfully![/bold green]")
 
 
+def push_changes(console):
+    """Push commits to remote repository."""
+    # Check if there are commits to push first
+    try:
+        if not has_commits_to_push():
+            console.print("\n[bold yellow]ℹ️  No commits to push (already up to date)[/bold yellow]\n")
+            return
+    except KnownError:
+        # If we can't determine, try to push anyway
+        pass
+    
+    console.print("\n[cyan]🚀 Pushing to remote...[/cyan]")
+    console.print("[dim]Note: You may be prompted for authentication[/dim]\n")
+    
+    try:
+        # Run push with stdin/stdout/stderr connected to terminal
+        # This allows interactive prompts (authentication) to work properly
+        result = subprocess.run(
+            ['git', 'push'],
+            check=False,  # Don't raise on error, we'll check return code
+            stdin=None,   # Inherit stdin for interactive prompts
+            stdout=None,  # Don't capture stdout - let it show in terminal
+            stderr=None   # Don't capture stderr - let it show in terminal
+        )
+        
+        if result.returncode == 0:
+            console.print("\n[bold green]✅ Pushed to remote successfully![/bold green]")
+        else:
+            raise KnownError("Push failed. Please check the output above for details.")
+    except FileNotFoundError:
+        raise KnownError("Git command not found. Please ensure git is installed.")
+    except Exception as e:
+        if isinstance(e, KnownError):
+            raise
+        raise KnownError(f"Push failed: {str(e)}")
+
+
 def prompt_commit_strategy(console, grouped):
     """Prompt user to choose between global or directory-based commits."""
     console.print()
@@ -310,16 +438,21 @@ def prompt_commit_strategy(console, grouped):
 
 
 def process_global_commit(console, flags):
-    """Process a single global commit for all changes."""
+    """Process a single global commit for all changes.
+    Returns True if a commit was made, False otherwise."""
     commit_message = analyze_changes(console)
     selected_commit = prompt_commit_message(console, commit_message)
     if selected_commit:
         commit_changes(console, selected_commit, flags["rawArgv"])
+        return True
+    return False
 
 
 def process_per_directory_commits(console, staged, flags):
-    """Process separate commits for each directory."""
+    """Process separate commits for each directory.
+    Returns True if at least one commit was made, False otherwise."""
     grouped = group_files_by_directory(staged["files"])
+    commits_made = False
     
     console.print()
     console.print("╭" + "─" * 60 + "╮", style="bold magenta")
@@ -368,7 +501,7 @@ def process_per_directory_commits(console, staged, flags):
     
     if not selected_directories:
         console.print("\n[bold yellow]⚠️  No directories selected[/bold yellow]\n")
-        return
+        return False
     
     # Process each selected directory
     for idx, directory in enumerate(selected_directories, 1):
@@ -420,8 +553,11 @@ def process_per_directory_commits(console, staged, flags):
             # Commit only the files in this directory
             subprocess.run(["git", "commit", "-m", selected_commit, *flags["rawArgv"], "--"] + files)
             console.print(f"\n[bold green]✅ Committed {directory}[/bold green]")
+            commits_made = True
         else:
             console.print(f"\n[bold yellow]⊘ Skipped {directory}[/bold yellow]")
+    
+    return commits_made
 
 
 if __name__ == "__main__":

devcommit-0.1.4.7/devcommit/utils/git.py

@@ -0,0 +1,326 @@
+#!/usr/bin/env python3
+"""Git utilities"""
+
+import os
+import subprocess
+from collections import defaultdict
+from typing import Dict, List, Optional
+
+
+class KnownError(Exception):
+    pass
+
+
+def assert_git_repo() -> str:
+    """
+    Asserts that the current directory is a Git repository.
+    Returns the top-level directory path of the repository.
+    """
+
+    try:
+        result = subprocess.run(
+            ['git', 'rev-parse', '--show-toplevel'],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        return result.stdout.strip()
+    except subprocess.CalledProcessError:
+        raise KnownError('The current directory must be a Git repository!')
+
+
+def exclude_from_diff(path: str) -> str:
+    """
+    Prepares a Git exclusion path string for the diff command.
+    """
+
+    return f':(exclude){path}'
+
+
+def get_default_excludes() -> List[str]:
+    """
+    Get list of files to exclude from diff.
+    Priority: Config > Defaults
+    """
+    try:
+        from devcommit.utils.logger import config
+        
+        # Get from config (supports comma-separated list)
+        exclude_config = config("EXCLUDE_FILES", default="")
+        
+        if exclude_config:
+            # Parse comma-separated values and strip whitespace
+            config_excludes = [f.strip() for f in exclude_config.split(",") if f.strip()]
+            return config_excludes
+    except:
+        pass
+    
+    # Default exclusions
+    return [
+        'package-lock.json',
+        'pnpm-lock.yaml',
+        'yarn.lock',
+        '*.lock'
+    ]
+
+
+# Get default files to exclude (can be overridden via config)
+files_to_exclude = get_default_excludes()
+
+
+def get_staged_diff(
+        exclude_files: Optional[List[str]] = None) -> Optional[dict]:
+    """
+    Gets the list of staged files and their diff, excluding specified files.
+    """
+    exclude_files = exclude_files or []
+    diff_cached = ['git', 'diff', '--cached', '--diff-algorithm=minimal']
+    excluded_from_diff = (
+        [exclude_from_diff(f) for f in files_to_exclude + exclude_files])
+
+    try:
+        # Get the list of staged files excluding specified files
+        files = subprocess.run(
+            diff_cached + ['--name-only'] + excluded_from_diff,
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        files_result = (
+            files.stdout.strip().split('\n') if files.stdout.strip() else []
+        )
+        if not files_result:
+            return None
+
+        # Get the staged diff excluding specified files
+        diff = subprocess.run(
+            diff_cached + excluded_from_diff,
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        diff_result = diff.stdout.strip()
+
+        return {
+            'files': files_result,
+            'diff': diff_result
+        }
+    except subprocess.CalledProcessError:
+        return None
+
+
+def get_detected_message(files: List[str]) -> str:
+    """
+    Returns a message indicating the number of staged files.
+    """
+    return (
+        f"Detected {len(files):,} staged file{'s' if len(files) > 1 else ''}"
+    )
+
+
+def group_files_by_directory(files: List[str]) -> Dict[str, List[str]]:
+    """
+    Groups files by their root directory (first-level directory).
+    Files in the repository root are grouped under 'root'.
+    """
+    grouped = defaultdict(list)
+    
+    for file_path in files:
+        # Get the first directory in the path
+        parts = file_path.split(os.sep)
+        if len(parts) > 1:
+            root_dir = parts[0]
+        else:
+            root_dir = 'root'
+        grouped[root_dir].append(file_path)
+    
+    return dict(grouped)
+
+
+def get_diff_for_files(files: List[str], exclude_files: Optional[List[str]] = None) -> str:
+    """
+    Gets the diff for specific files.
+    """
+    exclude_files = exclude_files or []
+    
+    # Filter out excluded files from the list
+    all_excluded = files_to_exclude + exclude_files
+    filtered_files = [
+        f for f in files 
+        if not any(f.endswith(excl.replace('*', '')) or excl.replace(':(exclude)', '') in f 
+                   for excl in all_excluded)
+    ]
+    
+    if not filtered_files:
+        return ""
+    
+    try:
+        diff = subprocess.run(
+            ['git', 'diff', '--cached', '--diff-algorithm=minimal', '--'] + filtered_files,
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        return diff.stdout.strip()
+    except subprocess.CalledProcessError:
+        return ""
+
+
+def get_files_from_paths(paths: List[str]) -> List[str]:
+    """
+    Gets all files from given paths (handles both files and directories).
+    Returns a list of file paths relative to the repository root.
+    """
+    repo_root = assert_git_repo()
+    all_files = []
+    
+    for path in paths:
+        # Normalize path
+        normalized_path = os.path.normpath(path)
+        full_path = os.path.join(repo_root, normalized_path) if not os.path.isabs(path) else path
+        
+        if not os.path.exists(full_path):
+            raise KnownError(f"Path does not exist: {path}")
+        
+        if os.path.isfile(full_path):
+            # It's a file, get relative path
+            rel_path = os.path.relpath(full_path, repo_root)
+            all_files.append(rel_path)
+        elif os.path.isdir(full_path):
+            # It's a directory, get all files in it
+            try:
+                result = subprocess.run(
+                    ['git', 'ls-files', '--', normalized_path],
+                    check=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    cwd=repo_root
+                )
+                files_in_dir = [f.strip() for f in result.stdout.strip().split('\n') if f.strip()]
+                all_files.extend(files_in_dir)
+            except subprocess.CalledProcessError:
+                # If git ls-files fails, try to find files manually
+                for root, dirs, files in os.walk(full_path):
+                    # Skip .git directories
+                    if '.git' in dirs:
+                        dirs.remove('.git')
+                    for file in files:
+                        file_path = os.path.join(root, file)
+                        rel_path = os.path.relpath(file_path, repo_root)
+                        all_files.append(rel_path)
+    
+    # Remove duplicates and return
+    return list(set(all_files))
+
+
+def stage_files(files: List[str]) -> None:
+    """
+    Stages specific files.
+    """
+    if not files:
+        return
+    
+    try:
+        subprocess.run(
+            ['git', 'add', '--'] + files,
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+    except subprocess.CalledProcessError as e:
+        raise KnownError(f"Failed to stage files: {e.stderr}")
+
+
+def get_current_branch() -> str:
+    """
+    Gets the current git branch name.
+    """
+    try:
+        result = subprocess.run(
+            ['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        return result.stdout.strip()
+    except subprocess.CalledProcessError:
+        raise KnownError("Failed to get current branch name")
+
+
+def has_commits_to_push(branch: Optional[str] = None, remote: str = "origin") -> bool:
+    """
+    Checks if there are commits ahead of the remote that need to be pushed.
+    Returns True if there are commits to push, False otherwise.
+    """
+    if branch is None:
+        branch = get_current_branch()
+    
+    try:
+        # Check if remote tracking branch exists
+        result = subprocess.run(
+            ['git', 'rev-parse', '--abbrev-ref', f'{branch}@{{upstream}}'],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        upstream = result.stdout.strip()
+    except subprocess.CalledProcessError:
+        # No upstream branch, assume we need to push
+        return True
+    
+    try:
+        # Check if local branch is ahead of remote
+        result = subprocess.run(
+            ['git', 'rev-list', '--count', f'{upstream}..{branch}'],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        ahead_count = int(result.stdout.strip())
+        return ahead_count > 0
+    except (subprocess.CalledProcessError, ValueError):
+        # If we can't determine, assume we need to push
+        return True
+
+
+def push_to_remote(branch: Optional[str] = None, remote: str = "origin") -> None:
+    """
+    Pushes the current branch to the remote repository.
+    """
+    if branch is None:
+        branch = get_current_branch()
+    
+    try:
+        # Check if remote exists
+        result = subprocess.run(
+            ['git', 'remote', 'get-url', remote],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+    except subprocess.CalledProcessError:
+        raise KnownError(f"Remote '{remote}' does not exist. Please add a remote first.")
+    
+    # Check if there are commits to push
+    if not has_commits_to_push(branch, remote):
+        return  # Nothing to push
+    
+    try:
+        # Don't capture stdout/stderr to allow interactive prompts (e.g., for authentication)
+        # This allows the user to see what's happening and enter credentials if needed
+        subprocess.run(
+            ['git', 'push', remote, branch],
+            check=True
+        )
+    except subprocess.CalledProcessError as e:
+        raise KnownError(f"Failed to push to remote. Please check your authentication and try again.")

{devcommit-0.1.4.6 → devcommit-0.1.4.7}/devcommit/utils/parser.py

@@ -9,6 +9,8 @@ class CommitFlag(TypedDict):
     stageAll: bool
     commitType: Optional[str]
     directory: bool
+    files: List[str]
+    push: bool
     rawArgv: List[str]
 
 
@@ -42,6 +44,14 @@ def parse_arguments() -> CommitFlag:
         "--directory", "-d", action="store_true", 
         help="Generate separate commits per root directory"
     )
+    parser.add_argument(
+        "--files", "-f", nargs="*", default=[],
+        help="Specific files or folders to stage and commit (can specify multiple)"
+    )
+    parser.add_argument(
+        "--push", "-p", action="store_true",
+        help="Push commits to remote after committing"
+    )
     parser.add_argument(
         "rawArgv", nargs="*", help="Additional arguments for git commit"
     )
@@ -54,5 +64,7 @@ def parse_arguments() -> CommitFlag:
         stageAll=args.stageAll,
         commitType=args.commitType,
         directory=args.directory,
+        files=args.files or [],
+        push=args.push,
         rawArgv=args.rawArgv,
     )

{devcommit-0.1.4.6 → devcommit-0.1.4.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devcommit"
-version = "0.1.4.6"
+version = "0.1.4.7"
 description = "AI-powered git commit message generator"
 readme = "README.md"
 license = {file = "COPYING"}

devcommit-0.1.4.6/devcommit/utils/git.py

@@ -1,170 +0,0 @@
-#!/usr/bin/env python3
-"""Git utilities"""
-
-import os
-import subprocess
-from collections import defaultdict
-from typing import Dict, List, Optional
-
-
-class KnownError(Exception):
-    pass
-
-
-def assert_git_repo() -> str:
-    """
-    Asserts that the current directory is a Git repository.
-    Returns the top-level directory path of the repository.
-    """
-
-    try:
-        result = subprocess.run(
-            ['git', 'rev-parse', '--show-toplevel'],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        return result.stdout.strip()
-    except subprocess.CalledProcessError:
-        raise KnownError('The current directory must be a Git repository!')
-
-
-def exclude_from_diff(path: str) -> str:
-    """
-    Prepares a Git exclusion path string for the diff command.
-    """
-
-    return f':(exclude){path}'
-
-
-def get_default_excludes() -> List[str]:
-    """
-    Get list of files to exclude from diff.
-    Priority: Config > Defaults
-    """
-    try:
-        from devcommit.utils.logger import config
-        
-        # Get from config (supports comma-separated list)
-        exclude_config = config("EXCLUDE_FILES", default="")
-        
-        if exclude_config:
-            # Parse comma-separated values and strip whitespace
-            config_excludes = [f.strip() for f in exclude_config.split(",") if f.strip()]
-            return config_excludes
-    except:
-        pass
-    
-    # Default exclusions
-    return [
-        'package-lock.json',
-        'pnpm-lock.yaml',
-        'yarn.lock',
-        '*.lock'
-    ]
-
-
-# Get default files to exclude (can be overridden via config)
-files_to_exclude = get_default_excludes()
-
-
-def get_staged_diff(
-        exclude_files: Optional[List[str]] = None) -> Optional[dict]:
-    """
-    Gets the list of staged files and their diff, excluding specified files.
-    """
-    exclude_files = exclude_files or []
-    diff_cached = ['git', 'diff', '--cached', '--diff-algorithm=minimal']
-    excluded_from_diff = (
-        [exclude_from_diff(f) for f in files_to_exclude + exclude_files])
-
-    try:
-        # Get the list of staged files excluding specified files
-        files = subprocess.run(
-            diff_cached + ['--name-only'] + excluded_from_diff,
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        files_result = (
-            files.stdout.strip().split('\n') if files.stdout.strip() else []
-        )
-        if not files_result:
-            return None
-
-        # Get the staged diff excluding specified files
-        diff = subprocess.run(
-            diff_cached + excluded_from_diff,
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        diff_result = diff.stdout.strip()
-
-        return {
-            'files': files_result,
-            'diff': diff_result
-        }
-    except subprocess.CalledProcessError:
-        return None
-
-
-def get_detected_message(files: List[str]) -> str:
-    """
-    Returns a message indicating the number of staged files.
-    """
-    return (
-        f"Detected {len(files):,} staged file{'s' if len(files) > 1 else ''}"
-    )
-
-
-def group_files_by_directory(files: List[str]) -> Dict[str, List[str]]:
-    """
-    Groups files by their root directory (first-level directory).
-    Files in the repository root are grouped under 'root'.
-    """
-    grouped = defaultdict(list)
-    
-    for file_path in files:
-        # Get the first directory in the path
-        parts = file_path.split(os.sep)
-        if len(parts) > 1:
-            root_dir = parts[0]
-        else:
-            root_dir = 'root'
-        grouped[root_dir].append(file_path)
-    
-    return dict(grouped)
-
-
-def get_diff_for_files(files: List[str], exclude_files: Optional[List[str]] = None) -> str:
-    """
-    Gets the diff for specific files.
-    """
-    exclude_files = exclude_files or []
-    
-    # Filter out excluded files from the list
-    all_excluded = files_to_exclude + exclude_files
-    filtered_files = [
-        f for f in files 
-        if not any(f.endswith(excl.replace('*', '')) or excl.replace(':(exclude)', '') in f 
-                   for excl in all_excluded)
-    ]
-    
-    if not filtered_files:
-        return ""
-    
-    try:
-        diff = subprocess.run(
-            ['git', 'diff', '--cached', '--diff-algorithm=minimal', '--'] + filtered_files,
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        return diff.stdout.strip()
-    except subprocess.CalledProcessError:
-        return ""