rbbt-util 5.21.46 → 5.21.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1842f04355fb68456343e2efd33e3f91a392b087
-  data.tar.gz: f900fd25199c8ea1e115288ae19419a076a7b295
+  metadata.gz: 819899d0b037631acb37460fb3cb4a6cea8e287f
+  data.tar.gz: 9f820f17c0417b8367b203ac296639c48a49fcf8
 SHA512:
-  metadata.gz: c5acb1a420921a7929890ca011e7e40dc8bea24dde6f8d722bc97306050e70f1220c6688cd00a7c2b5ecc1ce351a8fed55458e8e62d280be9bc0de7fa49a3601
-  data.tar.gz: 606c4d21d9c52b3f466cc8f0c6dfef007fd755dffe051d99dba04dc296e8479e99b1a241cf03adaede913b78bee3732109ecc81cbb04edfcf5a0de72eebf2104
+  metadata.gz: 3df9c99be5f1e0d9efc7fd35c7efa36e16584486dabca43282cded1febaa9987b9bd9c876728dbe8dada63c959cf5539e41239fad662166e7cb2a1e486f76550
+  data.tar.gz: c75ee8154d92c0f75cf8a0da3df765d26e858f07d0eac923a62a607cebf00a6cc33beb93fc58582e1e3edbc2e7c8b1b9ac4b26d0ac3aa4a11cadc432049be612

data/lib/rbbt/resource.rb

@@ -31,7 +31,7 @@ module Resource
   attr_accessor :pkgdir, :subdir, :resources, :rake_dirs, :remote_server, :search_paths
 
   def root()
-    Path.setup @subdir || "", @pkgdir, self
+    Path.setup @subdir || "", @pkgdir, self, @search_paths
   end
 
   def method_missing(name, prev = nil, *args)

data/lib/rbbt/resource/path.rb

@@ -85,7 +85,7 @@ module Path
     :default => :user
   })
 
-  STANDARD_SEARCH = %w(current user local global lib fast cache bulk)
+  STANDARD_SEARCH = %w(current user local workflow global lib fast cache bulk)
 
   search_path_file = File.join(ENV['HOME'], '.rbbt/etc/search_paths')
   if File.exist?(search_path_file)

data/lib/rbbt/util/colorize.rb

@@ -11,11 +11,15 @@ module Colorize
     end
   end
 
-  def self.continuous(array, start = :white, eend = :black) 
+  def self.continuous(array, start = :white, eend = :black, percent = false) 
     start_color = Color.new from_name(start)
     end_color = Color.new from_name(eend)
 
-    array = array.collect{|v| n = v.to_f; n = n > 100 ? 100 : n; n < 0.001 ? 0.001 : n}
+    if percent
+      array = array.collect{|v| n = v.to_f; n = n > 100 ? 100 : n; n < 0.001 ? 0.001 : n}
+    else
+      array = array.collect{|v| n = v.to_f; } 
+    end
     max = array.max
     min = array.min
     range = max - min
@@ -24,6 +28,21 @@ module Colorize
       start_color.blend end_color, ratio
     end
   end
+  
+  def self.gradient(array, value, start = :green, eend = :red, percent = false)
+    index = array.index value
+    colors = continuous(array, start, eend, percent)
+    colors[index]
+  end
+
+  def self.rank_gradient(array, value, start = :green, eend = :red, percent = false)
+    index = array.index value
+    sorted = array.sort
+    array = array.collect{|e| sorted.index e}
+    colors = continuous(array, start, eend, percent)
+    colors[index]
+  end
+
 
   def self.distinct(array)
     colors = Rbbt.share.color["diverging_colors.hex"].list.collect{|c| Color.new c}

data/lib/rbbt/workflow.rb

@@ -294,23 +294,6 @@ module Workflow
     @_m
   end
 
-  def get_job_step(step_path, task = nil, input_values = nil, dependencies = nil)
-    step_path = step_path.call if Proc === step_path
-    persist = input_values.nil? ? false : true
-    persist = false
-    key = Path === step_path ? step_path.find : step_path
-    step = Step.new step_path, task, input_values, dependencies
-
-
-    step.extend step_module
-
-    step.task ||= task
-    step.inputs ||= input_values
-    step.dependencies = dependencies if dependencies and (step.dependencies.nil? or step.dependencies.length < dependencies.length)
-
-    step
-  end
-
   def job(taskname, jobname = nil, inputs = {})
     taskname = taskname.to_sym
     return remote_tasks[taskname].job(taskname, jobname, inputs) if remote_tasks and remote_tasks.include? taskname
@@ -354,9 +337,21 @@ module Workflow
     job
   end
 
-  def load_step(path)
-    task = task_for path
-    get_job_step path, tasks[task.to_sym]
+  def get_job_step(step_path, task = nil, input_values = nil, dependencies = nil)
+    step_path = step_path.call if Proc === step_path
+    persist = input_values.nil? ? false : true
+    persist = false
+    key = Path === step_path ? step_path.find : step_path
+    step = Step.new step_path, task, input_values, dependencies
+
+
+    step.extend step_module
+
+    step.task ||= task
+    step.inputs ||= input_values
+    step.dependencies = dependencies if dependencies and (step.dependencies.nil? or step.dependencies.length < dependencies.length)
+
+    step
   end
 
   def load_id(id)
@@ -366,14 +361,23 @@ module Workflow
     step = Step.new path, tasks[task.to_sym]
     step.info
     if step.info.include? :dependencies
-      step.dependencies = step.info[:dependencies].collect do |task, job|
+      step.dependencies = step.info[:dependencies].collect do |task, job, path|
         next if job.nil?
-        load_id(File.join(task.to_s, job))
+        load_step(path) 
       end
     end
     step
   end
 
+  def load_step(path)
+    task = task_for path
+    if task
+      get_job_step path, tasks[task.to_sym]
+    else
+      get_job_step path
+    end
+  end
+
   def load_name(task, name)
     return remote_tasks[task].load_step(path) if remote_tasks and remote_tasks.include? task
     task = tasks[task.to_sym] if String === task or Symbol === task

data/lib/rbbt/workflow/accessor.rb

@@ -350,7 +350,12 @@ class Step
   end
 
   def dirty?
-    rec_dependencies.collect{|dependency| dependency.path unless dependency.error? and not dependency.recoverable_error? }.compact.uniq.reject{|path| not (Path === path) or path.exists?}.any?
+    dirty_files = rec_dependencies.collect{|dependency| dependency.path unless dependency.error? and not dependency.recoverable_error? }.compact.uniq.reject{|path| not (Path === path) or path.exists?}
+    if dirty_files.any?
+      true
+    else
+      false
+    end
   end
 
   def done?
@@ -358,7 +363,7 @@ class Step
   end
 
   def streaming?
-    IO === @result or @saved_stream or status == :streaming
+    (IO === @result) or (not @saved_stream.nil?) or status == :streaming
   end
 
 
@@ -806,7 +811,11 @@ module Workflow
     workdir_find = File.expand_path(workdir_find)
     path = File.expand_path(path)
     dir = File.dirname(path)
-    Misc.path_relative_to(workdir_find, dir).sub(/([^\/]+)\/.*/,'\1')
+    begin
+      Misc.path_relative_to(workdir_find, dir).sub(/([^\/]+)\/.*/,'\1')
+    rescue
+      nil
+    end
   end
 
   def task_exports

data/lib/rbbt/workflow/step.rb

@@ -220,6 +220,13 @@ class Step
     end
   end
 
+  def update
+    if dirty?
+      dependencies.collect{|d| d.update}
+      clean
+    end
+  end
+
   def clean
     status = []
     status << "dirty" if dirty?

data/lib/rbbt/workflow/step/run.rb

@@ -267,7 +267,7 @@ class Step
       end
     end
 
-    clean if dirty?
+    update 
 
     if dofork
       fork(true) unless started?
@@ -499,7 +499,11 @@ class Step
         dependencies.each{|dep| dep.join }
       end
 
-      sleep 1 until path.exists? or error? or aborted?
+      until path.exists? or error? or aborted?
+        iii [:sleep, status, streaming?]
+        sleep 1 
+        join_stream if streaming?
+      end
 
       self
     ensure

data/share/workflow_config.ru

@@ -10,7 +10,6 @@ def load_file(file)
     load file
   end
 end
-
 def app_eval(app, file)
   if Array === file
     file.each{|f| app_eval app, f }
@@ -22,6 +21,7 @@ def app_eval(app, file)
   end
 end
 
+
 #{{{ INIT
 ENV["RBBT_LOG"] = Log.severity.to_s
 require Rbbt.etc['app.d/init.rb'].find
@@ -30,79 +30,86 @@ require Rbbt.etc['app.d/init.rb'].find
 workflow = Rbbt.etc['target_workflow'].read
 wf = Workflow.require_workflow workflow, true
 
