utils 0.60.0 → 0.60.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d5a13dd0dc3c72e4110c54d7b218275b8ffe0aaffb79d1ad14d0e8c4de2201f
-  data.tar.gz: e35c204313debe613cbe39e915f986d84faf6ff0ef9c0a7d3529eeabcab8f628
+  metadata.gz: 6248e316412b8927ac4a15ed491fdbe83d86db6f121d96de85eed9a6aa1cd400
+  data.tar.gz: 2845d382afc8c0a597a947c2213ba1043548a19031865db0f57a087e72a9c044
 SHA512:
-  metadata.gz: f2755da93986eb39d4c2736578fa26acba7b8a3a4d8a56baaf30c509eb008260eb30281ad26dfba430ab5d031381f5f84ae8a0f4e2fdacc635e96aa105f0ec72
-  data.tar.gz: 8169b9827f29e237e589e76cc98a732a0bda047f524eeccdeaf2e1a0aadc18accdc879fecdbb00c1b19fdb318b52dac193c795bba4cfddf4043db7ebaedd90fc
+  metadata.gz: 438e3e13d461aeb22ffbccac934906b98b52bcc1e31af6cb2eaf9006631f7ea11ddfe76ba78cb3bee85ba980eb4190c1db99b4e0b342ca046283cd47e6360830
+  data.tar.gz: 6643afbc8922f6711939cb91371e5b56310147ffcb7774ee4e950eeae0b041c52ac927f9a6b061ff7aa4ca19bdeece11a4fa42d05a8d9e4f76fd09677a3eda32

data/Rakefile

@@ -29,7 +29,7 @@ GemHadar do
   dependency 'search_ui',      '~> 0.0'
   dependency 'all_images',     '~> 0.5.0'
   dependency 'ollama-ruby'
-  dependency 'kramdown-ansi'
+  dependency 'kramdown-ansi',  '~> 0.0.1'
   dependency 'simplecov'
   dependency 'debug'
 

data/bin/git-versions

@@ -1,25 +1,25 @@
 #!/usr/bin/env ruby
 
-require 'tins/xt'
+require 'tins'
 require 'term/ansicolor'
-include Tins::GO
-
-$opts = go 'r:v'
-
 class String
   include Term::ANSIColor
+  include Tins::StringVersion
 end
+require 'shellwords'
 
-regexp = $opts[?r] && Regexp.new($opts[?r]) || /^v((?:\d+\.)*\d+)/
+args = ARGV.dup
+args.empty? and args.concat %w[ --color --stat ]
+
+regexp = ENV['GIT_VERSIONS_REGEXP']
+regexp = regexp ? Regexp.new(regexp) : /^v((?:\d+\.)*\d+)/
 
 versions = `git tag`.lines.map(&:chomp).grep(regexp).sort_by { |x|
   x[regexp, 1].version
 }.reverse
+
+git_options = args.empty? ? ' ' : " #{Shellwords.join(args)} "
 versions.each_cons(2) do |new, old|
   puts "Version #{new}".red.bold
-  if $opts[?v]
-    puts `git log --color --stat -u #{old}..#{new}`
-  else
-    puts `git log --color --stat #{old}..#{new}`
-  end
+  puts `git log #{git_options}#{old}..#{new}`
 end

data/bin/strip_spaces

@@ -6,12 +6,9 @@ require 'tins/secure_write'
 include Tins::SecureWrite
 require 'tins/find'
 include Tins::Find
+require 'tins/xt/file_binary'
 require 'utils'
 
-class ::File
-  include Utils::FileXt
-end
-
 def usage
   puts <<-EOT
 Usage: #{File.basename($0)} [OPTS] [PATHS]

data/lib/utils/finder.rb

@@ -5,10 +5,6 @@ require 'digest/md5'
 require 'fileutils'
 require 'mize'
 
-class ::File
-  include Utils::FileXt
-end
-
 class Utils::Finder
   include Tins::Find
   include Utils::Patterns

data/lib/utils/grepper.rb

@@ -1,10 +1,6 @@
 require 'term/ansicolor'
 require 'tins/xt'
 
-class ::File
-  include Utils::FileXt
-end
-
 class Utils::Grepper
   include Tins::Find
   include Utils::Patterns

data/lib/utils/version.rb

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

data/lib/utils.rb

@@ -1,6 +1,5 @@
 module Utils
   require 'utils/version'
-  require 'utils/file_xt'
   require 'utils/md5'
   require 'utils/patterns'
   require 'utils/config_file'

data/utils.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.60.0 ruby lib
+# stub: utils 0.60.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.60.0".freeze
+  s.version = "0.60.2".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-10-31"
+  s.date = "2024-12-13"
   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/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/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/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.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.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.22".freeze
+  s.rubygems_version = "3.5.23".freeze
   s.summary = "Some useful command line utilities".freeze
 
   s.specification_version = 4
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])
   s.add_runtime_dependency(%q<all_images>.freeze, ["~> 0.5.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, [">= 0".freeze])
-  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0.1".freeze])
   s.add_runtime_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<debug>.freeze, [">= 0".freeze])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.60.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -168,16 +168,16 @@ dependencies:
   name: kramdown-ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +248,6 @@ extra_rdoc_files:
 - lib/utils.rb
 - lib/utils/config_file.rb
 - lib/utils/editor.rb
-- lib/utils/file_xt.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
 - lib/utils/irb.rb
@@ -303,7 +302,6 @@ files:
 - lib/utils.rb
 - lib/utils/config_file.rb
 - lib/utils/editor.rb
-- lib/utils/file_xt.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
 - lib/utils/irb.rb
@@ -339,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Some useful command line utilities

data/lib/utils/file_xt.rb

@@ -1,46 +0,0 @@
-require 'tins'
-
-module Utils
-  module FileXt
-    extend DSLKit::Concern
-    include File::Constants
-
-    SEEK_SET = File::SEEK_SET
-
-    ZERO   = "\x00"
-    BINARY = "\x01-\x1f\x7f-\xff"
-
-    if defined?(::Encoding)
-      ZERO.force_encoding(Encoding::ASCII_8BIT)
-      BINARY.force_encoding(Encoding::ASCII_8BIT)
-    end
-
-    def binary?
-      old_pos = tell
-      seek 0, SEEK_SET
-      data = read 2 ** 13
-      !data or data.empty? and return nil
-      data.count(ZERO) > 0 and return true
-      data.count(BINARY).to_f / data.size > 0.3
-    ensure
-      seek old_pos, SEEK_SET
-    end
-
-    def ascii?
-      case binary?
-      when true   then false
-      when false  then true
-      end
-    end
-
-    module ClassMethods
-      def binary?(name)
-        File.open(name, 'rb') { |f| f.binary? }
-      end
-
-      def ascii?(name)
-        File.open(name, 'rb') { |f| f.ascii? }
-      end
-    end
-  end
-end