utils 0.83.1 → 0.85.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0f4166083f3cce6f4abaed9d0369a817ac9eccdfb9dd4897d6c343963f52b3
-  data.tar.gz: 6d939dd9edde41c199009bc919f7af991d340a5b02767b052594d74ffd403f75
+  metadata.gz: 3fd913953f77f177caac61d9a98e615eaba79f5aad327b892a8728d510443b3f
+  data.tar.gz: d8f2937862ac26cffa7a4d3244155354b33e587d0fc6cecacedbf6539845bbf4
 SHA512:
-  metadata.gz: 4a253a744822c2060d4b05ef821729082c5d6cfbe7c673b92eacfbf15c088f350a31f3581d10085a8041bf851a2110489f7a8028819bb2ccfb0dc06e00c800c4
-  data.tar.gz: bdaca26ed245d8bb6773a0aa6c930228b5994e04983723bf6c4457ddc4436440137f13d06c5b422cf8929ac10b71cde52d61776bdc7fa5a320f30c71a36fcf8c
+  metadata.gz: cc3e00dd0c01f36a2835f74c490f2b35cb8d64b7d4197d49d7c3ae09e247ea3d6067483d34facbdc40c19018516e7a368ddfeb4a38e26efc6d8cf460a8785e4a
+  data.tar.gz: 566f70210d3ff85d8798cc2876371e49c86d2ec959fa11f76a6ecc6e546819953878fcabc53e210de8c1b024dab9d61863f86f5c415fcb02551fe0f79420b8de

data/Rakefile

@@ -26,7 +26,8 @@ GemHadar do
   dependency 'pstree',         '~> 0.3'
   dependency 'infobar',        '~> 0.8'
   dependency 'mize',           '~> 0.6'
-  dependency 'search_ui',      '~> 0.0'
+  dependency 'amatch',         '~> 0.6'
+  dependency 'search_ui',      '>= 0.0.9'
   dependency 'all_images',     '~> 0.5.0'
   dependency 'ollama-ruby',    '~> 1.6'
   dependency 'kramdown-ansi',  '~> 0.1'

data/bin/probe

@@ -33,6 +33,7 @@ def usage
 
       -n TESTNAME   run the test TESTNAME in file FILENAME
       -t FRAMEWORK  use test framework FRAMEWORK (rspec, test-unit or cucumber)
+      -s SERVER_URL tcp/unix URL to connect to
       -c            start probe as a client
       -C FOO[=BAR]  set/get env variable on probe server
       -l            start probe as a server
@@ -72,6 +73,17 @@ def find_cmd(*cmds, on_fail: -> *cmds { fail "no #{cmds * '|'} command found" })
   cmds.map { |c| `which #{c}`.full?(:chomp) }.compact.first or on_fail.(*cmds)
 end
 
+# The server_url method retrieves the configured server URL for probe operations.
+#
+# This method checks if a server URL has been specified via command-line
+# options and returns it if available. Otherwise, it falls back to the server
+# URL configured in the probe settings.
+#
+# @return [ String ] the server URL for probe operations
+def server_url
+  $opts[?s] || $config.probe.server_url
+end
+
 # The start_server method initializes and begins operation of a probe server.
 #
 # This method configures the environment for server operation by setting the
@@ -79,10 +91,7 @@ end
 # probe server instance to handle incoming requests and process jobs.
 def start_server
   Thread.abort_on_exception = $DEBUG
-  ProbeServer.new(
-    server_type: $config.probe.server_type,
-    port: $config.probe.tcp_server_port
-  ).start
+  ProbeServer.new(server_url:).start
 end
 
 # The connect_server method establishes a connection to a probe server and
@@ -93,10 +102,7 @@ end
 # It also enqueues jobs for execution on the probe server when specified.
 #
 def connect_server
-  probe_client = ProbeClient.new(
-    server_type: $config.probe.server_type,
-    port: $config.probe.tcp_server_port
-  )
+  probe_client = ProbeClient.new(server_url:)
   if setting = $opts[?C]
     case setting
     when /\A([^=]+)=([^=]+)\z/
@@ -125,7 +131,7 @@ if i = ARGV.index('--')
 else
   $args = ARGV.dup
 end
-$opts = go 'lct:n:C:h', $args
+$opts = go 'lct:n:C:s:h', $args
 $opts[?h] and usage
 
 case

data/lib/utils/config_file.rb

@@ -224,22 +224,16 @@ class Utils::ConfigFile
     # @param dirs [ Array<String> ] the array of directory names to include
     config :include_dirs, %w[lib test tests ext spec]
 
