scout-essentials 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a848d630e2eeffecaf053c2cd4a531e526edd32117fafd71c35833abdb41cc3b
-  data.tar.gz: 8b18cd5f7c4819814aee3edbabcb88975b7cb635ae2e0b7c0fc87cf37fc3bd6d
+  metadata.gz: 0b0a00cab2e80f5ac221c5b89ba51ac9d2e179108523533ccff04bcffa28b621
+  data.tar.gz: 59658780d237328a638a962d9645de6994534015c932deddd7c7b55ddad394c5
 SHA512:
-  metadata.gz: 52ef4a13bd1950d21dcad55fa0b5811521388b276ba11908f88e1e2bd13cd9658320591eb83aa689c7d62f724104c28706449c38e1dd79877882268893fe3cea
-  data.tar.gz: b412f4e6b21198aaaaaabdb87908e9e5222fab838d32f4666d33e336b497b23990ac5db1e7236cc89c0a6b79fab4d9435c21f0d5202537620d1bcb66089c136a
+  metadata.gz: 88d48ab2416e00f99db24211774c93841e3aab8bbe14d9a495358f77771aaf3fa03e08d9864a81e5e9818de13bc0bcafe94e975a2d8186312909dc1934750906
+  data.tar.gz: 2cdc543433977a1901f6cc15ad92d30acbb3718bc70919829912083f4cd71e8e18fe9bc63bc396625a78946d15450802b38fd564f6ba63dcd8b2723393db4d84

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/scout/log/fingerprint.rb

@@ -1,5 +1,8 @@
 require 'digest/md5'
 module Log
+  FP_MAX_STRING = 150
+  FP_MAX_ARRAY = 20
+  FP_MAX_HASH = 10
   def self.fingerprint(obj)
     return obj.fingerprint if obj.respond_to?(:fingerprint)
 
@@ -13,9 +16,11 @@ module Log
     when Symbol
       ":" << obj.to_s
     when String
-      if obj.length > 100
+      if obj.length > FP_MAX_STRING
         digest = Digest::MD5.hexdigest(obj)
-        "'" << obj.slice(0,30) << "<...#{obj.length} - #{digest[0..4]}...>" << obj.slice(-10,30)<< "'"
+        middle = "<...#{obj.length} - #{digest[0..4]}...>"
+        s = (FP_MAX_STRING - middle.length) / 2
+        "'" << obj.slice(0,s-1) << middle << obj.slice(-s, obj.length )<< "'"
       else 
         "'" << obj << "'"
       end
@@ -28,13 +33,13 @@ module Log
     when File
       "<File:" + obj.path + ">"
     when Array
-      if (length = obj.length) > 10
+      if (length = obj.length) > FP_MAX_ARRAY
         "[#{length}--" <<  (obj.values_at(0,1, length / 2, -2, -1).collect{|e| fingerprint(e)} * ",") << "]"
       else
         "[" << (obj.collect{|e| fingerprint(e) } * ", ") << "]"
       end
     when Hash
-      if obj.length > 10
+      if obj.length > FP_MAX_HASH
         "H:{"<< fingerprint(obj.keys) << ";" << fingerprint(obj.values) << "}"
       else
         new = "{"

data/lib/scout/meta_extension.rb

@@ -68,7 +68,8 @@ module MetaExtension
 
       if new.instance_variables.include?(:@extension_attrs)
         new.instance_variable_get(:@extension_attrs).each do |a|
-          new.remove_instance_variable("@#{a}")
+          var_name = "@#{a}".to_sym
+          new.remove_instance_variable(var_name) if new.instance_variables.include? var_name
         end
         new.remove_instance_variable("@extension_attrs")
       end

data/lib/scout/misc/digest.rb

@@ -9,6 +9,8 @@ module Misc
         #'\'' << obj << '\''
         if Path === obj || ! Open.exists?(obj)
           '\'' << obj << '\''
+        elsif File.directory?(obj)
+          "Directory MD5: #{digest_str(Dir.glob(File.join(obj, "*")))}"
         else
           "File MD5: #{Misc.file_md5(obj)}"
         end

data/lib/scout/misc/monitor.rb

@@ -8,8 +8,8 @@ module Misc
     res = nil
     begin
       measure = Benchmark.measure do
-        repeats.times do
-          res = yield
+        repeats.times do |i|
+          res = yield i
         end
       end
       if message

data/lib/scout/named_array.rb

@@ -70,6 +70,13 @@ module NamedArray
     super(pos)
   end
 
+  def []=(key, value)
+    pos = NamedArray.identify_name(@fields, key)
+    return nil if pos.nil?
+    super(pos, value)
+  end
+
+
   def concat(other)
     super(other)
     self.fields.concat(other.fields) if NamedArray === other

data/lib/scout/open/remote.rb

@@ -31,6 +31,7 @@ module Open
   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)
       return file_open(cache_file)
     end

data/lib/scout/open/util.rb

@@ -114,6 +114,10 @@ module Open
   end
   class << self; alias exist? exists? end
 
+  def self.exist_or_link?(file)
+    self.exists?(file) || File.symlink?(file)
+  end
+
   def self.mv(source, target, options = {})
     target = target.find if Path === target
     source = source.find if Path === source

data/lib/scout/path/find.rb

@@ -2,7 +2,7 @@ require_relative '../indiferent_hash'
 module Path
 
   def self.caller_lib_dir(file = nil, relative_to = ['lib', 'bin'])
-    
+
     if file.nil?
       caller_dup = caller.dup
       while file = caller_dup.shift
@@ -41,7 +41,7 @@ module Path
       sub('{SUBPATH}', path._subpath).
       sub('{BASENAME}', File.basename(path)).
       sub('{PATH}', path).
-      sub('{LIBDIR}', path.libdir || (path.pkgdir.respond_to?(:libdir) && path.pkgdir.libdir) || Path.caller_lib_dir || "NOLIBDIR").
+      sub('{LIBDIR}'){ path.libdir || (path.pkgdir.respond_to?(:libdir) && path.pkgdir.libdir) || Path.caller_lib_dir || "NOLIBDIR" }.
       sub('{MAPNAME}', map_name.to_s).
       sub('{REMOVE}/', '').
       sub('{REMOVE}', '').gsub(/\/+/,'/')
@@ -88,6 +88,19 @@ module Path
     @@map_order = nil
   end
 
+  def self.load_path_maps(filename)
+    Path.setup(filename) unless Path === filename
+    if filename.exist?
+      begin
+        YAML.load(filename.read).each do |where, location|
+          @@path_maps[where.to_sym] = location
+        end
+      rescue
+        Log.error "Error loading search_paths from #{filename}: " << $!.message
+      end
+    end
+  end
+
   def _parts
     @_parts ||= self.split("/")
   end
@@ -95,7 +108,7 @@ module Path
   def _subpath
     @subpath ||= _parts.length > 1 ? _parts[1..-1] * "/" : _parts[0] || ""
   end
-  
+
   def _toplevel
     @toplevel ||= _parts.length > 1 ? _parts[0] : ""
   end

data/lib/scout/path/util.rb

@@ -34,6 +34,10 @@ module Path
     File.directory?(self.find)
   end
 
+  def sub(*args)
+    self.annotate super(*args)
+  end
+
   def dirname
     self.annotate(File.dirname(self))
   end

data/lib/scout/persist/serialize.rb

@@ -52,7 +52,7 @@ module Persist
     when nil, :string, :text, :file, :stream, :select, :folder
       serialized
     when :path
-      Path.setup(serialized)
+      Path.setup(serialized.strip)
     when :integer
       serialized.to_i
     when :float

data/lib/scout/resource/scout.rb

@@ -1,3 +1,5 @@
 module Scout
   extend Resource
 end
+
+Path.load_path_maps(Scout.etc["path_maps"])

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.1.0 ruby lib
+# stub: scout-essentials 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   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 = "2023-07-06"
+  s.date = "2023-08-08"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -88,6 +88,7 @@ Gem::Specification.new do |s|
     "test/scout/indiferent_hash/test_case_insensitive.rb",
     "test/scout/indiferent_hash/test_options.rb",
     "test/scout/log/test_color.rb",
+    "test/scout/log/test_fingerprint.rb",
     "test/scout/log/test_progress.rb",
     "test/scout/misc/test_digest.rb",
     "test/scout/misc/test_filesystem.rb",
@@ -127,7 +128,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.4.13".freeze
+  s.rubygems_version = "3.5.0.dev".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4

data/test/scout/log/test_fingerprint.rb

@@ -0,0 +1,10 @@
+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 TestFingerprint < Test::Unit::TestCase
+  def test_str
+    str = "Start-" + ("0123456789" * 20) + "-End"
+    assert_equal 150, Log.fingerprint(str).length
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -185,6 +185,7 @@ files:
 - test/scout/indiferent_hash/test_case_insensitive.rb
 - test/scout/indiferent_hash/test_options.rb
 - test/scout/log/test_color.rb
+- test/scout/log/test_fingerprint.rb
 - test/scout/log/test_progress.rb
 - test/scout/misc/test_digest.rb
 - test/scout/misc/test_filesystem.rb
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.0.dev
 signing_key: 
 specification_version: 4
 summary: Scout essential tools