scout-essentials 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a682bf691d2d27784726f6eb108223abc0cc62a3a289f5580ef3ec9a850daffa
-  data.tar.gz: ac4409c3954aeaa68bfb45844de8701c265b3e896fbe77bb51dfae953ad47035
+  metadata.gz: 733fb62cfc8f1119cc35567f30bec3f569856a2c10e7fa4ab8dcb54fb39cf737
+  data.tar.gz: abc7a2a0ffa9c524da167c1f2132efb557a6ebd7debe267e014bba1269a31661
 SHA512:
-  metadata.gz: a9db53026e267d734499b85a2673933c43a7e549497fa76420872dff237fb2858da535fcd654c30153f5b78e4afc9568b884db0ca656f70f1a936d89cff570ab
-  data.tar.gz: 6868e8baf1d445bfc2aeebee9a0e0cb0c0f9e481e41ef87f3c670d2f9b628445fb8502b7a27a39decb445dabd4ff571145562f16fd0b477ae426d63e1a23d61b
+  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.2
+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

@@ -9,6 +9,7 @@ module AnnotatedArray
   end
 
   def annotate_item(obj, position = nil)
+    return obj if obj.nil?
     obj = obj.dup if obj.frozen?
     obj.extend AnnotatedArray if Array === obj
     obj.extend AnnotatedArrayItem
@@ -33,8 +34,17 @@ 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
+
+  def select(&block)
+    selected = []
+    each do |item|
+      selected << item if block.call(item)
     end
+
+    self.annotate(selected)
   end
 
   def each(&block)
@@ -60,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/cmd.rb

@@ -41,7 +41,10 @@ module CMD
         if claim
           claim.produce
         else
-          block.call
+          res = block.call
+          if Hash === res
+            Resource.install res, tool.to_s
+          end
         end
       end
       version_txt = ""

data/lib/scout/concurrent_stream.rb

@@ -51,7 +51,7 @@ module ConcurrentStream
       end
     end
 
-    stream.filename = filename.nil? ? stream.inspect.split(":").last[0..-2] : filename
+    stream.filename = filename if filename
 
     stream.lock = lock unless lock.nil?
 
@@ -60,6 +60,10 @@ module ConcurrentStream
     stream
   end
 
+  def filename 
+    @filename || self.inspect.split(":").last[0..-2]
+  end
+
   def annotate(stream)
     ConcurrentStream.setup(stream, :threads => threads, :pids => pids, :callback => callback, :abort_callback => abort_callback, :filename => filename, :autojoin => autojoin, :lock => lock)
     stream

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

@@ -146,7 +146,7 @@ module Log
       else
         begin
           STDERR.write str
-        rescue
+        rescue IOError
         end
       end
     end
@@ -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/digest.rb

@@ -6,15 +6,6 @@ module Misc
       obj.digest_str
     else
       case obj
-      when Path
-        case
-        when File.directory?(obj)
-          "Directory MD5: #{digest_str(Dir.glob(File.join(obj, "*")))}"
-        when obj.located? && File.exist?(obj)
-          "File MD5: #{Misc.digest_file(obj)}"
-        else
-          '\'' << obj << '\''
-        end
       when String
         if Path.is_filename?(obj) && Open.exists?(obj)
           if File.directory?(obj)

data/lib/scout/misc/format.rb

@@ -36,9 +36,7 @@ module Misc
     end
   end
 
-
-  
-  MAX_TTY_LINE_WIDTH = 100
+  MAX_TTY_LINE_WIDTH = 160
   def self.format_paragraph(text, size = nil, indent = nil, offset = nil)
     size ||= Log.tty_size || MAX_TTY_LINE_WIDTH
     size = MAX_TTY_LINE_WIDTH if size > MAX_TTY_LINE_WIDTH
@@ -74,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)
@@ -100,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/helper.rb

@@ -28,14 +28,23 @@ module Misc
     counts
   end
 
-  def self.chunk(array, num)
+  # Divides the array into chunks of size +size+ by taking
+  # consecutive elements. If a block is given it runs it
+  # instead of returning the chunks
+  def self.chunk(array, size)
     total = array.length
     current = 0
+    res = [] unless block_given?
     while current < total
-      last = current + num - 1
-      yield array[current..last]
+      last = current + size - 1
+      if block_given?
+        yield array[current..last]
+      else
+        res << array[current..last]
+      end
       current = last + 1
     end
+    block_given? ? nil : res
   end
 
   # Divides the array into +num+ chunks of the same size by placing one

data/lib/scout/named_array.rb

@@ -100,8 +100,8 @@ module NamedArray
 
   def to_hash
     hash = {}
-    self.fields.zip(self) do |field,value|
-      hash[field] = value
+    self.fields.each do |field|
+      hash[field] = self[field]
     end
     IndiferentHash.setup hash
   end
@@ -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

@@ -440,7 +440,7 @@ module Open
   #  StringIO.new stream.read.split("\n").sort.uniq * "\n"
   #end
 
-  def self.collapse_stream(s, line: nil, sep: "\t", header: nil, &block)
+  def self.collapse_stream(s, line: nil, sep: "\t", header: nil, compact: false, &block)
     sep ||= "\t"
     Open.open_pipe do |sin|
 
@@ -458,8 +458,13 @@ module Open
           current_key = key
         when current_key == key
           parts.each_with_index do |part,i|
-            if current_parts[i].nil?
-              current_parts[i] = "|" << part
+            next if compact and part.nil? || part.empty?
+            if current_parts[i].nil? || current_parts[i].empty?
+              if compact
+                current_parts[i] = part.dup
+              else
+                current_parts[i] = "|" << part
+              end
             else
               current_parts[i] = current_parts[i] << "|" << part
             end

data/lib/scout/open/util.rb

@@ -11,7 +11,7 @@ module Open
                end
              end
 
-  def self.grep(stream, grep, invert = false, fixed = nil)
+  def self.grep(stream, grep, invert = false, fixed = nil, options = {})
     case 
     when Array === grep
       TmpFile.with_file(grep * "\n", false) do |f|
@@ -242,6 +242,11 @@ module Open
     nil
   end
 
+  def self.link_dir(source, target)
+    Log.debug "Copy with hard-links #{Log.fingerprint source}->#{Log.fingerprint target}"
+    FileUtils.cp_lr(source, target)
+  end
+
   def self.list(file)
     file = file.produce_and_find if Path === file
     Open.read(file).split("\n")

data/lib/scout/open.rb

@@ -31,13 +31,13 @@ module Open
     File.open(file, mode)
   end
 
-  def self.file_open(file, grep = false, mode = 'r', invert_grep = false, options = {})
+  def self.file_open(file, grep = false, mode = 'r', invert_grep = false, fixed_grep = true, options = {})
     Open.mkdir File.dirname(file) if mode.include? 'w'
 
     stream = get_stream(file, mode, options)
 
     if grep
-      grep(stream, grep, invert_grep)
+      grep(stream, grep, invert_grep, fixed_grep)
     else
       stream
     end
@@ -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)
+    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/persist/serialize.rb

@@ -145,6 +145,8 @@ module Persist
       Open.marshal(file)
     when :stream
       Open.open(file)
+    when :path
+      Path === file ? file : Path.setup(file)
     when :file
       value = Open.read(file)
       value.sub!(/^\./, File.dirname(file)) if value.start_with?("./")

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.2 ruby lib
+# stub: scout-essentials 1.6.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.2".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-07-01"
+  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

data/test/scout/misc/test_helper.rb

@@ -6,6 +6,11 @@ class TestMiscHelper < Test::Unit::TestCase
     assert_equal 2, Misc.divide(%w(1 2 3 4 5 6 7 8 9),2).length
   end
 
+  def test_chunk
+    assert_equal %w(1 2), Misc.chunk(%w(1 2 3 4 5 6 7 8 9),2)[0]
+  end
+
+
   def test_ordered_divide
     assert_equal 5, Misc.ordered_divide(%w(1 2 3 4 5 6 7 8 9),2).length
   end

data/test/scout/open/test_stream.rb

@@ -393,6 +393,34 @@ row2 aa bb cc
     s = StringIO.new text
     assert Open.collapse_stream(s, sep: " ").read =~  /\|cc$/
   end
+
+  def test_collapse_stream_compact
+    text=<<-EOF
+row1	A	B	C
+row1	a	b	c
+row2		BB	CC
+row2	aa	bb	cc
+row2	aaa		ccc
+    EOF
+
+    s = StringIO.new text
+    stream = Open.collapse_stream(s, sep: "\t", compact: false)
+    txt = stream.read
+    assert_include txt, "A|a"
+    assert_include txt, "B|b"
+    assert_include txt, "C|c"
+    assert_include txt, "|aa"
+
+    s = StringIO.new text
+    stream = Open.collapse_stream(s, sep: "\t", compact: true)
+    txt = stream.read
+    assert_include txt, "A|a"
+    assert_include txt, "B|b"
+    assert_include txt, "C|c"
+    assert_not_include txt, "|aa\t"
+    assert_not_include txt, "bb|"
+  end
+
   #
   #
   #  def test_paste_stream

data/test/scout/open/test_util.rb

@@ -63,10 +63,25 @@ class TestOpenUtil < Test::Unit::TestCase
       file1 = directory.subdir1.file
       file2 = directory.subdir2.file
       Open.write(file1, "TEST")
-      Open.ln_s file1, file2
+      Open.ln_h file1, file2
+      assert_equal "TEST", Open.read(file2)
+      Open.write(file1, "TEST2")
+      assert_equal "TEST2", Open.read(file2)
+      assert_equal File.stat(file1).ino, File.stat(file2).ino
+    end
+  end
+
+  def test_ln_recursive
+    TmpFile.with_file do |directory|
+      Path.setup(directory)
+      file1 = directory.subdir1.file
+      file2 = directory.subdir2.file
+      Open.write(file1, "TEST")
+      Open.link_dir directory.subdir1, directory.subdir2
       assert_equal "TEST", Open.read(file2)
       Open.write(file1, "TEST2")
       assert_equal "TEST2", Open.read(file2)
+      assert_equal File.stat(file1).ino, File.stat(file2).ino
     end
   end
 end

data/test/scout/test_named_array.rb

@@ -39,5 +39,10 @@ ValueB (Entity type)
     assert_equal 1, a.a
     assert_equal 2, a.b
   end
-end
 
+  def test_to_hash
+    a = NamedArray.setup([1,2], [:a, :b])
+    assert_equal 1, a.to_hash[:a]
+    assert_equal 2, a.to_hash[:b]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-01 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