scout-essentials 1.6.14 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0586199497442010ccb5ea02066de21a220968857261f64799769e2af2233434'
-  data.tar.gz: c6d0e58c2a419e9a5afa1a0f6483ed5c6f816ceddb2deefd84c2b64f6fa694c5
+  metadata.gz: ddef0a88617b32cc676a5ae3e03630ef0ee05739dfa921065955b19dfd7035fd
+  data.tar.gz: e0d38a56a2403172c0014c6988a8d01d682b78a73bbd0deb5e0943368456d3f9
 SHA512:
-  metadata.gz: 4a1ca8a38e73ece435c2b2bc43fe2e35791ecc2015e5059e3ea571cfdd78f2c9fd98c816d03c7856b732fa9e3c74f21634bdc4b0962c422c9448b97aa396d65c
-  data.tar.gz: 4a11339327cb65af5f3d79491b51ac24b83ca2ebffbfd075738d9c6c77e1dc2627b78418f3742e14230b3c2eadf0380ccc30b6c5ca684405f3109c40a0e2ac70
+  metadata.gz: 0be0e7ac6382006df3a332ee4779391e6d00e8b51dffa8d4e225a921814b139b3601c4706ae738ba1d828ab04f2abdc830f17fb48429acfe21b304f07318e5a0
+  data.tar.gz: 4b47a4c814ad20f5f8fb81385cdd6ae45d371fae6a8529af244b07da2fb6b7a93fb4654a9c382a96d1b5dbe991c218b848b64872e3253f2b506d617e4a7518ad

data/VERSION

@@ -1 +1 @@
-1.6.14
+1.7.0

data/lib/scout/annotation/annotated_object.rb

@@ -52,6 +52,10 @@ module Annotation
         new.remove_instance_variable(:@annotation_types)
       end
 
+      if new.instance_variables.include?(:@container)
+        new.remove_instance_variable(:@container)
+      end
+
       new
     end
 

data/lib/scout/indiferent_hash/options.rb

@@ -93,10 +93,10 @@ module IndiferentHash
     }.compact * "#"
   end
 
-  def self.string2hash(string)
+  def self.string2hash(string, sep="#")
     options = {}
 
-    string.split('#').each do |str|
+    string.split(sep).each do |str|
       key, _, value = str.partition "="
 
       key = key[1..-1].to_sym if key[0] == ":"
@@ -114,4 +114,61 @@ module IndiferentHash
 
     IndiferentHash.setup(options)
   end
+
+  def self.parse_options(str)
+    options = {}
+    # Match key=value pairs, supporting quoted values with spaces
+    str.scan(/(\w+)=("[^"]*"|[^\s"]+)/) do |key, raw_value|
+      value = raw_value.strip
+
+      # Remove surrounding quotes if present
+      if value.start_with?('"') && value.end_with?('"')
+        value = value[1..-2]
+      end
+
+      # Split by commas, but preserve quoted substrings as single elements
+      if value.include?(',')
+        # This regex splits on commas not inside quotes
+        parts = value.scan(/"[^"]*"|[^,]+/).map do |v|
+          v = v.strip
+          v = v[1..-2] if v.start_with?('"') && v.end_with?('"')
+          v
+        end
+        value = parts
+        options[key] = value
+        next
+      end
+
+      options[key] = true and next if value.empty?
+      options[key] = value[1..-1].to_sym and next if value[0] == ":"
+      options[key] = Regexp.new(/#{value[1..-2]}/) and next if value[0] == "/" and value[-1] == "/"
+      options[key] = value[1..-2] and next if value =~ /^['"].*['"]$/
+      options[key] = value.to_i and next if value =~ /^\d+$/
+      options[key] = value.to_f and next if value =~ /^\d*\.\d+$/
+      options[key] = true and next if value == "true"
+      options[key] = false and next if value == "false"
+      options[key] = value
+    end
+
+    IndiferentHash.setup(options)
+  end
+
+  def self.print_options(options)
+    options.map do |key, value|
+      if value.is_a?(Array)
+        vals = value.map do |v|
+          if v.to_s.empty? || v.to_s.include?(' ')
+            "\"#{v}\""
+          else
+            v.to_s
+          end
+        end
+        "#{key}=#{vals.join(',')}"
+      else
+        val = value.to_s
+        val = "\"#{val}\"" if val.empty? || val.include?(' ')
+        "#{key}=#{val}"
+      end
+    end.join(' ')
+  end
 end

data/lib/scout/misc/filesystem.rb

@@ -33,7 +33,7 @@ module Misc
     end
   end
 
-  def self.tarize(source_dir, archive_path)
+  def self.tarize(source_dir, archive_path = nil)
     require 'rubygems/package'
     require 'zlib'
     require 'stringio'
@@ -57,10 +57,18 @@ module Misc
 
     tar_io.rewind
 
-    File.open(archive_path, 'wb') do |f|
-      gz = Zlib::GzipWriter.new(f)
-      gz.write(tar_io.string)
-      gz.close
+    if archive_path
+      File.open(archive_path, 'wb') do |f|
+        gz = Zlib::GzipWriter.new(f)
+        gz.write(tar_io.string)
+        gz.close
+      end
+    else
+      Open.open_pipe do |f|
+        gz = Zlib::GzipWriter.new(f)
+        gz.write(tar_io.string)
+        gz.close
+      end
     end
   end
 

data/lib/scout/open/final.rb

@@ -89,6 +89,8 @@ module Open
   end
 
   def self.touch(file)
+    file = file.find if Path === file
+    Open.mkdir File.dirname(file)
     FileUtils.touch(file)
   end
 
@@ -197,4 +199,8 @@ module Open
     FileUtils.cp_lr(source, target)
   end
 
+  def self.same_file(file1, file2)
+    File.identical?(file1, file2)
+  end
+
 end

data/lib/scout/path/find.rb

@@ -1,8 +1,7 @@
 require_relative '../indiferent_hash'
 module Path
 
-  def self.caller_lib_dir(file = nil, relative_to = ['lib', 'bin'])
-
+  def self.caller_file(file = nil)
     if file.nil?
       caller_dup = caller.dup
       while file = caller_dup.shift
@@ -16,10 +15,24 @@ module Path
       return nil if file.nil?
       file = file.sub(/\.rb[^\w].*/,'.rb')
     end
+    file
+  end
+
+  def self.caller_lib_dir(file = nil, relative_to = ['lib', 'bin'])
+
+    file = caller_file(file)
+
+    return nil if file.nil?
 
-    relative_to = [relative_to] unless Array === relative_to
     file = File.expand_path(file)
-    return Path.setup(file) if relative_to.select{|d| File.exist? File.join(file, d)}.any?
+
+    return File.dirname(file) if not relative_to
+
+    relative_to = [relative_to] unless Array === relative_to
+
+    if relative_to.select{|d| File.exist? File.join(file, d)}.any? 
+      return Path.setup(file)
+    end
 
     while file != '/'
       dir = File.dirname file
@@ -75,18 +88,28 @@ module Path
       :cache   => '/cache/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
       :bulk    => '/bulk/{TOPLEVEL}/{PKGDIR}/{SUBPATH}',
       :lib     => '{LIBDIR}/{TOPLEVEL}/{SUBPATH}',
-      :scout_essentials => File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}/{SUBPATH}"),
+      :scout_essentials_lib => File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}/{SUBPATH}"),
       :tmp     => '/tmp/{PKGDIR}/{TOPLEVEL}/{SUBPATH}',
       :default => :user
     })
   end
 
   def self.basic_map_order
-    @@basic_map_order ||= %w(current workflow user local global lib fast cache bulk)
+    @@basic_map_order ||= %w(current workflow user local global usr lib fast cache bulk).collect{|m| m.to_sym }
   end
 
   def self.map_order
-    @@map_order ||= (path_maps.keys & basic_map_order) + (path_maps.keys - basic_map_order)
+    @@map_order ||= 
+      begin
+        all_maps = path_maps.keys.collect{|m| m.to_s }.reverse
+        basic_map_order = self.basic_map_order.collect{|m| m.to_s }
+
+        lib_maps = all_maps.select{|m| m.end_with?('_lib') }
+        basic_map_order[basic_map_order.index 'lib'] = lib_maps + ['lib']
+        basic_map_order.flatten!
+
+        (basic_map_order & all_maps) + (all_maps - basic_map_order)
+      end.collect{|m| m.to_sym }
   end
 
   def self.add_path(name, map)
@@ -104,6 +127,21 @@ module Path
     map_order.push(name.to_sym)
   end
 
+  def map_order
+    @map_order ||= 
+      begin
+        all_maps = path_maps.keys.collect{|m| m.to_s }.reverse
+        basic_map_order = Path.map_order.collect{|m| m.to_s }
+
+        (basic_map_order & all_maps) + (all_maps - basic_map_order)
+      end.collect{|m| m.to_sym }
+  end
+
+  def add_path(name, map)
+    path_maps[name] = map
+    @map_order = nil
+  end
+
   def prepend_path(name, map)
     path_maps[name] = map
     map_order.unshift(name.to_sym)
@@ -147,7 +185,7 @@ module Path
   DOT = "."[0]
   def self.located?(path)
     # OPEN RESOURCE
-    path.slice(0,1) == SLASH || (path.slice(0,1) == DOT && path.slice(1,2) == SLASH)
+    path.slice(0,1) == SLASH || (path.slice(0,1) == DOT && path.slice(1,1) == SLASH)
   end
 
   def located?
@@ -216,6 +254,7 @@ module Path
     return follow(where) if where
 
     map_order.each do |map_name|
+      next unless path_maps.include?(map_name)
       found = follow(map_name, false)
 
       found = Path.exists_file_or_alternatives(found)

data/lib/scout/path/util.rb

@@ -49,16 +49,17 @@ module Path
     self.annotate(File.basename(self))
   end
 
-  def glob(pattern = '*')
+  def glob(pattern = "*")
     if self.include? "*"
       if located?
-        Dir.glob(File.join(self, pattern))
+        Dir.glob(self)
       else
         self.glob_all
       end
     else
       return [] unless self.exist? 
       found = self.find
+
       exp = File.join(found, pattern)
       paths = Dir.glob(exp).collect{|f| self.annotate(f) }
 

data/lib/scout/path.rb

@@ -1,5 +1,4 @@
 require_relative 'annotation'
-require_relative 'path/find'
 require_relative 'path/util'
 require_relative 'path/tmpfile'
 require_relative 'path/digest'
@@ -28,10 +27,6 @@ module Path
     @path_maps ||= Path.path_maps.dup
   end
 
-  def map_order
-    @map_order ||= (path_maps.keys & Path.map_order) + (path_maps.keys - Path.map_order)
-  end
-
   def join(subpath = nil, prevpath = nil)
     return self if subpath.nil?
 
@@ -54,5 +49,5 @@ module Path
       join(name, prev)
     end
   end
-
 end
+require_relative 'path/find'

data/lib/scout/resource/scout.rb

@@ -4,4 +4,6 @@ module Scout
   self.pkgdir = 'scout'
 end
 
+Resource.default_resource = Scout
+
 Path.load_path_maps(Scout.etc["path_maps"])

data/lib/scout/resource/util.rb

@@ -2,14 +2,19 @@ module Resource
   def identify(path)
     path = Path.setup path unless Path === path
     return path unless path.located?
+
     path_maps = path.path_maps if Path === path
     path_maps ||= self.path_maps || Path.path_maps
-    path = File.expand_path(path) if path.start_with?("/")
-    path += "/" if File.directory?(path)
 
-    map_order ||= (path_maps.keys & Path.basic_map_order) + (path_maps.keys - Path.basic_map_order)
+    map_order = path.map_order
+    map_order ||= Path.map_order
     map_order -= [:current, "current"]
 
+    libdir = Path.caller_lib_dir
+
+    path = File.expand_path(path) if path.start_with?('/')
+    path += "/" if File.directory?(path) and not path.end_with?('/')
+
     choices = []
     map_order.uniq.each do |name|
       pattern = path_maps[name]
@@ -22,6 +27,7 @@ module Resource
         regexp = "^" + pattern
           .gsub(/{(TOPLEVEL)}/,'(?<\1>[^/]+)')
           .gsub(/\.{(PKGDIR)}/,'\.(?<\1>[^/]+)')
+          .gsub(/{(LIBDIR)}/, libdir)
           .gsub(/\/{([^}]+)}/,'(?:/(?<\1>[^/]+))?') +
         "(?:/(?<REST>.+))?/?$"
         if m = path.match(regexp) 

data/lib/scout/resource.rb

@@ -7,6 +7,15 @@ require_relative 'resource/util'
 require_relative 'resource/software'
 require_relative 'resource/sync'
 
+require_relative 'log'
+require_relative 'path'
+require_relative 'resource/produce'
+require_relative 'resource/path'
+require_relative 'resource/open'
+require_relative 'resource/util'
+require_relative 'resource/software'
+require_relative 'resource/sync'
+
 module Resource
   extend Annotation
   annotation :pkgdir, :libdir, :subdir, :resources, :rake_dirs, :path_maps, :map_order, :lock_dir
@@ -24,7 +33,7 @@ module Resource
   end
 
   def path_maps
-    @path_maps ||= Path.path_maps.dup
+    @path_maps ||= Path.path_maps
   end
 
   def subdir

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.14 ruby lib
+# stub: scout-essentials 1.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.14".freeze
+  s.version = "1.7.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 = "1980-01-02"
+  s.date = "2025-06-05"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -146,7 +146,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.6.7".freeze
+  s.rubygems_version = "3.6.6".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4

data/test/scout/indiferent_hash/test_options.rb

@@ -42,5 +42,10 @@ class TestOptions < Test::Unit::TestCase
     hash = {:a => /test/}
     assert_equal({}, IndiferentHash.string2hash(IndiferentHash.hash2string(hash)))
   end
+
+  def test_parse_options
+    assert_include IndiferentHash.parse_options('blueberries=true title="This is a title" list=one,two,"and three"'), "title"
+    assert_include IndiferentHash.parse_options('source="=>Alias"'), "source"
+  end
 end
 

data/test/scout/path/test_find.rb

@@ -110,7 +110,7 @@ class TestPathFind < Test::Unit::TestCase
     path = Path.setup("somefile")
     TmpFile.with_path do |tmpdir|
       Open.write(tmpdir.somefile, 'test')
-      path.path_maps["tmpdir"] = tmpdir
+      path.add_path :tmpdir, tmpdir
       assert path.exists?
     end
   end

data/test/scout/resource/test_util.rb

@@ -10,6 +10,12 @@ class TestResourceUtil < Test::Unit::TestCase
     assert_equal 'share/data/somedir/somepath', Scout.identify(path)
   end
 
+  def test_identify_lib
+    p = Scout.data.file.find(:lib)
+    assert p.located?
+    assert_equal "data/file", p.identify
+  end
+
   def test_identify_dir
     path = Path.setup('share/data/somedir/').find
     assert_equal 'share/data/somedir', Scout.identify(path)
@@ -29,8 +35,8 @@ class TestResourceUtil < Test::Unit::TestCase
       Path.setup dir
 
       path_base = Path.setup("basedir").someother.file
-      path_base.path_maps[:subdir1] = File.join(dir, 'subdir1', '{PATH}')
-      path_base.path_maps[:subdir2] = File.join(dir, 'subdir2', '{PATH}')
+      path_base.add_path :subdir1, File.join(dir, 'subdir1', '{PATH}')
+      path_base.add_path :subdir2, File.join(dir, 'subdir2', '{PATH}')
 
       path1 = path_base.find(:subdir1)
       path2 = path_base.find(:subdir2)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.7.0
 platform: ruby
 authors:
 - Miguel Vazquez
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Scout essential tools
 test_files: []