utils 0.92.0 → 0.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e463ff924e67f19010624b289785351548ff5a2936b2313364746db6cda78ab1
-  data.tar.gz: 108ecbd19c3181d3ec171c9b299c0c6cbdecce2ca7dc74c6e79b628fd0817d99
+  metadata.gz: 9e75e4da900a5682f8be3d521d422a48b201f1ba9868468f703b420d344860e8
+  data.tar.gz: 2f1317551005fd0e0c413a76f790dcfd670c60124a1c88376b4b8d60001861b5
 SHA512:
-  metadata.gz: e15ee8452f37913150ec92fef8b34713eacf1fd711f05b103a53d5f95b703dcc66ab6e0e33d0d2adaef2025f9dd9addade2d56b4e146e25190d3f0704f130f5f
-  data.tar.gz: b190a70da86e9fa3f79f6d46a6fbe846f06151d201108519712da7f910081d188a3cdb5aa759176e7a70fbcce305bf61e5452693eff31c73abe334c459753b14
+  metadata.gz: 7bd6708c73311146fab0a0f14e4dfb5b470b958bee9911630c12cc40468ff359be46680a53f12c48310f058680d89d5693ab7040ff91c1dd778ca6f618f305b5
+  data.tar.gz: 6093657c875f1f276b3e8b95b1f799521200baca5d29568c06e032059b5a5888c01c333028e63adac91d8eeb75a05fba5adf2d2c7e73bf171e4cb53048515480

data/.contexts/lib.rb

@@ -0,0 +1,23 @@
+context do
+  namespace "structure" do
+    command "tree", tags: %w[ project_structure ]
+  end
+
+  namespace "lib" do
+    Dir['lib/**/*.rb'].each do |filename|
+      file filename, tags: 'lib'
+    end
+  end
+
+  namespace "gems" do
+    file Dir['*.gemspec'].first
+    file 'Gemfile'
+    file 'Gemfile.lock'
+  end
+
+  file 'Rakefile',  tags: 'gem_hadar'
+
+  file 'README.md', tags: 'documentation'
+
+  meta ruby: RUBY_DESCRIPTION
+end

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: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: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/config_file.rb

@@ -205,8 +205,9 @@ class Utils::ConfigFile
     #
     # @return [ TrueClass, FalseClass ] true if the basename matches any prune pattern,
     #         false otherwise
-    def prune?(basename)
-      Array(prune_dirs).any? { |pd| pd.match(basename.to_s) }
+    def prune?(basename, additional_dirs: nil)
+      ([ Array(prune_dirs), Array(additional_dirs) ].compact.flatten).
+        any? { |pd| pd.match(basename.to_s) }
     end
 
     # The skip? method determines whether a file should be skipped based on

data/lib/utils/finder/files.rb

@@ -155,7 +155,7 @@ module Utils::Finder::Files
       s  = filename.stat
       bn = filename.pathname.basename
       if !s ||
-          s.directory? && @config.discover.prune?(bn) ||
+          s.directory? && @config.discover.prune?(bn, additional_dirs: @args[?P]) ||
           s.file? && @config.discover.skip?(bn)
       then
         @args[?v] and warn "Pruning #{filename.inspect}."

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],
@@ -138,7 +143,7 @@ class Utils::Grepper
     @filename = filename
     @output = []
     bn, s = File.basename(filename), File.stat(filename)
-    if !s || s.directory? && @config.search.prune?(bn)
+    if !s || s.directory? && @config.search.prune?(bn, additional_dirs: @args[?P])
       @args[?v] and warn "Pruning #{filename.inspect}."
       prune
     end
@@ -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
 
@@ -335,7 +335,7 @@ else
       #
       # @return [ String ] the input text wrapped with green color ANSI escape codes
       def success_color(text)
-        Term::ANSIColor.green(text)
+        Term::ANSIColor.bright_green(text)
       end
 
       # The failure_color method applies red color formatting to the provided
@@ -349,7 +349,7 @@ else
       #
       # @return [ String ] the colorized text wrapped with red formatting codes
       def failure_color(text)
-        Term::ANSIColor.red(text)
+        Term::ANSIColor.bright_red(text)
       end
 
       # The pending_color method applies yellow color formatting to the
@@ -363,7 +363,7 @@ else
       #
       # @return [ String ] the colorized text with yellow formatting applied
       def pending_color(text)
-        Term::ANSIColor.yellow(text)
+        Term::ANSIColor.bright_yellow(text)
       end
 
       # The location method extracts and formats the file path and line number

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.92.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.92.0 ruby lib
+# stub: utils 0.94.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.92.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]
@@ -13,17 +13,17 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de".freeze
   s.executables = ["ascii7".freeze, "blameline".freeze, "changes".freeze, "classify".freeze, "code_comment".freeze, "code_indexer".freeze, "commit_message".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "git-empty".freeze, "git-versions".freeze, "irb_client".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "on_change".freeze, "path".freeze, "print_method".freeze, "probe".freeze, "rainbow".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/config_file/block_config.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/finder/files.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/irb_server.rb".freeze, "lib/utils/irb/regexp.rb".freeze, "lib/utils/irb/shell.rb".freeze, "lib/utils/irb/shell/wrappers.rb".freeze, "lib/utils/irb/string.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.rb".freeze, "lib/utils/probe/probe_client.rb".freeze, "lib/utils/probe/probe_server.rb".freeze, "lib/utils/probe/process_job.rb".freeze, "lib/utils/probe/server_handling.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xdg.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
-  s.files = ["Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/changes".freeze, "bin/classify".freeze, "bin/code_comment".freeze, "bin/code_indexer".freeze, "bin/commit_message".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_client".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/print_method".freeze, "bin/probe".freeze, "bin/rainbow".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/config_file/block_config.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/finder/files.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/irb_server.rb".freeze, "lib/utils/irb/regexp.rb".freeze, "lib/utils/irb/shell.rb".freeze, "lib/utils/irb/shell/wrappers.rb".freeze, "lib/utils/irb/string.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.rb".freeze, "lib/utils/probe/probe_client.rb".freeze, "lib/utils/probe/probe_server.rb".freeze, "lib/utils/probe/process_job.rb".freeze, "lib/utils/probe/server_handling.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xdg.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze, "utils.gemspec".freeze]
+  s.files = [".contexts/lib.rb".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/changes".freeze, "bin/classify".freeze, "bin/code_comment".freeze, "bin/code_indexer".freeze, "bin/commit_message".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_client".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/print_method".freeze, "bin/probe".freeze, "bin/rainbow".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/config_file/block_config.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/finder/files.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/irb_server.rb".freeze, "lib/utils/irb/regexp.rb".freeze, "lib/utils/irb/shell.rb".freeze, "lib/utils/irb/shell/wrappers.rb".freeze, "lib/utils/irb/string.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.rb".freeze, "lib/utils/probe/probe_client.rb".freeze, "lib/utils/probe/probe_server.rb".freeze, "lib/utils/probe/process_job.rb".freeze, "lib/utils/probe/server_handling.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xdg.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "tests/test_helper.rb".freeze, "tests/utils_test.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 = "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.92.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
@@ -341,6 +341,7 @@ extra_rdoc_files:
 - lib/utils/xdg.rb
 - lib/utils/xt/source_location_extension.rb
 files:
+- ".contexts/lib.rb"
 - Gemfile
 - LICENSE
 - README.md
@@ -429,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: