scout-essentials 1.6.4 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 733fb62cfc8f1119cc35567f30bec3f569856a2c10e7fa4ab8dcb54fb39cf737
-  data.tar.gz: abc7a2a0ffa9c524da167c1f2132efb557a6ebd7debe267e014bba1269a31661
+  metadata.gz: 49e4171f1423c14ce88fa83062e7a90febad44c979596dd3e185d296ec37d9bc
+  data.tar.gz: 174e9b8798c3d2541d1b1ee72233adb98152406dc95611a4e2022938442ce373
 SHA512:
-  metadata.gz: cdd5c50d28fa8ffac0c5f1660ab5ff8b0e63c3df7d27966cb98c78928161c78270b3bab72732c5eeb5c37a1824fc101fdb2b569567b3af977404f540fb5912de
-  data.tar.gz: c4f4e5f5f7b276d20ea65ef22d8447c0499606a3b9c590768517808f6f226c137361b38f1dc56c5e90f2a7652d8519f9cfc591438f939ed2345de2c999f05139
+  metadata.gz: 5826fb333507b38743aa46232391eec8208062539d72263794747b8b67b79d642c22146866d207fb69fcc1b35bcba07da4ce9deabf936783aff75e2b6c6ce598
+  data.tar.gz: 381d4453ac80ee4ac6258da44cd0818f5df046744995620d8fc957e873b874360dfb4915f0e30e2ea3c69faddedff0307db6ecd7429ab96c1f3f5e3696e752b6

data/Rakefile

@@ -19,6 +19,7 @@ Juwelier::Tasks.new do |gem|
   
   gem.add_runtime_dependency 'term-ansicolor'
   gem.add_runtime_dependency 'yaml'
+  gem.add_runtime_dependency 'rake'
 end
 Juwelier::RubygemsDotOrgTasks.new
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.6

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.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/config.rb

@@ -89,7 +89,19 @@ module Scout::Config
   # For equal priorities the matching prioritizes tokens ealier in the list
   def self.get(key, *tokens)
     options = tokens.pop if Hash === tokens.last
+    options = IndiferentHash.setup options if options
+
     default = options.nil? ? nil : options[:default]
+    env = options.nil? ? nil : options[:env]
+
+    if env
+      env.split(/,\s*/).each do |variable|
+        if ENV[variable]
+          default = ENV[variable]
+          break
+        end
+      end
+    end
 
     tokens = ["key:" + key] if tokens.empty?
 
@@ -120,12 +132,16 @@ module Scout::Config
     value = priorities.empty? ? default : priorities.collect{|p| p }.sort_by{|p,v| p}.first.last.first
     value = false if value == 'false'
 
-    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}"
+    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}" + (env ? " env:#{env}" : '')
     GOT_KEYS << [key, value, tokens]
 
     if String === value && m = value.match(/^env:(.*)/)
-      variable = m.captures.first
-      ENV[variable]
+      variables = m.captures.first
+      variables.split(/,\s*/).each do |variable|
+        value = ENV[variable]
+        return value if value
+      end
+      nil
     elsif value == 'nil'
       nil
     else

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)
@@ -99,5 +118,27 @@ module IndiferentHash
       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/misc/helper.rb

@@ -34,17 +34,18 @@ module Misc
   def self.chunk(array, size)
     total = array.length
     current = 0
-    res = [] unless block_given?
+    res = []
     while current < total
       last = current + size - 1
       if block_given?
-        yield array[current..last]
+        r = yield array[current..last]
+        res.concat r if Array === r
       else
         res << array[current..last]
       end
       current = last + 1
     end
-    block_given? ? nil : res
+    res
   end
 
   # Divides the array into +num+ chunks of the same size by placing one

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/math.rb

@@ -52,7 +52,7 @@ module Misc
   end
 
   def self.variance(list)
-    return nil if list.length < 3
+    return nil if list.length < 2
     mean = mean(list)
     list = list.compact
     list_length = list.length
@@ -66,9 +66,8 @@ module Misc
     total_square_distance / (list_length - 1)
   end
 
-
   def self.sd(list)
-    return nil if list.length < 3
+    return nil if list.length < 2
     variance = self.variance(list)
     Math.sqrt(variance)
   end

data/lib/scout/misc/system.rb

@@ -52,7 +52,23 @@ module Misc
       ENV[var] = old_value
     end
   end
-  
+
+  def self.with_envs(hash, &block)
+    old_value = {}
+    begin
+      hash.each do |var,value|
+        old_value[var] = ENV[var]
+        ENV[var] = value
+      end
+      yield
+    ensure
+      old_value.each do |var,value|
+        ENV[var] = value
+      end
+    end
+  end
+
+
   def self.update_git(gem_name = 'scout-essentials')
     gem_name = 'scout-essentials' if gem_name.nil?
     dir = File.join(__dir__, '../../../../', gem_name)

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) }

data/lib/scout/open/remote.rb

@@ -30,6 +30,17 @@ module Open
     end
   end
 
+  LAST_TIME = {}
+  def self.wait(lag, key = nil)
+    time = Time.now
+
+    if LAST_TIME[key] != nil && (time < LAST_TIME[key] + lag)
+      sleep (LAST_TIME[key] + lag) - time
+    end
+
+    LAST_TIME[key] = Time.now
+  end
+
   def self.wget(url, options = {})
     options = options[:wget_options] if options.include?(:wget_options)
     if ! (options[:force] || options[:nocache]) && cache_file = in_cache(url, options)

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/path/util.rb

@@ -82,12 +82,28 @@ 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
 
   def unset_extension
-    self.annotate(self.split(".")[0..-2] * ".")
+    parts = self.split("/")
+    basename = parts.pop
+    return self unless basename.include?(".")
+    basename = basename.split(".")[0..-2] * "."
+    parts.push basename
+    self.annotate(parts * "/")
   end
 
   def remove_extension(extension = nil)

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
 
@@ -56,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/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.4 ruby lib
+# stub: scout-essentials 1.6.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.4".freeze
+  s.version = "1.6.6".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-12-10"
+  s.date = "2025-03-10"
   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.23".freeze
+  s.rubygems_version = "3.6.5".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4
@@ -150,5 +151,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<yaml>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<rake>.freeze, [">= 0".freeze])
 end
 

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/path/test_util.rb

@@ -18,5 +18,13 @@ class TestPathUtil < Test::Unit::TestCase
       assert_equal %w(foo bar).sort, tmpdir.glob.collect{|p| p.basename }.sort
     end
   end
+
+  def test_unset_extension
+    path = Path.setup("/home/.scout/dir/file.txt")
+    assert_equal "/home/.scout/dir/file", path.unset_extension
+
+    path = Path.setup("/home/.scout/dir/file")
+    assert_equal "/home/.scout/dir/file", path.unset_extension
+  end
 end
 

data/test/scout/test_config.rb

@@ -63,4 +63,20 @@ class TestConfig < Test::Unit::TestCase
     Scout::Config.add_entry 'key', 'V1', 'token1'
     assert_equal "V3", Scout::Config.get('key', 'token2', :default => 'V3')
   end
+
+  def test_env
+    Misc.with_env "TEST_VAR", "TEST" do
+      assert_equal "TEST", Scout::Config.get("value", :key, :env => "TEST_VAR")
+      Scout::Config.set "value", 'env:TEST_VAR', 'key'
+      assert_equal "TEST", Scout::Config.get(:value, :key)
+    end
+  end
+
+  def test_env_multiple
+    Misc.with_env "TEST_VAR", "TEST" do
+      assert_equal "TEST", Scout::Config.get("value", :key, :env => "TEST_VAR,TESTVAR")
+      Scout::Config.set "value", 'env:TEST_VAR,TESTVAR', 'key'
+      assert_equal "TEST", Scout::Config.get(:value, :key)
+    end
+  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,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.6
 platform: ruby
 authors:
 - Miguel Vazquez
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -108,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Things a scout can use anywhere
 email: mikisvaz@gmail.com
 executables: []
@@ -149,6 +162,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 +201,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 +211,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
@@ -236,7 +250,6 @@ homepage: http://github.com/mikisvaz/scout-essentials
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -251,8 +264,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.5
 specification_version: 4
 summary: Scout essential tools
 test_files: []