utils 0.27.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a695d4074ac4053773c97491cc160ee37439ab05fef58e3905f83ba5629b85
-  data.tar.gz: 1efe92716015195fa04402b046dc13eb9a22460f94400b284a4735ca659941a0
+  metadata.gz: 2575be12b2687c0a44ff009c5a67dd1471bf2765f73fc3c16277e0b88c902169
+  data.tar.gz: 07ed52d1ec8ad9e22fe50e2ba47f5ccd52584604279f4bc2ff246dc2971843dd
 SHA512:
-  metadata.gz: c3c354e67b143c6a237258c5feb4f8bbe04c6a295dcdc03bda36f144814e862d6a1c1e966f89fd976519b036866b5fd2fc84139f8b58ee6868c169a26f56ba93
-  data.tar.gz: 911fdec36192ffb28405b913ff2f1625dd92bd4daf4c957dd330efdc3aab18ccdad8fbf65ce565be881d5cf8ff6eaad8bdc4646133698d8d913843983a10234b
+  metadata.gz: ef17b8234600c00003aa8ab3fc892041f2cabd9efc53c8aa859955e791984353d6a4f736f67f5adeeb3db3ef71efd4706a0b1d2b3c5b7f8cc8c72113ace3ef55
+  data.tar.gz: 4c7680b9daad7cc6b04c6b9396b1ddb5f6cca9cf334faaa023b6e814ae6f3abcba9b0f4f15b58c8d2f72905c371013612002b443ae218646313273d336b1586a

data/Rakefile

@@ -24,6 +24,7 @@ GemHadar do
   dependency  'infobar'
   dependency  'mize'
   dependency  'search_ui'
+  dependency  'all_images'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/bin/check-yaml

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+format = -> s {
+  if /^\((?<f>[^)]+)\):\ (?<m>.*?) at line (?<l>\d+) column (?<c>\d+)/ =~ s
+    [ f, l, c, m ] * ?:
+  else
+    s
+  end
+}
+
+if filename = ARGV.first
+  begin
+    yaml = YAML.load_file(filename).to_yaml
+    ENV['DEBUG'].to_i == 1 and puts yaml
+    puts 'ok'
+  rescue => e
+    STDERR.puts format.(e.message)
+    puts 'nak'
+    exit 1
+  end
+else
+  string = STDIN.read
+  begin
+    yaml = YAML.load(string).to_yaml
+    ENV['DEBUG'].to_i == 1 and puts yaml
+    puts 'ok'
+  rescue => e
+    STDERR.puts format.(e.message)
+    puts 'nak'
+    exit 1
+  end
+end

data/bin/search

@@ -116,6 +116,7 @@ Options are
   -B NUMBER   displays NUMBER lines of context before the match
   -C NUMBER   displays NUMBER lines of context around the match
   -f          just list the paths of the files that would be searched
+  -F          just consider real files when searching
   -l          just list the paths of the files with matches
   -L          list only the path:linenumber of the files with matches
   -pX         interpret PATTERN argument as X=f fuzzy or X=r for regexp
@@ -136,7 +137,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:cflLeEvbgh'
+args = go 'r:p:I:A:B:C:s:S:n:N:a:i: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

@@ -156,11 +156,12 @@ class Utils::Grepper
   def search
     suffixes = Array(@args[?I])
     visit = -> filename {
-      s  = filename.stat
+      s  = filename.lstat
       bn = filename.pathname.basename
       if !s ||
           s.directory? && @config.search.prune?(bn) ||
-          s.file? && @config.search.skip?(bn)
+          (s.file? || s.symlink?) && @config.search.skip?(bn) ||
+          @args[?F] && s.symlink?
       then
         @args[?v] and warn "Pruning #{filename.inspect}."
         prune

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.27.0'
+  VERSION         = '0.30.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.27.0 ruby lib
+# stub: utils 0.30.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.27.0"
+  s.version = "0.30.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-05-14"
+  s.date = "2022-06-16"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
-  s.executables = ["all_images".freeze, "ascii7".freeze, "blameline".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, "ssl_cert_info".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/all_images".freeze, "bin/ascii7".freeze, "bin/blameline".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/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.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.3.13".freeze
+  s.rubygems_version = "3.3.14".freeze
   s.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<infobar>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<mize>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<all_images>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
@@ -40,5 +41,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<infobar>.freeze, [">= 0"])
     s.add_dependency(%q<mize>.freeze, [">= 0"])
     s.add_dependency(%q<search_ui>.freeze, [">= 0"])
+    s.add_dependency(%q<all_images>.freeze, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -108,12 +108,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: all_images
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
-- all_images
 - ascii7
 - blameline
+- check-yaml
 - classify
 - create_cstags
 - create_tags
@@ -167,9 +181,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/all_images
 - bin/ascii7
 - bin/blameline
+- bin/check-yaml
 - bin/classify
 - bin/create_cstags
 - bin/create_tags
@@ -238,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Some useful command line utilities

data/bin/all_images

@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby
-# Configure like so:
-#dockerfile: |-
-#  RUN apk add --no-cache build-base git
-#  RUN gem update --system
-#  RUN gem install gem_hadar bundler
-#
-#script: &script |-
-#  echo -e "\e[1m"
-#  ruby -v
-#  bundle
-#  echo -e "\e[0m"
-#  if rake test
-#
-#images:
-#  ruby:3.0-alpine: *script
-#  ruby:2.7-alpine: *script
-#  ruby:2.6-alpine: *script
-#  ruby:2.5-alpine: *script
-#  ruby:2.4-alpine: *script
-#  ruby:2.3-alpine: *script
-
-require 'yaml'
-require 'tmpdir'
-require 'fileutils'
-include FileUtils
-
-alias sh system
-
-def provide_image(image, dockerfile)
-  prefix = $config.fetch('prefix', File.basename(Dir.pwd))
-  tag = "#{prefix}/all_images/#{image}"
-  sh "docker pull '#{image}'"
-  build_dir = File.join(Dir.tmpdir, 'build')
-  mkdir_p build_dir
-  cd build_dir do
-    File.open('Dockerfile', 'w') do |t|
-      t.puts <<~end
-        FROM #{image}
-
-        WORKDIR /work
-
-        #{dockerfile}
-      end
-    end
-    sh "docker build --pull -t '#{tag}' ."
-  end
-  tag
-ensure
-  rm_rf File.join(Dir.tmpdir, 'build')
-end
-
-def red(string)
-  "\e[31m#{string}\e[0m"
-end
-
-def green(string)
-  "\e[32m#{string}\e[0m"
-end
-
-$config = YAML.load_file(ARGV.shift || '.all_images.yml')
-dockerfile = $config['dockerfile'].to_s
-Array($config['images']).each do |image, script|
-  tag = provide_image image, dockerfile
-  if sh "docker run --name all_images -v `pwd`:/work '#{tag}' sh -c '#{script}'"
-    puts green('SUCCESS')
-  else
-    puts red('FAILURE')
-  end
-ensure
-  sh 'docker rm -f all_images >/dev/null'
-end