utils 0.60.2 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6248e316412b8927ac4a15ed491fdbe83d86db6f121d96de85eed9a6aa1cd400
-  data.tar.gz: 2845d382afc8c0a597a947c2213ba1043548a19031865db0f57a087e72a9c044
+  metadata.gz: cb608b3d361742306cafe1b44729d2de4d4dcd01df60ae727d6317e4225e932e
+  data.tar.gz: d3a0e74795e6dd0b84d0482b65c654e215d748e8631898850a3b6d6c84fe75f4
 SHA512:
-  metadata.gz: 438e3e13d461aeb22ffbccac934906b98b52bcc1e31af6cb2eaf9006631f7ea11ddfe76ba78cb3bee85ba980eb4190c1db99b4e0b342ca046283cd47e6360830
-  data.tar.gz: 6643afbc8922f6711939cb91371e5b56310147ffcb7774ee4e950eeae0b041c52ac927f9a6b061ff7aa4ca19bdeece11a4fa42d05a8d9e4f76fd09677a3eda32
+  metadata.gz: 60dc92c6645f507de9ccc6ecc46eed3c7575d5a6ad8f095747059768fb8ffb984442c8421475813f3c960a99ae9724d1a6a2e4ddf54364f4c7c03a9a73bb0190
+  data.tar.gz: 52cbbc17bf192017e1f6d271f1891039b5e1a06717582da89ccd8af3596145a8f0d5c9997612d871d3c523982c2d3ab1b116e04dbee82c70ca9e95a19a84085e

data/bin/code_comment

@@ -8,7 +8,7 @@ def fetch_method(filename_linenumber)
   result = ''
   source_location = filename_linenumber.source_location
   lf = Tins::LinesFile.for_filename(source_location.filename, source_location.linenumber)
-  if spaces = lf.match_backward(/^(\s*)def\s+(?:\S+?)(?:\(|\s*$)/)&.first
+  if spaces = lf.match_backward(/^(\s*|.*?(private|protected)\s+)def\s+(?:\S+?)(?:\(|\s*$)/)&.first
     line_number_begin = lf.line_number
     lf.match_forward(/^#{spaces}end/)
     line_number_end = lf.line_number
@@ -26,11 +26,12 @@ def fetch_file(filename_linenumber)
 end
 
 filename_linenumber = ARGV.shift or fail "require file_name as second argument"
-method   = fetch_method(filename_linenumber)
-#file     = fetch_file(filename_linenumber)
-files = Dir['{lib,spec,test}/**/*.rb']
-base_url = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
-model    = ENV.fetch('OLLAMA_MODEL', 'llama3.1')
+method              = fetch_method(filename_linenumber)
+method_indent       = method[/\A( *)/, 1].size
+#file                = fetch_file(filename_linenumber)
+files               = Dir['{lib,spec,test}/**/*.rb']
+base_url            = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+model               = ENV.fetch('OLLAMA_MODEL', 'llama3.2')
 #file                = File.read(file_name)
 #call_sites          = %x(cscope -L -3 "#{method_name}" $(find . -name '*.rb') | awk '{ print $1 ":" $3 }').lines.map(&:chomp).uniq
 #methods             = call_sites.map { fetch_method(_1) } * ?\n
@@ -86,7 +87,10 @@ documentation later.
 EOT
 
 system = <<EOT
-You are a Ruby code commenter that writes succinct, simple ruby YARD comments.
+Provide high-quality YARD comments for the given Ruby method, including a brief
+description of its purpose, parameters, raised exceptions (and why), and
+return values, assuming an expert-level understanding of the programming
+concepts involved.
 EOT
 system = nil
 
@@ -95,20 +99,52 @@ Analyze this code:
 
 #{files.map { File.read(_1) } * ?\n}
 
-Then output a succinct YARD comment for the method below.
+Here's an example for how you should document a method.
+
+    # The foo method computes the bar result by processing…
+    # then it returns the result.
+    #
+    # @param first [ String ] the foo string
+    # @param second [ Integer ] the number of bars lengthy detailed mutltiline
+    #                           detailed explanation including a newline.
+    # @param third [ TrueClass, FalseClass ]
+    #
+    # @yield [ a, b ]
+    #
+    # @raise [ ArgumentError ] if block argument wasn't provided
+    # @raise [ ArgumentError ] if second parameter was too small.
+    #
+    # @example
+    #   bar.foo("blub", 4) { |a, b| … } #=> …
+    #
+    # @return [ ProcessResult ]
+    def foo(first, second, third: false, &block)
+      block or raise ArgumentError, 'no &block'
+      a = first * 2
+      if second < 0
+        raise ArgumentError, 'too small'
+      end
+      b = "foo" * second
+      if third
+        a = a * b
+      end
+      block_result = block.(a, b)
+      result = process block_result
+      return result
+    end
 
-Follow the following guidelines:
-- Do not repeat the ruby method code.
-- Do not use `, `ruby, ```, ```ruby in your response.
-- Start each line of your comment with a single # character.
+And this is the method you should document:
 
-Here's a cheatsheet for YARD you can peek into:
+#{method}
 
-#{cheatsheet}
+Output a YARD comment for this method:
 
-And this is the method you should document:
+Format requirements:
 
-#{method}
+1. Focus on providing a description of the method's purpose, without including any code snippets.
+2. Never use `, `ruby, ```, ```ruby in your response.
+3. Never add any other remarks or explanation to your response.
+4. Start each line of your comment with a single # character.
 EOT
 
 options = Ollama::Options.new(
@@ -131,5 +167,6 @@ if ENV['DEBUG'].to_i == 1
   end
 end
 
-ollama = Client.new(base_url:, read_timeout: 120)
-ollama.generate(model:, system:, prompt:, options:, stream: false, &Print)
+ollama   = Client.new(base_url:, read_timeout: 120)
+response = ollama.generate(model:, system:, prompt:, options:, stream: false).response
+puts response.gsub(/^/) { ' ' * method_indent }

data/bin/discover

@@ -63,7 +63,6 @@ Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args[?c]
 STDOUT.sync = true
 config = Utils::ConfigFile.new
 config.configure_from_paths
-args[?b] ||= config.discover.binary
 args[?n] ||= (args[?l] || args[?L]) ? 1 << 60 : config.discover.max_matches
 
 if args[?s]

data/bin/search

@@ -134,7 +134,6 @@ def usage
       -e          open the matching files with edit command
       -E          pick one file to edit
       -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
@@ -146,7 +145,7 @@ def usage
   exit 1
 end
 
-args = go 'r:p:I:A:B:C:s:S:n:N:a:i:G:cfFlLeEvbgh'
+args = go 'r:p:I:A:B:C:s:S:n:N:a:i:G:cfFlLeEvgh'
 args[?h] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }

data/bin/strip_spaces

@@ -6,7 +6,6 @@ require 'tins/secure_write'
 include Tins::SecureWrite
 require 'tins/find'
 include Tins::Find
-require 'tins/xt/file_binary'
 require 'utils'
 
 def usage

data/lib/utils/config_file.rb

@@ -132,8 +132,6 @@ class Utils::ConfigFile
 
     config :skip_files, /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
 
-    config :binary, false
-
     config :max_matches, 10
 
     config :index_expire_after
@@ -150,8 +148,6 @@ class Utils::ConfigFile
     config :prune_dirs, /\A(\.svn|\.git|CVS|tmp)\z/
 
     config :skip_files, /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
-
-    config :binary, false
   end
 
   def scope(&block)

data/lib/utils/grepper.rb

@@ -72,15 +72,11 @@ class Utils::Grepper
       (!@name_pattern || @name_pattern.match(bn))
     then
       File.open(filename, 'rb', encoding: Encoding::UTF_8) do |file|
-        if @args[?b] && !@args[?g] || file.binary? != true
-          @args[?v] and warn "Matching #{filename.inspect}."
-          if @args[?f]
-            @output << filename
-          else
-            match_lines file
-          end
+        @args[?v] and warn "Matching #{filename.inspect}."
+        if @args[?f]
+          @output << filename
         else
-          @args[?v] and warn "Skipping binary file #{filename.inspect}."
+          match_lines file
         end
       end
     else

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.60.2'
+  VERSION         = '0.62.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.60.2 ruby lib
+# stub: utils 0.62.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.60.2".freeze
+  s.version = "0.62.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-12-13"
+  s.date = "2025-01-10"
   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]
@@ -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.23".freeze
+  s.rubygems_version = "3.6.2".freeze
   s.summary = "Some useful command line utilities".freeze
 
   s.specification_version = 4

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.60.2
+  version: 0.62.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -318,7 +317,6 @@ homepage: http://github.com/flori/utils
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--title"
 - Utils - Some useful command line utilities
@@ -337,8 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Some useful command line utilities
 test_files: []