rbbt-util 5.26.76 → 5.26.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8f0ab8033ad4f6ae517030186428b50e0585928416ed00bc37036c0c4d87c4
-  data.tar.gz: e3c7622e0666a43d1d7b683e15eb9198ba60f7cbc495b91cdbdf65b0f21d9b37
+  metadata.gz: 1a692bb25efd5eec786a9aa7ed436abdd30f663850570631cd116f4cba01a144
+  data.tar.gz: 1128c92e4b23b7b5d69e619e1b0a368c8025e136d8e292e16ec26a9364ff9af6
 SHA512:
-  metadata.gz: ced80f97ced12fb25eb2b7167007e418ab61fd64f44fef58c5efd6a8faebdb17ac04bf576342333a006c4641c62513209c3e7b3cf8c05a81f6fee3705fd8a712
-  data.tar.gz: 9a813a06cbcb4d7912afb1aacf9162165a3cee629ac5612195c01213b5c7ec1d64be6484a4dfc16ff9f4935795c84e38922b842e566f46ea0189242901c8e9af
+  metadata.gz: e8c8bc0cf7bfda033b36aa6817a86fa78812356e892af458889fefc1628688d406c19dadf2f99fb791bf416b7f42d142d11c569c9dde538822c62497ce8b4b23
+  data.tar.gz: 429bde72bf0b7d61f3f5089cf0ce90445406dd120fce2d4d0c0b8fc9a20c5f5796623b066335b12f6355bf50dc0bae5f88e43231237ab53ad6029623475fe943

data/lib/rbbt/resource/path.rb

@@ -167,7 +167,7 @@ module Path
 
     if located?
       @path[key] = self
-      self.original = self
+      self.original ||= self
       return self
     end
 
@@ -247,7 +247,7 @@ module Path
                        res = path
                      end
 
-                     res.original = self
+                     res.original = self.original || self
 
                      res
                    end

data/share/rbbt_commands/rsync

@@ -28,7 +28,8 @@ if options[:help]
   exit 0
 end
 
-excludes = %w(.save .crap .source tmp filecache  open-remote workflows apps software jobs sinatra PCAWG)
+#excludes = %w(.save .crap .source tmp filecache open-remote workflows apps software jobs PCAWG)
+excludes = %w(.save .crap .source tmp filecache open-remote)
 excludes += (options[:exclude] || "").split(/,\s*/)
 excludes_str = excludes.collect{|s| "--exclude '#{s}'" } * " "
 
@@ -36,7 +37,7 @@ test_str = options[:test] ? '-nv' : ''
 
 source, target, _sep, *other = ARGV
 
-cmd = "rsync -at #{test_str} #{excludes_str} #{source} #{target} #{other * " "}"
+cmd = "rsync -atAX #{test_str} #{excludes_str} #{source} #{target} #{other * " "}"
 
 if options[:print]
   puts cmd 

data/share/rbbt_commands/workflow/task

@@ -341,6 +341,11 @@ begin
     exit 0
   end
 
+  if options.delete(:printname)
+    puts job.name
+    exit 0
+  end
+
   if do_exec or (job.respond_to?(:is_exec) and job.is_exec)
     res = job.exec(:stream)
 
@@ -373,7 +378,11 @@ begin
 
   if options.delete(:provenance)
     require 'rbbt/workflow/provenance'
-    puts Step.prov_report(job)
+    if options.delete(:printpath)
+      puts job.path
+    else
+      puts Step.prov_report(job)
+    end
     exit 0
   end
 
@@ -403,12 +412,6 @@ begin
   end
 
 
-  if options.delete(:printname)
-    job.join if IO === job.result
-    puts job.name
-    exit 0
-  end
-
   if options.delete(:printpath)
     job.join
     raise job.messages.last if (job.error? || job.aborted?) && job.messages

metadata

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