scout-essentials 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ebe0cbbfda369f1d1b3de5009566eed0749cdb0a418c19c663a21ec68214c1
-  data.tar.gz: 2303029301ea7b4ef1f9d7cf44bd906cb8db637b31a5147ae2950e4eb1c6e37e
+  metadata.gz: 24500b0c2c21f23844c3eb87ce87ed1ea4fd6f0e9ee635ef474b29d919baffdf
+  data.tar.gz: b54836819a0a394bf3b2907d641b6ae34b7b4c4b9ced9b2dd0b78b3d22d30cc9
 SHA512:
-  metadata.gz: 707278b8bdd09658049035622021bd822d8b53ecef993f4136b550f2acb47be30cf515a460b07f5c45ed51769d782639b06e128947dab80832a4de3b6b66f574
-  data.tar.gz: d8a5ce01ca753d159734871447f961a39d48992af934f7ad69a0f95ff708794d00962cd36fbabbcd535a721611f5d0fa9194f87d5662cd8ab66ed80d8abeed38
+  metadata.gz: 12c4740363f2e5d64e3c3f691dfa0ca6086617d84a82b666d25d683e0d0e36c3fe062bcc3f210b3c38358a0a36f0b1a2ab6b3c7c6628a9b74fa4ebb2b92afb1e
+  data.tar.gz: 86df3be0b64051d8aa0007d061f181f281835a241c1cbeeb113dd53d0595b0c52adf7bfa269b91c70bdf2233c0fef7b0ca3064c3763fb2a49e5ca3f6e7e0d5ad

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.6.0

data/lib/scout/annotation/array.rb

@@ -62,8 +62,8 @@ module AnnotatedArray
 
   %w(compact uniq flatten reverse sort_by).each do |method|
 
-    self.define_method(method) do |*args|
-      res = super(*args)
+    self.define_method(method) do |*args,&block|
+      res = super(*args, &block)
 
       annotate(res)
       res.extend AnnotatedArray

data/lib/scout/misc/system.rb

@@ -13,6 +13,22 @@ module Misc
     Sys::ProcTable.ps.select{ |pe| pe.ppid == ppid }
   end
 
+  def self.wait_child(pid)
+    begin
+      Process.waitpid2 pid.to_i
+    rescue Errno::ECHILD
+    end
+  end
+
+  def self.abort_child(pid, wait = true)
+    begin
+      Process.kill("TERM", pid.to_i)
+      wait_child(pid) if wait
+    rescue
+      Log.debug("Process #{pid} was not killed: #{$!.message}")
+    end
+  end
+
   def self.env_add(var, value, sep = ":", prepend = true)
     if ENV[var].nil?
       ENV[var] = value

data/lib/scout/path/find.rb

@@ -7,7 +7,7 @@ module Path
       caller_dup = caller.dup
       while file = caller_dup.shift
         break unless file =~ /(?:scout|rbbt)\/(?:resource\.rb|workflow\.rb)/ or
-          file =~ /(?:scout|rbbt)\/(?:.*\/)?(path|open)\.rb/ or
+          file =~ /(?:scout|rbbt)\/(?:.*\/)?(path|open|tsv|refactor)\.rb/ or
           file =~ /(?:scout|rbbt)\/(?:.*\/)?path\/(?:find|refactor|util)\.rb/ or
           file =~ /(?:scout|rbbt)\/persist.rb/ or
           file =~ /scout\/resource\/produce.rb/ or
@@ -90,17 +90,27 @@ module Path
   end
 
   def self.add_path(name, map)
-    @@path_maps[name] = map
+    path_maps[name] = map
     @@map_order = nil
   end
 
+  def self.prepend_path(name, map)
+    path_maps[name] = map
+    map_order.unshift(name.to_sym)
+  end
+
+  def self.append_path(name, map)
+    path_maps[name] = map
+    map_order.push(name.to_sym)
+  end
+
   def prepend_path(name, map)
-    @@path_maps[name] = map
+    path_maps[name] = map
     map_order.unshift(name.to_sym)
   end
 
   def append_path(name, map)
-    @@path_maps[name] = map
+    path_maps[name] = map
     map_order.push(name.to_sym)
   end
 

data/lib/scout/path.rb

@@ -28,7 +28,7 @@ module Path
   end
 
   def map_order
-    @map_order ||= (path_maps.keys & Path.basic_map_order) + (path_maps.keys - Path.basic_map_order)
+    @map_order ||= (path_maps.keys & Path.map_order) + (path_maps.keys - Path.map_order)
   end
 
   def join(subpath = nil, prevpath = nil)

data/lib/scout/resource.rb

@@ -39,7 +39,7 @@ module Resource
   end
 
   def root
-    Path.setup(subdir, self, self.libdir, @path_maps, @map_order)
+    Path.setup(subdir.dup, self, self.libdir, @path_maps, @map_order)
   end
 
   def method_missing(name, prev = nil, *args)

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.4.0 ruby lib
+# stub: scout-essentials 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.4.0".freeze
+  s.version = "1.6.0".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-05-15"
+  s.date = "2024-06-05"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda