scout-essentials 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff597b1b0d5a5a8582e92677aa951559d3ddf2f56cec76bbbfd5f0c90ea180e
-  data.tar.gz: 298441b06d0c2d048732fa7fb525a51c4ff93a31e39b1882211048f06978c1b9
+  metadata.gz: e5c16f695461037137552a5dc43c5135eae7873176ae2bc9495e9c0ed7fdbf0b
+  data.tar.gz: 6bea89686ff4be00f385757cf2d4e96aa15c973253432244eb7c0412c7977365
 SHA512:
-  metadata.gz: 91c63f92b747ea2c39b291430b8a63a7db63bf28465eb66b5d7cceda88f07ceaefef1c7718a589bd5f8f040ff082f9a90232edfa16d4c28a5ba75877ac5a34b9
-  data.tar.gz: 10d3e562974232b7fe87954a6970cc9008799e341d2bb01e454406d3ceec5386bb27542dcc8b6622a27fd5382d29320561766b1abfd0467eee939d7c82af0a84
+  metadata.gz: 10864ea7dc1d73802a5c4bdc4f48f48434f3d610c4efef5df281f0d34b38eae366329673daff86756242ca43cee792ba76c8c8f590d0ed030c0c77c645eb4a58
+  data.tar.gz: 6d2d19fa54ee2ab3c3130310f54feb080713a53f41a69a99debed28e69f127e7e1596eb99a0e715f4a6af5f89af78c86d8c189cc94afef6427c5802962c12c1f

data/.vimproject

@@ -34,6 +34,11 @@ scout-essentials=/$PWD filter="*.rb *.txt *.md *.conf *.yaml" {
     color_class.rb
     fingerprint.rb
     progress.rb
+    progress=progress{
+     report.rb
+     util.rb
+    }
+
     trap.rb
    }
    tmpfile.rb

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.5

data/lib/scout/annotation/annotated_object.rb

@@ -1,9 +1,5 @@
 module Annotation
   module AnnotatedObject
-    def annotations
-      @annotations ||= []
-    end
-
     def annotation_types
       @annotation_types ||= []
     end

data/lib/scout/annotation/annotation_module.rb

@@ -34,7 +34,11 @@ module Annotation
       end
       obj = block if obj.nil?
       return nil if obj.nil?
-      obj.extend self unless self === obj
+      begin
+        obj.extend self unless self === obj
+      rescue TypeError
+        return obj
+      end
       attrs = self.instance_variable_get("@annotations")
 
       return obj if attrs.nil? || attrs.empty?

data/lib/scout/annotation/array.rb

@@ -34,7 +34,7 @@ module AnnotatedArray
 
   def each_with_index(&block)
     super do |item,i|
-      block.call annotate_item(item, i)
+      block.call annotate_item(item, i), i
     end
   end
 
@@ -70,6 +70,14 @@ module AnnotatedArray
     end
   end
 
+  def subset(list)
+    self.annotate(self & list)
+  end
+
+  def remove(list)
+    self.annotate(self - list)
+  end
+
   %w(compact uniq flatten reverse sort_by).each do |method|
 
     self.define_method(method) do |*args,&block|

data/lib/scout/annotation.rb

@@ -9,8 +9,12 @@ module Annotation
     annotation_types = annotation_types.split("|") if String === annotation_types
     annotation_types = [annotation_types] unless Array === annotation_types
     annotation_types.each do |type|
-      type = Kernel.const_get(type) if String === type
-      type.setup(obj, annotation_hash)
+      begin
+        type = Kernel.const_get(type) if String === type
+        type.setup(obj, annotation_hash)
+      rescue NameError
+        Log.warn "Annotation #{type} not defined"
+      end
     end
     obj
   end

data/lib/scout/indiferent_hash/options.rb

@@ -29,7 +29,9 @@ module IndiferentHash
 
   def self.pull_keys(hash, prefix)
     IndiferentHash.setup(hash)
-    new = hash.include?("#{prefix}_options") ? hash.delete("#{prefix}_options") : {}
+    new = hash.delete("#{prefix}_options") if hash.include?("#{prefix}_options")
+    new = {} if new.nil?
+    IndiferentHash.setup(new)
     prefix = prefix.to_s
     hash.keys.each do |key|
       if key.to_s =~ /#{ prefix }_(.*)/
@@ -45,8 +47,7 @@ module IndiferentHash
         end
       end
     end
-
-    IndiferentHash.setup(new)
+    new
   end
 
   def self.zip2hash(list1, list2)

data/lib/scout/indiferent_hash.rb

@@ -17,6 +17,19 @@ module IndiferentHash
     new
   end
 
+  def deep_merge(other)
+    new = self.dup
+    IndiferentHash.setup(new)
+    other.each do |k,value|
+      if new.include?(k) && IndiferentHash === new[k] && Hash === value
+        new[k] = new[k].deep_merge(value)
+      else
+        new[k] = value
+      end
+    end
+    new
+  end
+
   def []=(key,value)
     delete(key)
     super(key,value)
@@ -28,16 +41,22 @@ module IndiferentHash
 
   def [](key)
     res = super(key) 
-    return res unless res.nil? or (_default? and not keys.include? key)
 
-    case key
-    when Symbol, Module
-      super(key.to_s)
-    when String
-      super(key.to_sym)
-    else
-      res
+    if ! (res.nil? || (_default? and not keys.include?(key)))
+      IndiferentHash.setup(res) if Hash === res
+      return res
     end
+
+    res = case key
+          when Symbol, Module
+            super(key.to_s)
+          when String
+            super(key.to_sym)
+          else
+            res
+          end
+    IndiferentHash.setup(res) if Hash === res
+    res
   end
 
   def values_at(*key_list)
@@ -92,5 +111,34 @@ module IndiferentHash
     end
     IndiferentHash.setup(super(*ext_list))
   end
+
+  def keys_to_sym!
+    string_keys = keys.select{|k| String === k}
+    string_keys.each do |key|
+      self[key.to_sym] = self.delete(key)
+    end
+  end
+
+  def prety_print
+    Misc.format_definition_list(self, sep: "\n")
+  end
+
+  def except(*list)
+    full_list = list.dup
+
+    list.each do |e|
+      begin
+        if String === e
+          full_list << e.to_sym
+        else
+          full_list << e.to_s
+        end
+      rescue
+        next
+      end
+    end
+
+    super(*full_list)
+  end
 end
 

data/lib/scout/log.rb

@@ -252,14 +252,18 @@ module Log
   end
 
   def self.exception(e)
-    stack = caller
+    return if e.message.include?("NOLOG")
+    last_caller = last_caller caller
+    message = e.message
+    message = Log.fingerprint(message) if String === message && message.length > 1000
     backtrace = e.backtrace || []
+    backtrace = [] if message.include?("NOSTACK")
     if ENV["SCOUT_ORIGINAL_STACK"] == 'true'
-      error([e.class.to_s, e.message].compact * ": " )
-      error("BACKTRACE [#{Process.pid}]: " << Log.last_caller(stack) << "\n" + color_stack(backtrace)*"\n")
+      error([e.class.to_s, message].compact * ": " )
+      error("BACKTRACE [#{Process.pid}]: " << last_caller << "\n" + color_stack(backtrace)*"\n")
     else
-      error("BACKTRACE [#{Process.pid}]: " << Log.last_caller(stack) << "\n" + color_stack(backtrace.reverse)*"\n")
-      error([e.class.to_s, e.message].compact * ": " )
+      error("BACKTRACE [#{Process.pid}]: " << last_caller << "\n" + color_stack(backtrace.reverse)*"\n")
+      error([e.class.to_s, message].compact * ": " )
     end
   end
 
@@ -355,6 +359,7 @@ def ppp(message)
   stack = caller
   puts "#{Log.color :cyan, "PRINT:"} " << stack.first
   puts ""
+  message = message.prety_print if message.respond_to?(:prety_print)
   if message.length > 200 or message.include? "\n"
     puts Log.color(:cyan, "=>|") << "\n" << message.to_s
   else

data/lib/scout/misc/format.rb

@@ -72,7 +72,7 @@ module Misc
       end*""
   end
 
-  def self.format_definition_list_item(dt, dd,  indent = nil, size = nil, color = :yellow)
+  def self.format_definition_list_item(dt, dd,  indent = nil, size = nil, color: :yellow)
     if size.nil?
       base_size = MAX_TTY_LINE_WIDTH
       base_indent = indent || (base_size / 3)
@@ -98,12 +98,12 @@ module Misc
     text
   end
 
-  def self.format_definition_list(defs, indent = nil, size = nil, color = :yellow, sep = "\n\n")
+  def self.format_definition_list(defs, indent = nil, size = nil, color: :yellow, sep: "\n\n")
     indent ||= 30
     size ||= (Log.tty_size || MAX_TTY_LINE_WIDTH) - indent
     entries = []
     defs.each do |dt,dd|
-      text = format_definition_list_item(dt,dd,indent, size,color)
+      text = format_definition_list_item(dt,dd,indent, size, color: color)
       entries << text
     end
     entries * sep 

data/lib/scout/misc/matching.rb

@@ -0,0 +1,44 @@
+module Misc
+  def self._convert_match_condition(condition)
+    return true if condition == 'true'
+    return false if condition == 'false'
+    return condition.to_regexp if condition[0] == "/"
+    return [:cmp, $1, $2.to_f] if condition =~ /^([<>]=?)(.*)/
+    return [:invert, _convert_match_condition(condition[1..-1].strip)] if condition[0] == "!"
+    #return {$1 => $2.to_f} if condition =~ /^([<>]=?)(.*)/
+    #return {false => _convert_match_condition(condition[1..-1].strip)} if condition[0] == "!"
+    return condition
+  end
+
+  def self.match_value(value, condition)
+    condition = _convert_match_condition(condition.strip) if String === condition
+
+    case condition
+    when Regexp
+      !! value.match(condition)
+    when NilClass, TrueClass
+      value === TrueClass or (String === value and value.downcase == 'true')
+    when FalseClass
+      value === FalseClass or (String === value and value.downcase == 'false')
+    when String
+      Numeric === value ? value.to_f == condition.to_f : value == condition
+    when Numeric
+      value.to_f == condition.to_f
+    when Array
+      case condition.first
+      when :cmp
+        value.to_f.send(condition[1], condition[2])
+      when :invert
+        ! match_value(value, condition[1] )
+      else
+        condition.inject(false){|acc,e| acc = acc ? true : match_value(value, e) }
+      end
+    else
+      raise "Condition not understood: #{Misc.fingerprint condition}"
+    end
+  end
+
+  def self.tokenize(str)
+    str.scan(/"([^"]*)"|'([^']*)'|([^"'\s]+)/).flatten.compact
+  end
+end

data/lib/scout/misc.rb

@@ -5,6 +5,7 @@ require_relative 'misc/filesystem'
 require_relative 'misc/monitor'
 require_relative 'misc/system'
 require_relative 'misc/helper'
+require_relative 'misc/matching'
 require_relative 'misc/math'
 
 module Misc

data/lib/scout/named_array.rb

@@ -42,7 +42,7 @@ module NamedArray
         pos = names.index{|f| f.to_s == field }
         next pos if pos
         if field =~ /^\d+$/
-          next identify_names(names, field.to_i)
+          next identify_name(names, field.to_i)
         end
         next pos if strict
         pos = names.index{|name| field_match(field, name) }
@@ -158,4 +158,8 @@ module NamedArray
       return super(name, *args)
     end
   end
+
+  def prety_print
+    Misc.format_definition_list(self.to_hash, sep: "\n")
+  end
 end

data/lib/scout/open/stream.rb

@@ -407,7 +407,8 @@ module Open
     str
   end
 
-  def self.sort_stream(stream, header_hash: "#", cmd_args: "-u", memory: false)
+  def self.sort_stream(stream, header_hash: "#", cmd_args: nil, memory: false)
+    cmd_args = '-u' if cmd_args.nil?
     sout = Open.open_pipe do |sin|
       ConcurrentStream.process_stream(stream) do
         line = stream.gets

data/lib/scout/open.rb

@@ -68,11 +68,11 @@ module Open
 
     options = IndiferentHash.add_defaults options, :noz => false, :mode => 'r'
 
-    mode = IndiferentHash.process_options options, :mode
+    mode, grep, invert_grep, fixed_grep = IndiferentHash.process_options options, :mode, :grep, :invert_grep, :fixed_grep
 
     options[:noz] = true if mode.include? "w"
 
-    io = file_open(file, options[:grep], mode, options[:invert_grep], options[:fixed_grep], options)
+    io = file_open(file, grep, mode, invert_grep, fixed_grep, options)
 
     io = unzip(io)   if ((String === file and zip?(file))   and not options[:noz]) or options[:zip]
     io = gunzip(io)  if ((String === file and gzip?(file))  and not options[:noz]) or options[:gzip]

data/lib/scout/path/util.rb

@@ -82,6 +82,17 @@ module Path
     end.flatten.uniq
   end
 
+  def get_extension(multiple = false)
+    parts = File.basename(self).split(".")
+    extension = [parts.pop]
+
+    while parts.length < 5
+      extension << [parts.pop]
+    end if multiple
+
+    extension * "."
+  end
+
   def set_extension(extension)
     self.annotate(self + ".#{extension}")
   end

data/lib/scout/resource/produce.rb

@@ -22,7 +22,7 @@ module Resource
     }.last
   end
 
-  def has_rake(path)
+  def has_rake?(path)
     !! rake_for(path)
   end
 
@@ -34,6 +34,7 @@ module Resource
     rake_dir = rake_dir.find(:user) if rake_dir.respond_to? :find
 
     begin
+      Thread.current["resource"] = self
       if Proc === rakefile
         ScoutRake.run(nil, rake_dir, task, &rakefile)
       else
@@ -55,7 +56,7 @@ module Resource
       type, content = @resources[path]
     when (Path === path && @resources && @resources.include?(path.original))
       type, content = @resources[path.original]
-    when has_rake(path)
+    when has_rake?(path)
       type = :rake
       rake_dir, content = rake_for(path)
       rake_dir = Path.setup(rake_dir.dup, self.pkgdir, self)

data/lib/scout/tmpfile.rb

@@ -31,6 +31,7 @@ module TmpFile
   # Creates a random filename in the temporary directory
   def self.tmp_file(prefix = 'tmp-', max = 1_000_000_000, dir = nil)
     dir ||= TmpFile.tmpdir
+    dir = dir.find if Path === dir
     File.expand_path(File.join(dir, random_name(prefix, max)))
   end
 

data/scout-essentials.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-essentials 1.6.3 ruby lib
+# stub: scout-essentials 1.6.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.3".freeze
+  s.version = "1.6.5".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Miguel Vazquez".freeze]
-  s.date = "2024-10-04"
+  s.date = "2025-01-17"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     "lib/scout/misc/format.rb",
     "lib/scout/misc/helper.rb",
     "lib/scout/misc/insist.rb",
+    "lib/scout/misc/matching.rb",
     "lib/scout/misc/math.rb",
     "lib/scout/misc/monitor.rb",
     "lib/scout/misc/system.rb",
@@ -90,7 +91,6 @@ Gem::Specification.new do |s|
     "share/color/color_names",
     "share/color/diverging_colors.hex",
     "share/software/install_helpers",
-    "test/scout/annotation/test_annotated_object.rb",
     "test/scout/annotation/test_array.rb",
     "test/scout/indiferent_hash/test_case_insensitive.rb",
     "test/scout/indiferent_hash/test_options.rb",
@@ -101,6 +101,7 @@ Gem::Specification.new do |s|
     "test/scout/misc/test_filesystem.rb",
     "test/scout/misc/test_helper.rb",
     "test/scout/misc/test_insist.rb",
+    "test/scout/misc/test_matching.rb",
     "test/scout/misc/test_math.rb",
     "test/scout/misc/test_system.rb",
     "test/scout/open/test_lock.rb",
@@ -138,7 +139,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.5.10".freeze
+  s.rubygems_version = "3.5.23".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4

data/test/scout/misc/test_matching.rb

@@ -0,0 +1,9 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+class TestMatches < Test::Unit::TestCase
+  def test_match_value
+    assert Misc.match_value('test', 'test')
+  end
+end
+

data/test/scout/test_indiferent_hash.rb

@@ -22,5 +22,23 @@ class TestClass < Test::Unit::TestCase
     assert_equal 2, a["B"]
     assert_equal 2, a[:b]
   end
+
+  def test_deep_merge
+    o = {h: {a: 1, b: 2}}
+    n = {h: {c: 3}}
+
+    IndiferentHash.setup(o)
+    o = o.deep_merge(n)
+
+    assert_equal 1, o[:h]["a"]
+    assert_equal 3, o[:h]["c"]
+  end
+
+  def test_except
+    h = {:a => 1, "b" => 2}
+    IndiferentHash.setup(h)
+    assert_equal [:a], h.except(:b).keys
+    assert_equal ["b"], h.except("a").keys
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -149,6 +149,7 @@ files:
 - lib/scout/misc/format.rb
 - lib/scout/misc/helper.rb
 - lib/scout/misc/insist.rb
+- lib/scout/misc/matching.rb
 - lib/scout/misc/math.rb
 - lib/scout/misc/monitor.rb
 - lib/scout/misc/system.rb
@@ -187,7 +188,6 @@ files:
 - share/color/color_names
 - share/color/diverging_colors.hex
 - share/software/install_helpers
-- test/scout/annotation/test_annotated_object.rb
 - test/scout/annotation/test_array.rb
 - test/scout/indiferent_hash/test_case_insensitive.rb
 - test/scout/indiferent_hash/test_options.rb
@@ -198,6 +198,7 @@ files:
 - test/scout/misc/test_filesystem.rb
 - test/scout/misc/test_helper.rb
 - test/scout/misc/test_insist.rb
+- test/scout/misc/test_matching.rb
 - test/scout/misc/test_math.rb
 - test/scout/misc/test_system.rb
 - test/scout/open/test_lock.rb
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: Scout essential tools