+
 $title = wf.to_s
 $app_name = app_name = wf.to_s + "REST"
 $app = app = eval "class #{app_name} < Sinatra::Base; self end"
 
+Rbbt.search_paths = Path::SEARCH_PATHS.merge(:workflow => File.join(wf.libdir, '{TOPLEVEL}','{SUBPATH}'))
+
+etc_dir = Rbbt.etc
+#etc_dir.search_paths = Path::SEARCH_PATHS.merge(:workflow => File.join(wf.libdir, '{TOPLEVEL}','{SUBPATH}'))
+
+
 #{{{ PRE
-load_file Rbbt.etc['app.d/pre.rb'].find 
+load_file etc_dir['app.d/pre.rb'].find 
 
 app.get '/' do
   redirect to(File.join('/', wf.to_s))
 end
 
 #{{{ BASE
-app_eval app, Rbbt.etc['app.d/base.rb'].find
+app_eval app, etc_dir['app.d/base.rb'].find
 
 app.add_workflow wf, :priority
 
 #{{{ WORKFLOWS
-app_eval app, Rbbt.etc['app.d/workflows.rb'].find_all
+app_eval app, etc_dir['app.d/workflows.rb'].find_all
 
 #{{{ RESOURCES
-load_file Rbbt.etc['app.d/resources.rb'].find
+load_file etc_dir['app.d/resources.rb'].find
 
 #{{{ KNOWLEDGEBASE
-load_file Rbbt.etc['app.d/knowledge_bases.rb'].find
+load_file etc_dir['app.d/knowledge_bases.rb'].find
 
 #{{{ REQUIRES
-load_file Rbbt.etc['app.d/requires.rb'].find
+load_file etc_dir['app.d/requires.rb'].find
 
 #{{{ ENTITIES
-load_file Rbbt.etc['app.d/entities.rb'].find
+load_file etc_dir['app.d/entities.rb'].find
 
 #{{{ ROUTES
-app_eval app, Rbbt.etc['app.d/routes.rb'].find_all
+app_eval app, etc_dir['app.d/routes.rb'].find_all
 
 #{{{ FINDER
-app_eval app, Rbbt.etc['app.d/finder.rb'].find
+app_eval app, etc_dir['app.d/finder.rb'].find
 
 #{{{ POST
-load_file Rbbt.etc['app.d/post.rb'].find_all
+load_file etc_dir['app.d/post.rb'].find_all
 
 #{{{ PRELOAD
-load_file Rbbt.etc['app.d/preload.rb'].find_all
+load_file etc_dir['app.d/preload.rb'].find_all
 
-if Rbbt.etc['target_workflow_exports'].exists?
-  exports = Rbbt.etc['target_workflow_exports'].read.split("\n")
+if etc_dir['target_workflow_exports'].exists?
+  exports = etc_dir['target_workflow_exports'].read.split("\n")
   exports.each do |task|
     wf.export task.to_sym
   end
 end
 
-if Rbbt.etc['target_workflow_stream_exports'].exists?
-  exports = Rbbt.etc['target_workflow_stream_exports'].read.split("\n")
+if etc_dir['target_workflow_stream_exports'].exists?
+  exports = etc_dir['target_workflow_stream_exports'].read.split("\n")
   exports.each do |task|
     wf.export_stream task.to_sym
   end
 end
 
-if Rbbt.etc['target_workflow_async_exports'].exists?
-  exports = Rbbt.etc['target_workflow_async_exports'].read.split("\n")
+if etc_dir['target_workflow_async_exports'].exists?
+  exports = etc_dir['target_workflow_async_exports'].read.split("\n")
   exports.each do |task|
     wf.export_asynchronous task.to_sym
   end
 end
 
-if Rbbt.etc['target_workflow_sync_exports'].exists?
-  exports = Rbbt.etc['target_workflow_sync_exports'].read.split("\n")
+if etc_dir['target_workflow_sync_exports'].exists?
+  exports = etc_dir['target_workflow_sync_exports'].read.split("\n")
   exports.each do |task|
     wf.export_synchronous task.to_sym
   end
 end
 
-if Rbbt.etc['target_workflow_exec_exports'].exists?
-  exports = Rbbt.etc['target_workflow_exec_exports'].read.split("\n")
+if etc_dir['target_workflow_exec_exports'].exists?
+  exports = etc_dir['target_workflow_exec_exports'].read.split("\n")
   exports.each do |task|
     wf.export_exec task.to_sym
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.46
+  version: 5.21.47
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake