rbbt-util 5.26.21 → 5.26.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ffa5b32ce869fb1371baa14d9d66cd30d37f829b8bc3dd55807afeddf188ee
-  data.tar.gz: 95c3cd549d8719e6f3da4eb89d64fd9915666c84d76eebc123067f9272d4036b
+  metadata.gz: fe3389fbf9a1bdb98118ed58d3954a5a65cff4bcff685badd18ba552980e231b
+  data.tar.gz: 4b0e32c868b68bc3ebddca24502a70137881da4be77567dd89afffa8f1b79e58
 SHA512:
-  metadata.gz: db46d5759962c088304b67cdf3f7b76282caaa343e4b1a14a32bae6c0c51277f7fedc25713792a07e6898252a2f05f62baf3cd6b08092ab14a6453834ecf08b9
-  data.tar.gz: 21d0111d50df3e10d29f563ec657f22df9e0e9623cd00733f8f98749434f38b048ae65ca8f017db5eb770a44cb1c8a2d18ee624fd5cd3048b70a6baf2b4ec55b
+  metadata.gz: c62ad7ab3449ee7d9d468ea8d7256e67a38acacaf7316405d2209af2660e3ae3fce8758b3f1b66d5532335d7e18397ec6a418ef8a14091aafe565c96eb462bfb
+  data.tar.gz: d22c6a8965b81968d9e56d4debddc465e71bed0ecaf2d733aeec0136557ad73145736a58afaa21a0a0e354ec9fee93e5115b55e61bd8fa54e17e634250ddb451

data/etc/app.d/resources.rb

@@ -17,3 +17,5 @@ end
 RbbtRESTHelpers.add_sass_load_path './www/views/compass'
 
 WorkflowRESTHelpers.workflow_resources.unshift(Path.setup($app_dir).www.views) if $app_dir
+
+

data/lib/rbbt/persist.rb

@@ -124,6 +124,10 @@ module Persist
           content = stream.read.unpack("m").first
           Marshal.load(content) 
         end
+      when :json
+        Open.open(path) do |stream|
+          JSON.parse(stream.read)
+        end
       when :yaml
         Open.open(path) do |stream|
           YAML.load(stream)
@@ -186,6 +190,8 @@ module Persist
     when :marshal
       dump = Marshal.dump(content)
       Misc.sensiblewrite(path, [dump].pack("m"), :lock => lockfile)
+    when :json
+      Misc.sensiblewrite(path, JSON.dump(content), :lock => lockfile)
     when :yaml
       Misc.sensiblewrite(path, YAML.dump(content), :lock => lockfile)
     when :float, :integer, :tsv

data/lib/rbbt/workflow/archive.rb

@@ -39,11 +39,50 @@ class Step
       end
 
       Misc.in_dir(tmpdir) do
-        io = CMD.cmd("tar cvhzf '#{target}'  ./*", :pipe => true)
-        while line = io.gets
-          Log.debug line
+        if File.directory?(target)
+          CMD.cmd_log("rsync -avzHP --copy-unsafe-links '#{ tmpdir }/' '#{ target }/'")
+        else
+          CMD.cmd_log("tar cvhzf '#{target}'  ./*")
+        end
+      end
+      Log.debug "Archive finished at: #{target}"
+    end
+  end
+
+  def self.archive(files, target = nil)
+    target = self.path + '.tar.gz' if target.nil?
+    target = File.expand_path(target)
+
+    jobs = files.collect{|file| file = file.sub(/\.info$/,''); Step.new(File.expand_path(file))}.uniq
+    TmpFile.with_file do |tmpdir|
+      jobs.each do |step|
+        Step.link_job step.path, tmpdir
+        rec_dependencies = Set.new
+        deps = [step.path]
+        seen = Set.new
+        while deps.any?
+          path = deps.shift
+          dep = Step.new path
+          seen << dep.path
+          dep.info[:dependencies].each do |task, name, path|
+            dep = Step.new path
+            next if seen.include? dep.path
+            deps << dep.path
+            rec_dependencies << dep.path
+          end if dep.info[:dependencies]
+        end
+
+        rec_dependencies.each do |path|
+          Step.link_job path, tmpdir
+        end
+      end
+
+      Misc.in_dir(tmpdir) do
+        if File.directory?(target)
+          CMD.cmd_log("rsync -avzHP --copy-unsafe-links '#{ tmpdir }/' '#{ target }/'")
+        else
+          CMD.cmd_log("tar cvhzf '#{target}'  ./*")
         end
-        io.join if io.respond_to? :join
       end
       Log.debug "Archive finished at: #{target}"
     end

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

@@ -220,7 +220,7 @@ class Step
         begin
           dep.produce
         rescue RbbtException
-          Log.warn "Allowing failing of #{dep.path}: #{dep.messages.last}"
+          Log.warn "Allowing failing of #{dep.path}: #{dep.messages.last if dep.messages}"
         end
         nil
       end

data/share/config.ru

@@ -81,6 +81,15 @@ Entity.entity_property_cache = Rbbt.var.sinatra.app[app_name].find.entity_proper
 
 Sinatra::RbbtRESTMain.add_resource_path($app_dir.www.views.find, true)
 
+require 'tilt/sass'
+class Tilt::SassTemplate
+  private
+  def sass_options
+    options.merge(:filename => eval_file, :line => line, :syntax => :sass, :load_paths => RbbtRESTHelpers.sass_resources)
+  end
+end
+
+
 $title = app_name
 require 'rack'
 use Rack::Deflater

data/share/rbbt_commands/workflow/archive_all

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'rbbt/workflow'
+
+require 'rbbt-util'
+require 'fileutils'
+require 'rbbt/util/simpleopt'
+require 'rbbt/workflow/step'
+require 'rbbt/util/misc'
+
+require 'rbbt-util'
+require 'rbbt/util/simpleopt'
+
+$0 = "rbbt #{$previous_commands*""} #{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+Examine the provenance of a job result
+
+$ rbbt workflow archive <target> <job> [<job> ...]
+
+Archive jobs and all dependencies into the target tar gz file or directory. If no target is specified 
+it defaults to a <job>.tar.gz
+
+-h--help Help
+EOF
+
+SOPT.usage if options[:help]
+
+target, *files = ARGV
+
+raise "Target already exists: #{ target }" if File.exists?(target) and not File.directory(target)
+Step.archive(files, target)

data/share/workflow_config.ru

@@ -142,6 +142,14 @@ app.get '/reload_workflow' do
   halt 200, "Workflow #{ workflow } reloaded"
 end
 
+require 'tilt/sass'
+class << Tilt::SassTemplate
+  private
+  def sass_options
+    options.merge(:filename => eval_file, :line => line, :syntax => :scss, :load_paths => RbbtRESTHelpers.sass_resources)
+  end
+end
+
 #{{{ RUN
 require 'rack'
 use Rack::Deflater

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.21
+  version: 5.26.22
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -398,6 +398,7 @@ files:
 - share/rbbt_commands/tsv/zip
 - share/rbbt_commands/watch
 - share/rbbt_commands/workflow/archive
+- share/rbbt_commands/workflow/archive_all
 - share/rbbt_commands/workflow/cmd
 - share/rbbt_commands/workflow/example
 - share/rbbt_commands/workflow/info