rbbt-util 5.26.72 → 5.26.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48218a636227053649451600d1225572ad96f01ed39d67fbf42a1f8f8c7c7c77
-  data.tar.gz: 612183134de313b8a3dd986faf314d2593ce95c7a2c17d8146d5cdf6eb5b5ff9
+  metadata.gz: bb3feb1e58b84ace085492fd7084cc1f86bb60544c9d25a1cc069a5217db9c27
+  data.tar.gz: 57863cf771d3ad64f651180e27f28ef4f6c88ea6a478d049e0a98d2acd717677
 SHA512:
-  metadata.gz: de75682521e5fa1ada0d0f1e3fca19bd20ad6d877abe1a070c6244e7de6a22d7f2564d89308b9a27a7a0de7ab150f4aa58566f78a4bbe89c3fdcd695e262998c
-  data.tar.gz: 017f12231eaf26f807b00a5317f656b2694f70c9cf38cc4044648abdd313c2083124cd49120fb08550700d297d7807fb4a26defc69aa55c4143fd2c23fcc3c87
+  metadata.gz: 56ae37215ec051636f1077815587e1cc7d2cd47ecf853a062c2a13f15ae9583e6cb43f6c222ee90f2a5e662d149967e53d1a63e79ab2b46803446e2c2ef7fd80
+  data.tar.gz: 25df8edcc598354c7f1e1311ab90b4545ba3f8ca76d70cd6f5f8f35df0ce727db9842294de443a855d25a84d799e529140fd848e22779f68cb521c22e64fc01b

data/lib/rbbt/resource/path.rb

@@ -51,11 +51,13 @@ module Path
 
   def join(name)
     raise "Invalid path: #{ self }" if self.nil?
-    if self.empty?
-      self.annotate name.to_s.dup
-    else
-      self.annotate File.join(self, name.to_s)
-    end
+    new = if self.empty?
+            self.annotate name.to_s.dup
+          else
+            self.annotate File.join(self, name.to_s)
+          end
+    new.original = File.join(self.original, name.to_s) if self.original
+    new
   end
 
   def dirname
@@ -72,9 +74,37 @@ module Path
       self.glob_all
     else
       return [] unless self.exists? 
-      exp = File.join(self.find, pattern)
-      Dir.glob(exp).collect{|f| Path.setup(f, self.resource, self.pkgdir)}
+      found = self.find
+      exp = File.join(found, pattern)
+      paths = Dir.glob(exp).collect{|f| Path.setup(f, self.resource, self.pkgdir)}
+
+      paths.each do |p|
+        p.original = File.join(found.original, p.sub(/^#{found}/, ''))
+      end
+
+      paths
+    end
+  end
+
+  def glob_all(pattern = nil, caller_lib = nil, search_paths = nil)
+    search_paths ||= @search_paths || SEARCH_PATHS
+    search_paths = search_paths.dup
+
+    location_paths = {}
+    search_paths.keys.collect do |where| 
+      found = find(where, Path.caller_lib_dir, search_paths)
+      paths = pattern ? Dir.glob(File.join(found, pattern)) : Dir.glob(found) 
+
+      paths.each do |p|
+        self.annotate p
+        p.original = File.join(found.original, p.sub(/^#{found}/, ''))
+      end
+
+      location_paths[where] = paths
     end
+
+    #location_paths.values.compact.flatten.collect{|file| File.expand_path(file) }.uniq.collect{|path| Path.setup(path, self.resource, self.pkgdir)}
+    location_paths.values.compact.flatten.uniq
   end
 
   def [](name, orig = false)
@@ -232,14 +262,6 @@ module Path
       compact.select{|file| file.exists? }.uniq
   end
 
-  def glob_all(pattern = nil, caller_lib = nil, search_paths = nil)
-    search_paths ||= @search_paths || SEARCH_PATHS
-    search_paths = search_paths.dup
-
-    search_paths.keys.
-      collect{|where| pattern ? Dir.glob(File.join(find(where, Path.caller_lib_dir, search_paths), pattern)) : Dir.glob(find(where, Path.caller_lib_dir, search_paths)) }.
-      compact.flatten.collect{|file| File.expand_path(file)}.uniq.collect{|path| Path.setup(path, self.resource, self.pkgdir)}
-  end
   #{{{ Methods
 
   def in_dir?(dir)

data/lib/rbbt/util/cmd.rb

@@ -1,9 +1,40 @@
 require 'rbbt/util/log'
 require 'stringio'
 require 'open3'
+require 'rbbt/util/misc/indiferent_hash'
 
 module CMD
 
+  TOOLS = IndiferentHash.setup({})
+  def self.tool(tool, claim = nil, test = nil, &block)
+    TOOLS[tool] = [claim, test, block]
+  end
+
+  def self.get_tool(tool)
+    return tool.to_s unless TOOLS[tool]
+
+    @@init_cmd_tool ||= IndiferentHash.setup({})
+    if !@@init_cmd_tool[tool]
+      claim, test, block = TOOLS[tool]
+      begin
+        if test
+          CMD.cmd(test)
+        else
+          CMD.cmd("#{cmd} --help")
+        end
+      rescue
+        if claim
+          claim.produce
+        else
+          block.call
+        end
+      end
+      @@init_cmd_tool[tool] = true
+    end
+
+    tool.to_s
+  end
+
   def self.gzip_pipe(file)
     Open.gzip?(file) ? "<(gunzip -c '#{file}')" : "'#{file}'"
   end
@@ -39,7 +70,9 @@ module CMD
     string.strip
   end
 
-  def self.cmd(cmd, options = {}, &block)
+  def self.cmd(tool, cmd = nil, options = {}, &block)
+    options, cmd = cmd, nil if Hash === cmd
+
     options = Misc.add_defaults options, :stderr => Log::DEBUG
     in_content = options.delete(:in)
     stderr     = options.delete(:stderr)
@@ -52,6 +85,18 @@ module CMD
     dont_close_in  = options.delete(:dont_close_in)
 
     log = true if log.nil?
+    
+    if cmd.nil? and ! Symbol === tool 
+      cmd = tool
+    else
+      tool = get_tool(tool)
+      if cmd.nil?
+        cmd = tool
+      else
+        cmd = tool + ' ' + cmd
+      end
+
+    end
 
     if stderr == true
       stderr = Log::HIGH
@@ -170,4 +215,5 @@ module CMD
 
     nil
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.72
+  version: 5.26.73
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake