scout-essentials 1.6.5 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c16f695461037137552a5dc43c5135eae7873176ae2bc9495e9c0ed7fdbf0b
-  data.tar.gz: 6bea89686ff4be00f385757cf2d4e96aa15c973253432244eb7c0412c7977365
+  metadata.gz: 800981da332ab6cceb17244d49454560c59cdc86df7122b012c2b26b7ab7d427
+  data.tar.gz: 02c265335fd31c11f9b0161708c670d4dfdf1a989cfb6254d5f11c08118e6e98
 SHA512:
-  metadata.gz: 10864ea7dc1d73802a5c4bdc4f48f48434f3d610c4efef5df281f0d34b38eae366329673daff86756242ca43cee792ba76c8c8f590d0ed030c0c77c645eb4a58
-  data.tar.gz: 6d2d19fa54ee2ab3c3130310f54feb080713a53f41a69a99debed28e69f127e7e1596eb99a0e715f4a6af5f89af78c86d8c189cc94afef6427c5802962c12c1f
+  metadata.gz: eff7851e6e63bf645d366c38e1cac85a3a6d4b0d34a00091d4c0cbb683361aab9b60a5da0e21fae5318d332bf559275b4748362520e66cc509f125988d7969a9
+  data.tar.gz: 74c799cbfdbf5458bc7e4e59a6e966a280cf39bc0af9bf4691ef8b4390303c78b360b56c81fafbf6465e5932af3eba43d08fba56723a13c32840254358bb658f

data/.vimproject

@@ -21,6 +21,7 @@ scout-essentials=/$PWD filter="*.rb *.txt *.md *.conf *.yaml" {
     monitor.rb
     system.rb
     math.rb
+    hook.rb
    }
    named_array.rb
    indiferent_hash.rb
@@ -41,7 +42,6 @@ scout-essentials=/$PWD filter="*.rb *.txt *.md *.conf *.yaml" {
 
     trap.rb
    }
-   tmpfile.rb
    simple_opt.rb
    simple_opt=simple_opt{
     accessor.rb
@@ -61,12 +61,14 @@ scout-essentials=/$PWD filter="*.rb *.txt *.md *.conf *.yaml" {
    cmd.rb
    open.rb
    open=open{
+    final.rb
     lock.rb
     remote.rb
     stream.rb
     util.rb
     bgzf.rb
    }
+   tmpfile.rb
    resource.rb
    resource=resource{
     open.rb

data/Rakefile

@@ -19,6 +19,7 @@ Juwelier::Tasks.new do |gem|
   
   gem.add_runtime_dependency 'term-ansicolor'
   gem.add_runtime_dependency 'yaml'
+  gem.add_runtime_dependency 'rake'
 end
 Juwelier::RubygemsDotOrgTasks.new
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.6.7

data/lib/scout/annotation/annotation_module.rb

@@ -1,7 +1,8 @@
 module Annotation
   module AnnotationModule
     def annotation(*attrs)
-      self.instance_variable_get("@annotations").concat attrs
+      annotations = self.instance_variable_get("@annotations")
+      annotations.concat attrs - annotations
       attrs.each do |a|
         self.attr_accessor a
       end

data/lib/scout/config.rb

@@ -89,7 +89,19 @@ module Scout::Config
   # For equal priorities the matching prioritizes tokens ealier in the list
   def self.get(key, *tokens)
     options = tokens.pop if Hash === tokens.last
+    options = IndiferentHash.setup options if options
+
     default = options.nil? ? nil : options[:default]
+    env = options.nil? ? nil : options[:env]
+
+    if env
+      env.split(/,\s*/).each do |variable|
+        if ENV[variable]
+          default = ENV[variable]
+          break
+        end
+      end
+    end
 
     tokens = ["key:" + key] if tokens.empty?
 
@@ -120,12 +132,16 @@ module Scout::Config
     value = priorities.empty? ? default : priorities.collect{|p| p }.sort_by{|p,v| p}.first.last.first
     value = false if value == 'false'
 
-    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}"
+    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}" + (env ? " env:#{env}" : '')
     GOT_KEYS << [key, value, tokens]
 
     if String === value && m = value.match(/^env:(.*)/)
-      variable = m.captures.first
-      ENV[variable]
+      variables = m.captures.first
+      variables.split(/,\s*/).each do |variable|
+        value = ENV[variable]
+        return value if value
+      end
+      nil
     elsif value == 'nil'
       nil
     else

data/lib/scout/log/color.rb

@@ -202,7 +202,7 @@ module Log
 
     str = str.to_s unless str.nil?
     return str if Symbol === color
-    color_str = reset ? Term::ANSIColor.reset : ""
+    color_str = reset ? Term::ANSIColor.reset.dup : ""
     color_str << color if color
     if str.nil?
       color_str

data/lib/scout/misc/digest.rb

@@ -9,7 +9,11 @@ module Misc
       when String
         if Path.is_filename?(obj) && Open.exists?(obj)
           if File.directory?(obj)
-            "Directory MD5: #{digest_str(Dir.glob(File.join(obj, "*")))}"
+            if Path === obj
+              "Directory MD5: #{digest_str(obj.glob("*"))}"
+            else
+              "Directory MD5: #{digest_str(Dir.glob(File.join(obj, "*")))}"
+            end
           else
             "File MD5: #{Misc.digest_file(obj)}"
           end

data/lib/scout/misc/helper.rb

@@ -34,17 +34,18 @@ module Misc
   def self.chunk(array, size)
     total = array.length
     current = 0
-    res = [] unless block_given?
+    res = []
     while current < total
       last = current + size - 1
       if block_given?
-        yield array[current..last]
+        r = yield array[current..last]
+        res.concat r if Array === r
       else
         res << array[current..last]
       end
       current = last + 1
     end
-    block_given? ? nil : res
+    res
   end
 
   # Divides the array into +num+ chunks of the same size by placing one

data/lib/scout/misc/hook.rb

@@ -0,0 +1,45 @@
+module Hook
+  def self.extended(hook_class)
+    hook_class.class_variable_set(:@@prev_methods, hook_class.methods)
+  end
+
+  def self.apply(hook_class, base_class)
+    base_class.class_variable_set(:@@hooks, []) unless base_class.class_variables.include?([])
+    base_class.class_variable_get(:@@hooks).push hook_class
+
+    hook_class.singleton_methods.each do |method_name|
+      next unless base_class.singleton_methods.include? method_name
+      orig_name = ("orig_" + method_name.to_s).to_sym
+      if not base_class.singleton_methods.include?(orig_name)
+        base_class.singleton_class.alias_method orig_name, method_name
+        base_class.define_singleton_method method_name do |*args|
+          base_class.class_variable_get(:@@hooks).each do |hook|
+            next if hook.respond_to?(:claim) and not hook.claim(*args)
+            if hook.respond_to?(method_name)
+              return hook.send(method_name, *args)
+            end
+          end
+          return base_class.send(orig_name, *args)
+        end
+      end
+    end
+
+    hook_class.instance_methods.each do |method_name|
+      next unless base_class.instance_methods.include? method_name
+      orig_name = ("orig_" + method_name.to_s).to_sym
+      if not base_class.instance_methods.include?(orig_name)
+        base_class.alias_method orig_name, method_name
+        base_class.define_method method_name do |*args|
+          base_class.class_variable_get(:@@hooks).each do |hook|
+            next if hook.respond_to?(:claim) and not hook.claim(self, *args)
+            if hook.instance_methods.include?(method_name)
+              return hook.instance_method(method_name).bind(self).call *args
+              #return self.instance_exec *args, &hook.instance_method(method_name)
+            end
+          end
+          return self.send(orig_name, *args)
+        end
+      end
+    end
+  end
+end

data/lib/scout/misc/math.rb

@@ -52,7 +52,7 @@ module Misc
   end
 
   def self.variance(list)
-    return nil if list.length < 3
+    return nil if list.length < 2
     mean = mean(list)
     list = list.compact
     list_length = list.length
@@ -66,9 +66,8 @@ module Misc
     total_square_distance / (list_length - 1)
   end
 
-
   def self.sd(list)
-    return nil if list.length < 3
+    return nil if list.length < 2
     variance = self.variance(list)
     Math.sqrt(variance)
   end

data/lib/scout/misc/system.rb

@@ -52,7 +52,23 @@ module Misc
       ENV[var] = old_value
     end
   end
-  
+
+  def self.with_envs(hash, &block)
+    old_value = {}
+    begin
+      hash.each do |var,value|
+        old_value[var] = ENV[var]
+        ENV[var] = value
+      end
+      yield
+    ensure
+      old_value.each do |var,value|
+        ENV[var] = value
+      end
+    end
+  end
+
+
   def self.update_git(gem_name = 'scout-essentials')
     gem_name = 'scout-essentials' if gem_name.nil?
     dir = File.join(__dir__, '../../../../', gem_name)

data/lib/scout/open/final.rb

@@ -0,0 +1,143 @@
+require 'scout/log'
+module Open
+  def self.get_stream(file, mode = 'r', options = {})
+    return file if Open.is_stream?(file)
+    return file.stream if Open.has_stream?(file)
+    file = file.find if Path === file
+
+    return Open.ssh(file, options) if Open.ssh?(file)
+    return Open.wget(file, options) if Open.remote?(file)
+
+    File.open(file, mode)
+  end
+
+  def self.file_write(file, content, mode = 'w')
+    File.open(file, mode) do |f|
+      begin
+        f.flock(File::LOCK_EX)
+        f.write content 
+        f.flock(File::LOCK_UN)
+      ensure
+        f.close unless f.closed?
+      end
+    end
+  end
+
+  def self.write(file, content = nil, options = {})
+    options = IndiferentHash.add_defaults options, :mode => 'w'
+
+    file = file.find(options[:where]) if Path === file
+    mode = IndiferentHash.process_options options, :mode
+
+    Open.mkdir File.dirname(file)
+
+    case
+    when block_given?
+      begin
+        f = File.open(file, mode)
+        begin
+          yield f
+        ensure
+          f.close unless f.closed?
+        end
+      rescue Exception
+        FileUtils.rm file if File.exist? file
+        raise $!
+      end
+    when content.nil?
+      file_write(file, "", mode)
+    when String === content
+      file_write(file, content, mode)
+    when (IO === content || StringIO === content)
+      begin
+        File.open(file, mode) do |f| 
+          f.flock(File::LOCK_EX)
+          while block = content.read(Open::BLOCK_SIZE)
+            f.write block
+          end
+          f.flock(File::LOCK_UN)
+        end
+      rescue Exception
+        FileUtils.rm_rf file if File.exist? file
+        raise $!
+      end
+      content.close unless content.closed?
+      content.join if content.respond_to? :join
+    else
+      raise "Content unknown #{Log.fingerprint content}"
+    end
+
+    notify_write(file)
+  end
+
+  def self.mv(source, target, options = {})
+    target = target.find if Path === target
+    source = source.find if Path === source
+    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
+    tmp_target = File.join(File.dirname(target), '.tmp_mv.' + File.basename(target))
+    FileUtils.mv source, tmp_target
+    FileUtils.mv tmp_target, target
+    return nil
+  end
+
+  def self.rm(file)
+    FileUtils.rm(file) if File.exist?(file) || Open.broken_link?(file)
+  end
+
+  def self.rm_rf(file)
+    FileUtils.rm_rf(file)
+  end
+
+  def self.touch(file)
+    FileUtils.touch(file)
+  end
+
+  def self.mkdir(target)
+    target = target.find if Path === target
+    if ! File.exist?(target)
+      FileUtils.mkdir_p target
+    end
+  end
+
+  def self.cp(source, target, options = {})
+    source = source.find if Path === source
+    target = target.find if Path === target
+
+    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
+    FileUtils.rm_rf target if File.exist?(target)
+    FileUtils.cp_r source, target
+  end
+
+  def self.directory?(file)
+    file = file.find if Path === file
+    File.directory?(file)
+  end
+
+  def self.exists?(file)
+    file = file.find if Path === file
+    File.exist?(file)
+  end
+
+  def self.ctime(file)
+    file = file.find if Path === file
+    File.ctime(file)
+  end
+
+  def self.mtime(file)
+    file = file.find if Path === file
+    begin
+      if File.symlink?(file) || File.stat(file).nlink > 1
+        if File.exist?(file + '.info') && defined?(Step)
+          done = Persist.load(file + '.info', Step::SERIALIZER)[:done]
+          return done if done
+        end
+
+        file = Pathname.new(file).realpath.to_s 
+      end
+      return nil unless File.exist?(file)
+      File.mtime(file)
+    rescue
+      nil
+    end
+  end
+end

data/lib/scout/open/remote.rb

@@ -30,6 +30,17 @@ module Open
     end
   end
 
+  LAST_TIME = {}
+  def self.wait(lag, key = nil)
+    time = Time.now
+
+    if LAST_TIME[key] != nil && (time < LAST_TIME[key] + lag)
+      sleep (LAST_TIME[key] + lag) - time
+    end
+
+    LAST_TIME[key] = Time.now
+  end
+
   def self.wget(url, options = {})
     options = options[:wget_options] if options.include?(:wget_options)
     if ! (options[:force] || options[:nocache]) && cache_file = in_cache(url, options)

data/lib/scout/open/stream.rb

@@ -105,7 +105,7 @@ module Open
 
     Open.lock tmp_path_lock, lock_options do
 
-      if File.exist? path and not force
+      if Open.exist? path and not force
         Log.warn "Path exists in sensible_write, not forcing update: #{ path }"
         Open.consume_stream content
       else

data/lib/scout/open/util.rb

@@ -103,50 +103,12 @@ module Open
     File.symlink?(path) && ! File.exist?(File.readlink(path))
   end
 
-  def self.directory?(file)
-    file = file.find if Path === file
-    File.directory?(file)
-  end
-
-  def self.exists?(file)
-    file = file.find if Path === file
-    File.exist?(file)
-  end
   class << self; alias exist? exists? end
 
   def self.exist_or_link?(file)
     self.exists?(file) || File.symlink?(file)
   end
 
-  def self.mv(source, target, options = {})
-    target = target.find if Path === target
-    source = source.find if Path === source
-    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
-    tmp_target = File.join(File.dirname(target), '.tmp_mv.' + File.basename(target))
-    FileUtils.mv source, tmp_target
-    FileUtils.mv tmp_target, target
-    return nil
-  end
-
-  def self.rm(file)
-    FileUtils.rm(file) if File.exist?(file) || Open.broken_link?(file)
-  end
-
-  def self.rm_rf(file)
-    FileUtils.rm_rf(file)
-  end
-
-  def self.touch(file)
-    FileUtils.touch(file)
-  end
-
-  def self.mkdir(target)
-    target = target.find if Path === target
-    if ! File.exist?(target)
-      FileUtils.mkdir_p target
-    end
-  end
-
   def self.writable?(path)
     path = path.find if Path === path
     if File.symlink?(path)
@@ -158,44 +120,11 @@ module Open
     end
   end
 
-  def self.ctime(file)
-    file = file.find if Path === file
-    File.ctime(file)
-  end
-
   def self.realpath(file)
     file = file.find if Path === file
     Pathname.new(File.expand_path(file)).realpath.to_s 
   end
 
-  def self.mtime(file)
-    file = file.find if Path === file
-    begin
-      if File.symlink?(file) || File.stat(file).nlink > 1
-        if File.exist?(file + '.info') && defined?(Step)
-          done = Persist.load(file + '.info', Step::SERIALIZER)[:done]
-          return done if done
-        end
-
-        file = Pathname.new(file).realpath.to_s 
-      end
-      return nil unless File.exist?(file)
-      File.mtime(file)
-    rescue
-      nil
-    end
-  end
-
-  def self.cp(source, target, options = {})
-    source = source.find if Path === source
-    target = target.find if Path === target
-
-    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
-    FileUtils.rm_rf target if File.exist?(target)
-    FileUtils.cp_r source, target
-  end
-
-
   def self.ln_s(source, target, options = {})
     source = source.find if Path === source
     target = target.find if Path === target

data/lib/scout/open.rb

@@ -1,7 +1,7 @@
-require_relative 'tmpfile'
 require_relative 'path'
 require_relative 'cmd'
 
+require_relative 'open/final'
 require_relative 'open/stream'
 require_relative 'open/util'
 require_relative 'open/remote'
@@ -20,17 +20,6 @@ module Open
     end
   end
 
-  def self.get_stream(file, mode = 'r', options = {})
-    return file if Open.is_stream?(file)
-    return file.stream if Open.has_stream?(file)
-    file = file.find if Path === file
-
-    return Open.ssh(file, options) if Open.ssh?(file)
-    return Open.wget(file, options) if Open.remote?(file)
-
-    File.open(file, mode)
-  end
-
   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'
 
@@ -43,18 +32,6 @@ module Open
     end
   end
 
-  def self.file_write(file, content, mode = 'w')
-    File.open(file, mode) do |f|
-      begin
-        f.flock(File::LOCK_EX)
-        f.write content 
-        f.flock(File::LOCK_UN)
-      ensure
-        f.close unless f.closed?
-      end
-    end
-  end
-
   def self.open(file, options = {})
     if IO === file || StringIO === file
       if block_given?
@@ -120,51 +97,4 @@ module Open
       end
     end
   end
-
-  def self.write(file, content = nil, options = {})
-    options = IndiferentHash.add_defaults options, :mode => 'w'
-
-    file = file.find(options[:where]) if Path === file
-    mode = IndiferentHash.process_options options, :mode
-
-    FileUtils.mkdir_p File.dirname(file)
-
-    case
-    when block_given?
-      begin
-        f = File.open(file, mode)
-        begin
-          yield f
-        ensure
-          f.close unless f.closed?
-        end
-      rescue Exception
-        FileUtils.rm file if File.exist? file
-        raise $!
-      end
-    when content.nil?
-      file_write(file, "", mode)
-    when String === content
-      file_write(file, content, mode)
-    when (IO === content || StringIO === content)
-      begin
-        File.open(file, mode) do |f| 
-          f.flock(File::LOCK_EX)
-          while block = content.read(Open::BLOCK_SIZE)
-            f.write block
-          end
-          f.flock(File::LOCK_UN)
-        end
-      rescue Exception
-        FileUtils.rm_rf file if File.exist? file
-        raise $!
-      end
-      content.close unless content.closed?
-      content.join if content.respond_to? :join
-    else
-      raise "Content unknown #{Log.fingerprint content}"
-    end
-
-    notify_write(file)
-  end
 end

data/lib/scout/path/digest.rb

@@ -3,7 +3,7 @@ module Path
   def digest_str
     case
     when File.directory?(self)
-      "Directory MD5: #{Misc.digest_str(Dir.glob(File.join(self, "*")))}"
+      "Directory MD5: #{Misc.digest_str(self.glob("*"))}"
     when self.located? && File.exist?(self)
       "File MD5: #{Misc.digest_file(self)}"
     else

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|tsv|refactor)\.rb/ or
+          file =~ /(?:scout|rbbt)\/(?:.*\/)?(path|open|final|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
@@ -42,10 +42,10 @@ module Path
     file = map.sub('{PKGDIR}', pkgdir).
       sub('{HOME}', ENV["HOME"]).
       sub('{RESOURCE}', path.pkgdir.to_s).
-      sub('{PWD}', FileUtils.pwd).
-      sub('{TOPLEVEL}', path._toplevel).
-      sub('{SUBPATH}', path._subpath).
-      sub('{BASENAME}', File.basename(path)).
+      sub('{PWD}'){ FileUtils.pwd }.
+      sub('{TOPLEVEL}'){ path._toplevel }.
+      sub('{SUBPATH}'){ path._subpath }.
+      sub('{BASENAME}'){ File.basename(path)}.
       sub('{PATH}', path).
       sub('{LIBDIR}'){ path.libdir || (path.pkgdir.respond_to?(:libdir) && path.pkgdir.libdir) || Path.caller_lib_dir || "NOLIBDIR" }.
       sub('{MAPNAME}', map_name.to_s).

data/lib/scout/path/util.rb

@@ -8,7 +8,10 @@ module Path
   def self.is_filename?(string, need_to_exists = true)
     return false if string.nil?
     return true if Path === string
-    return true if String === string and ! string.include?("\n") and string.split("/").select{|p| p.length > 265 }.empty? and (! need_to_exists || File.exist?(string))
+    return true if String === string and
+      ! string.include?("\n") and
+      (string.length < 265 || string.split("/").select{|p| p.length > 265 }.empty?) and
+      (! need_to_exists || File.exist?(string))
     return false
   end
 
@@ -48,7 +51,11 @@ module Path
 
   def glob(pattern = '*')
     if self.include? "*"
-      self.glob_all
+      if located?
+        Dir.glob(File.join(self, pattern))
+      else
+        self.glob_all
+      end
     else
       return [] unless self.exist? 
       found = self.find
@@ -69,7 +76,8 @@ module Path
 
     search_paths.keys.collect do |where| 
       found = find(where)
-      paths = pattern ? Dir.glob(File.join(found, pattern)) : Dir.glob(found) 
+
+      paths = pattern ? found.glob(pattern) : found.glob
 
       paths = paths.collect{|p| self.annotate p }
 
@@ -98,7 +106,12 @@ module Path
   end
 
   def unset_extension
-    self.annotate(self.split(".")[0..-2] * ".")
+    parts = self.split("/")
+    basename = parts.pop
+    return self unless basename.include?(".")
+    basename = basename.split(".")[0..-2] * "."
+    parts.push basename
+    self.annotate(parts * "/")
   end
 
   def remove_extension(extension = nil)

data/lib/scout/resource/produce/rake.rb

@@ -57,7 +57,6 @@ module ScoutRake
         end
       rescue Exception
         Log.error "Error in rake: #{$!.message}"
-        Log.exception $!
         Kernel.exit! -1
       end
       Kernel.exit! 0

data/lib/scout/resource/util.rb

@@ -15,7 +15,7 @@ module Resource
       pattern = path_maps[pattern] while Symbol === pattern
       next if pattern.nil?
 
-      pattern = pattern.sub('{PWD}', Dir.pwd)
+      pattern = pattern.sub('{PWD}'){Dir.pwd}
       pattern = pattern.sub('{HOME}', ENV["HOME"])
       if String ===  pattern and pattern.include?('{')
         regexp = "^" + pattern

data/lib/scout/tmpfile.rb

@@ -1,3 +1,4 @@
+require_relative 'open'
 require_relative 'misc'
 require_relative 'log'
 require 'fileutils'
@@ -32,7 +33,7 @@ module TmpFile
   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)))
+    File.join(dir, random_name(prefix, max))
   end
 
   def self.with_file(content = nil, erase = true, options = {})
@@ -52,9 +53,9 @@ module TmpFile
     tmpfile = tmp_file prefix, max, tmpdir
     tmpfile += ".#{options[:extension]}" if options[:extension]
 
-    FileUtils.mkdir_p tmpdir
+    Open.mkdir tmpdir
     if IO === content
-      File.open(tmpfile, 'wb') do |f|
+      Open.open(tmpfile, mode: 'wb') do |f|
         begin
           while c = content.readpartial(1024)
             f << c
@@ -63,12 +64,12 @@ module TmpFile
         end
       end
     elsif !content.nil?
-      File.open(tmpfile, 'w') { |f| f.write content }
+      Open.write(tmpfile, content)
     end
 
     result = yield(tmpfile)
 
-    FileUtils.rm_rf tmpfile if File.exist?(tmpfile) && erase
+    Open.rm_rf tmpfile if Open.exist?(tmpfile) && erase
 
     result
   end
@@ -77,11 +78,11 @@ module TmpFile
     prefix = options[:prefix] || 'tmpdir-'
     tmpdir = tmp_file prefix
 
-    FileUtils.mkdir_p tmpdir
+    Open.mkdir tmpdir
 
     result = yield(tmpdir)
 
