utils 0.70.0 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ceaf5765e54421ff1940fb7f39c2e46a40ae1f3886b31490da70780e810cdf6
-  data.tar.gz: 3b1df5558bb1a352778b8c747a4a1085951a16e4dc33050a2d14ce5353402ad6
+  metadata.gz: fb43a2fb980621c39c8dd83850e3b7752d3b8b2697d169d155ee2d541e9d4649
+  data.tar.gz: b804d7973f33d5ce1a8904d96d9b11b7e1560f73fd18facd6e0d1011de95b8a8
 SHA512:
-  metadata.gz: a1318e0a95615867bdaff12d8a5fd88e9e8329ab997585a804e7e8f160b7ff303d33101b9f43b055ec6bbc30c93ba9c915f9e5c3c29f4d45c876377b7269225c
-  data.tar.gz: 6f064a83362f4e5053fb3dbb37ab1331b00865707139cc880e08f2230fac2c95bb16184814e707c8f88f87a08aa3f13b3d432cac6e706443c4feeb12a51f5c59
+  metadata.gz: 6214647c846b302c6ae3a02f4c58dd1520a58e5d61f6f7b9a5060d90d16c8663eae861ae866c43f5e70c01e3794a8376efccdd942e282efeaa3e130ee83d418b
+  data.tar.gz: 1a1e7c14221af1f4a72d0c94fa81915fd512378e62bd8981299e4ab697fb5a664c293387a96d368322ca75da30ac3f437dfb215c7a3bd45496100ae7f41ce602

data/Rakefile

@@ -31,6 +31,7 @@ GemHadar do
   dependency 'ollama-ruby',    '~> 1.5.0'
   dependency 'kramdown-ansi',  '~> 0.0.1'
   dependency 'figlet',         '~> 1.0'
+  dependency 'context_spook',  '~> 0.2'
   dependency 'simplecov'
   dependency 'debug'
   development_dependency 'test-unit'

data/bin/code_comment

@@ -32,6 +32,7 @@
 require 'ollama'
 include Ollama
 require 'utils'
+require 'context_spook'
 
 META_METHOD = /(
   (class_)?                   # Optional "class_" prefix
@@ -79,11 +80,11 @@ def fetch_construct(filename_linenumber)
   return result, :method
 end
 
-def build_method_prompt(construct_type, construct, file_contents)
+def build_method_prompt(construct_type, construct, context)
   default_prompt = <<~EOT
     Look at this code to document it:
 
-    %{file_contents}
+    %{context}
 
     Here's an example for how you should document a %{construct_type}.
 
@@ -118,15 +119,15 @@ def build_method_prompt(construct_type, construct, file_contents)
     5. Start each line of your comment with a single # character.
   EOT
   $config.read('method-prompt.txt', default: default_prompt) % {
-    construct_type:, construct:, file_contents:,
+    construct_type:, construct:, context:,
   }
 end
 
-def build_class_module_prompt(construct_type, construct, file_contents)
+def build_class_module_prompt(construct_type, construct, context)
   default_prompt = <<~EOT
     Look at this code to document it:
 
-    %{file_contents}
+    %{context}
 
     Here's an example for how you should document a %{construct_type}.
 
@@ -154,16 +155,16 @@ def build_class_module_prompt(construct_type, construct, file_contents)
     5. Start each line of your comment with a single # character.
   EOT
   $config.read('class-module-prompt.txt', default: default_prompt) % {
-    construct_type:, construct:, file_contents:,
+    construct_type:, construct:, context:,
   }
 end
 
-def build_prompt(construct_type, construct, file_contents)
+def build_prompt(construct_type, construct, context)
   case construct_type
   when :method
-    build_method_prompt(construct_type, construct, file_contents)
+    build_method_prompt(construct_type, construct, context)
   when :class, :module
-    build_class_module_prompt(construct_type, construct, file_contents)
+    build_class_module_prompt(construct_type, construct, context)
   else
     fail "unknown construct_type #{construct_type.inspect}"
   end
@@ -171,12 +172,28 @@ end
 
 filename_linenumber = ARGV.shift or fail "require file_name as second argument"
 $config             = Utils::ConfigDir.new('code_comment', env_var: 'XDG_CONFIG_HOME')
-files               = Dir['{lib,spec,test}/**/*.rb']
 base_url            = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
 model               = ENV.fetch('OLLAMA_MODEL', 'llama3.1')
 construct, construct_type = fetch_construct(filename_linenumber)
 construct_indent          = construct[/\A( *)/, 1].size
-file_contents = files.map { _1 + ":\n" + File.read(_1) } * ?\n
+context = if File.exist?(filename = 'contexts/code_comment.rb')
+            ContextSpook.generate_context(filename)
+          else
+            ContextSpook.generate_context do
+              context do
+                file "README.md", tags: %w[ documentation ]
+
+                # Auto-discover files using globs
+                %w[ lib spec test ].each do |dir|
+                  namespace dir do
+                    Dir["#{dir}/**/*.rb"].each do |filename|
+                      file filename, tags: %w[ ruby ]
+                    end
+                  end
+                end
+              end
+            end
+          end.to_json
 #call_sites          = %x(cscope -L -3 "#{method_name}" $(find . -name '*.rb') | awk '{ print $1 ":" $3 }').lines.map(&:chomp).uniq
 #methods             = call_sites.map { fetch_method(_1) } * ?\n
 
@@ -201,7 +218,7 @@ default_system = <<~EOT
 EOT
 system = $config.read('system.txt', default: default_system)
 
-prompt = build_prompt(construct_type, construct, file_contents)
+prompt = build_prompt(construct_type, construct, context)
 
 default_options = JSON(
   #repeat_penalty: 1.8,

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.70.0'
+  VERSION         = '0.71.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.70.0 ruby lib
+# stub: utils 0.71.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.70.0".freeze
+  s.version = "0.71.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.5.0".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0.1".freeze])
   s.add_runtime_dependency(%q<figlet>.freeze, ["~> 1.0".freeze])
+  s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 0.2".freeze])
   s.add_runtime_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<debug>.freeze, [">= 0".freeze])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.71.0
 platform: ruby
 authors:
 - Florian Frank
@@ -205,6 +205,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: context_spook
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement