scout-essentials 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b180a31f0775b92588e69028899896e5d7a865a818eaa3ac07235e9e3cbe0a4b
-  data.tar.gz: dee502eb8812dd3dbeb039858225110114b7b6279eb6fb7c062dff3f86e697d7
+  metadata.gz: 635a27a40f5897e83e1632e43a1cfa9343edd5c53e7eee522fc99f4a74e03171
+  data.tar.gz: 19bb00a9be1cc0ab21661cedc46bfd1d21118cd0fed9f0d240b205580e8a733a
 SHA512:
-  metadata.gz: 224014296d5798f7dbe980d67eb241456c62de05b21ddaf255c429f1f8c76a3d28de89fdff69f8c37ed06e8de65cc244a77f9d34004545318d986c8386de2ff2
-  data.tar.gz: de7644e77bac10982314a1f73ea200294755901e66aff6010c027c6808f3209c35da1d6675a179689662c6c57370ddf8c2f61bf5df358b59fe747936d682f889
+  metadata.gz: 11813ec485609e4275258e12aee416663bb70e99c453dc9e7ec2363a864370c07506c74c38b20ac43426a12e7872456eb37e9e368fc10e3f2d3a5b1083d12281
+  data.tar.gz: da326b8fa64b0850fd2d4e50ab1e0e13d4a881039b4945503a56debcd800a8c5850b5b09f6f63d2631746ae177dcce16ce235ae9deb803b095e8b7d7e588c0a0

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.3.0

data/lib/scout/misc/digest.rb

@@ -57,7 +57,6 @@ module Misc
   def self.file_md5(file)
     file = file.find if Path === file
     file = File.expand_path(file)
-    #md5file = file + '.md5'
     Persist.persist("MD5:#{file}", :string) do
       Digest::MD5.file(file).hexdigest
     end

data/lib/scout/named_array.rb

@@ -3,6 +3,10 @@ module NamedArray
   extend MetaExtension
   extension_attr :fields, :key
 
+  def all_fields
+    [key, fields].compact.flatten
+  end
+
   def self.field_match(field, name)
     if (String === field) && (String === name)
       field == name || 
@@ -70,6 +74,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
@@ -123,6 +134,7 @@ module NamedArray
 
   def self.add_zipped(source, new)
     source.zip(new).each do |s,n|
+      next if n.nil?
       s.concat(n)
     end
     source

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\.rb/ or
+          file =~ /(?:scout|rbbt)\/(?:.*\/)?(path|open)\.rb/ or
           file =~ /(?:scout|rbbt)\/(?:.*\/)?path\/(?:find|refactor|util)\.rb/ or
           file =~ /(?:scout|rbbt)\/persist.rb/ or
           file =~ /scout\/resource\/produce.rb/ or
@@ -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/persist/serialize.rb

@@ -49,8 +49,10 @@ module Persist
     type = SERIALIZER if type == :serializer
 
     case type
-    when nil, :string, :text, :file, :stream, :select, :folder
+    when nil, :text, :stream
       serialized
+    when :string, :file, :select, :folder
+      serialized.strip
     when :path
       Path.setup(serialized.strip)
     when :integer
@@ -142,7 +144,11 @@ module Persist
     when :file
       value = Open.read(file)
       value.sub!(/^\./, File.dirname(file)) if value.start_with?("./")
-      value
+      if Misc.is_filename?(value)
+        value
+      else
+        file
+      end
     when :file_array
       Open.read(file).split("\n").collect do |f|
         f.sub!(/^\./, File.dirname(file)) if f.start_with?("./")
@@ -151,7 +157,8 @@ module Persist
     when Hash
       type[file]
     else
-      deserialize(Open.read(file), type)
+      serialized = Open.read(file)
+      deserialize(serialized, type)
     end
   end
 end

data/lib/scout/persist.rb

@@ -55,7 +55,13 @@ module Persist
           res = yield
 
           if res.nil?
-            return Persist.load(file, type)
+            if type.nil?
+              Log.debug "Empty result and no persist type; not loading result file"
+              return nil
+            else
+              Log.debug "Empty result; loading #{type} result from file"
+              return Persist.load(file, type)
+            end
           end
 
           Open.rm(file)

data/lib/scout/resource/path.rb

@@ -1,5 +1,6 @@
 module Path
   def produce(force = false)
+    raise @produced if Exception === @produced
     return self if ! force && (Open.exist?(self) || @produced)
     begin
       if Resource === self.pkgdir
@@ -8,14 +9,14 @@ module Path
         false
       end
     rescue ResourceNotFound
-      false
+      @produced = false
     rescue
       message = $!.message
       message = "No exception message" if message.nil? || message.empty?
       Log.warn "Error producing #{self}: #{message}"
       raise $!
     ensure
-      @produced = true
+      @produced = true if @produced.nil?
     end
   end
 

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.1 ruby lib
+# stub: scout-essentials 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.1.1"
+  s.version = "1.3.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-08-01"
+  s.date = "2023-11-07"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -128,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -241,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