rbbt-util 5.34.3 → 5.34.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac036317d84e57e31c930adcd9f6f3b83951fd858772a59d04045f6b83c747f1
-  data.tar.gz: 072e7053018bb6d38b7db1ed3164f5fe89e534264918bf1657154ef6d689f5f1
+  metadata.gz: eda1db070a45b3361a0c5c6b02fd59e39b031ae4264771f015e4068a888d1f09
+  data.tar.gz: 0f9a4bfafce4180f1db402510f83a880e22f5a75d92bf7506781801ce61575a2
 SHA512:
-  metadata.gz: e399e00198996cfc6958e897b41359824c3277511a9ddd402cb46a8f7cebbe99ce560ffa3f645afb7e64983f1fb1c31cb1d0269adde2333e3f43f5764b9a5393
-  data.tar.gz: 3341baac06e6aa8f2517d1bc812a89f3ac86d30f13483c394b7557bb20fcc36ca4846402d18e83587ee6329047bc9445892e99cf4a94d48fed9555ebef2b4804
+  metadata.gz: 7738b49efed37124e80b5aa72b367e9d92d32dc13d64fceef5c452e5b50687882d5bc03106aa906c7f425937ceac72694f8eb8959e2c9d3402164b8618c4c639
+  data.tar.gz: de617b931b585915e029f8f23124b6ce5cccc9091dec25e2fc3fdd8c4d2eaf4e23bfce798c73b753cb08f590933c316ceb7deffafd8e8aca854ea175d5744014

data/lib/rbbt/resource.rb

@@ -346,9 +346,12 @@ url='#{url}'
     locations = (Path::STANDARD_SEARCH + resource.search_order + resource.search_paths.keys)
     locations -= [:current, "current"]
     locations << :current
+    search_paths = IndiferentHash.setup(resource.search_paths)
     locations.uniq.each do |name|
-      pattern = resource.search_paths[name]
+      pattern = search_paths[name]
+      pattern = resource.search_paths[pattern] while Symbol === pattern
       next if pattern.nil?
+
       pattern = pattern.sub('{PWD}', Dir.pwd)
       if String ===  pattern and pattern.include?('{')
         regexp = "^" + pattern.gsub(/{([^}]+)}/,'(?<\1>[^/]+)') + "(?:/(?<REST>.*))?/?$"

data/lib/rbbt/util/misc/pipes.rb

@@ -420,7 +420,7 @@ module Misc
           end
 
           Open.touch path if Open.exists? path
-          content.join if content.respond_to? :join and not (content.respond_to?(:joined?) and content.joined?)
+          content.join if content.respond_to?(:join) and not Path === content and not (content.respond_to?(:joined?) && content.joined?)
 
           Open.notify_write(path) 
         rescue Aborted

data/lib/rbbt/util/python.rb

@@ -4,6 +4,11 @@ require 'pycall/import'
 module RbbtPython
   extend PyCall::Import
 
+  def self.script(text, options = {})
+    Log.debug "Running python script:\n#{text.dup}"
+    text = StringIO.new text unless IO === text
+    CMD.cmd_log(:python, options.merge(:in => text))
+  end
 
   def self.add_path(path)
     self.run 'sys' do
@@ -87,7 +92,9 @@ module RbbtPython
 
   def self.run_log(mod = nil, imports = nil, severity = 0, severity_err = nil, &block)
     if mod
-      if Array === imports
+      if imports == "*" || imports == ["*"]
+        pyfrom mod
+      elsif Array === imports
         pyfrom mod, :import => imports
       elsif Hash === imports
         pyimport mod, imports

data/lib/rbbt/workflow/definition.rb

@@ -22,8 +22,13 @@ module Workflow
     :extension          => nil)
 
 
-  def helper(name, &block)
-    helpers[name] = block
+  def helper(name, *args, &block)
+    if block_given?
+      helpers[name] = block
+    else
+      raise RbbtException, "helper #{name} unkown in #{self} workflow" unless helpers[name]
+      helpers[name].call(*args)
+    end
   end
 
   def desc(description)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.34.3
+  version: 5.34.4
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake