rbbt-util 5.26.83 → 5.26.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ab0538fa770f31569dcc29a7c10f69c2baa671faa5d544bc29d67e44188acb
-  data.tar.gz: fe65f02a82226b98bff48fc39c862d892d8ffaf1fa68a7b101d7bf5befb67db3
+  metadata.gz: a7a03e9e9cec9f84ea91902fe393037932b4bc155abc38ef4145573dea832171
+  data.tar.gz: dc7030fb86e929d468bd8481eea26a8fd55e679c99cc8709507b9cff3a1044b8
 SHA512:
-  metadata.gz: 756e42e468afcf1d93d4a9616ab2f5ab4eeb1ad6511d91aeb1b447f79ef2f00a076601eb02eec17bddd20576f9824ae34a5db5d913043e17a97758f4bbca84f6
-  data.tar.gz: cbd3625ce98062162ef323a10a3e991e60947e883171a1c63af25368af2ee076d622ade4321172a59503744acf47db055ec48003a9fa7ed54d12376f5609eca2
+  metadata.gz: c67e91543978c2b151b1bfc77083de1decd53e2912da81beaac2925190db85531255fcca48056f6c7a2b02ee91a03017b74390531ae44bec6777bfea1b23c100
+  data.tar.gz: 285ba9a06af9cec0377b828a24949250ee5cc62825a0ad59fd207fdd7f44acc1e3469a495773e2818198eb414dc8090283117021276b5b2525c7f5e3f2e6d783

data/lib/rbbt/entity.rb

@@ -130,6 +130,8 @@ module Entity
       end
 
       def self.property(name, &block)
+        Log.debug "Defining property #{name} for #{self}"
+
         case
         when (Hash === name and name.size == 1)
           name, type = name.collect.first

data/lib/rbbt/workflow/util/archive.rb

@@ -24,14 +24,13 @@ class Step
       seen = Set.new
       while deps.any?
         path = deps.shift
-        dep = Step.new path
+        dep = Workflow.load_step path
         seen << dep.path
-        dep.info[:dependencies].each do |task, name, path|
-          dep = Step.new path
+        dep.dependencies.each do |dep|
           next if seen.include? dep.path
           deps << dep.path
           rec_dependencies << dep.path
-        end if dep.info[:dependencies]
+        end if dep.dependencies
       end
 
       rec_dependencies.each do |path|
@@ -72,7 +71,7 @@ class Step
       while deps.any?
         path = deps.shift
 
-        dep = Step.new path
+        dep = Workflow.load_step path
         seen << dep.path
 
         dep.relocated = !!relocate
@@ -86,9 +85,7 @@ class Step
         end if dep.info[:dependencies]
       end
 
-      rec_dependencies.each do |path|
-        next unless File.exists?(path)
-        dep = Step.new path
+      rec_dependencies.each do |dep|
         job_files << dep.path
         job_files << dep.files_dir if Dir.glob(dep.files_dir + '/*').any?
         job_files << dep.info_file if File.exists?(dep.info_file)

data/share/rbbt_commands/resource/read

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require 'rbbt-util'
+require 'rbbt/resource'
+require 'rbbt/workflow'
+
+options = SOPT.get <<EOF
+-W--workflows* Workflows to use; 'all' for all in Rbbt.etc.workflows:
+-r--requires* Files to require; 'all' for all in Rbbt.etc.requires:
+-O--output* Where to save the file. Defaults to its proper location:
+-s--server* Server to use:
+-w--where* What path location to use
+-h--help Help
+EOF
+
+if options[:help]
+  puts SOPT.doc 
+  exit
+end
+
+case options[:workflows]
+when nil, false, "false", "none"
+when "all"
+  Rbbt.etc.workflows.list.each do |workflow|
+    Workflow.require_workflow file
+  end if Rbbt.etc.workflows.exists?
+else
+  options[:workflows].split(/[ ,;|]/).each do |workflow|
+    Workflow.require_workflow workflow
+  end
+end
+
+case options[:requires]
+when nil, false, "false", "none"
+when "all"
+  Rbbt.etc.requires.list.each do |file|
+    require file
+  end if Rbbt.etc.requires.exists?
+else
+  options[:requires].split(/[ ,;|]/).each do |file|
+    require file
+  end
+end
+
+resource, path = ARGV
+
+resource = Kernel.const_get(resource)
+
+Misc.consume_stream resource[path].find(options[:where]).open, false, STDOUT

data/share/workflow_config.ru

@@ -38,8 +38,6 @@ $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 etc_dir['app.d/pre.rb'].find 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.83
+  version: 5.26.84
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -372,6 +372,7 @@ files:
 - share/rbbt_commands/resource/find
 - share/rbbt_commands/resource/get
 - share/rbbt_commands/resource/produce
+- share/rbbt_commands/resource/read
 - share/rbbt_commands/rsync
 - share/rbbt_commands/stat/abs
 - share/rbbt_commands/stat/boxplot