-    FileUtils.rm_rf tmpdir if File.exist?(tmpdir) && erase
+    Open.rm_rf tmpdir if Open.exist?(tmpdir) && erase
 
     result
   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.5 ruby lib
+# stub: scout-essentials 1.6.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.5".freeze
+  s.version = "1.6.7".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 = "2025-01-17"
+  s.date = "2025-03-19"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     "lib/scout/misc/filesystem.rb",
     "lib/scout/misc/format.rb",
     "lib/scout/misc/helper.rb",
+    "lib/scout/misc/hook.rb",
     "lib/scout/misc/insist.rb",
     "lib/scout/misc/matching.rb",
     "lib/scout/misc/math.rb",
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
     "lib/scout/misc/system.rb",
     "lib/scout/named_array.rb",
     "lib/scout/open.rb",
+    "lib/scout/open/final.rb",
     "lib/scout/open/lock.rb",
     "lib/scout/open/lock/lockfile.rb",
     "lib/scout/open/remote.rb",
@@ -100,6 +102,7 @@ Gem::Specification.new do |s|
     "test/scout/misc/test_digest.rb",
     "test/scout/misc/test_filesystem.rb",
     "test/scout/misc/test_helper.rb",
+    "test/scout/misc/test_hook.rb",
     "test/scout/misc/test_insist.rb",
     "test/scout/misc/test_matching.rb",
     "test/scout/misc/test_math.rb",
@@ -139,7 +142,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.5.23".freeze
+  s.rubygems_version = "3.6.5".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4
@@ -151,5 +154,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<yaml>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<rake>.freeze, [">= 0".freeze])
 end
 

data/test/scout/misc/test_hook.rb

@@ -0,0 +1,42 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+class TestHook < Test::Unit::TestCase
+  def test_hook
+    m = Module.new do
+      def self.test
+        "original"
+      end
+      
+      def test
+        'ORIGINAL'
+      end
+    end
+
+    a = 's'
+    a.extend m
+
+    assert_equal 'original', m.test
+    assert_equal 'ORIGINAL', a.test
+
+    h = Module.new do
+      extend Hook
+      def self.test
+        "hook"
+      end
+
+      def test
+        'HOOK'
+      end
+    end
+    
+    Hook.apply(h, m)
+
+    a = 's'
+    a.extend m
+
+    assert_equal 'hook', m.test
+    assert_equal 'HOOK', a.test
+  end
+end
+

data/test/scout/path/test_util.rb

@@ -18,5 +18,13 @@ class TestPathUtil < Test::Unit::TestCase
       assert_equal %w(foo bar).sort, tmpdir.glob.collect{|p| p.basename }.sort
     end
   end
+
+  def test_unset_extension
+    path = Path.setup("/home/.scout/dir/file.txt")
+    assert_equal "/home/.scout/dir/file", path.unset_extension
+
+    path = Path.setup("/home/.scout/dir/file")
+    assert_equal "/home/.scout/dir/file", path.unset_extension
+  end
 end
 

data/test/scout/test_config.rb

@@ -63,4 +63,20 @@ class TestConfig < Test::Unit::TestCase
     Scout::Config.add_entry 'key', 'V1', 'token1'
     assert_equal "V3", Scout::Config.get('key', 'token2', :default => 'V3')
   end
+
+  def test_env
+    Misc.with_env "TEST_VAR", "TEST" do
+      assert_equal "TEST", Scout::Config.get("value", :key, :env => "TEST_VAR")
+      Scout::Config.set "value", 'env:TEST_VAR', 'key'
+      assert_equal "TEST", Scout::Config.get(:value, :key)
+    end
+  end
+
+  def test_env_multiple
+    Misc.with_env "TEST_VAR", "TEST" do
+      assert_equal "TEST", Scout::Config.get("value", :key, :env => "TEST_VAR,TESTVAR")
+      Scout::Config.set "value", 'env:TEST_VAR,TESTVAR', 'key'
+      assert_equal "TEST", Scout::Config.get(:value, :key)
+    end
+  end
 end

data/test/scout/test_tmpfile.rb

@@ -17,7 +17,7 @@ class TestTmpFile < Test::Unit::TestCase
   def test_do_tmp_file_io
     content = "Hello World!"
     TmpFile.with_file(content) do |file1|
-      File.open(file1) do |io|
+      Open.open(file1) do |io|
         TmpFile.with_file(io) do |file|
           assert_equal content, File.open(file).read
         end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.7
 platform: ruby
 authors:
 - Miguel Vazquez
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -108,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Things a scout can use anywhere
 email: mikisvaz@gmail.com
 executables: []
@@ -148,6 +161,7 @@ files:
 - lib/scout/misc/filesystem.rb
 - lib/scout/misc/format.rb
 - lib/scout/misc/helper.rb
+- lib/scout/misc/hook.rb
 - lib/scout/misc/insist.rb
 - lib/scout/misc/matching.rb
 - lib/scout/misc/math.rb
@@ -155,6 +169,7 @@ files:
 - lib/scout/misc/system.rb
 - lib/scout/named_array.rb
 - lib/scout/open.rb
+- lib/scout/open/final.rb
 - lib/scout/open/lock.rb
 - lib/scout/open/lock/lockfile.rb
 - lib/scout/open/remote.rb
@@ -197,6 +212,7 @@ files:
 - test/scout/misc/test_digest.rb
 - test/scout/misc/test_filesystem.rb
 - test/scout/misc/test_helper.rb
+- test/scout/misc/test_hook.rb
 - test/scout/misc/test_insist.rb
 - test/scout/misc/test_matching.rb
 - test/scout/misc/test_math.rb
@@ -237,7 +253,6 @@ homepage: http://github.com/mikisvaz/scout-essentials
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key: 
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Scout essential tools
 test_files: []