utils 0.97.0 → 0.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088f06f0b7afc673dfe77ddc10735e335adc01e5a2123162fc518be1f16d233e'
-  data.tar.gz: 9a4b0425541b6f7ef5174a4fa31fb6f582014de7e5f5f158d69b2dedc169fd7c
+  metadata.gz: 7232e4cf01c7018df6fc5f06172fe53c7677e573240b2309d37d7ce5063d9102
+  data.tar.gz: 4374f2832d691ae845a5c9dc578f6ec5c0fe707dbfb5341f1a1f3698dd7a8566
 SHA512:
-  metadata.gz: 9a66320d7a7b3cd863660fb3e4f2944631c0340ffb3e16f1c35afc6b00505f124956ba23bfb7f2b4d7b46563074b0201a039dbfc52aef5ba0864fab85b1ccdb2
-  data.tar.gz: d193b6d96ad83d2f8846746a69f72318d817d3a8560edddb551d35a022b5267be23fa8c997b626a738dae9a6c7d17f7d2a4be39b0852fb4e762923e3b8284850
+  metadata.gz: 3b0ba498ca1c5f16060af527eb3c6a2f71b42fd21cebe35c54186cce18bb6cb5e324988bb2d8b28cfb0ddc1ef24e3a33b57d6c79efbf9a1465b1f5fbd758873a
+  data.tar.gz: b21168e8c5863a9552a689d0640793f89a229d1c5bca776e9d77c84472cba816d4614d9639003d6818008127d894575f6d6660e35cd6855d9107a62036ee8090

data/README.md

@@ -100,9 +100,16 @@ gem install utils
 - **`serve`** - Simple HTTP server launcher
 - **`ssh-tunnel`** - Create SSH tunnel to remote host
 
+### ⌨️ Interactive
+
+- **`irb_client`** - Send code to a running IRB server for evaluation and
+  execution (start the server with `irb_server` in the session)
+
 ### 🎨 Slacking
 
 - **`ascii7`** - Generate ASCII art from text
+- **`charpick`** - Fuzzy-search Unicode characters by name and copy the
+  glyph to the clipboard
 - **`enum`** - Enumerate files and directories with line counts
 - **`rainbow`** - Display rainbow-colored banner text
 

data/bin/changes

@@ -15,13 +15,13 @@
 #   - Configuration files in ~/.config/changes/
 #     - system.txt: System prompt for LLM
 #     - prompt.txt: Template for changelog generation
-#     - client.json: Ollama client settings
-#     - options.json: Generation options (temperature, etc.)
 #
 # Environment variables:
 #   OLLAMA_URL:  Base URL of Ollama server OR
 #   OLLAMA_HOST: Host of Ollama server
 #   OLLAMA_MODEL: Model to use (default: llama3.1)
+#   OLLAMA_CLIENT: JSON client configuration
+#   OLLAMA_MODEL_OPTIONS: JSON model options
 #   XDG_CONFIG_HOME: Custom config directory location
 #   DEBUG: Set to 1 for verbose output
 
@@ -111,7 +111,7 @@ def compute_change(range_from, range_to, future_tag: range_to)
   model         = ENV.fetch('OLLAMA_MODEL', 'llama3.1')
   system        = config.read('system.txt')
   prompt        = config.read('prompt.txt') + "\n\n#{log}\n"
-  client_config = Client::Config.load_from_json(config + 'client.json')
+  client_config = Client::Config[**JSON.parse(ENV.fetch('OLLAMA_CLIENT', '{}'))]
   client_config.base_url = base_url
 
   if ENV['DEBUG'].to_i == 1
@@ -120,7 +120,7 @@ def compute_change(range_from, range_to, future_tag: range_to)
   end
 
   ollama  = Client.configure_with(client_config)
-  options = Options.load_from_json "#{config}/options.json"
+  options = Options.from_hash(JSON.parse(ENV.fetch('OLLAMA_MODEL_OPTIONS', '{}')))
   changes = ollama.generate(model:, system:, prompt:, options:, stream: false, think: false)
   changes = changes.response.gsub(/\t/, '  ')
 

data/bin/charpick

@@ -8,7 +8,7 @@
 #
 # Usage:
 #   charpick               # interactive search
-#   charpick rightarrow    # pre-fill the search field
+#   charpick rightwarrow   # pre-fill the search field
 #
 # Requires the search_ui (>= 0.2), amatch, and tins gems.
 
@@ -42,8 +42,6 @@ module Charpick
   end
 
   # Downloads the UCD character database into the cache directory.
-  #
-  # @return [ void ]
   def self.download
     uri = URI(DATA_URL)
     Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
@@ -98,14 +96,14 @@ selected = SearchUI::Search.new(
   match: -> answer {
     return [] if answer.empty?
     matcher = Amatch::PairDistance.new(answer.downcase)
-    entries.map { |entry| [ entry, matcher.similar(entry.name) ] }
+    entries.map { |entry| [ entry, matcher.similar(entry.name, ?-) ] }
       .select { |_, score| score > 0 }
       .sort_by { |_, score| -score }
       .first(limit)
       .map(&:first)
   },
   query: -> _answer, matches, selector {
-    return 'Type to search names (e.g. "rightarrow").' if matches.empty?
+    return 'Type to search names (e.g. "rightwarrow").' if matches.empty?
     matches.each_with_index.map do |entry, i|
       line = "%s  U+%04X  %s" % [ entry.char, entry.codepoint, entry.name ]
       i == selector ? "→ " + SearchUI::Search.on_blue(line) : "  " + line

data/bin/code_comment

@@ -16,12 +16,13 @@
 #   - Configuration files in ~/.config/code_comment/
 #     - system.txt: System prompt for LLM
 #     - prompt.txt: Template for comment generation
-#     - client.json: Ollama client settings
-#     - options.json: Generation options (temperature, etc.)
+#
 #
 # Environment variables:
 #   OLLAMA_URL: Base URL of Ollama server
 #   OLLAMA_MODEL: Model to use (default: llama3.1)
+#   OLLAMA_CLIENT: JSON client configuration
+#   OLLAMA_MODEL_OPTIONS: JSON model options
 #   XDG_CONFIG_HOME: Custom config directory location
 #   DEBUG: Set to 1 for verbose output and debug.log creation
 #
@@ -254,10 +255,10 @@ default_options = JSON(
   min_p: 0.1,
 )
 
-client_config = Client::Config.load_from_json $config_dir + 'client.json'
+client_config = Client::Config[**JSON.parse(ENV.fetch('OLLAMA_CLIENT', '{}'))]
 client_config.base_url = base_url
 ollama  = Client.configure_with(client_config)
-options = JSON.parse($config_dir.read('options.json', default: default_options))
+options = Options.from_hash(JSON.parse(ENV.fetch('OLLAMA_MODEL_OPTIONS', default_options)))
 
 if ENV['DEBUG'].to_i == 1
   File.open('debug.log', ?w) do |log|

data/bin/code_indexer

@@ -14,7 +14,7 @@ config.code_indexer.formats.each do |format, output|
   puts "Indexing code for #{format}…"
   case format
   when 'ctags'
-    cmd = [ 'ctags', '-f', output, '--exclude=pkg', '-R' ]
+    cmd = [ 'ctags', '-f', output, '--sort=no', '--exclude=pkg', '-R' ]
     config.code_indexer.verbose and cmd << '--verbose'
   when 'cscope'
     cmd = [ 'starscope', '-e', format, '-f', output, '--no-read' ]

data/bin/commit_message

@@ -10,7 +10,7 @@
 #
 # The script automatically:
 # - Determines current git branch name
-# - Loads configuration files (client.json, options.json, system.txt, prompt.txt)
+# - Loads configuration files (system.txt, prompt.txt)
 # - Generates commit message using ollama_cli with the current diff as input
 #
 # Requirements:
@@ -20,10 +20,12 @@
 # - Configuration files in $XDG_CONFIG_HOME/commit_message/
 #
 # Configuration files:
-# - client.json: Ollama API client configuration
-# - options.json: Generation options  
 # - system.txt: System prompt for AI model
 # - prompt.txt: Commit message template, contains %{branch} and %{stdin}
+#
+# Environment variables (used by ollama_cli):
+# - OLLAMA_CLIENT: JSON client configuration
+# - OLLAMA_MODEL_OPTIONS: JSON model options
 
 require 'utils'
 include Utils::XDG
@@ -31,6 +33,6 @@ include Utils::XDG
 config = XDG_CONFIG_HOME + 'commit_message'
 
 branch = `git rev-parse --abbrev-ref HEAD`.chomp
-exec 'ollama_cli', '-c', config + 'client.json',
-  '-M', config + 'options.json', '-P', "branch=#{branch}",
+exec 'ollama_cli',
+  '-P', "branch=#{branch}",
   '-s', config + 'system.txt', '-p', config + 'prompt.txt'

data/bin/irb_client

@@ -1,4 +1,13 @@
 #!/usr/bin/env ruby
+#
+# irb_client — interact with a running IRB session remotely.
+#
+# Start the server by typing `irb_server` in your IRB session (provided by
+# require 'utils/irb'). Then send code snippets from the command line:
+#
+#   echo '2 + 2' | irb_client eval_snippet    # => 4
+#   echo 'puts "hi"' | irb_client execute_snippet
+#   irb_client stop_server
 
 require 'utils/irb'
 include Utils::IRB

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.97.0'
+  VERSION         = '0.99.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.97.0 ruby lib
+# stub: utils 0.99.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.97.0".freeze
+  s.version = "0.99.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/flori/utils".freeze
   s.licenses = ["GPL-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Utils - Some useful command line utilities".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "4.0.17".freeze
+  s.rubygems_version = "4.0.20".freeze
   s.summary = "Some useful command line utilities".freeze
   s.test_files = ["tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.97.0
+  version: 0.99.0
 platform: ruby
 authors:
 - Florian Frank
@@ -432,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Some useful command line utilities
 test_files: