rbbt-util 5.26.10 → 5.26.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1454994af12b81032c1a6df59d0eac32a575cef17cb5a55b3cb65a02e898a9
-  data.tar.gz: c4b6f2f9bdb2b80f5a90c6bb4dd9c41d6acba094fae748f97d01969f308db114
+  metadata.gz: 47c3a5304ab04d9f3b75b8f26350ddcb26473ddb7e3448eeeb412c838b04cb5e
+  data.tar.gz: d709e752b74d99ebe5393a16fdab296a936998a8376536a9315ecf7c4e30263d
 SHA512:
-  metadata.gz: 38f212480a624cc5cf91eb542574a2268178462415f6e8b09f8ff58c3d75d0aa4f396ce0a2ebd189a6b4bf57207eb796b2331cb9475fcdf5e4a0b121f4547d9e
-  data.tar.gz: 42780a986412bfb387a8e8ecc359e2fb6df67767e4c44f9ff00781a4d58e23ca7433f4549c48cb78203729f0f0febb9df7c6f036beb10d8fdae0d85fda9cb3f4
+  metadata.gz: 1877924f85a5db0f199cc6fb26be19af74c41a29070583984015757bdde8d487e380fd35deab8dca918a1ee00cca610dded6dd5cd427c2c63b8a09ab283ad6ed
+  data.tar.gz: 24b91de30df2ec4426b75373eb0bde9a0e267b58f3ee761b8590777a0ffbe0454a6f7a0db46aad012e368941bc4608ebb1da4d5633f098c0c534e07ce759fe66

data/lib/rbbt/monitor.rb

@@ -175,8 +175,9 @@ module Rbbt
                     #cmd = "find -L '#{ taskdir }/'  -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' 2>/dev/null"
                     cmd = "find -L '#{ taskdir }/' -not \\( -path \"#{taskdir}/.info/*\" -prune \\) -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.md5' -not -name '*.notify' -not -name '\\.*' \\( -not -type d -o -name '*.files' \\)  2>/dev/null"
 
-                    CMD.cmd(cmd, :pipe => true)
+                    CMD.cmd(cmd, :pipe => true).read.split("\n")
                   end
+          files = files.sort_by{|f| Open.mtime f}
           TSV.traverse files, :type => :array, :into => jobs, :_bar => "Finding jobs in #{ taskdir }" do |file|
             _files << file
             if m = file.match(/(.*)\.(info|pid|files)$/)

data/lib/rbbt/tsv.rb

@@ -33,6 +33,8 @@ module TSV
     key, fields_str = field_options.split("~")
 
     fields = fields_str.nil? ? [] : fields_str.split(/,\s*/)
+
+    rest = ":type=" << rest if rest =~ /^:?\w+$/
     rest_options = rest.nil? ? {} : Misc.string2hash(rest)
 
     {:key_field => key, :fields => fields}.merge(rest_options)

data/lib/rbbt/tsv/melt.rb

@@ -3,7 +3,8 @@ module TSV
     dumper = TSV::Dumper.new :key_field => "ID", :fields => [key_field] + info_fields, :type => :list
     dumper.init
     TSV.traverse tsv, :into => dumper, :fields => info_fields do |k,values|
-      values = [values] if tsv.type == :flat
+      values = [values] if tsv.type == :single
+      values = values.collect{|v| [v]} if tsv.type == :list
       values = Misc.zip_fields(values) if tsv.type == :double
 
       res = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.10
+  version: 5.26.11
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake