scout-essentials 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff597b1b0d5a5a8582e92677aa951559d3ddf2f56cec76bbbfd5f0c90ea180e
-  data.tar.gz: 298441b06d0c2d048732fa7fb525a51c4ff93a31e39b1882211048f06978c1b9
+  metadata.gz: 733fb62cfc8f1119cc35567f30bec3f569856a2c10e7fa4ab8dcb54fb39cf737
+  data.tar.gz: abc7a2a0ffa9c524da167c1f2132efb557a6ebd7debe267e014bba1269a31661
 SHA512:
-  metadata.gz: 91c63f92b747ea2c39b291430b8a63a7db63bf28465eb66b5d7cceda88f07ceaefef1c7718a589bd5f8f040ff082f9a90232edfa16d4c28a5ba75877ac5a34b9
-  data.tar.gz: 10d3e562974232b7fe87954a6970cc9008799e341d2bb01e454406d3ceec5386bb27542dcc8b6622a27fd5382d29320561766b1abfd0467eee939d7c82af0a84
+  metadata.gz: cdd5c50d28fa8ffac0c5f1660ab5ff8b0e63c3df7d27966cb98c78928161c78270b3bab72732c5eeb5c37a1824fc101fdb2b569567b3af977404f540fb5912de
+  data.tar.gz: c4f4e5f5f7b276d20ea65ef22d8447c0499606a3b9c590768517808f6f226c137361b38f1dc56c5e90f2a7652d8519f9cfc591438f939ed2345de2c999f05139

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.4

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

@@ -92,5 +92,12 @@ 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
 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/named_array.rb

@@ -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.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/resource/produce.rb

@@ -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

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.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.3".freeze
+  s.version = "1.6.4".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 = "2024-12-10"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -138,7 +138,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -251,7 +251,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