utils 0.56.1 → 0.57.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c084e3a5580950140252810adfa52663324149594e25ce6e3ed6f94329bab624
-  data.tar.gz: 0d3a709885df968bd9111f3b1c303cb23c5ff5f00519e2982a565f8d568403ac
+  metadata.gz: 4aac57a70b356647de0bdd6dd93ef4f327f58935e28cb85d3d40efc855a13c16
+  data.tar.gz: 0d12e68efae607546f43d287c67f1b02d70dd4d56a73367d434ab8748d6390fb
 SHA512:
-  metadata.gz: 0bc1513dc0ca75893424dc0ed6b85b6671cc32ee52bef80797f9915a092550cd3636fbf5fc4fa65576d0f2b066b728d6995f7ec4a5a669a9f9294a8a0df37d55
-  data.tar.gz: 88fc874d4f5255029a586e8c9b05123f211cade072814405085e617492dddc0d0e363823fd4b1068fd95c8b138d1568d678e7f8532b111486642e7bd7e4075e6
+  metadata.gz: 9f730b4ec5bb32fa151a759f3d9e5638e090d7497dabecc5d5535b62dfe4c056a1176004c69b4fea83bf63f508666abc4048b99f0341c11b830d57d6ac0e0fea
+  data.tar.gz: 03507d0cffb9bdf7c93eb923d50ff9b1824acdea35f03ab0c658255f1290768e224f22da3e1743a28f0f4f4be3cb494820cde007d39b0cdc48e6cd2bb21e8bc2

data/bin/changes

@@ -5,7 +5,7 @@ include Ollama
 require 'tins/xt'
 
 def x(cmd)
-  output=`#{cmd}`
+  output = `#{cmd}`
   $?.success? or fail "failed to execute #{cmd.inspect}"
   output
 end
@@ -31,10 +31,10 @@ def compute_change(range_from, range_to)
     range = "#{range_from}..#{range_to}"
   end
 
-  log=x("git log #{range}")
+  log = x("git log #{range}")
   $?.success? or exit 1
 
-  date=x("git log -n1 --pretty='format:%cd' --date=short #{range_to}")
+  date = x("git log -n1 --pretty='format:%cd' --date=short #{range_to}")
 
   if log.strip.empty?
     return <<~EOT
@@ -80,7 +80,8 @@ def compute_change(range_from, range_to)
   )
 
   ollama = Client.new(base_url:, read_timeout: 120)
-  changes = ollama.generate(model:, system:, prompt:, options:, stream: false).response
+  changes = ollama.generate(model:, system:, prompt:, options:, stream: false)
+  changes = changes.response.gsub(/\t/, '  ')
 
   return <<~EOT
 
@@ -125,7 +126,7 @@ when 'full', 'add'
     _1.sub(/\Av/, '').version
   }.sort
   if command == 'full'
-    date=x("git log -n1 --pretty='format:%cd' --date=short v#{tags.first}").chomp
+    date = x("git log -n1 --pretty='format:%cd' --date=short v#{tags.first}").chomp
     ary << <<~EOT
 
       ## #{date} v#{tags.first}

data/bin/git-md

@@ -1,29 +1,37 @@
 #!/usr/bin/env ruby
 
-require 'ollama'
+require 'utils/markdown'
+include Utils::Markdown
+require 'utils/pager'
 require 'shellwords'
 
-def markdown(message)
-  Ollama::Utils::ANSIMarkdown.parse(message)
-end
-
 cmd = %{git log --color=always --pretty=format:"commit %C(auto)%H%d%nDate:   %Cgreen%cD (%cr)%Creset%nAuthor: %Cblue%an <%ae>%Creset%n%nMARKUP%n%s%n%n%b%nMARKDOWN%n"}
 
-IO.popen("#{cmd} #{Shellwords.join(ARGV)}") do |log|
-  until log.eof?
-    message = nil
-    log.each do |line|
-      case line
-      when /^MARKUP$/
-        message =  ''
-      when /^MARKDOWN$/
-        puts markdown(message + "\n---\n")
-        message = nil
-      else
-        if message
-          message << line
+core_pager     = `git config get core.pager`.chomp.full?
+git_pager      = ENV['GIT_PAGER'].full?
+default_pager  = ENV['PAGER'].full?
+if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
+  fallback_pager << ' -r'
+end
+my_pager = git_pager || core_pager || default_pager || fallback_pager
+
+Utils::Pager.pager(command: my_pager) do |output|
+  IO.popen("#{cmd} #{Shellwords.join(ARGV)}") do |log|
+    until log.eof?
+      message = nil
+      log.each do |line|
+        case line
+        when /^MARKUP$/
+          message =  ''
+        when /^MARKDOWN$/
+          output.puts markdown(message + "\n---\n")
+          message = nil
         else
-          puts line
+          if message
+            message << line
+          else
+            output.puts line
+          end
         end
       end
     end

data/bin/md

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'utils/markdown'
+include Utils::Markdown
+require 'utils/pager'
+
+rendered      = markdown(ARGF.read)
+default_pager = ENV['PAGER'].full?
+if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
+  fallback_pager << ' -r'
+end
+my_pager = default_pager || fallback_pager
+
+Utils::Pager.pager(lines: rendered.count(?\n), command: my_pager) do |output|
+  output.puts rendered
+end

data/lib/utils/markdown.rb

@@ -0,0 +1,11 @@
+require 'ollama'
+
+module Utils
+  module Markdown
+    module_function
+
+    def markdown(message)
+      Ollama::Utils::ANSIMarkdown.parse(message)
+    end
+  end
+end

data/lib/utils/pager.rb

@@ -0,0 +1,30 @@
+require 'tins'
+
+module Utils
+  module Pager
+    module_function
+
+    def pager(command: nil, lines: nil, &block)
+      if block
+        if my_pager = pager(command:, lines:)
+          IO.popen(my_pager, 'w') do |output|
+            output.sync = true
+            yield output
+            output.close
+          end
+        else
+          yield STDOUT
+        end
+      else
+        return unless STDOUT.tty?
+        if lines
+          if lines >= Tins::Terminal.lines
+            pager(command:)
+          end
+        else
+          command
+        end
+      end
+    end
+  end
+end

data/lib/utils/version.rb

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

data/lib/utils.rb

@@ -10,6 +10,8 @@ module Utils
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
   require 'utils/line_blamer'
+  require 'utils/markdown'
+  require 'utils/pager'
 
   require 'utils/xt/source_location_extension'
   class ::Object

data/utils.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.56.1 ruby lib
+# stub: utils 0.57.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.56.1".freeze
+  s.version = "0.57.1".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-09-30"
+  s.date = "2024-10-03"
   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-md".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-md".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.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-md".freeze, "git-versions".freeze, "json_check".freeze, "long_lines".freeze, "md".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/markdown.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/pager.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-md".freeze, "bin/git-versions".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/md".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/markdown.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/pager.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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.56.1
+  version: 0.57.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -212,6 +212,7 @@ executables:
 - git-versions
 - json_check
 - long_lines
+- md
 - myex
 - number_files
 - on_change
@@ -241,7 +242,9 @@ extra_rdoc_files:
 - lib/utils/irb.rb
 - lib/utils/line_blamer.rb
 - lib/utils/line_formatter.rb
+- lib/utils/markdown.rb
 - lib/utils/md5.rb
+- lib/utils/pager.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
 - lib/utils/ssh_tunnel_specification.rb
@@ -271,6 +274,7 @@ files:
 - bin/git-versions
 - bin/json_check
 - bin/long_lines
+- bin/md
 - bin/myex
 - bin/number_files
 - bin/on_change
@@ -297,7 +301,9 @@ files:
 - lib/utils/irb.rb
 - lib/utils/line_blamer.rb
 - lib/utils/line_formatter.rb
+- lib/utils/markdown.rb
 - lib/utils/md5.rb
+- lib/utils/pager.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
 - lib/utils/ssh_tunnel_specification.rb