utils 0.93.0 → 0.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4412a2649cf7a18654f0cdec0cf7fa86ba33cb15c8cf88e2ef1ba10267753cd4
-  data.tar.gz: 30095f823b5fad6f66e79667d82f88757d47f04d28cde52fe7706c1731331d6b
+  metadata.gz: 9e75e4da900a5682f8be3d521d422a48b201f1ba9868468f703b420d344860e8
+  data.tar.gz: 2f1317551005fd0e0c413a76f790dcfd670c60124a1c88376b4b8d60001861b5
 SHA512:
-  metadata.gz: 0aa5db98d16b760637beb04b4fa5fcd99cb951854b9bb6f8714bc350f2351bb2acbe26fc2220e35b7caf3e079f0b19c3fa74f218bc44107ad03d98c7cbbcb5c2
-  data.tar.gz: fdb6289ad43454ed499fbdf9ae17051d5b24e93c474dc9ddc81c1f34661135e1c5275bc9dfee6b0b505a017c5a64b9c8c8a28e1caa744f9d7ae255e4ea115951
+  metadata.gz: 7bd6708c73311146fab0a0f14e4dfb5b470b958bee9911630c12cc40468ff359be46680a53f12c48310f058680d89d5693ab7040ff91c1dd778ca6f618f305b5
+  data.tar.gz: 6093657c875f1f276b3e8b95b1f799521200baca5d29568c06e032059b5a5888c01c333028e63adac91d8eeb75a05fba5adf2d2c7e73bf171e4cb53048515480

data/bin/discover

@@ -82,7 +82,7 @@ Options are
   -d          match also directories
   -D          list all search leaf directories
   -v          be verbose
-  -n NUMBER   the first NUMBER of matches is returned
+  -m NUMBER   the maximum NUMBER of matches that is returned
   -s          search by interactively inputting PATTERN
   -l          list all paths in cache relative to current directory
   -L          list all paths in cache as absolute pathes from root
@@ -94,14 +94,14 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'n:I:i:a:p:P:lLcreEvdsDgh', defaults: { ?a => '\\w' }
+args = go 'm:I:i:a:p:P:lLcreEvdsDgh', defaults: { ?a => '\\w' }
 args[?h] and usage
 
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args[?c]
 STDOUT.sync = true
 config = Utils::ConfigFile.new
 config.configure_from_paths
-args[?n] ||= (args[?l] || args[?L]) ? 1 << 60 : config.discover.max_matches
+args[?m] ||= (args[?l] || args[?L]) ? 1 << 60 : config.discover.max_matches
 
 if args[?s]
   pattern = ''
@@ -125,7 +125,7 @@ finder = -> * {
 search = -> * {
   f        = nil
   pattern  = pattern.dup
-  args[?n] = Term::ANSIColor.terminal_lines - 1
+  args[?m] = Term::ANSIColor.terminal_lines - 1
   found = Search.new(
     match: -> answer {
       pattern.replace answer

data/bin/search

@@ -200,6 +200,7 @@ def usage
 
       -n PATTERN  only search files whose names match fuzzy PATTERN
       -N PATTERN  only search files whose names match regexp PATTERN
+      -m NUMBER   maximum number of files to return
       -s PATTERN  skip lines that match fuzzy PATTERN
       -S PATTERN  skip lines that match regexp PATTERN
       -A NUMBER   displays NUMBER lines of context after the match
@@ -227,7 +228,7 @@ def usage
   exit 1
 end
 
-args = go 'r:p:I:A:B:C:s:S:n:N:a:i:G:P:cfFlLeEvgh'
+args = go 'r:p:I:A:B:C:s:S:n:N:m:a:i:G:P:cfFlLeEvgh'
 args[?h] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }

data/lib/utils/finder.rb

@@ -150,9 +150,9 @@ class Utils::Finder
     end
     paths.compact!
     @paths, @output = paths.sort.transpose.values_at(-2, -1)
-    if n = @args[?n]&.to_i
-      @paths = @paths&.first(n) || []
-      @output = @output&.first(n) || []
+    if m = @args[?m]&.to_i
+      @paths = @paths&.first(m) || []
+      @output = @output&.first(m) || []
     end
     self
   end

data/lib/utils/grepper.rb

@@ -88,6 +88,11 @@ class Utils::Grepper
         raise ArgumentError, "needs to be an integer number >= 1"
       end
     end
+
+    if max_files = @args[?m].to_i and max_files > 0
+      @max_files = max_files
+    end
+
     @paths  = []
     pattern_opts = opts.subhash(:pattern) | {
       :cset  => @args[?a],
@@ -260,8 +265,17 @@ class Utils::Grepper
       end
     }
     find(*@roots, visit: visit) do |filename|
-      match(filename)
+      if @max_files && @paths.length >= @max_files
+        break
+      else
+        match(filename)
+      end
+    end
+
+    if @max_files
+      @paths = @paths.first(@max_files)
     end
+
     @paths = @paths.sort_by(&:source_location)
     self
   end

data/lib/utils/line_formatter.rb

@@ -33,13 +33,13 @@ else
       # The start method initializes the error logging output.
       #
       # This method writes a header message to the output indicating where the
-      # error list will be stored, followed by a separator line made of dashes
+      # errors list will be stored, followed by a separator line made of dashes
       # that spans the width of the terminal.
       #
       # @param _ignore [ Object ] this parameter is ignored and exists for
       # interface compatibility
       def start(_ignore)
-        output.puts "Storing error list in #{@errors_lst.path.inspect}: "
+        output.puts "Storing errors list in #{@errors_lst.path.inspect}: "
         output.puts ?━ * Tins::Terminal.columns
       end
 

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.93.0'
+  VERSION         = '0.94.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,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.93.0 ruby lib
+# stub: utils 0.94.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.93.0".freeze
+  s.version = "0.94.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -17,13 +17,13 @@ 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 = "4.0.3".freeze
+  s.rubygems_version = "4.0.4".freeze
   s.summary = "Some useful command line utilities".freeze
   s.test_files = ["tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.17.0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 2.8".freeze])
   s.add_development_dependency(%q<test-unit>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.51".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.93.0
+  version: 0.94.0
 platform: ruby
 authors:
 - Florian Frank
@@ -13,16 +13,16 @@ dependencies:
   name: gem_hadar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Some useful command line utilities
 test_files: