utils 0.63.0 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57d27bd0ccbe0822c7d234983f01ca7014b0d2d21313aecdfad2bad40e00ec9
-  data.tar.gz: 333db226cb9e85c47dc3f585a1e258cad35630827442c4bec44b8a20f10210f8
+  metadata.gz: 04c80c59e58b4eddfd99b4890f90e9b79197a3058650355e93317234ffdacb21
+  data.tar.gz: 6b169b24ba94fd2c8fa1d64c53d69b3d93c4c60ca5ee8bf85098492f9d446904
 SHA512:
-  metadata.gz: a0e71cdf38a4911ef2dc1c60949f86b84bc9c0052fa47534448a2b3d957eb4ab01b8487540f77538241e1b9d606a81e677f49cb0e88c46c52a6c0fe1cc16fb8c
-  data.tar.gz: ed17da49e7b31403d91b1aee7d2704ca53283cc359079b350838c7e5f10eb6e7110b0f221d17e272e8a0cc9608404b0cfb58a72b7e4ee1d84c92fdd71f7810ab
+  metadata.gz: 3f0e39525fe0f42fe02cd834f436b09084d72532e47ee720eea97652420cf2f2502c47a265479c1a3501107fa945ec6433ff053cba78b6a148d7a4ffd797cfd1
+  data.tar.gz: b370aea11cc359cbf88261f305b2574764243d23c4f402fab14a5e1caf13b3328069a1e6dac82cf5809da6fc4c74fd51d830177d1a38a9ab5d6c961641d9e7e6

data/.utilsrc

@@ -0,0 +1,30 @@
+# vim: set ft=ruby:
+
+search do
+  prune_dirs /\A(\.svn|\.git|\.terraform|CVS|tmp|coverage|corpus|pkg|\.yardoc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.(log|fnm|jpg|jpeg|png|pdf|svg)\z|\Atags\z|~\z)/i
+end
+
+discover do
+  prune_dirs /\A(\.svn|\.git|\.terraform|\.yardoc|CVS|tmp|coverage|corpus|pkg|\.yardoc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+  index_expire_after 3_600
+end
+
+strip_spaces do
+  prune_dirs /\A(\..*|CVS|pkg|\.yardoc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+end
+
+probe do
+  test_framework :'test-unit'
+end
+
+ssh_tunnel do
+  terminal_multiplexer :tmux
+  login_session "/home/#{ENV['USER']}"
+end
+
+classify do
+  shift_path_by_default 1
+end

data/Rakefile

@@ -19,7 +19,7 @@ GemHadar do
   readme      'README.md'
   licenses << 'GPL-2.0'
 
-  dependency 'drb'
+  dependency 'unix_socks'
   dependency 'webrick'
   dependency 'tins',           '~> 1.14'
   dependency 'term-ansicolor', '~> 1.11'
@@ -32,6 +32,7 @@ GemHadar do
   dependency 'kramdown-ansi',  '~> 0.0.1'
   dependency 'simplecov'
   dependency 'debug'
+  development_dependency 'test-unit'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/bin/code_comment

@@ -95,7 +95,7 @@ EOT
 system = nil
 
 prompt = <<EOT
-Analyze this code:
+Look at this code to document it:
 
 #{files.map { File.read(_1) } * ?\n}
 

data/bin/probe

@@ -5,7 +5,6 @@ require 'tins/lines_file'
 include Tins::GO
 require 'utils'
 include Utils
-require 'drb'
 require 'shellwords'
 
 def usage
@@ -19,7 +18,6 @@ def usage
       -c            start probe as a client
       -C FOO[=BAR]  set/get env variable on probe server
       -l            start probe as a server
-      -u URI        use this DRb URI communication
       -h            display this help
 
     Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -39,25 +37,17 @@ end
 
 def start_server
   Thread.abort_on_exception = $DEBUG
-
-  begin
-    DRb.start_service
-    DRbObject.new_with_uri($uri).shutdown
-  rescue DRb::DRbConnError
-  end
-
-  Utils::ProbeServer.new($uri).start
+  Utils::ProbeServer.new.start
 end
 
 def connect_server
-  DRb.start_service
-  probe_server = DRbObject.new_with_uri($uri)
+  probe_client = ProbeClient.new
   if setting = $opts[?C]
     case setting
     when /\A([^=]+)=([^=]+)\z/
-      probe_server.env[$1] = $2
+      puts probe_client.env[$1] = $2
     when /\A([^=]+)\z/
-      puts probe_server.env[$1]
+      puts probe_client.env[$1]
     else
       usage
     end
@@ -66,7 +56,7 @@ def connect_server
     opts = $opts.subhash(*%w[n t]).each_with_object([]) { |(k, v), a|
       v.full? and a.concat [ "-#{k}", v ]
     }
-    probe_server.enqueue opts + $args
+    probe_client.enqueue opts + $args
     exit
   end
 end
@@ -80,11 +70,9 @@ if i = ARGV.index('--')
 else
   $args = ARGV.dup
 end
-$opts = go 'lct:n:u:C:h', $args
+$opts = go 'lct:n:C:h', $args
 $opts[?h] and usage
 
-$uri = $opts[?u] || 'drbunix:probe.socket'
-
 case
 when $opts[?l]
   start_server

data/lib/utils/probe_server.rb

@@ -1,3 +1,4 @@
+require 'unix_socks'
 require 'tins/xt'
 require 'term/ansicolor'
 class String
@@ -5,48 +6,91 @@ class String
 end
 
 module Utils
-  class ProbeServer
-    class Job
-      def initialize(probe_server, args)
-        @id           = probe_server.next_job_id
-        @args         = Array(args)
+  class ProcessJob
+    def initialize(args:, probe_server: nil)
+      @id           = probe_server&.next_job_id
+      @args         = Array(args)
+    end
+
+    attr_reader :id
+
+    attr_reader :args
+
+    attr_writer :ok
+
+    def type
+      'process_job'
+    end
+
+    def ok
+      case @ok
+      when false then 'n'
+      when true  then 'y'
+      else            '…'
       end
+    end
 
-      attr_reader :id
+    def ok_colorize(string)
+      case @ok
+      when false then string.white.on_red
+      when true  then string.black.on_green
+      else            string
+      end
+    end
 
-      attr_reader :args
+    def inspect
+      ok_colorize("#{id} #{args.map { |a| a.include?(' ') ? a.inspect : a } * ' '}")
+    end
 
-      attr_writer :ok
+    alias to_s inspect
 
-      def ok
-        case @ok
-        when false then 'n'
-        when true  then 'y'
-        else            '…'
-        end
+    def as_json(*)
+      { type:, id:, args:, }
+    end
+
+    def to_json(*)
+      as_json.to_json(*)
+    end
+  end
+
+  class ProbeClient
+    class EnvProxy
+      def initialize(server)
+        @server = server
       end
 
-      def ok_colorize(string)
-        case @ok
-        when false then string.white.on_red
-        when true  then string.black.on_green
-        else            string
-        end
+      def []=(key, value)
+        response = @server.transmit_with_response(type: 'set_env', key:, value:)
+        response.env
       end
 
-      def inspect
-        ok_colorize("#{id} #{args.map { |a| a.include?(' ') ? a.inspect : a } * ' '}")
+      def [](key)
+        response = @server.transmit_with_response(type: 'get_env', key:)
+        response.env
       end
 
-      alias to_s inspect
+      attr_reader :env
+    end
+
+    def initialize
+      @server = UnixSocks::Server.new(socket_name: 'probe.sock', runtime_dir: Dir.pwd)
+    end
+
+    def env
+      EnvProxy.new(@server)
+    end
+
+    def enqueue(args)
+      @server.transmit({ type: 'process_job', args: })
     end
+  end
 
-    def initialize(uri)
-      @uri        = uri
-      @history    = [].freeze
-      @jobs_queue = Queue.new
+  class ProbeServer
+    def initialize
+      @server         = UnixSocks::Server.new(socket_name: 'probe.sock', runtime_dir: Dir.pwd)
+      @history        = [].freeze
+      @jobs_queue     = Queue.new
       @current_job_id = 0
-      Thread.new { work_loop }
     end
 
     def print(*msg)
@@ -56,10 +100,15 @@ module Utils
     end
 
     def start
-      output_message "Starting probe server listening to #{@uri.inspect}.", type: :info
-      DRb.start_service(@uri, self)
+      output_message "Starting probe server listening to #{@server.server_socket_path}.", type: :info
+      work_loop = Thread.new do
+        loop do
+          job = @jobs_queue.pop
+          run_job job
+        end
+      end
       begin
-        DRb.thread.join
+        receive_loop.join
       rescue Interrupt
         ARGV.clear << '-f'
         output_message %{\nEntering interactive mode.}, type: :info
@@ -70,7 +119,8 @@ module Utils
         ensure
           $VERBOSE = old
         end
-        output_message "Quitting interactive mode, but still listening to #{@uri.inspect}.", type: :info
+        @server.remove_socket_path
+        output_message "Quitting interactive mode, but still listening to #{@server.server_socket_path}.", type: :info
         retry
       end
     end
@@ -91,17 +141,17 @@ module Utils
       docs_size = docs.map { |a| a.first.size }.max
       format = "%-#{docs_size}s %-3s %s"
       output_message [
-          (format % %w[ command sho description ]).on_color(20).white
-        ] << docs.map { |cmd, doc|
-          shortcut = shortcut_of(cmd) and shortcut = "(#{shortcut})"
-          format % [ cmd, shortcut, doc ]
-        }
+        (format % %w[ command sho description ]).on_color(20).white
+      ] << docs.map { |cmd, doc|
+        shortcut = shortcut_of(cmd) and shortcut = "(#{shortcut})"
+        format % [ cmd, shortcut, doc ]
+      }
     end
 
-    doc 'Enqueue a new job with the argument array <job_args>.'
+    doc 'Enqueue a new job with the argument array <args>.'
     shortcut :e
-    def job_enqueue(job_args)
-      job = Job.new(self, job_args)
+    def job_enqueue(args)
+      job = ProcessJob.new(args:, probe_server: self)
       output_message " → #{job.inspect} enqueued.", type: :info
       @jobs_queue.push job
     end
@@ -118,7 +168,7 @@ module Utils
     doc 'Repeat the job with <job_id> or the last, it will be assigned a new id, though.'
     shortcut :r
     def job_repeat(job_id = @history.last)
-      Job === job_id and job_id = job_id.id
+      ProcessJob === job_id and job_id = job_id.id
       if old_job = @history.find { |job| job.id == job_id }
         job_enqueue old_job.args
         true
@@ -209,15 +259,21 @@ module Utils
         message << " and failed with exit status #{$?.exitstatus}!"
         output_message message, type: :failure
       end
-      @history += [ @job.freeze ]
+      @history += [ job.freeze ]
       @history.freeze
-      @job = nil
     end
 
-    def work_loop
-      loop do
-        @job = @jobs_queue.shift
-        run_job @job
+    def receive_loop
+      @server.receive_in_background do |job|
+        case job.type
+        when 'process_job'
+          enqueue job.args
+        when 'set_env'
+          env[job.key] = job.value
+          job.respond(env: env[job.key])
+        when 'get_env'
+          job.respond(env: env[job.key])
+        end
       end
     end
 

data/lib/utils/version.rb

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

data/tests/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require 'utils'

data/tests/utils_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class UtilsTest < Test::Unit::TestCase
+  def setup
+  end
+
+
+  def test_foo
+    assert true
+  end
+end

data/utils.gemspec

@@ -1,29 +1,31 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.63.0 ruby lib
+# stub: utils 0.64.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.63.0".freeze
+  s.version = "0.64.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2025-01-23"
+  s.date = "1980-01-02"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ascii7".freeze, "blameline".freeze, "changes".freeze, "classify".freeze, "code_comment".freeze, "commit_message".freeze, "create_cstags".freeze, "create_tags".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "git-empty".freeze, "git-versions".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".freeze, "print_method".freeze, "probe".freeze, "rd2md".freeze, "search".freeze, "sedit".freeze, "serve".freeze, "ssh-tunnel".freeze, "strip_spaces".freeze, "sync_dir".freeze, "untest".freeze, "utils-utilsrc".freeze, "vcf2alias".freeze, "yaml_check".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
-  s.files = [".github/dependabot.yml".freeze, ".github/workflows/codeql-analysis.yml".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/changes".freeze, "bin/classify".freeze, "bin/code_comment".freeze, "bin/commit_message".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/print_method".freeze, "bin/probe".freeze, "bin/rd2md".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/sync_dir".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vcf2alias".freeze, "bin/yaml_check".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
+  s.files = [".github/dependabot.yml".freeze, ".github/workflows/codeql-analysis.yml".freeze, ".utilsrc".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/changes".freeze, "bin/classify".freeze, "bin/code_comment".freeze, "bin/commit_message".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/print_method".freeze, "bin/probe".freeze, "bin/rd2md".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/sync_dir".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vcf2alias".freeze, "bin/yaml_check".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze, "utils.gemspec".freeze]
   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 = "3.6.2".freeze
+  s.rubygems_version = "3.6.9".freeze
   s.summary = "Some useful command line utilities".freeze
+  s.test_files = ["tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.19".freeze])
-  s.add_runtime_dependency(%q<drb>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.20".freeze])
+  s.add_development_dependency(%q<test-unit>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<webrick>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.64.0
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -15,16 +15,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
-  name: drb
+  name: test-unit
+  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: unix_socks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -261,6 +275,7 @@ extra_rdoc_files:
 files:
 - ".github/dependabot.yml"
 - ".github/workflows/codeql-analysis.yml"
+- ".utilsrc"
 - COPYING
 - Gemfile
 - README.md
@@ -312,6 +327,8 @@ files:
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
 - lib/utils/xt/source_location_extension.rb
+- tests/test_helper.rb
+- tests/utils_test.rb
 - utils.gemspec
 homepage: http://github.com/flori/utils
 licenses:
@@ -335,7 +352,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Some useful command line utilities
-test_files: []
+test_files:
+- tests/test_helper.rb
+- tests/utils_test.rb