commitgpt 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc31b958101709cf5acae4d52106fd56ede0dea448fbc8332d60f4865315adeb
-  data.tar.gz: d60c821b82edd35a28caa2254a72722208af8019af86bb5e6f30d326f6a77845
+  metadata.gz: de7ab665c77f18d08715d16d56b7f4cd0a3b7e677bdbeabb80b25e96afcc8f47
+  data.tar.gz: f3cddebeaf3d1f479155e85a9039f47a14c7cc61d0390968c47fb0e810ca6ce7
 SHA512:
-  metadata.gz: ee1adb84767305fb84d0b2371685498ebcb28efaaf50920425483c3db563a7e1917fa69735f08203f6d990d071d3b5c0536c28992cf655f3a75db5b49bb8fb99
-  data.tar.gz: 77e6f1cb82eecfe6e30f947fe3dd2fc1a0c4a456f104bee0119f459ae56296297183e16dcb4858bcef2a2857207cc4ecd2d7865df7a57760820e23df6ea21706
+  metadata.gz: 9576ab5271ad85fb136eab275b987787cac5bae9af6c3458563089dd4e782c92ce57b48630379ad7c8ebbd11a816a0f2d6b69d302557dc8f5e3f69b482d2b889
+  data.tar.gz: e882ab4a80976721e87fcee2d5935021c2063ddf23c61e1cb26a45c7e8ead43da33610fb1f18cbd21fbc17d540cbdbdc7d9f52cc7641c666d589ce2fd41e15b2

data/commitgpt.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "httparty", "~> 0.24"
-  spec.add_dependency "thor", "~> 1.4"
+  spec.add_dependency 'httparty', '~> 0.24'
+  spec.add_dependency 'thor', '~> 1.4'
   spec.add_dependency 'tty-prompt', '~> 0.23'
 
   # For more information and examples about making a new gem, checkout our

data/lib/commitgpt/commit_ai.rb

@@ -8,11 +8,14 @@ require 'io/console'
 require 'tty-prompt'
 require_relative 'string'
 require_relative 'config_manager'
+require_relative 'diff_helpers'
 
 # CommitGpt based on GPT-3
 module CommitGpt
   # Commit AI roboter based on GPT-3
   class CommitAi
+    include DiffHelpers
+
     attr_reader :api_key, :base_url, :model, :diff_len
 
     def initialize
@@ -127,126 +130,6 @@ module CommitGpt
       generate_commit(diff)
     end
 
-    def git_diff
-      exclusions = '":(exclude)Gemfile.lock" ":(exclude)package-lock.json" ":(exclude)yarn.lock" ":(exclude)pnpm-lock.yaml"'
-      diff_cached = `git diff --cached . #{exclusions}`.chomp
-      diff_unstaged = `git diff . #{exclusions}`.chomp
-
-      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
-
-      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 welcome
       puts "\n▲ Welcome to AI Commits!".green
 

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: 'Anthropic (Claude)', value: 'anthropic', base_url: 'https://api.anthropic.com/v1' },
     { 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: '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: '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: '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

data/lib/commitgpt/string.rb

@@ -1,5 +1,24 @@
 # frozen_string_literal: true
 
+require 'tty-prompt'
+
+# Monkey patch TTY::Prompt::List to add padding at the bottom of menus
+module TTY
+  class Prompt
+    # Monkey patch to add padding
+    class List
+      alias original_render_menu render_menu
+
+      # Override render_menu to add empty lines at the bottom
+      def render_menu
+        output = original_render_menu
+        # Add 2 empty lines at the bottom so menu doesn't stick to terminal edge
+        "#{output}\n\n"
+      end
+    end
+  end
+end
+
 # Open String to add color
 class String
   def red

data/lib/commitgpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CommitGpt
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commitgpt
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Peng Zhang
@@ -68,6 +68,7 @@ files:
 - lib/commitgpt/cli.rb
 - lib/commitgpt/commit_ai.rb
 - lib/commitgpt/config_manager.rb
+- lib/commitgpt/diff_helpers.rb
 - lib/commitgpt/provider_presets.rb
 - lib/commitgpt/setup_wizard.rb
 - lib/commitgpt/string.rb