utils 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88af92dc7e32b6d24fef9951b3cac7ee7a053c2b803e03f56e14a67db59e947e
-  data.tar.gz: 282bde2c79a6f3bb47f84aee99bf8a3bd3dc234034f548088c15647f7a8b1592
+  metadata.gz: 2261e1420324f65e6793524f113440a9cecfcc6a4026da61957d5991aa6237b0
+  data.tar.gz: c954c1928241f54ab0d37aff885f95ba26d4c7ed786814e5efd4028a18499a69
 SHA512:
-  metadata.gz: 971526eb0818d727a0810720c6d25647dcac76336276c9465064f5288700fc10d36f1ef42e5903704f1208670ed318c0c58c55d48c8155f8957d972636074280
-  data.tar.gz: 4b63131b02ab4865237b2438fb1be38e9fff1f6c2730067ae95386e94329569790611b55d71f4a563c9a79e18a10179733a16ec31aac9b12dfe59326bdc90dd9
+  metadata.gz: 5a9c602a87e531234c595ffb91cdc3c18b690400cc59f52b49ffa2a5032b5425add0acc032898ddd8c3ed529c53c5451edca0e4fae9f24813e70275388f4356c
+  data.tar.gz: 5511eaae6e97cd9069ab65164eedccaab6db0fb3636d8724dcc392de2eb9fdd3c70a60812027044999ce1f151216e1857af921778e5d744aec0706588fb2c786

data/bin/create_tags

@@ -4,7 +4,7 @@ require 'infobar'
 
 paths = %w[ . ] + `bundle list --paths`.lines.map(&:chomp)
 cmd = %w[ ctags --recurse=yes --languages=Ruby,C ] + paths
-Infobar.busy(label: 'Creating tags') { system *cmd }
+Infobar.busy(label: 'Creating tags') { system(*cmd) }
 if megabytes = File.size('tags').to_f / 1024 ** 2 rescue nil
   infobar.puts 'Created %.3fM of tags.' % megabytes
 end

data/bin/discover

@@ -12,7 +12,7 @@ def edit_files(*paths, pick: false, wait: true)
   if pick
     if paths.size > 1
       path = complete(prompt: 'Pick? ') do |p|
-        paths.grep /#{p}/
+        paths.grep(/#{p}/)
       end
     else
       path = paths.first
@@ -83,7 +83,6 @@ search = -> * {
   f = nil
   pattern = pattern.dup
   args[?n] = Term::ANSIColor.terminal_lines - 1
-  path = nil
   found = Search.new(
     match: -> answer {
       pattern.replace answer
@@ -95,9 +94,7 @@ search = -> * {
       matches.each_with_index.map { |l, i| (i == selector ? '> ' : '  ') + l }.join(?\n)
     },
     found: -> _answer, matches, selector {
-      if f
-        path = f.paths[selector]
-      end
+      f.paths[selector] if f
     },
     output: STDERR
   ).start
@@ -117,9 +114,9 @@ case
 when args[?s]
   search.()
 when args[?E]
-  edit_files *finder.().paths, pick: true
+  edit_files(*finder.().paths, pick: true)
 when args[?e]
-  edit_files *finder.().search.paths
+  edit_files(*finder.().search.paths)
 when args[?D]
   args[?d] = true
   paths = finder.().load_paths.select { |p| File.directory?(p) }.reverse

data/bin/json_check

@@ -5,6 +5,6 @@ require 'json'
 begin
   JSON.parse(ARGF.read)
   exit 0
-rescue JSON::ParserError => e
+rescue JSON::ParserError
   exit 1
 end

data/bin/search

@@ -18,7 +18,7 @@ end
 
 def read_line(path)
   filename, lineno = path.source_location
-  line = File.open(filename) do |file|
+  File.open(filename) do |file|
     file.lazy.each_with_index.select { |l, n| n + 1 == lineno }.first&.first
   end
 end
@@ -71,8 +71,6 @@ def replace_ask(editor, path, pattern, replace, all)
       when ?e
         editor.edit(path.strip)
         break false
-      when ?a
-        break true
       else
         next
       end
@@ -95,7 +93,7 @@ def edit_files(pattern, paths, pick: false, replace: nil)
   when pick
     if paths.size > 1
       path = complete(prompt: 'Pick? ') do |p|
-        paths.grep /#{p}/
+        paths.grep(/#{p}/)
       end
     else
       path = paths.first
@@ -139,6 +137,7 @@ Options are
   -r REPLACE  replace the searched match with REPLACE
   -b          also search binary files
   -g          use git to determine author of the line
+  -G AUTHOR   only display lines authored by AUTHOR
   -a CSET     use only character set CSET from PATTERN
   -v          be verbose
   -h          display this help
@@ -148,7 +147,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'r:p:I:A:B:C:s:S:n:N:a:i:cfFlLeEvbgh'
+args = go 'r:p:I:A:B:C:s:S:n:N:a:i:G:cfFlLeEvbgh'
 args[?h] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }

data/lib/utils/grepper.rb

@@ -97,9 +97,12 @@ class Utils::Grepper
         @output.each do |l|
           blamer = LineBlamer.for_line(l)
           if blame = blamer.perform
+            author = nil
             blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
-            blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
-            puts "#{blame.chomp} #{Term::ANSIColor.blue(l)}"
+            blame.sub!(/\(([^)]+)\)/) { author = $1; "(#{Term::ANSIColor.red($1)})" }
+            if !@args[?G] || author&.downcase&.match?(@args[?G].downcase)
+              puts "#{blame.chomp} #{Term::ANSIColor.blue(l)}"
+            end
           end
         end
       when @args[?l], @args[?e], @args[?E], @args[?r]

data/lib/utils/irb.rb

@@ -51,7 +51,7 @@ module Utils
       end
 
       def yri(*patterns)
-        ri *patterns, doc: 'yri'
+        ri(*patterns, doc: 'yri')
       end
 
       def irb_open(url = nil, &block)

data/lib/utils/line_blamer.rb

@@ -5,15 +5,7 @@ module Utils
     end
 
     def self.for_line(line)
-      location = line.source_location and new *location
-    end
-
-    def self.blame(line)
-      blamer = for_line(line)
-      if blame = blamer.perform
-        blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
-        blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
-      end
+      location = line.source_location and new(*location)
     end
 
     def perform(options = '')

data/lib/utils/probe_server.rb

@@ -89,7 +89,7 @@ module Utils
     def help
       docs      = doc_annotations.sort_by(&:first)
       docs_size = docs.map { |a| a.first.size }.max
-      format = '%-20s %-3s %s'
+      format = "%-#{docs_size}s %-3s %s"
       output_message [
           (format % %w[ command sho description ]).on_color(20).white
         ] << docs.map { |cmd, doc|
@@ -198,7 +198,7 @@ module Utils
 
     def run_job(job)
       output_message " → #{job.inspect} now running.", type: :info
-      system *cmd(job.args)
+      system(*cmd(job.args))
       message = " → #{job.inspect} was just run"
       if $?.success?
         job.ok = true

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.41.0'
+  VERSION         = '0.42.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,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.41.0 ruby lib
+# stub: utils 0.42.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.41.0".freeze
+  s.version = "0.42.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-04-17"
+  s.date = "2024-04-24"
   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]
@@ -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 = "3.5.3".freeze
+  s.rubygems_version = "3.5.9".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.41.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Some useful command line utilities