commitgpt 0.3.1 → 0.3.4

data/lib/commitgpt/config_manager.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "yaml"
-require "fileutils"
-require_relative "provider_presets"
-require_relative "string"
+require 'yaml'
+require 'fileutils'
+require_relative 'provider_presets'
+require_relative 'string'
 
 module CommitGpt
   # Manages configuration files for CommitGPT
@@ -11,22 +11,22 @@ module CommitGpt
     class << self
       # Get the config directory path
       def config_dir
-        File.expand_path("~/.config/commitgpt")
+        File.expand_path('~/.config/commitgpt')
       end
 
       # Get main config file path
       def main_config_path
-        File.join(config_dir, "config.yml")
+        File.join(config_dir, 'config.yml')
       end
 
       # Get local config file path
       def local_config_path
-        File.join(config_dir, "config.local.yml")
+        File.join(config_dir, 'config.local.yml')
       end
 
       # Ensure config directory exists
       def ensure_config_dir
-        FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
+        FileUtils.mkdir_p(config_dir)
       end
 
       # Check if config files exist
@@ -47,12 +47,12 @@ module CommitGpt
       # Get active provider configuration
       def get_active_provider_config
         config = load_config
-        return nil if config.nil? || config["active_provider"].nil?
+        return nil if config.nil? || config['active_provider'].nil?
 
-        active_provider = config["active_provider"]
-        providers = config["providers"] || []
+        active_provider = config['active_provider']
+        providers = config['providers'] || []
 
-        providers.find { |p| p["name"] == active_provider }
+        providers.find { |p| p['name'] == active_provider }
       end
 
       # Save main config
@@ -74,36 +74,36 @@ module CommitGpt
         # Generate main config with all providers but empty models
         providers = PROVIDER_PRESETS.map do |preset|
           {
-            "name" => preset[:value],
-            "model" => "",
-            "diff_len" => 32768,
-            "base_url" => preset[:base_url]
+            'name' => preset[:value],
+            'model' => '',
+            'diff_len' => 32_768,
+            'base_url' => preset[:base_url]
           }
         end
 
         main_config = {
-          "providers" => providers,
-          "active_provider" => ""
+          'providers' => providers,
+          'active_provider' => ''
         }
 
         # Generate local config with empty API keys
         local_providers = PROVIDER_PRESETS.map do |preset|
           {
-            "name" => preset[:value],
-            "api_key" => ""
+            'name' => preset[:value],
+            'api_key' => ''
           }
         end
 
         local_config = {
-          "providers" => local_providers
+          'providers' => local_providers
         }
 
         save_main_config(main_config)
         save_local_config(local_config)
 
         # Remind user to add config.local.yml to .gitignore
-        puts "▲ Generated default configuration files.".green
-        puts "▲ Remember to add ~/.config/commitgpt/config.local.yml to your .gitignore".yellow
+        puts '▲ Generated default configuration files.'.green
+        puts '▲ Remember to add ~/.config/commitgpt/config.local.yml to your .gitignore'.yellow
       end
 
       # Get list of configured providers (with API keys)
@@ -111,25 +111,25 @@ module CommitGpt
         config = load_config
         return [] if config.nil?
 
-        providers = config["providers"] || []
-        providers.select { |p| p["api_key"] && !p["api_key"].empty? }
+        providers = config['providers'] || []
+        providers.select { |p| p['api_key'] && !p['api_key'].empty? }
       end
 
       # Update provider configuration
       def update_provider(provider_name, main_attrs = {}, local_attrs = {})
         # Update main config
         main_config = YAML.load_file(main_config_path)
-        provider = main_config["providers"].find { |p| p["name"] == provider_name }
+        provider = main_config['providers'].find { |p| p['name'] == provider_name }
         provider&.merge!(main_attrs)
         save_main_config(main_config)
 
         # Update local config
-        local_config = File.exist?(local_config_path) ? YAML.load_file(local_config_path) : { "providers" => [] }
-        local_provider = local_config["providers"].find { |p| p["name"] == provider_name }
+        local_config = File.exist?(local_config_path) ? YAML.load_file(local_config_path) : { 'providers' => [] }
+        local_provider = local_config['providers'].find { |p| p['name'] == provider_name }
         if local_provider
           local_provider.merge!(local_attrs)
         else
-          local_config["providers"] << { "name" => provider_name }.merge(local_attrs)
+          local_config['providers'] << { 'name' => provider_name }.merge(local_attrs)
         end
         save_local_config(local_config)
       end
@@ -137,7 +137,7 @@ module CommitGpt
       # Set active provider
       def set_active_provider(provider_name)
         main_config = YAML.load_file(main_config_path)
-        main_config["active_provider"] = provider_name
+        main_config['active_provider'] = provider_name
         save_main_config(main_config)
       end
 
@@ -148,15 +148,15 @@ module CommitGpt
         result = main_config.dup
 
         # Merge provider-specific settings
-        main_providers = main_config["providers"] || []
-        local_providers = local_config["providers"] || []
+        main_providers = main_config['providers'] || []
+        local_providers = local_config['providers'] || []
 
         merged_providers = main_providers.map do |main_provider|
-          local_provider = local_providers.find { |lp| lp["name"] == main_provider["name"] }
+          local_provider = local_providers.find { |lp| lp['name'] == main_provider['name'] }
           local_provider ? main_provider.merge(local_provider) : main_provider
         end
 
-        result["providers"] = merged_providers
+        result['providers'] = merged_providers
         result
       end
     end

data/lib/commitgpt/diff_helpers.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+module CommitGpt
+  # Helper methods for handling git diffs
+  # rubocop:disable Metrics/ModuleLength
+  module DiffHelpers
+    # Lock files to exclude from diff but detect changes
+    LOCK_FILES = %w[Gemfile.lock package-lock.json yarn.lock pnpm-lock.yaml].freeze
+
+    def git_diff
+      exclusions = LOCK_FILES.map { |f| "\":(exclude)#{f}\"" }.join(' ')
+      diff_cached = `git diff --cached . #{exclusions}`.chomp
+      diff_unstaged = `git diff . #{exclusions}`.chomp
+
+      # Detect lock file changes and build summary
+      @lock_file_summary = detect_lock_file_changes
+
+      if !diff_unstaged.empty?
+        if diff_cached.empty?
+          # Scenario: Only unstaged changes
+          choice = prompt_no_staged_changes
+          case choice
+          when :add_all
+            puts '▲ Running git add .'.yellow
+            system('git add .')
+            diff_cached = `git diff --cached . #{exclusions}`.chomp
+            if diff_cached.empty?
+              puts '▲ Still no changes to commit.'.red
+              return nil
+            end
+          when :exit
+            return nil
+          end
+        else
+          # Scenario: Mixed state (some staged, some not)
+          puts '▲ You have both staged and unstaged changes:'.yellow
+
+          staged_files = `git diff --cached --name-status . #{exclusions}`.chomp
+          unstaged_files = `git diff --name-status . #{exclusions}`.chomp
+
+          puts "\n  #{'Staged changes:'.green}"
+          puts staged_files.gsub(/^/, '    ')
+
+          puts "\n  #{'Unstaged changes:'.red}"
+          puts unstaged_files.gsub(/^/, '    ')
+          puts ''
+
+          prompt = TTY::Prompt.new
+          choice = prompt.select('How to proceed?') do |menu|
+            menu.choice 'Include unstaged changes (git add .)', :add_all
+            menu.choice 'Use staged changes only', :staged_only
+            menu.choice 'Exit', :exit
+          end
+
+          case choice
+          when :add_all
+            puts '▲ Running git add .'.yellow
+            system('git add .')
+            diff_cached = `git diff --cached . #{exclusions}`.chomp
+          when :exit
+            return nil
+          end
+        end
+      elsif diff_cached.empty?
+        # Scenario: No changes at all (staged or unstaged)
+        # Check if there are ANY unstaged files (maybe untracked?)
+        # git status --porcelain includes untracked files
+        git_status = `git status --porcelain`.chomp
+        if git_status.empty?
+          puts '▲ No changes to commit. Working tree clean.'.yellow
+          return nil
+        else
+          # Only untracked files? Or ignored files?
+          # If diff_unstaged is empty but git status is not, it usually means untracked files.
+          # Let's offer to add them too.
+          choice = prompt_no_staged_changes
+          case choice
+          when :add_all
+            puts '▲ Running git add .'.yellow
+            system('git add .')
+            diff_cached = `git diff --cached . #{exclusions}`.chomp
+          when :exit
+            return nil
+          end
+        end
+      end
+
+      diff = diff_cached
+
+      # Prepend lock file summary to diff if present
+      diff = "#{@lock_file_summary}\n\n#{diff}" if @lock_file_summary
+
+      if diff.length > diff_len
+        choice = prompt_diff_handling(diff.length, diff_len)
+        case choice
+        when :truncate
+          puts "▲ Truncating diff to #{diff_len} chars...".yellow
+          diff = diff[0...diff_len]
+        when :unlimited
+          puts "▲ Using full diff (#{diff.length} chars)...".yellow
+        when :exit
+          return nil
+        end
+      end
+
+      diff
+    end
+
+    def prompt_no_staged_changes
+      puts '▲ No staged changes found (but unstaged/untracked files exist).'.yellow
+      prompt = TTY::Prompt.new
+      begin
+        prompt.select('Choose an option:') do |menu|
+          menu.choice "Run 'git add .' to stage all changes", :add_all
+          menu.choice 'Exit (stage files manually)', :exit
+        end
+      rescue TTY::Reader::InputInterrupt, Interrupt
+        :exit
+      end
+    end
+
+    def prompt_diff_handling(current_len, max_len)
+      puts "▲ The diff is too large (#{current_len} chars, max #{max_len}).".yellow
+      prompt = TTY::Prompt.new
+      begin
+        prompt.select('Choose an option:') do |menu|
+          menu.choice "Use first #{max_len} characters to generate commit message", :truncate
+          menu.choice 'Use unlimited characters (may fail or be slow)', :unlimited
+          menu.choice 'Exit', :exit
+        end
+      rescue TTY::Reader::InputInterrupt, Interrupt
+        :exit
+      end
+    end
+
+    def detect_lock_file_changes
+      # Check both staged and unstaged changes for lock files
+      staged_files = `git diff --cached --name-only`.chomp.split("\n")
+      unstaged_files = `git diff --name-only`.chomp.split("\n")
+      changed_files = (staged_files + unstaged_files).uniq
+
+      updated_locks = LOCK_FILES.select { |lock| changed_files.include?(lock) }
+      return nil if updated_locks.empty?
+
+      updated_locks.map { |f| "#{f} updated (dependency changes)" }.join(', ')
+    end
+  end
+  # rubocop:enable Metrics/ModuleLength
+end

data/lib/commitgpt/provider_presets.rb

@@ -3,17 +3,18 @@
 module CommitGpt
   # Provider presets for common AI providers
   PROVIDER_PRESETS = [
-    { label: "Cerebras", value: "cerebras", base_url: "https://api.cerebras.ai/v1" },
-    { label: "Ollama", value: "ollama", base_url: "http://127.0.0.1:11434/v1" },
-    { label: "OpenAI", value: "openai", base_url: "https://api.openai.com/v1" },
-    { label: "LLaMa.cpp", value: "llamacpp", base_url: "http://127.0.0.1:8080/v1" },
-    { label: "LM Studio", value: "lmstudio", base_url: "http://127.0.0.1:1234/v1" },
-    { label: "Llamafile", value: "llamafile", base_url: "http://127.0.0.1:8080/v1" },
-    { label: "DeepSeek", value: "deepseek", base_url: "https://api.deepseek.com" },
-    { label: "Groq", value: "groq", base_url: "https://api.groq.com/openai/v1" },
-    { label: "Mistral", value: "mistral", base_url: "https://api.mistral.ai/v1" },
-    { label: "Anthropic (Claude)", value: "anthropic", base_url: "https://api.anthropic.com/v1" },
-    { label: "OpenRouter", value: "openrouter", base_url: "https://openrouter.ai/api/v1" },
-    { label: "Google AI", value: "gemini", base_url: "https://generativelanguage.googleapis.com/v1beta/openai" }
+    { label: 'Anthropic (Claude)', value: 'anthropic', base_url: 'https://api.anthropic.com/v1' },
+    { label: 'Cerebras', value: 'cerebras', base_url: 'https://api.cerebras.ai/v1' },
+    { label: 'DeepSeek', value: 'deepseek', base_url: 'https://api.deepseek.com' },
+    { label: 'Google AI', value: 'gemini', base_url: 'https://generativelanguage.googleapis.com/v1beta/openai' },
+    { label: 'Groq', value: 'groq', base_url: 'https://api.groq.com/openai/v1' },
+    { label: 'LLaMa.cpp', value: 'llamacpp', base_url: 'http://127.0.0.1:8080/v1' },
+    { label: 'LM Studio', value: 'lmstudio', base_url: 'http://127.0.0.1:1234/v1' },
+    { label: 'Llamafile', value: 'llamafile', base_url: 'http://127.0.0.1:8080/v1' },
+    { label: 'Mistral', value: 'mistral', base_url: 'https://api.mistral.ai/v1' },
+    { label: 'NVIDIA NIM', value: 'nvidia_nim', base_url: 'https://integrate.api.nvidia.com/v1' },
+    { label: 'Ollama', value: 'ollama', base_url: 'http://127.0.0.1:11434/v1' },
+    { label: 'OpenAI', value: 'openai', base_url: 'https://api.openai.com/v1' },
+    { label: 'OpenRouter', value: 'openrouter', base_url: 'https://openrouter.ai/api/v1' }
   ].freeze
 end