aigc 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731000c9272bd0e49dccf72a563483eaf7181ad8625b700681fc19ef20920f99
-  data.tar.gz: 9abc3262a28663be3bf20e3b3f49f053cec6db3c31f41cbfc8305407f5c4b86d
+  metadata.gz: 77df6281418a993b1d1a4575403579a734b80e26bae4d25782e55d51cd32b56e
+  data.tar.gz: 03ee82eae23ed408a3887e770125129eed42d46d39b956a8139db60d2b213bef
 SHA512:
-  metadata.gz: 5756382d91f21ac0e15e538fe129a794dc97df50be3de1fa0f4d5be8024f473cf5bfe1e2580e4cc192eb0a79e5cd125a69bbf2444c0a537915f5a2ef137fc304
-  data.tar.gz: fb8967522a40b62a442875a34ec40a78e73fa7d82d60ba704cec33de61615c6ccdb515e9a2297b985885275a82c81d7a0b741f6dff34d5480bf09c15d1a53310
+  metadata.gz: f27de3cef28a0f21abed1b1d17d0891ec2740c5ba9b502f814bd6fae540535954382ceb3670ccba8f3234c2db7c2da59b37cf48e05eb97bf1c9a8fe09434e0f5
+  data.tar.gz: e763ed357ac9e15d96fdc23694175c895680ffa75fe9e5e2096a900217274d1714a63ffae5631b297d7a64bd0ff604d8648aef8b05e570ae2379946f806e0074

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.8.0] - 2025-01-27
+
+### Added
+- Smart ticket number extraction from branch names
+- Automatically detects ticket numbers like ABC-123, PROJ-456 from branch names
+- Supports common branch naming patterns: feature/ABC-123, bugfix/PROJ-456, etc.
+- Includes ticket numbers in commit message scope when relevant
+- Refactored commit guidelines into a constant for DRY code
+
+## [0.7.0] - 2025-01-27
+
+### Added
+- `--hash` option to generate commit messages from diff between HEAD and specified commit
+- Users can now run `aigc --hash abc123` to generate a message for changes between commit abc123 and HEAD
+- Useful for analyzing existing commits or generating messages for uncommitted changes since a specific commit
+- Added `Git.commit_diff` method to get diff between two commits
+
 ## [0.6.0] - 2025-01-27
 
 ### Changed

data/lib/ai/commit/claude_client.rb

@@ -29,30 +29,36 @@ module Ai
       
       private
       
+      COMMIT_GUIDELINES = <<~GUIDELINES
+        1. Use conventional commit format: type(scope): description
+        2. Keep subject line under 50 characters
+        3. Use imperative mood ("add" not "added")
+        4. Separate subject from body with blank line
+        5. Use 'feat' for new features, 'fix' for bug fixes, 'docs' for documentation, 'style' for formatting, 'refactor' for code refactoring, 'test' for tests, 'chore' for build/tooling
+        6. Be clear and specific about what changed, not just "update"
+        7. Explain the impact/benefit when relevant
+        8. Include scope based on file structure (e.g., auth, bank, api, components)
+        9. Reference any related components or services affected
+        10. For breaking changes, start with 'BREAKING CHANGE:'
+        11. Use bullet points in body for multiple changes
+        12. Include ticket numbers in scope when available (e.g., auth(ABC-123): description)
+        13. Match existing project commit style
+      GUIDELINES
+      
       def build_prompt(diff)
         custom_prompts = Config.custom_prompts
         custom_prompt_text = custom_prompts.empty? ? '' : "\n\nAdditional context and preferences:\n#{custom_prompts.join("\n")}"
         
+        ticket_number = Git.extract_ticket_from_branch
+        ticket_context = ticket_number ? "\n\nTicket number from branch: #{ticket_number} (include in scope if relevant)" : ""
+        
         <<~PROMPT
           You are a helpful assistant that generates conventional commit messages.
           
           Based on the following git diff, generate a conventional commit message that:
-          1. Use conventional commit format: type(scope): description
-          2. Keep subject line under 50 characters
-          3. Use imperative mood ("add" not "added")
-          4. Separate subject from body with blank line
-          5. Wrap body at 72 characters
-          6. Use 'feat' for new features, 'fix' for bug fixes, 'docs' for documentation, 'style' for formatting, 'refactor' for code refactoring, 'test' for tests, 'chore' for build/tooling
-          7. Be clear and specific about what changed, not just "update"
-          8. Explain the impact/benefit when relevant
-          9. Include scope based on file structure (e.g., auth, bank, api, components)
-          10. Reference any related components or services affected
-          11. For breaking changes, start with 'BREAKING CHANGE:'
-          12. Use bullet points in body for multiple changes
-          13. Reference ticket numbers when applicable
-          14. Match existing project commit style
+          #{COMMIT_GUIDELINES}
 
-          #{custom_prompt_text}
+          #{custom_prompt_text}#{ticket_context}
           
           Git diff:
           #{diff}
@@ -65,28 +71,18 @@ module Ai
         custom_prompts = Config.custom_prompts
         custom_prompt_text = custom_prompts.empty? ? '' : "\n\nAdditional context and preferences:\n#{custom_prompts.join("\n")}"
         
+        ticket_number = Git.extract_ticket_from_branch
+        ticket_context = ticket_number ? "\n\nTicket number from branch: #{ticket_number} (include in scope if relevant)" : ""
+        
         feedback_text = feedback_array.map.with_index { |feedback, i| "#{i + 1}. #{feedback}" }.join("\n")
         
         <<~PROMPT
           You are a helpful assistant that generates conventional commit messages.
           
           Based on the following git diff, generate a conventional commit message that:
-          1. Use conventional commit format: type(scope): description
-          2. Keep subject line under 50 characters
-          3. Use imperative mood ("add" not "added")
-          4. Separate subject from body with blank line
-          5. Wrap body at 72 characters
-          6. Use 'feat' for new features, 'fix' for bug fixes, 'docs' for documentation, 'style' for formatting, 'refactor' for code refactoring, 'test' for tests, 'chore' for build/tooling
-          7. Be clear and specific about what changed, not just "update"
-          8. Explain the impact/benefit when relevant
-          9. Include scope based on file structure (e.g., auth, bank, api, components)
-          10. Reference any related components or services affected
-          11. For breaking changes, start with 'BREAKING CHANGE:'
-          12. Use bullet points in body for multiple changes
-          13. Reference ticket numbers when applicable
-          14. Match existing project commit style
+          #{COMMIT_GUIDELINES}
 
-          #{custom_prompt_text}
+          #{custom_prompt_text}#{ticket_context}
           
           IMPORTANT: The user has provided feedback on previous attempts. Please address ALL of the following feedback:
           #{feedback_text}

data/lib/ai/commit/cli.rb

@@ -70,6 +70,7 @@ module Ai
       end
       
       desc "commit", "Generate a commit message and commit with confirmation"
+      option :hash, :type => :string, :desc => "Generate message from diff between HEAD and specified commit hash"
       def commit
         unless Config.api_key_configured?
           puts "❌ No API key configured. Please run 'aigc setup' first."
@@ -81,15 +82,32 @@ module Ai
           exit 1
         end
         
-        unless Git.has_staged_changes?
-          puts "❌ No staged changes found. Stage your changes with 'git add' first."
-          exit 1
+        if options[:hash]
+          puts "🤖 Generating commit message from diff between HEAD and #{options[:hash]}..."
+          
+          begin
+            diff = Git.commit_diff(options[:hash])
+          rescue => e
+            puts "❌ Error getting commit diff: #{e.message}"
+            exit 1
+          end
+        else
+          unless Git.has_staged_changes?
+            puts "❌ No staged changes found. Stage your changes with 'git add' first."
+            exit 1
+          end
+          
+          puts "🤖 Generating commit message..."
+          
+          begin
+            diff = Git.staged_diff
+          rescue => e
+            puts "❌ Error getting staged diff: #{e.message}"
+            exit 1
+          end
         end
         
-        puts "🤖 Generating commit message..."
-        
         begin
-          diff = Git.staged_diff
           client = ClaudeClient.new(Config.api_key)
           message = client.generate_commit_message(diff)
           
@@ -97,25 +115,21 @@ module Ai
           puts "=" * 50
           puts message
           puts "=" * 50
-          
-          print "\nCommit with this message? (y/N/e to edit/r to regenerate): "
-          response = STDIN.gets.chomp.downcase
-          
-          if response == 'y' || response == 'yes'
-            puts "\n🚀 Committing..."
-            result = system("git", "commit", "-m", message)
             
-            if result
-              puts "✅ Successfully committed!"
+            if options[:hash]
+              print "\nCopy this message? (y/N/e to edit/r to regenerate): "
             else
-              puts "❌ Failed to commit"
-              exit 1
+              print "\nCommit with this message? (y/N/e to edit/r to regenerate): "
             end
-          elsif response == 'e' || response == 'edit'
-            edited_message = edit_message(message)
-            if edited_message && !edited_message.strip.empty?
-              puts "\n🚀 Committing with edited message..."
-              result = system("git", "commit", "-m", edited_message)
+            response = STDIN.gets.chomp.downcase
+          
+          if response == 'y' || response == 'yes'
+            if options[:hash]
+              puts "\n📋 Message ready to copy:"
+              puts message
+            else
+              puts "\n🚀 Committing..."
+              result = system("git", "commit", "-m", message)
               
               if result
                 puts "✅ Successfully committed!"
@@ -123,14 +137,36 @@ module Ai
                 puts "❌ Failed to commit"
                 exit 1
               end
+            end
+          elsif response == 'e' || response == 'edit'
+            edited_message = edit_message(message)
+            if edited_message && !edited_message.strip.empty?
+              if options[:hash]
+                puts "\n📋 Edited message ready to copy:"
+                puts edited_message
+              else
+                puts "\n🚀 Committing with edited message..."
+                result = system("git", "commit", "-m", edited_message)
+                
+                if result
+                  puts "✅ Successfully committed!"
+                else
+                  puts "❌ Failed to commit"
+                  exit 1
+                end
+              end
             else
-              puts "❌ Commit cancelled."
+              puts "❌ Operation cancelled."
               exit 0
             end
           elsif response == 'r' || response == 'regenerate'
-            regenerate_with_feedback(diff, client, 1, [])
+            regenerate_with_feedback(diff, client, 1, [], options[:hash])
           else
-            puts "❌ Commit cancelled."
+            if options[:hash]
+              puts "❌ Operation cancelled."
+            else
+              puts "❌ Commit cancelled."
+            end
             exit 0
           end
           
@@ -219,7 +255,7 @@ module Ai
         edited_content
       end
       
-      def regenerate_with_feedback(diff, client, attempt = 1, accumulated_feedback = [])
+      def regenerate_with_feedback(diff, client, attempt = 1, accumulated_feedback = [], is_hash_mode = false)
         if attempt > 3
           puts "\n⚠️  Maximum regenerations (3) reached. Please commit with the current message or edit it manually."
           return
@@ -251,18 +287,27 @@ module Ai
           puts new_message
           puts "=" * 50
           
-          print "\nCommit with this message? (y/N/e to edit/r to regenerate again): "
+          if is_hash_mode
+            print "\nCopy this message? (y/N/e to edit/r to regenerate again): "
+          else
+            print "\nCommit with this message? (y/N/e to edit/r to regenerate again): "
+          end
           response = STDIN.gets.chomp.downcase
           
           if response == 'y' || response == 'yes'
-            puts "\n🚀 Committing..."
-            result = system("git", "commit", "-m", new_message)
-            
-            if result
-              puts "✅ Successfully committed!"
+            if is_hash_mode
+              puts "\n📋 Message ready to copy:"
+              puts new_message
             else
-              puts "❌ Failed to commit"
-              exit 1
+              puts "\n🚀 Committing..."
+              result = system("git", "commit", "-m", new_message)
+              
+              if result
+                puts "✅ Successfully committed!"
+              else
+                puts "❌ Failed to commit"
+                exit 1
+              end
             end
           elsif response == 'e' || response == 'edit'
             edited_message = edit_message(new_message)
@@ -281,7 +326,7 @@ module Ai
               exit 0
             end
           elsif response == 'r' || response == 'regenerate'
-            regenerate_with_feedback(diff, client, attempt + 1, all_feedback)
+            regenerate_with_feedback(diff, client, attempt + 1, all_feedback, is_hash_mode)
           else
             puts "❌ Commit cancelled."
             exit 0

data/lib/ai/commit/git.rb

@@ -24,6 +24,48 @@ module Ai
       def self.has_staged_changes?
         !`git diff --cached --name-only`.strip.empty?
       end
+      
+      def self.current_branch
+        result = `git branch --show-current`
+        result.strip if $?.exitstatus == 0
+      end
+      
+      def self.extract_ticket_from_branch
+        branch_name = current_branch
+        return nil unless branch_name
+        
+        # Common patterns: ABC-123, PROJ-456, JIRA-789, etc.
+        # Look for patterns like: feature/ABC-123, bugfix/PROJ-456, hotfix/JIRA-789
+        ticket_match = branch_name.match(/(?:feature|bugfix|hotfix|fix|feat|chore|docs|style|refactor|test|perf|revert)\/([A-Z]+-\d+)/i)
+        
+        if ticket_match
+          return ticket_match[1]
+        end
+        
+        # Also check for ticket numbers without prefixes
+        ticket_match = branch_name.match(/([A-Z]+-\d+)/)
+        ticket_match ? ticket_match[1] : nil
+      end
+      
+      def self.commit_diff(commit_hash)
+        # Validate the commit hash exists
+        unless system("git rev-parse --verify #{commit_hash}", out: File::NULL, err: File::NULL)
+          raise Error, "Commit hash '#{commit_hash}' not found"
+        end
+        
+        # Get the diff between HEAD and the specified commit
+        result = `git diff #{commit_hash}..HEAD`
+        
+        if $?.exitstatus != 0
+          raise Error, "Failed to get diff between #{commit_hash} and HEAD"
+        end
+        
+        if result.empty?
+          raise Error, "No differences found between #{commit_hash} and HEAD"
+        end
+        
+        result
+      end
     end
   end
 end

data/lib/ai/commit/version.rb

@@ -2,6 +2,6 @@
 
 module Ai
   module Commit
-    VERSION = "0.6.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aigc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Behrang Mirzamani