llm_fixer 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ad882d017de42f02930ba978b352b1fd1b089095b5de7fdbd6aadebce6e574
-  data.tar.gz: 9cde3148d984a28e3366a5b837e93a0f919d9d30dfe28cc16e444ea550a07985
+  metadata.gz: cb73fbc33ad7bb58e87e339fd4bb0a04df64f38902f5aea2729753d7db090644
+  data.tar.gz: db8767bcb98be1c1421e133bbe988e12a77892925eaa24701afc8c59760759e3
 SHA512:
-  metadata.gz: db7fe05f51c1cc138e993bae90ca6cbfcd0e3c125309ca82bc302d16e6f4448fe409e4afc82b015c9e8319332abf77aec869f7cbf331218d7c166d2d516b97aa
-  data.tar.gz: ccc4e7d472cb87840daa4e9db929bab22cfa510649945e94d7f9d09217f6e416de20ae77683962db359296bbb232377a7de0488a4d912ccc4abb3206bfcec58a
+  metadata.gz: 61d7ffdc4b0f9f9fd2b916d116c7dab2a8800a3dda4b00c996fc11cbc3084922e58fc9e382cb2bd9c0b78212b4b9a3a3e80f5d26c4e35e025fd68e522b2baf96
+  data.tar.gz: acc8fec0fb87c8fe25dd5636827881a6848284277b1c53f625c126348c8bb8a52887b234de04825b3b5a8302da28217b8492a4a5a26a5a080f9719ed4c7525ef

data/.rspec

@@ -0,0 +1,3 @@
+--require spec_helper
+--format documentation
+--color 

data/.rspec_status

@@ -0,0 +1,12 @@
+example_id                                              | status | run_time        |
+------------------------------------------------------- | ------ | --------------- |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:1:1:1] | passed | 0.01216 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:1:2:1] | passed | 0.0065 seconds  |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:1:2:2] | passed | 0.00644 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:1:3:1] | passed | 0.00635 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:2:1]   | passed | 0.00056 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:2:2]   | passed | 0.00033 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:3:1]   | passed | 0.00156 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:3:2]   | passed | 0.00018 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:4:1:1] | passed | 0.00012 seconds |
+./spec/llm_fixer/static_analysis_fixer_spec.rb[1:4:2:1] | passed | 0.00015 seconds |

data/.rubocop.yml

@@ -19,8 +19,18 @@ AllCops:
     - "config/**/*"
     - "db/**/*"
     - "deploy/**/*"
+    - "llm_fixer.gemspec"
   NewCops: enable
 
 Rails/Output:
   Enabled: false
   AutoCorrect: false
+
+Rails/Exit:
+  Enabled: false
+
+Metrics/BlockLength:
+  Max: 150
+
+Layout/LineLength:
+  Max: 125

data/Gemfile

@@ -11,3 +11,5 @@ gem 'rubocop-rails'
 gem 'rubocop-rspec'
 gem 'rubocop-rspec_rails'
 gem 'rubocop-performance'
+gem 'vcr'
+gem 'webmock'

data/Gemfile.lock

@@ -22,6 +22,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.2.0)
     benchmark (0.4.0)
@@ -31,6 +33,9 @@ GEM
     colorize (1.1.0)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
+    crack (1.0.0)
+      bigdecimal
+      rexml
     diff-lcs (1.6.0)
     drb (2.2.1)
     event_stream_parser (1.0.0)
@@ -42,6 +47,7 @@ GEM
       multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
+    hashdiff (1.1.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     json (2.9.1)
@@ -62,10 +68,12 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
+    public_suffix (6.0.1)
     racc (1.8.1)
     rack (3.1.11)
     rainbow (3.1.1)
     regexp_parser (2.10.0)
+    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -117,6 +125,12 @@ GEM
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.3)
+    vcr (6.3.1)
+      base64
+    webmock (3.25.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   arm64-darwin-23
@@ -132,6 +146,8 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   rubocop-rspec_rails
+  vcr
+  webmock
 
 BUNDLED WITH
    2.6.2

data/README.md

@@ -2,41 +2,41 @@
 
 # LLM fixer
 
-静的解析エラーを自動的に修正するツールです。
+A tool that automatically fixes static analysis errors.
 
-## インストール
+## Installation
 
-Gemfile に以下を追加します:
+Add this line to your Gemfile:
 
 ```ruby
 gem 'llm_fixer'
 ```
 
-そして以下を実行します:
+And then execute:
 
 ```bash
 $ bundle install
 ```
 
-または、以下のようにインストールします:
+Or install it yourself as:
 
 ```bash
 $ gem install llm_fixer
 ```
 
-## 環境変数
+## Environment Variables
 
-以下の環境変数を使用して動作をカスタマイズできます:
+You can customize the behavior using the following environment variables:
 
-- `LLM_API_KEY` : LLM API キー
-- `LLM_API_BASE` : LLM API のベース URL
-- `LLM_MODEL` : 使用する LLM モデル
+- `LLM_API_KEY` : LLM API key
+- `LLM_API_BASE` : Base URL for the LLM API
+- `LLM_MODEL` : LLM model to use
 
-## 使用方法
+## Usage
 
-環境変数を設定します:
+Set the environment variables:
 
-### ChatGPT
+ChatGPT
 
 ```bash
 export LLM_API_KEY="your-api-key-here"
@@ -44,7 +44,7 @@ export LLM_API_BASE="https://api.openai.com/v1"
 export LLM_MODEL="gpt-4o"
 ```
 
-### Google Gemini
+Google Gemini
 
 ```bash
 export LLM_API_KEY="your-api-key-here"
@@ -52,13 +52,28 @@ export LLM_API_BASE="https://generativelanguage.googleapis.com/v1beta"
 export LLM_MODEL="gemini-2.0-pro-exp"
 ```
 
-### 実行
+Local(LM Studio)
 
-静的解析ツールコマンド（例：RuboCop）を実行します:
+```bash
+export LLM_API_KEY="n/a"
+export LLM_API_BASE="http://localhost:1234"
+export LLM_MODEL="tinyswallow-1.5b-instruct"
+```
+
+##
+
+Run your static analysis tool command (e.g., RuboCop):
 
 ```bash
 llm_fixer fix your-lint-or-test-command path/to/target
 
-# Rubocop例
+# RuboCop example
 llm_fixer fix bundle exec rubocop path/to/target.rb
+
+# With additional prompt to guide the LLM
+llm_fixer fix --additional-prompt "Follow the style guide and use double quotes" bundle exec rubocop path/to/target.rb
+# or using the short form
+llm_fixer fix -a "Follow the style guide and use double quotes" bundle exec rubocop path/to/target.rb
 ```
+
+The `--additional-prompt` (or `-a`) option allows you to provide additional instructions to the LLM when fixing errors. This can be useful when you want to customize the style or approach used for fixes.

data/bin/llm_fixer

@@ -5,8 +5,7 @@ require 'thor'
 require_relative '../lib/llm_fixer/static_analysis_fixer'
 
 class CLI < Thor
-  desc 'fix COMMAND [ARGS...]', 'Static analysis errors are automatically fixed by LLM'
-  method_option :command, type: :string, required: false
+  desc 'fix [--additional-prompt TEXT | -a TEXT] COMMAND [ARGS...]', 'Static analysis errors are automatically fixed by LLM'
   
   def fix(*args)
     %w[LLM_API_BASE LLM_MODEL LLM_API_KEY].each do |key|
@@ -16,16 +15,29 @@ class CLI < Thor
       end
     end
     
-
-    puts "args: #{args.inspect}"
-    if args.empty?
-      puts 'Usage: llm_fixer fix COMMAND [ARGS...]'
+    additional_prompt = nil
+    command_args = args.dup
+    
+    if command_args[0] == '--additional-prompt' || command_args[0] == '-a'
+      command_args.shift
+      additional_prompt = command_args.shift
+      if additional_prompt.nil? || additional_prompt.empty?
+        puts 'ERROR: Additional prompt option requires a value'
+        exit 1
+      end
+    end
+    
+    puts "args: #{command_args.inspect}"
+    if command_args.empty?
+      puts 'Usage: llm_fixer fix [--additional-prompt TEXT | -a TEXT] COMMAND [ARGS...]'
       exit 1
     end
 
-    puts "command: #{args.join(' ')}"
+    puts "command: #{command_args.join(' ')}"
+    puts "additional prompt: #{additional_prompt}" if additional_prompt
+    
     fixer = LlmFixer::StaticAnalysisFixer.new(ENV.fetch('LLM_API_KEY', nil))
-    success = fixer.fix_file(args)
+    success = fixer.fix_file(command_args, additional_prompt)
     exit(1) unless success
   end
 

data/bump_new_version.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  echo "Usage: $0 <version>"
+  exit 1
+fi
+
+# ~/.gem/credentials
+if [ ! -f ~/.gem/credentials ]; then
+  echo "Error: ~/.gem/credentials not found. Please set up your RubyGems credentials."
+  exit 1
+fi
+
+PROJECT_NAME="llm_fixer"
+GITHUB_REPO="kaibadash/llm_fixer"
+VERSION=$1
+echo "Start bumping version: $VERSION"
+
+# Publish
+# Add release branch
+git checkout master
+git checkout -b release/$VERSION
+sed -i '' "s/VERSION = \".*\"/VERSION = \"$VERSION\"/" lib/$PROJECT_NAME/version.rb
+git commit -am "Bump version $VERSION"
+
+# Publish to rubygems
+gem build $PROJECT_NAME.gemspec
+bundle install
+gem push $PROJECT_NAME-$VERSION.gem
+
+# GitHub release
+git tag $VERSION
+git push --tags
+open https://github.com/$GITHUB_REPO/releases/new
+
+# merge to master
+git checkout master
+git merge release/$VERSION
+

data/lib/llm_fixer/static_analysis_fixer.rb

@@ -3,7 +3,6 @@
 require "openai"
 require "open3"
 require "tempfile"
-require "pry"
 require "erb"
 require "colorize"
 require "ostruct"
@@ -23,7 +22,7 @@ module LlmFixer
       puts "LLM model: #{@model}"
     end
 
-    def fix_file(args)
+    def fix_file(args, additional_prompt = nil)
       command = args.join(" ")
       output, succeeded = run_command(command)
       if succeeded
@@ -36,7 +35,7 @@ module LlmFixer
       return false unless file_path
 
       # Request correction from LLM
-      result = generate_fix(file_path, command, output)
+      result = generate_fix(file_path, command, output, additional_prompt)
       return false unless result
 
       File.write(file_path, result)
@@ -68,10 +67,9 @@ module LlmFixer
       [output, succeeded]
     end
 
-    # rubocop:disable Metrics/MethodLength
-    def generate_fix(file_path, command, error_output)
+    def generate_fix(file_path, command, error_output, additional_prompt = nil)
       file_content = File.read(file_path)
-      messages = build_messages(file_path, command, error_output, file_content)
+      messages = build_messages(file_path, command, error_output, file_content, additional_prompt)
       puts messages
       full_response = ""
       puts "===== Start generating fix ====="
@@ -88,16 +86,13 @@ module LlmFixer
 
       full_response.strip!
       # remove markdown syntax
-      if full_response.start_with?("```")
-        full_response = "#{full_response.split("\n")[1..-2].join("\n")}\n"
-      end
+      full_response = "#{full_response.split("\n")[1..-2].join("\n")}\n" if full_response.start_with?("```")
       puts full_response
       puts "===== End generating fix ====="
       full_response
     end
-    # rubocop:enable Metrics/MethodLength
 
-    def build_messages(file_path, command, error_output, file_content)
+    def build_messages(file_path, command, error_output, file_content, additional_prompt = nil)
       templates = {
         system: "fix_prompt_system.erb",
         user: "fix_prompt_user.erb",
@@ -107,7 +102,9 @@ module LlmFixer
       b = binding
       system_template = ERB.new(File.read(File.join(File.dirname(__FILE__),
                                                     "../templates/#{templates[:system]}")))
-      messages << { role: "system", content: system_template.result(b) }
+      system_content = system_template.result(b)
+      system_content += "\n#{additional_prompt}" if additional_prompt
+      messages << { role: "system", content: system_content }
       user_template = ERB.new(File.read(File.join(File.dirname(__FILE__),
                                                   "../templates/#{templates[:user]}")))
       messages << { role: "user", content: user_template.result(b) }

data/lib/llm_fixer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LlmFixer
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: llm_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - kaiba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,6 +52,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool that uses LLM to automatically fix errors detected by static analysis
   tools (such as RuboCop).
 email:
@@ -61,6 +131,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
+- ".rspec_status"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -68,11 +140,11 @@ files:
 - README.md
 - Rakefile
 - bin/llm_fixer
+- bump_new_version.sh
 - lib/llm_fixer/static_analysis_fixer.rb
 - lib/llm_fixer/version.rb
 - lib/templates/fix_prompt_system.erb
 - lib/templates/fix_prompt_user.erb
-- sample/sample_spec.rb
 homepage: https://github.com/kaibadash/llm_fixer
 licenses:
 - MIT

data/sample/sample_spec.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "基本的な算術演算" do
-  let!(:result) { 1 + 1 }
-  describe "足し算" do
-    it "1 + 1 は 2 になること" do
-      expect(1 + 1).to eq(result)
-    end
-  end
-end