-    # The server_type method configures the type of server to be used.
+    # The server_url method configures the URL for the probe server
+    # communication.
     #
-    # This method sets up the server type configuration option, which
-    # determines the underlying server implementation to be utilized, this is
-    # either :unix for UNIX domain sockets or :tcp for TCP Sockets.
+    # This method sets up a DSL accessor for the probe server URL, providing a
+    # default value that uses a Unix domain socket located in the current
+    # working directory.
     #
-    # @return [ Symbol ] returns the server type configured
-    config :server_type, :unix
-
-    # The tcp_server_port method configures the TCP server port setting.
-    #
-    # This method sets up a configuration option that specifies the port number
-    # to be used for TCP server operations.
-    #
-    # @param value [ Integer ] the TCP server port number to use
-    config :tcp_server_port, 59999
+    # @return [ String ] the configured probe server URL including the default
+    #   socket path
+    dsl_accessor :server_url, "unix://#{Pathname.pwd + 'probe.socket'}"
 
     # The include_dirs_argument method constructs a colon-separated string from
     # include directories.

data/lib/utils/irb.rb

@@ -4,6 +4,9 @@ require 'tempfile'
 require 'pp'
 require 'shellwords'
 require 'utils'
+require 'fileutils'
+require 'amatch'
+require 'search_ui'
 require_maybe 'ap'
 
 $editor = Utils::Editor.new
@@ -24,7 +27,7 @@ module Utils
     # Provides enhanced regexp operations including match highlighting and
     # shell command integration.
     module Shell
-      require 'fileutils'
+      include SearchUI
       include FileUtils
       include Tins::Find
 
@@ -672,36 +675,59 @@ module Utils
         end
       end
 
-      # The irb_load! method loads Ruby files by their names into the current
-      # environment.
-      #
-      # This method takes one or more file names and attempts to locate and
-      # load the corresponding Ruby files from the current directory and its
-      # subdirectories. It ensures that each file is loaded only once by
-      # tracking loaded files using their MD5 checksums. The method outputs
-      # messages to standard error indicating which files have been
-      # successfully loaded.
-      #
-      # @param files [ Array<String> ] the names of the Ruby files to be loaded
-      #
-      # @return [ nil ] always returns nil after processing all specified files
-      def irb_load!(*files)
-        files = files.map { |f| f.gsub(/(\.rb)?\Z/, '.rb') }
-        loaded = {}
-        for file in files
-          catch :found do
-            Find.find('.') do |f|
-              File.directory?(f) and next
-              md5_f = Utils::MD5.md5(f)
-              if f.end_with?(file) and !loaded[md5_f]
-                Kernel.load f
-                loaded[md5_f] = true
-                STDERR.puts "Loaded '#{f}'."
-              end
-            end
-          end
-        end
-        nil
+    # The irb_load! method loads Ruby files by their names into the current
+    # environment through an interactive selection interface.
+    #
+    # This method takes a glob pattern and finds matching Ruby files, then
+    # presents an interactive search interface for selecting which file to load.
+    # It ensures that each file is loaded only once by tracking loaded files
+    # using their paths. The method outputs messages to standard error
+    # indicating which file has been successfully loaded.
+    #
+    # @param glob [String] the glob pattern to search for Ruby files (defaults to
+    #   ENV['UTILS_IRB_LOAD_GLOB'] or 'lib/**/*.rb')
+    #
+    # @return [Boolean] true if a file was successfully loaded, false if no file
+    #   was selected or loaded
+    #
+    # @example
+    #   # Load a file interactively with default glob pattern
+    #   irb_load!
+    #
+    #   # Load files matching a custom pattern
+    #   irb_load!('app/models/**/*.rb')
+    #
+    #   # Set environment variable for default pattern
+    #   ENV['UTILS_IRB_LOAD_GLOB'] = 'lib/**/*.rb'
+    #   irb_load!
+    #
+    # @note This method uses fuzzy matching to help find files when typing
+    #   partial names. It respects the terminal height to limit the number of
+    #   displayed results.
+    #
+    # @see SearchUI for the interactive search interface implementation
+    # @see Amatch::PairDistance for the fuzzy matching algorithm
+      def irb_load!(glob = ENV.fetch('UTILS_IRB_LOAD_GLOB', 'lib/**/*.rb'))
+        files = Dir.glob(glob)
+        found = Search.new(
+          match: -> answer {
+            matcher = Amatch::PairDistance.new(answer.downcase)
+            matches = files.map { |n| [ n, -matcher.similar(n.downcase) ] }.
+              sort.select { _2 < 0 }.sort_by(&:last).map(&:first)
+            matches.empty? and matches = files
+            matches.first(Tins::Terminal.lines - 1)
+          },
+          query: -> _answer, matches, selector {
+            matches.each_with_index.
+            map { |m, i| i == selector ? "→ " + Search.on_blue(m) : "  " + m } * ?\n
+          },
+          found: -> _answer, matches, selector {
+            matches[selector]
+          },
+          output: STDOUT
+        ).start
+        found or return false
+        load found
       end
 
       # The irb_server method provides access to an IRB server instance for

data/lib/utils/probe/probe_client.rb

@@ -57,15 +57,18 @@ module Utils::Probe
 
     # The initialize method sets up a new probe server instance.
     #
-    # This method creates and configures a Unix domain socket server for
-    # handling probe jobs and communication. It initializes the server with a
-    # specific socket name and runtime directory, preparing it to listen for
-    # incoming connections and process jobs.
+    # This method creates and configures the core components of the probe
+    # server, including initializing the Unix domain socket server for
+    # communication, setting up the job queue for processing tasks, and
+    # preparing the history tracking for completed jobs.
     #
-    # @return [ Utils::ProbeServer ] a new probe server instance configured with
-    #         the specified socket name and runtime directory
-    def initialize(server_type: :unix, port: 6666)
-      @server = create_server(server_type, port)
+    # @param server_url [ String ] the URL to be used for the probe server
+    #   communication
+    #
+    # @return [ Utils::ProbeServer ] a new probe server instance configured
+    #   with the specified socket name and runtime directory
+    def initialize(server_url:)
+      @server = create_server(server_url)
     end
 
     # The env method provides access to environment variable management through

data/lib/utils/probe/probe_server.rb

@@ -19,8 +19,8 @@ module Utils::Probe
     #
     # @return [ Utils::ProbeServer ] a new probe server instance configured
     # with the specified socket name and runtime directory
-    def initialize(server_type: :unix, port: 6666)
-      @server         = create_server(server_type, port)
+    def initialize(server_url:)
+      @server         = create_server(server_url)
       @history        = [].freeze
       @jobs_queue     = Queue.new
       @current_job_id = 0

data/lib/utils/probe/server_handling.rb

@@ -8,25 +8,20 @@ module Utils::Probe
   # creation and management within the Utils library.
   module ServerHandling
     # The create_server method initializes and returns a socket server instance
-    # based on the specified server type.
+    # based on the specified server URL configuration
     #
-    # This method creates either a TCP socket server or a domain socket server
-    # depending on the server type parameter. It configures the server with the
-    # appropriate parameters including port number for TCP servers or socket
-    # name and runtime directory for domain sockets.
+    # This method acts as a factory for creating socket server objects,
+    # delegating to the UnixSocks.from_url method to construct either a TCP
+    # socket server or a domain socket server depending on the URL scheme
+    # provided
     #
-    # @param server_type [ Symbol ] the type of socket server to create, either :tcp or another value for domain socket
-    # @param port [ Integer ] the port number to use for TCP socket server creation
+    # @param server_url [ String ] the URL specifying the socket server
+    #   configuration
     #
     # @return [ UnixSocks::TCPSocketServer, UnixSocks::DomainSocketServer ] a
-    #   new socket server instance of the specified type
-    def create_server(server_type, port)
-      case server_type
-      when :tcp
-        UnixSocks::TCPSocketServer.new(port:)
-      else
-        UnixSocks::DomainSocketServer.new(socket_name: 'probe.sock', runtime_dir: Dir.pwd)
-      end
+    #   new socket server instance configured according to the URL specification
+    def create_server(server_url)
+      UnixSocks.from_url(server_url)
     end
   end
 end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.83.1'
+  VERSION         = '0.85.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.83.1 ruby lib
+# stub: utils 0.85.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.83.1".freeze
+  s.version = "0.85.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -31,7 +31,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<pstree>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<infobar>.freeze, ["~> 0.8".freeze])
   s.add_runtime_dependency(%q<mize>.freeze, ["~> 0.6".freeze])
-  s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])
+  s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.6".freeze])
+  s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0.0.9".freeze])
   s.add_runtime_dependency(%q<all_images>.freeze, ["~> 0.5.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.6".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.1".freeze])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.83.1
+  version: 0.85.0
 platform: ruby
 authors:
 - Florian Frank
@@ -122,19 +122,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: search_ui
+  name: amatch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: search_ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement