commitgpt 0.3.1 → 0.3.4

data/lib/commitgpt/setup_wizard.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "tty-prompt"
-require "httparty"
-require "timeout"
-require_relative "config_manager"
-require_relative "provider_presets"
-require_relative "string"
+require 'tty-prompt'
+require 'httparty'
+require 'timeout'
+require_relative 'config_manager'
+require_relative 'provider_presets'
+require_relative 'string'
 
 module CommitGpt
   # Interactive setup wizard for configuring AI providers
@@ -26,34 +26,34 @@ module CommitGpt
     # Switch to a different configured provider
     def switch_provider
       configured = ConfigManager.configured_providers
-      
+
       if configured.empty?
         puts "▲ No providers configured. Please run 'aicm setup' first.".red
         return
       end
 
       choices = configured.map do |p|
-        preset = PROVIDER_PRESETS.find { |pr| pr[:value] == p["name"] }
-        { name: preset ? preset[:label] : p["name"], value: p["name"] }
+        preset = PROVIDER_PRESETS.find { |pr| pr[:value] == p['name'] }
+        { name: preset ? preset[:label] : p['name'], value: p['name'] }
       end
 
-      selected = @prompt.select("Choose your provider:", choices)
-      
+      selected = @prompt.select('Choose your provider:', choices)
+
       # Get current config for this provider
       config = ConfigManager.load_config
-      provider = config["providers"].find { |p| p["name"] == selected }
+      provider = config['providers'].find { |p| p['name'] == selected }
 
       # Fetch models and let user select
-      models = fetch_models_with_timeout(provider["base_url"], provider["api_key"])
+      models = fetch_models_with_timeout(provider['base_url'], provider['api_key'])
       return if models.nil?
 
-      model = select_model(models, provider["model"])
-      
+      model = select_model(models, provider['model'])
+
       # Prompt for diff length
-      diff_len = prompt_diff_len(provider["diff_len"] || 32768)
-      
+      diff_len = prompt_diff_len(provider['diff_len'] || 32_768)
+
       # Update config
-      ConfigManager.update_provider(selected, { "model" => model, "diff_len" => diff_len })
+      ConfigManager.update_provider(selected, { 'model' => model, 'diff_len' => diff_len })
       reset_provider_inference_params(selected)
       ConfigManager.set_active_provider(selected)
 
@@ -67,22 +67,22 @@ module CommitGpt
     # Change model for the active provider
     def change_model
       provider_config = ConfigManager.get_active_provider_config
-      
-      if provider_config.nil? || provider_config["api_key"].nil? || provider_config["api_key"].empty?
+
+      if provider_config.nil? || provider_config['api_key'].nil? || provider_config['api_key'].empty?
         puts "▲ No active provider configured. Please run 'aicm setup'.".red
         return
       end
 
       # Fetch models and let user select
-      models = fetch_models_with_timeout(provider_config["base_url"], provider_config["api_key"])
+      models = fetch_models_with_timeout(provider_config['base_url'], provider_config['api_key'])
       return if models.nil?
 
-      model = select_model(models, provider_config["model"])
-      
+      model = select_model(models, provider_config['model'])
+
       # Update config
-      ConfigManager.update_provider(provider_config["name"], { "model" => model })
-      reset_provider_inference_params(provider_config["name"])
-      
+      ConfigManager.update_provider(provider_config['name'], { 'model' => model })
+      reset_provider_inference_params(provider_config['name'])
+
       puts "\nModel selected: #{model}".green
     end
 
@@ -91,29 +91,29 @@ module CommitGpt
     # Select provider from list
     def select_provider
       config = ConfigManager.load_config
-      configured = config ? (config["providers"] || []) : []
+      configured = config ? (config['providers'] || []) : []
 
       choices = PROVIDER_PRESETS.map do |preset|
         # Check if this provider already has an API key
-        provider_config = configured.find { |p| p["name"] == preset[:value] }
-        has_key = provider_config && provider_config["api_key"] && !provider_config["api_key"].empty?
-        
+        provider_config = configured.find { |p| p['name'] == preset[:value] }
+        has_key = provider_config && provider_config['api_key'] && !provider_config['api_key'].empty?
+
         label = preset[:label]
         label = "✅ #{label}" if has_key
-        label = "#{label} (recommended)" if preset[:value] == "cerebras"
+        label = "#{label} (recommended)" if preset[:value] == 'cerebras'
         label = "#{label} (local)" if %w[ollama llamacpp lmstudio llamafile].include?(preset[:value])
 
         { name: label, value: preset[:value] }
       end
 
-      choices << { name: "Custom (OpenAI-compatible)", value: "custom" }
+      choices << { name: 'Custom (OpenAI-compatible)', value: 'custom' }
 
-      @prompt.select("Choose your AI provider:", choices, per_page: 15)
+      @prompt.select('Choose your AI provider:', choices, per_page: 15)
     end
 
     # Configure selected provider
     def configure_provider(provider_name)
-      if provider_name == "custom"
+      if provider_name == 'custom'
         configure_custom_provider
         return
       end
@@ -124,10 +124,10 @@ module CommitGpt
 
       # Get existing API key if any
       config = ConfigManager.load_config
-      existing_provider = config["providers"].find { |p| p["name"] == provider_name } if config
+      existing_provider = config['providers'].find { |p| p['name'] == provider_name } if config
 
       # Prompt for API key
-      api_key = prompt_api_key(provider_label, existing_provider&.dig("api_key"))
+      api_key = prompt_api_key(provider_label, existing_provider&.dig('api_key'))
       return if api_key.nil? # User cancelled
 
       # Fetch models with timeout
@@ -135,16 +135,16 @@ module CommitGpt
       return if models.nil?
 
       # Let user select model
-      model = select_model(models, existing_provider&.dig("model"))
+      model = select_model(models, existing_provider&.dig('model'))
 
       # Prompt for diff length
-      diff_len = prompt_diff_len(existing_provider&.dig("diff_len") || 32768)
+      diff_len = prompt_diff_len(existing_provider&.dig('diff_len') || 32_768)
 
       # Save configuration
       ConfigManager.update_provider(
         provider_name,
-        { "model" => model, "diff_len" => diff_len },
-        { "api_key" => api_key }
+        { 'model' => model, 'diff_len' => diff_len },
+        { 'api_key' => api_key }
       )
       ConfigManager.set_active_provider(provider_name)
 
@@ -154,53 +154,56 @@ module CommitGpt
 
     # Configure custom provider
     def configure_custom_provider
-      provider_name = @prompt.ask("Enter provider name:") do |q|
+      provider_name = @prompt.ask('Enter provider name:') do |q|
         q.required true
         q.modify :strip, :down
       end
 
-      base_url = @prompt.ask("Enter base URL:") do |q|
+      base_url = @prompt.ask('Enter base URL:') do |q|
         q.required true
-        q.default "http://localhost:8080/v1"
+        q.default 'http://localhost:8080/v1'
       end
 
-      api_key = @prompt.mask("Enter your API key (optional):") { |q| q.echo false }
+      api_key = @prompt.mask('Enter your API key (optional):') { |q| q.echo false }
 
       # Fetch models
       models = fetch_models_with_timeout(base_url, api_key)
       return if models.nil?
 
       model = select_model(models)
-      diff_len = prompt_diff_len(32768)
+      diff_len = prompt_diff_len(32_768)
 
       # Add to presets dynamically (just for this session)
       # Save to config
-      config = ConfigManager.load_config || { "providers" => [], "active_provider" => "" }
-      
+      config = ConfigManager.load_config || { 'providers' => [], 'active_provider' => '' }
+
       # Add or update provider in main config
-      existing = config["providers"].find { |p| p["name"] == provider_name }
+      existing = config['providers'].find { |p| p['name'] == provider_name }
       if existing
-        existing.merge!({ "model" => model, "diff_len" => diff_len, "base_url" => base_url })
+        existing.merge!({ 'model' => model, 'diff_len' => diff_len, 'base_url' => base_url })
       else
-        config["providers"] << {
-          "name" => provider_name,
-          "model" => model,
-          "diff_len" => diff_len,
-          "base_url" => base_url
+        config['providers'] << {
+          'name' => provider_name,
+          'model' => model,
+          'diff_len' => diff_len,
+          'base_url' => base_url
         }
       end
-      config["active_provider"] = provider_name
+      config['active_provider'] = provider_name
       ConfigManager.save_main_config(config)
 
       # Update local config
-      local_config = File.exist?(ConfigManager.local_config_path) ? 
-        YAML.load_file(ConfigManager.local_config_path) : { "providers" => [] }
-      
-      local_existing = local_config["providers"].find { |p| p["name"] == provider_name }
+      local_config = if File.exist?(ConfigManager.local_config_path)
+                       YAML.load_file(ConfigManager.local_config_path)
+                     else
+                       { 'providers' => [] }
+                     end
+
+      local_existing = local_config['providers'].find { |p| p['name'] == provider_name }
       if local_existing
-        local_existing["api_key"] = api_key
+        local_existing['api_key'] = api_key
       else
-        local_config["providers"] << { "name" => provider_name, "api_key" => api_key }
+        local_config['providers'] << { 'name' => provider_name, 'api_key' => api_key }
       end
       ConfigManager.save_local_config(local_config)
 
@@ -209,15 +212,15 @@ module CommitGpt
     end
 
     # Prompt for API key
-    def prompt_api_key(provider_name, existing_key)
+    def prompt_api_key(_provider_name, existing_key)
       message = if existing_key && !existing_key.empty?
-                  "Enter your API key (press Enter to keep existing):"
+                  'Enter your API key (press Enter to keep existing):'
                 else
-                  "Enter your API key:"
+                  'Enter your API key:'
                 end
 
       key = @prompt.mask(message) { |q| q.echo false }
-      
+
       # If user pressed Enter and there's an existing key, use it
       if key.empty? && existing_key && !existing_key.empty?
         existing_key
@@ -228,29 +231,29 @@ module CommitGpt
 
     # Fetch models from provider with timeout
     def fetch_models_with_timeout(base_url, api_key)
-      puts "Fetching available models...".gray
+      puts 'Fetching available models...'.gray
 
       models = nil
       begin
         Timeout.timeout(5) do
           headers = {
-            "Content-Type" => "application/json",
-            "User-Agent" => "Ruby/#{RUBY_VERSION}"
+            'Content-Type' => 'application/json',
+            'User-Agent' => "Ruby/#{RUBY_VERSION}"
           }
-          headers["Authorization"] = "Bearer #{api_key}" if api_key && !api_key.empty?
+          headers['Authorization'] = "Bearer #{api_key}" if api_key && !api_key.empty?
 
           response = HTTParty.get("#{base_url}/models", headers: headers)
-          
+
           if response.code == 200
-            models = response["data"] || []
-            models = models.map { |m| m["id"] }.compact.sort
+            models = response['data'] || []
+            models = models.map { |m| m['id'] }.compact.sort
           else
             puts "▲ Failed to fetch models: HTTP #{response.code}".red
             return nil
           end
         end
       rescue Timeout::Error
-        puts "▲ Connection timeout (5s). Please check your network, base_url, and api_key.".red
+        puts '▲ Connection timeout (5s). Please check your network, base_url, and api_key.'.red
         exit(0)
       rescue StandardError => e
         puts "▲ Error fetching models: #{e.message}".red
@@ -258,7 +261,7 @@ module CommitGpt
       end
 
       if models.nil? || models.empty?
-        puts "▲ No models found. Please check your configuration.".red
+        puts '▲ No models found. Please check your configuration.'.red
         exit(0)
       end
 
@@ -268,7 +271,7 @@ module CommitGpt
     # Let user select a model
     def select_model(models, current_model = nil)
       choices = models.map { |m| { name: m, value: m } }
-      choices << { name: "Custom model name...", value: :custom }
+      choices << { name: 'Custom model name...', value: :custom }
 
       # Set default to current model if it exists
       default_index = if current_model && models.include?(current_model)
@@ -277,10 +280,10 @@ module CommitGpt
                         1
                       end
 
-      selected = @prompt.select("Choose your model:", choices, per_page: 15, default: default_index)
+      selected = @prompt.select('Choose your model:', choices, per_page: 15, default: default_index)
 
       if selected == :custom
-        @prompt.ask("Enter custom model name:") do |q|
+        @prompt.ask('Enter custom model name:') do |q|
           q.required true
           q.modify :strip
         end
@@ -290,8 +293,8 @@ module CommitGpt
     end
 
     # Prompt for diff length
-    def prompt_diff_len(default = 32768)
-      answer = @prompt.ask("Set the maximum diff length (Bytes) for generating commit message:") do |q|
+    def prompt_diff_len(default = 32_768)
+      answer = @prompt.ask('Set the maximum diff length (Bytes) for generating commit message:') do |q|
         q.default default.to_s
         q.convert :int
       end
@@ -301,12 +304,12 @@ module CommitGpt
 
     def reset_provider_inference_params(provider_name)
       config = YAML.load_file(ConfigManager.main_config_path)
-      return unless config && config["providers"]
-      
-      provider = config["providers"].find { |p| p["name"] == provider_name }
+      return unless config && config['providers']
+
+      provider = config['providers'].find { |p| p['name'] == provider_name }
       if provider
-        provider.delete("can_disable_reasoning")
-        provider.delete("max_tokens")
+        provider.delete('can_disable_reasoning')
+        provider.delete('max_tokens')
         ConfigManager.save_main_config(config)
       end
     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.1"
+  VERSION = '0.3.4'
 end

data/lib/commitgpt.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "commitgpt/version"
-require_relative "commitgpt/commit_ai"
+require_relative 'commitgpt/version'
+require_relative 'commitgpt/commit_ai'
 
 module CommitGpt
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commitgpt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Peng Zhang
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -79,6 +80,7 @@ metadata:
   homepage_uri: https://github.com/ZPVIP/commitgpt
   source_code_uri: https://github.com/ZPVIP/commitgpt
   changelog_uri: https://github.com/ZPVIP/commitgpt/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib