n2b 0.5.0 → 0.7.1

data/lib/n2b/merge_conflict_parser.rb

@@ -0,0 +1,70 @@
+module N2B
+  # Parses files containing Git or Mercurial merge conflict markers.
+  # Returns an array of ConflictBlock objects with context information.
+  class MergeConflictParser
+    ConflictBlock = Struct.new(
+      :start_line, :end_line,
+      :base_content, :incoming_content,
+      :context_before, :context_after,
+      :base_label, :incoming_label,
+      keyword_init: true
+    )
+
+    DEFAULT_CONTEXT_LINES = 10
+
+    def initialize(context_lines: DEFAULT_CONTEXT_LINES)
+      @context_lines = context_lines
+    end
+
+    def parse(file_path)
+      raise ArgumentError, "File not found: #{file_path}" unless File.exist?(file_path)
+
+      lines = File.readlines(file_path, chomp: true)
+      blocks = []
+      i = 0
+      while i < lines.length
+        line = lines[i]
+        unless line.start_with?('<<<<<<<')
+          i += 1
+          next
+        end
+
+        start_line = i + 1
+        base_label = line.sub('<<<<<<<', '').strip
+        i += 1
+        base_lines = []
+        while i < lines.length && !lines[i].start_with?('=======')
+          base_lines << lines[i]
+          i += 1
+        end
+        i += 1 # skip ======= line
+        incoming_lines = []
+        while i < lines.length && !lines[i].start_with?('>>>>>>>')
+          incoming_lines << lines[i]
+          i += 1
+        end
+        incoming_label = lines[i].sub('>>>>>>>', '').strip if i < lines.length
+        end_line = i + 1
+
+        context_before_start = [start_line - @context_lines - 1, 0].max
+        context_before = lines[context_before_start...(start_line - 1)].join("\n")
+        context_after_end = [end_line + @context_lines - 1, lines.length - 1].min
+        context_after = lines[(end_line)..context_after_end].join("\n")
+
+        blocks << ConflictBlock.new(
+          start_line: start_line,
+          end_line: end_line,
+          base_content: base_lines.join("\n"),
+          incoming_content: incoming_lines.join("\n"),
+          context_before: context_before,
+          context_after: context_after,
+          base_label: base_label,
+          incoming_label: incoming_label
+        )
+        i += 1
+      end
+
+      blocks
+    end
+  end
+end

data/lib/n2b/template_engine.rb

@@ -0,0 +1,105 @@
+module N2B
+  class TemplateEngine
+    def initialize(template, data)
+      @template = template
+      @data = data
+    end
+
+    def render
+      result = @template.dup
+      
+      # Process loops first (they can contain variables)
+      result = process_loops(result)
+      
+      # Process conditionals
+      result = process_conditionals(result)
+      
+      # Process simple variables
+      result = process_variables(result)
+      
+      result
+    end
+
+    private
+
+    def process_loops(content)
+      # Match {#each array_name} ... {/each}
+      content.gsub(/\{#each\s+(\w+)\}(.*?)\{\/each\}/m) do |match|
+        array_name = $1
+        loop_content = $2
+        array_data = @data[array_name] || @data[array_name.to_sym] || []
+        
+        if array_data.is_a?(Array)
+          array_data.map do |item|
+            item_content = loop_content.dup
+
+            # Process conditionals within the loop context
+            if item.is_a?(Hash)
+              # Create temporary data context with item data
+              temp_data = @data.merge(item)
+              temp_engine = TemplateEngine.new(item_content, temp_data)
+              item_content = temp_engine.send(:process_conditionals, item_content)
+
+              # Replace item variables like {description}, {file_reference}
+              item.each do |key, value|
+                item_content.gsub!(/\{#{key}\}/, value.to_s)
+              end
+            else
+              # If item is a string, replace {.} with the item itself
+              item_content.gsub!(/\{\.?\}/, item.to_s)
+            end
+
+            item_content
+          end.join("")
+        else
+          ""
+        end
+      end
+    end
+
+    def process_conditionals(content)
+      # Match {#if condition} ... {#else} ... {/if} or {#if condition} ... {/if}
+      content.gsub(/\{#if\s+(.+?)\}(.*?)(?:\{#else\}(.*?))?\{\/if\}/m) do |match|
+        condition = $1.strip
+        if_content = $2
+        else_content = $3 || ""
+        
+        if evaluate_condition(condition)
+          if_content
+        else
+          else_content
+        end
+      end
+    end
+
+    def process_variables(content)
+      # Replace {variable_name} with actual values
+      content.gsub(/\{(\w+)\}/) do |match|
+        var_name = $1
+        value = @data[var_name] || @data[var_name.to_sym]
+        value.to_s
+      end
+    end
+
+    def evaluate_condition(condition)
+      # Handle conditions like: status == 'IMPLEMENTED'
+      if condition.match(/(\w+)\s*(==|!=)\s*['"]([^'"]+)['"]/)
+        var_name = $1
+        operator = $2
+        expected_value = $3
+        actual_value = @data[var_name] || @data[var_name.to_sym]
+
+        case operator
+        when '=='
+          actual_value.to_s == expected_value
+        when '!='
+          actual_value.to_s != expected_value
+        end
+      else
+        # Simple boolean check
+        var_value = @data[condition] || @data[condition.to_sym]
+        !!var_value
+      end
+    end
+  end
+end

data/lib/n2b/templates/diff_json_instruction.txt

@@ -0,0 +1,27 @@
+CRITICAL: Return ONLY a valid JSON object.
+Do not include any explanatory text before or after the JSON.
+Each error and improvement should include specific file paths and line numbers.
+
+The JSON object must contain the following keys:
+- "summary": (string) Brief overall description of the changes.
+- "ticket_implementation_summary": (string) A concise summary of what was implemented or achieved in relation to the ticket's goals, based *only* on the provided diff. This is for developer status updates and Jira comments.
+- "errors": (list of strings) Potential bugs or issues found.
+- "improvements": (list of strings) Suggestions for code quality, style, performance, or security.
+- "test_coverage": (string) Assessment of test coverage for the changes.
+- "requirements_evaluation": (string, include only if requirements were provided in the prompt) Evaluation of how the changes meet the provided requirements.
+
+Example format:
+{
+  "summary": "Refactored the user authentication module and added password complexity checks.",
+  "ticket_implementation_summary": "Implemented the core logic for user password updates and strengthened security by adding complexity validation as per the ticket's primary goal. Some UI elements are pending.",
+  "errors": [
+    "lib/example.rb line 42: Potential null pointer exception when accessing user.name without checking if user is nil.",
+    "src/main.js lines 15-20: Missing error handling for async operation."
+  ],
+  "improvements": [
+    "lib/example.rb line 30: Consider using a constant for the magic number 42.",
+    "src/utils.py lines 5-10: This method could be simplified using list comprehension."
+  ],
+  "test_coverage": "Good: New functionality in lib/example.rb has corresponding tests in test/example_test.rb. Missing: No tests for error handling edge cases in the new validation method.",
+  "requirements_evaluation": "✅ IMPLEMENTED: User authentication feature is fully implemented in auth.rb. ⚠️ PARTIALLY IMPLEMENTED: Error handling is present but lacks specific error codes. ❌ NOT IMPLEMENTED: Email notifications are not addressed in this diff."
+}

data/lib/n2b/templates/diff_system_prompt.txt

@@ -0,0 +1,23 @@
+You are a senior software developer reviewing a code diff.
+Your task is to provide a constructive and detailed analysis of the changes.
+Focus on identifying potential bugs, suggesting improvements in code quality, style, performance, and security.
+Also, provide a concise summary of the changes.
+
+IMPORTANT: When referring to specific issues or improvements, always include:
+- The exact file path (e.g., "lib/n2b/cli.rb")
+- The specific line numbers or line ranges (e.g., "line 42" or "lines 15-20")
+- The exact code snippet you're referring to when possible
+
+This helps users quickly locate and understand the issues you identify.
+
+SPECIAL FOCUS ON TEST COVERAGE:
+Pay special attention to whether the developer has provided adequate test coverage for the changes:
+- Look for new test files or modifications to existing test files
+- Check if new functionality has corresponding tests
+- Evaluate if edge cases and error conditions are tested
+- Assess if the tests are meaningful and comprehensive
+- Note any missing test coverage that should be added
+
+NOTE: In addition to the diff, you will also receive the current code context around the changed areas.
+This provides better understanding of the surrounding code and helps with more accurate analysis.
+The user may provide additional instructions or specific requirements below.

data/lib/n2b/templates/jira_comment.txt

@@ -0,0 +1,67 @@
+*N2B Code Analysis Report*
+=========================
+
+*Implementation Summary:*
+{implementation_summary}
+
+---
+
+*Automated Analysis Findings:*
+
+{expand:🚨 Critical Issues (Must Fix Before Merge)}
+{#each critical_errors}
+☐ {file_reference} - {description}
+{/each}
+{#if critical_errors_empty}
+✅ No critical issues found
+{/if}
+{expand}
+
+{expand:⚠️ Important Issues (Should Address)}
+{#each important_errors}
+☐ {file_reference} - {description}
+{/each}
+{#if important_errors_empty}
+✅ No important issues found
+{/if}
+{expand}
+
+{expand:💡 Suggested Improvements (Nice to Have)}
+{#each improvements}
+☐ {file_reference} - {description}
+{/each}
+{#if improvements_empty}
+ℹ️ No specific improvements suggested
+{/if}
+{expand}
+
+{expand:🧪 Test Coverage Assessment}
+*Overall Assessment:* {test_coverage_summary}
+
+*Missing Test Coverage:*
+{#each missing_tests}
+☐ {description}
+{/each}
+{#if missing_tests_empty}
+✅ Test coverage appears adequate
+{/if}
+{expand}
+
+*📋 Requirements Evaluation:*
+{#each requirements}
+{#if status == 'IMPLEMENTED'}
+☑ ✅ *IMPLEMENTED:* {description}
+{/if}
+{#if status == 'PARTIALLY_IMPLEMENTED'}
+☐ ⚠️ *PARTIALLY IMPLEMENTED:* {description}
+{/if}
+{#if status == 'NOT_IMPLEMENTED'}
+☐ ❌ *NOT IMPLEMENTED:* {description}
+{/if}
+{#if status == 'UNCLEAR'}
+☐ 🔍 *UNCLEAR:* {description}
+{/if}
+{/each}
+
+---
+*Analysis completed on {timestamp} | Branch: {branch_name} | Files changed: {files_changed} | Lines: +{lines_added} -{lines_removed}*

data/lib/n2b/templates/merge_conflict_prompt.txt

@@ -0,0 +1,20 @@
+You are a merge assistant. Combine the following conflict into a single version and explain your reasoning briefly.
+
+FULL FILE CONTENT FOR CONTEXT:
+{full_file_content}
+
+CONFLICT TO RESOLVE:
+Context before:
+{context_before}
+
+<<<<<<< {base_label}
+{base_content}
+=======
+{incoming_content}
+>>>>>>> {incoming_label}
+
+Context after:
+{context_after}
+{user_comment}
+
+Respond in JSON with keys "merged_code" and "reason".

data/lib/n2b/version.rb

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

data/lib/n2b.rb

@@ -12,6 +12,9 @@ require 'n2b/llm/gemini'
 require 'n2b/errors' # Load custom errors
 require 'n2b/base'
 require 'n2b/cli'
+require 'n2b/merge_conflict_parser'
+require 'n2b/merge_cli'
+require 'n2b/template_engine'
 
 require 'n2b/irb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n2b
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Stefan Nothegger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,18 +52,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: A tool to convert natural language instructions to bash commands using
-  Claude API or OpenAI's GPT. also is q quick helper in the console to provide ruby
-  code snippets and explanations or debug exceptions.
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: 'N2B is a comprehensive AI-powered development toolkit that enhances
+  your daily workflow with smart merge conflict resolution, interactive Jira ticket
+  analysis, and intelligent code diff analysis. Features include: AI-assisted merge
+  conflicts with editor integration, interactive Jira templates with checklists, automatic
+  VCS resolution marking, JSON auto-repair, and multi-LLM support (OpenAI, Claude,
+  Gemini, OpenRouter, Ollama).'
 email:
 - stefan@kaproblem.com
 executables:
 - n2b
+- n2b-diff
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/n2b
+- bin/n2b-diff
 - bin/n2b-test-jira
 - lib/n2b.rb
 - lib/n2b/base.rb
@@ -77,7 +96,14 @@ files:
 - lib/n2b/llm/ollama.rb
 - lib/n2b/llm/open_ai.rb
 - lib/n2b/llm/open_router.rb
+- lib/n2b/merge_cli.rb
+- lib/n2b/merge_conflict_parser.rb
 - lib/n2b/model_config.rb
+- lib/n2b/template_engine.rb
+- lib/n2b/templates/diff_json_instruction.txt
+- lib/n2b/templates/diff_system_prompt.txt
+- lib/n2b/templates/jira_comment.txt
+- lib/n2b/templates/merge_conflict_prompt.txt
 - lib/n2b/version.rb
 homepage: https://github.com/stefan-kp/n2b
 licenses:
@@ -86,6 +112,7 @@ metadata:
   source_code_uri: https://github.com/stefan-kp/n2b
   changelog_uri: https://github.com/stefan-kp/n2b/blob/main/CHANGELOG.md
   documentation_uri: https://github.com/stefan-kp/n2b/blob/main/README.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -101,8 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
-summary: Convert natural language to bash commands or ruby code and help with debugging.
+summary: AI-powered development toolkit with merge conflict resolution and Jira integration
 test_files: []