utils 0.31.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d7f609e660eeda7da1508e1b1afddd1a3b01e7232153f59ba4ca4cc1b11b052
-  data.tar.gz: ba8ef55413f9b3890f4cfd239864c67e10fb81ac5314197932c451b2f69bdd7d
+  metadata.gz: 12cef3e32a424a560f550a93f4fbd793ab4ead58999cd091ae62613f681e125f
+  data.tar.gz: 3eb0225e890989209666e6194db9c1bfcf8e1fadc8c27f8cce9d6a4850c88f31
 SHA512:
-  metadata.gz: 8ab8ae0a58b32aa3c78b6002bf6a4bde18cbaa99070a4dabeb198aabf2d1bc1a4b33856adb77fe0ac812220335ace5d8d802df267576b6e629c3b23524e670df
-  data.tar.gz: adcf4e93e2a3f6b507c4eea3ec2ab65c9d02054be2db6ed8ae9ca18803e39b33bb14e5578a2fb342124a5c300c8c7484740e63e4bea8a7b441a2b83fa03cea9f
+  metadata.gz: abd0e88886486b7351b772bc90f8f3c5e0bd69cbd903650025ff586456a0a497326d9be87331447d830b8700be5f6bde2da8a3cc37fec99ef53aaf01a2a0f795
+  data.tar.gz: 9009126fb1c63d1327b16f6fb2cc98c307f1a4ae911c2f23b20b9f4658024e31c88da552a9f3a9be719a62fd7dc6f110d166304758f0baa5b4739f21b0588bd3

data/bin/probe

@@ -20,6 +20,7 @@ Options are
   -C FOO[=BAR]  set/get env variable on probe server
   -l            start probe as a server
   -u URI        use this DRb URI communication
+  -f FORMATTER  use FORMATTER to display rspec output
   -h            display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -31,6 +32,7 @@ def cmd(*args)
   if ENV.key?('BUNDLE_GEMFILE')
     args.unshift 'bundle', 'exec'
   end
+  p args
   puts args * ' '
   system(*args) or exit $?.exitstatus
 end
@@ -76,7 +78,7 @@ def connect_server
     end
   end
   if $opts[?c]
-    opts = $opts.subhash('n', 't').each_with_object([]) { |(k, v), a|
+    opts = $opts.subhash(*%w[n t f]).each_with_object([]) { |(k, v), a|
       v.full? and a.concat [ "-#{k}", v ]
     }
     probe_server.enqueue opts + $args
@@ -93,7 +95,7 @@ if i = ARGV.index('--')
 else
   $args = ARGV.dup
 end
-$opts = go 'lct:n:u:C:h', $args
+$opts = go 'lct:n:u:C:f:h', $args
 $opts[?h] and usage
 
 $uri = $opts[?u] || 'drbunix:probe.socket'
@@ -117,7 +119,10 @@ when :rspec
   else
     rspec = [ find_cmd('rspec', 'spec') ]
   end
-  rspec << '-rutils' << '-f' << 'Utils::LineFormatter'
+  rspec << '-rutils'
+  unless $args.any? { |a| a.start_with?('-f') }
+    rspec << '-f' << ($opts[?f] || 'Utils::LineFormatter')
+  end
   $args = $args.map do |a|
     if Utils::Editor::FILE_LINENUMBER_REGEXP =~ a
       $~.captures.compact * ':'

data/lib/utils/irb.rb

@@ -273,6 +273,7 @@ module Utils
       def irb_time_watch(duration = 1)
         start = Time.now
         pre = nil
+        avg = Hash.new
         loop do
           cur = [ yield ].flatten
           unless pre
@@ -282,7 +283,20 @@ module Utils
           expired = Time.now - start
           diffs = cur.zip(pre).map { |c, p| c - p }
           rates = diffs.map { |d| d / duration }
-          warn "#{expired} #{cur.zip(diffs, rates).map(&:inspect) * ' '} 𝝙 / per sec."
+          durs = cur.zip(rates).each_with_index.map { |(c, r), i|
+            if r < 0
+              x = c.to_f / -r
+              a = avg[i].to_f
+              a -= a / 2
+              a += x / 2
+              d = Tins::Duration.new(a)
+              ds = d.to_s
+              ds.singleton_class { define_method(:to_f) { d.to_f } }
+              avg[i] = ds
+            end
+            avg[i]
+          }
+          warn "#{expired} #{cur.zip(diffs, rates, durs).map(&:inspect) * ' '} 𝝙 / per sec."
           pre = cur.map(&:to_f)
           sleep duration
         end

data/lib/utils/probe_server.rb

@@ -227,7 +227,7 @@ module Utils
         call << bundle << 'exec'
       end
       call.push($0, *job)
-      #output_message "Executing #{call.inspect} now.", type: :info
+      output_message "Executing #{call.inspect} now.", type: :info
       call
     end
   end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.31.1'
+  VERSION         = '0.33.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.31.1 ruby lib
+# stub: utils 0.33.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.31.1"
+  s.version = "0.33.0"
 
   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 = "2022-08-04"
+  s.date = "2022-12-05"
   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, "ssl_cert_info".freeze, "strip_spaces".freeze, "untest".freeze, "utils-utilsrc".freeze, "vcf2alias".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, "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/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/ssl_cert_info".freeze, "bin/strip_spaces".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.files = [".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/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.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.2.33".freeze
+  s.rubygems_version = "3.3.26".freeze
   s.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -151,7 +151,6 @@ executables:
 - sedit
 - serve
 - ssh-tunnel
-- ssl_cert_info
 - strip_spaces
 - untest
 - utils-utilsrc
@@ -207,7 +206,6 @@ files:
 - bin/sedit
 - bin/serve
 - bin/ssh-tunnel
-- bin/ssl_cert_info
 - bin/strip_spaces
 - bin/untest
 - bin/utils-utilsrc
@@ -252,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Some useful command line utilities

data/bin/ssl_cert_info

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-
-def cert_info(crt)
-  check_cmd = 'openssl x509 -inform pem -subject -fingerprint -issuer -sha256 -dates'
-  IO.popen(check_cmd, 'w+') do |process|
-    process.write crt
-    process.close_write
-    return process.read
-  end
-end
-
-def split_certs(input)
-  inside_cert = false
-  certs = []
-  input.each do |line|
-    case line
-    when /^-+BEGIN\s+CERTIFICATE-+$/
-      certs << line
-      inside_cert = true
-      next
-    when /^-+END\s+CERTIFICATE-+$/
-      certs.last << line
-      inside_cert = false
-      next
-    end
-    if inside_cert
-      certs.last << line
-    end
-  end
-  certs
-end
-
-split_certs(ARGF).each do |c|
-  puts "", cert_info(c)
-end