n2b 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 698bca4814bd42e8587efb9d278ce1cb090b3ea23afd645c9c082b1c277ea22d
-  data.tar.gz: c7ec9715a8b5807b1ea5eb90e448fd70767fdc3e6ace987e1b123e29ee37dd33
+  metadata.gz: 644455363c88bf95c4ab4f21121ed6b8f56a591fb32bd1a8fa9f8f36d981e515
+  data.tar.gz: f899199e26524f38f88e4416217616c048e588c1f54becb228261b07ffcda3d1
 SHA512:
-  metadata.gz: 7d00b68b8e2925b63d4bf6b2e4842a18034e2dc318686d55261480c2612f47f8574379df85ae166670a721aa6bd41406d08323cddb0ebd831e3777dc1773ca1a
-  data.tar.gz: e7b3621fcf9051d433ca0fba961b12d348b03f9d73981d641b252b4a4223b8edfec0f8ee438f6c603382ca62c1cf4679e9960f6c40f16b84c644d6939290dbe5
+  metadata.gz: 2b3cfcba02a3c41017737317df2d932e1ff053c2d470c529a3158ccba11696ccf09367369f4530de78fc7669cc26795a3dad8abe49a26da0f5a8f836758baf4d
+  data.tar.gz: f664e6b0e9099aecc969e7d46a71b7cf7da0bf1238e9fbf203f445bed9d7073c2a643cce09a3a50fc1ce666805505c7e8d6222817a207fd3b4ec9491c8fcd4e4

data/README.md

@@ -6,10 +6,15 @@ N2B (Natural Language to Bash & Ruby) is a Ruby gem that leverages AI to convert
 
 ## Features
 
-- Convert natural language to bash commands
-- Generate Ruby code from natural language instructions
-- Analyze Errbit errors and generate detailed reports
-- Create formatted Scrum tickets from errors
+- **🤖 Natural Language to Commands**: Convert natural language to bash commands
+- **💎 Ruby Code Generation**: Generate Ruby code from natural language instructions
+- **🔍 AI-Powered Diff Analysis**: Analyze git/hg diffs with comprehensive code review
+- **📋 Requirements Compliance**: Check if code changes meet specified requirements
+- **🧪 Test Coverage Assessment**: Evaluate test coverage for code changes
+- **🌿 Branch Comparison**: Compare changes against any branch (main/master/default)
+- **🛠️ VCS Support**: Full support for both Git and Mercurial repositories
+- **📊 Errbit Integration**: Analyze Errbit errors and generate detailed reports
+- **🎫 Scrum Tickets**: Create formatted Scrum tickets from errors
 
 ## Installation
 
@@ -135,6 +140,9 @@ n2b [options] your natural language instruction
 
 Options:
 - `-x` or `--execute`: Execute the generated commands after confirmation
+- `-d` or `--diff`: Analyze git/hg diff with AI-powered code review
+- `-b` or `--branch [BRANCH]`: Compare against specific branch (auto-detects main/master/default)
+- `-r` or `--requirements FILE`: Requirements file for compliance checking
 - `-c` or `--config`: Reconfigure the tool
 - `-h` or `--help`: Display help information
 
@@ -152,6 +160,82 @@ Examples:
 
 ```n2b -c  ```
 
+## 🔍 AI-Powered Diff Analysis
+
+N2B provides comprehensive AI-powered code review for your git and mercurial repositories.
+
+### Basic Diff Analysis
+
+```bash
+# Analyze uncommitted changes
+n2b --diff
+
+# Analyze changes against specific branch
+n2b --diff --branch main
+n2b --diff --branch feature/auth
+
+# Auto-detect default branch (main/master/default)
+n2b --diff --branch
+
+# Short form
+n2b -d -b main
+```
+
+### Requirements Compliance Checking
+
+```bash
+# Check if changes meet requirements
+n2b --diff --requirements requirements.md
+n2b -d -r req.md
+
+# Combine with branch comparison
+n2b --diff --branch main --requirements requirements.md
+```
+
+### What You Get
+
+The AI analysis provides:
+
+- **📝 Summary**: Clear overview of what changed
+- **🚨 Potential Errors**: Bugs, security issues, logic problems with exact file/line references
+- **💡 Suggested Improvements**: Code quality, performance, style recommendations
+- **🧪 Test Coverage Assessment**: Evaluation of test completeness and quality
+- **📋 Requirements Evaluation**: Compliance check with clear status indicators:
+  - ✅ **IMPLEMENTED**: Requirement fully satisfied
+  - ⚠️ **PARTIALLY IMPLEMENTED**: Needs more work
+  - ❌ **NOT IMPLEMENTED**: Not addressed
+  - 🔍 **UNCLEAR**: Cannot determine from diff
+
+### Example Output
+
+```
+Code Diff Analysis:
+-------------------
+Summary:
+Added user authentication with JWT tokens and password validation.
+
+Potential Errors:
+- lib/auth.rb line 42: Password validation allows weak passwords
+- controllers/auth_controller.rb lines 15-20: Missing rate limiting for login attempts
+
+Suggested Improvements:
+- lib/auth.rb line 30: Consider using bcrypt for password hashing
+- spec/auth_spec.rb: Add tests for edge cases and security scenarios
+
+Test Coverage Assessment:
+Good: Basic authentication flow is tested. Missing: No tests for password validation edge cases, JWT expiration handling, or security attack scenarios.
+
+Requirements Evaluation:
+✅ IMPLEMENTED: User login/logout functionality fully working
+⚠️ PARTIALLY IMPLEMENTED: Password strength requirements present but not comprehensive
+❌ NOT IMPLEMENTED: Two-factor authentication not addressed in this diff
+-------------------
+```
+
+### Supported Version Control Systems
+
+- **Git**: Full support with auto-detection of main/master branches
+- **Mercurial (hg)**: Full support with auto-detection of default branch
 
 n2r in ruby or rails console
 n2r "your question", files:['file1.rb', 'file2.rb'], exception: AnError
@@ -240,4 +324,4 @@ The generated tickets include:
 - Acceptance criteria
 - Story point estimate
 - Priority level
-- Reference to the original Errbit URL
+- Reference to the original Errbit URL# Test change

data/lib/n2b/cli.rb

@@ -46,7 +46,7 @@ module N2B
         requirements_content = File.read(requirements_filepath)
       end
 
-      diff_output = execute_vcs_diff(vcs_type)
+      diff_output = execute_vcs_diff(vcs_type, @options[:branch])
       analyze_diff(diff_output, config, user_prompt_addition, requirements_content)
     end
 
@@ -60,17 +60,139 @@ module N2B
       end
     end
 
-    def execute_vcs_diff(vcs_type)
+    def execute_vcs_diff(vcs_type, branch_option = nil)
       case vcs_type
       when :git
-        `git diff HEAD`
+        if branch_option
+          target_branch = branch_option == 'auto' ? detect_git_default_branch : branch_option
+          if target_branch
+            # Validate that the target branch exists
+            unless validate_git_branch_exists(target_branch)
+              puts "Error: Branch '#{target_branch}' does not exist."
+              puts "Available branches:"
+              puts `git branch -a`.lines.map(&:strip).reject(&:empty?)
+              exit 1
+            end
+
+            puts "Comparing current branch against '#{target_branch}'..."
+            `git diff #{target_branch}...HEAD`
+          else
+            puts "Could not detect default branch, falling back to HEAD diff..."
+            `git diff HEAD`
+          end
+        else
+          `git diff HEAD`
+        end
       when :hg
-        `hg diff`
+        if branch_option
+          target_branch = branch_option == 'auto' ? detect_hg_default_branch : branch_option
+          if target_branch
+            # Validate that the target branch exists
+            unless validate_hg_branch_exists(target_branch)
+              puts "Error: Branch '#{target_branch}' does not exist."
+              puts "Available branches:"
+              puts `hg branches`.lines.map(&:strip).reject(&:empty?)
+              exit 1
+            end
+
+            puts "Comparing current branch against '#{target_branch}'..."
+            `hg diff -r #{target_branch}`
+          else
+            puts "Could not detect default branch, falling back to standard diff..."
+            `hg diff`
+          end
+        else
+          `hg diff`
+        end
       else
         "" # Should not happen if get_vcs_type logic is correct and checked before calling
       end
     end
 
+    def detect_git_default_branch
+      # Try multiple methods to detect the default branch
+
+      # Method 1: Check origin/HEAD symbolic ref
+      result = `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null`.strip
+      if $?.success? && !result.empty?
+        return result.split('/').last
+      end
+
+      # Method 2: Check remote show origin
+      result = `git remote show origin 2>/dev/null | grep "HEAD branch"`.strip
+      if $?.success? && !result.empty?
+        match = result.match(/HEAD branch:\s*(\w+)/)
+        return match[1] if match
+      end
+
+      # Method 3: Check if common default branches exist
+      ['main', 'master'].each do |branch|
+        result = `git rev-parse --verify origin/#{branch} 2>/dev/null`
+        if $?.success?
+          return branch
+        end
+      end
+
+      # Method 4: Fallback - check local branches
+      ['main', 'master'].each do |branch|
+        result = `git rev-parse --verify #{branch} 2>/dev/null`
+        if $?.success?
+          return branch
+        end
+      end
+
+      # If all else fails, return nil
+      nil
+    end
+
+    def detect_hg_default_branch
+      # Method 1: Check current branch (if it's 'default', that's the main branch)
+      result = `hg branch 2>/dev/null`.strip
+      if $?.success? && result == 'default'
+        return 'default'
+      end
+
+      # Method 2: Look for 'default' branch in branch list
+      result = `hg branches 2>/dev/null`
+      if $?.success? && result.include?('default')
+        return 'default'
+      end
+
+      # Method 3: Check if there are any branches at all
+      result = `hg branches 2>/dev/null`.strip
+      if $?.success? && !result.empty?
+        # Get the first branch (usually the main one)
+        first_branch = result.lines.first&.split&.first
+        return first_branch if first_branch
+      end
+
+      # Fallback to 'default' (standard hg main branch name)
+      'default'
+    end
+
+    def validate_git_branch_exists(branch)
+      # Check if branch exists locally
+      result = `git rev-parse --verify #{branch} 2>/dev/null`
+      return true if $?.success?
+
+      # Check if branch exists on remote
+      result = `git rev-parse --verify origin/#{branch} 2>/dev/null`
+      return true if $?.success?
+
+      false
+    end
+
+    def validate_hg_branch_exists(branch)
+      # Check if branch exists in hg branches
+      result = `hg branches 2>/dev/null`
+      if $?.success?
+        return result.lines.any? { |line| line.strip.start_with?(branch) }
+      end
+
+      # If we can't list branches, assume it exists (hg is more permissive)
+      true
+    end
+
     private
 
     def process_natural_language_command(input_text, config)
@@ -387,8 +509,13 @@ JSON_INSTRUCTION
       # This internal JSON parsing is for the *content* of a successful LLM response.
       # The LlmApiError for network/auth issues should be caught before this.
       begin
-        parsed_response = JSON.parse(response_json_str)
-        parsed_response
+        # Check if response_json_str is already a Hash (parsed JSON)
+        if response_json_str.is_a?(Hash)
+          response_json_str
+        else
+          parsed_response = JSON.parse(response_json_str)
+          parsed_response
+        end
       rescue JSON::ParserError => e
         puts "Error parsing LLM response JSON for command generation: #{e.message}"
         # This is a fallback for when the LLM response *content* is not valid JSON.
@@ -490,7 +617,7 @@ JSON_INSTRUCTION
     
 
     def parse_options
-      options = { execute: false, config: nil, diff: false, requirements: nil }
+      options = { execute: false, config: nil, diff: false, requirements: nil, branch: nil }
 
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: n2b [options] [natural language command]"
@@ -503,6 +630,10 @@ JSON_INSTRUCTION
           options[:diff] = true
         end
 
+        opts.on('-b', '--branch [BRANCH]', 'Compare against branch (default: auto-detect main/master)') do |branch|
+          options[:branch] = branch || 'auto'
+        end
+
         opts.on('-r', '--requirements FILE', 'Requirements file for diff analysis') do |file|
           options[:requirements] = file
         end
@@ -526,6 +657,14 @@ JSON_INSTRUCTION
         exit 1
       end
 
+      # Validate option combinations
+      if options[:branch] && !options[:diff]
+        puts "Error: --branch option can only be used with --diff"
+        puts ""
+        puts parser.help
+        exit 1
+      end
+
       options
     end
   end

data/lib/n2b/version.rb

@@ -1,4 +1,4 @@
 # lib/n2b/version.rb
 module N2B
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: n2b
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stefan Nothegger