utils 0.43.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3583ce3465c67920f1657f0abf6755c0fc9f901bca1c52caa0c87cd9a75ae37
-  data.tar.gz: 77c44067f0bb95ebdeb1a7fdade018d335b949b63c1727e15f4afb67246b2e20
+  metadata.gz: 0ba83a3d4301571d5cefae45b004dbc83ac40d4e96844b66d2e9f53e70dfa326
+  data.tar.gz: 87b84b9c9f1ee5fde106c521bebd6cff73653f2c172a6acf38615d1d7ce6b266
 SHA512:
-  metadata.gz: '09ceb99122db1b754ae147d6ad0f6a002e26b6c21f99554e5f2a448b98cbc5618a74f988ca09138e8528b9ad766430296faa30a59a41c7e38c91ae33945f03ed'
-  data.tar.gz: 70481a4a7a41bf70546b53b4d2d942682e3f3756d8a4088790ce126a2bfeb2d84c337cfe762dc236a085f37e2b073206b7b1fe31940d32fe026968cbdbaa9b83
+  metadata.gz: 27e8d0af4da40ee35153d82288df743a74fa58e3477ba7ff100dba07237d29138ae49b79e060ab7628d7b96c63d52a1d9b42edeaa4872e56e230d81c8477c12c
+  data.tar.gz: 679e3ab9e2039895ac417ec86d5f6af0205f9cc8171c8e27622d5231670595b0ee25f3978b215ad2e9c8e0a4162f573315b685dc3618d5faab5496b763fdb5f4

data/bin/sync_dir

@@ -51,6 +51,7 @@ diff_dir.each_line do |line|
       (E)dit #{s.inspect}
       (D)elete #{s.inspect}
       (S)kip
+      (Q)uit
     end
     case ask?(prompt: 'action? ')
     when /\Ac/i
@@ -60,6 +61,8 @@ diff_dir.each_line do |line|
       redo
     when /\Ad/i
       rm s
+    when /\Aq/i
+      exit
     end
   when /^Files (.*?) and (.*?) differ$/
     s, d = $~.captures
@@ -71,9 +74,16 @@ diff_dir.each_line do |line|
     puts <<~end
       (V)imdiff
       (S)kip
+      (Q)uit
+    end
+    case ask?(prompt: 'action? ')
+    when /\Av/i
+      system "vimdiff #{s.inspect} #{d.inspect}"
+    when /\Aq/i
+      exit
+    else 
+      next
     end
-    ask?(prompt: 'action? ') =~ /\Av/i or next
-    system "vimdiff #{s.inspect} #{d.inspect}"
     redo
   end
 rescue Interrupt

data/lib/utils/irb.rb

@@ -11,8 +11,6 @@ $pager = ENV['PAGER'] || 'less -r'
 
 module Utils
   module IRB
-    require 'utils/irb/service'
-
     module Shell
       require 'fileutils'
       include FileUtils
@@ -71,16 +69,6 @@ module Utils
         end
       end
 
-      # Start an irb server.
-      def irb_server(uri = nil)
-        Utils::IRB::Service.start(uri) {}
-      end
-
-      # Connect to an irb server.
-      def irb_connect(uri = nil)
-        Utils::IRB::Service.connect(uri)
-      end
-
       # TODO: change the API of this stuff
 
       # Return all instance methods of obj's class.

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.43.0'
+  VERSION         = '0.45.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,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.43.0 ruby lib
+# stub: utils 0.45.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.43.0".freeze
+  s.version = "0.45.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 = "2024-06-05"
+  s.date = "2024-07-08"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
-  s.executables = ["ascii7".freeze, "blameline".freeze, "check-yaml".freeze, "classify".freeze, "create_cstags".freeze, "create_tags".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "fix-brew".freeze, "git-empty".freeze, "git-versions".freeze, "irb_connect".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".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]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.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/check-yaml".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/fix-brew".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".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, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.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.executables = ["ascii7".freeze, "blameline".freeze, "check-yaml".freeze, "classify".freeze, "create_cstags".freeze, "create_tags".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "fix-brew".freeze, "git-empty".freeze, "git-versions".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".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]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.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/check-yaml".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/fix-brew".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/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, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.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.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.5.9".freeze
+  s.rubygems_version = "3.5.14".freeze
   s.summary = "Some useful command line utilities".freeze
 
   s.specification_version = 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -166,7 +166,6 @@ executables:
 - fix-brew
 - git-empty
 - git-versions
-- irb_connect
 - json_check
 - long_lines
 - myex
@@ -194,7 +193,6 @@ extra_rdoc_files:
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
 - lib/utils/irb.rb
-- lib/utils/irb/service.rb
 - lib/utils/line_blamer.rb
 - lib/utils/line_formatter.rb
 - lib/utils/md5.rb
@@ -223,7 +221,6 @@ files:
 - bin/fix-brew
 - bin/git-empty
 - bin/git-versions
-- bin/irb_connect
 - bin/json_check
 - bin/long_lines
 - bin/myex
@@ -248,7 +245,6 @@ files:
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
 - lib/utils/irb.rb
-- lib/utils/irb/service.rb
 - lib/utils/line_blamer.rb
 - lib/utils/line_formatter.rb
 - lib/utils/md5.rb
@@ -281,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Some useful command line utilities

data/bin/irb_connect

@@ -1,37 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require 'tins/xt'
-include Tins::GO
-require 'utils/irb'
-require 'drb'
-
-def usage
-  puts <<-EOT
-Usage: #{File.basename($0)} [OPTS]
-
-Options are
-
-  -e CODE       CODE is execute on the remote irb
-  -l PATH       load file PATH into remote irb context
-  -u URL        druby url to connect to
-  -h            display this help
-
-Version is #{File.basename($0)} #{Utils::VERSION}.
-  EOT
-  exit 1
-end
-
-
-$opts = go 'e:u:l:h'
-$opts[?h] and usage
-
-proxy = Utils::IRB::Service.connect($opts[?u])
-case
-when load_path = $opts[?l]
-  proxy.load(load_path)
-when code = $opts[?e]
-  p proxy.eval(code)
-else
-  puts proxy.eval(STDIN.read)
-end

data/lib/utils/irb/service.rb

@@ -1,39 +0,0 @@
-require 'drb'
-
-module Utils::IRB::Service
-  class << self
-    attr_accessor :hostname
-
-    attr_accessor :port
-
-    def start(uri = nil, &block)
-      uri ||= "druby://localhost:6642"
-      block    ||= proc {}
-      puts "Starting IRB server listening to #{uri.inspect}."
-      DRb.start_service(uri, eval('irb_current_working_binding', block.binding))
-    end
-
-    def connect(uri = nil)
-      uri ||= "druby://localhost:6642"
-      irb = DRbObject.new_with_uri(uri)
-      Proxy.new(irb)
-    end
-  end
-
-  class Proxy
-    def initialize(irb)
-      @irb = irb
-    end
-
-    def eval(code)
-      @irb.conf.workspace.evaluate nil, code
-    end
-
-    def load(filename)
-      unless filename.start_with?('/')
-        filename = File.expand_path filename
-      end
-      @irb.load filename
-    end
-  end
-end