rbbt-util 5.26.10 → 5.26.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/monitor.rb +2 -1
- data/lib/rbbt/tsv.rb +2 -0
- data/lib/rbbt/tsv/melt.rb +2 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 47c3a5304ab04d9f3b75b8f26350ddcb26473ddb7e3448eeeb412c838b04cb5e
|
4
|
+
data.tar.gz: d709e752b74d99ebe5393a16fdab296a936998a8376536a9315ecf7c4e30263d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1877924f85a5db0f199cc6fb26be19af74c41a29070583984015757bdde8d487e380fd35deab8dca918a1ee00cca610dded6dd5cd427c2c63b8a09ab283ad6ed
|
7
|
+
data.tar.gz: 24b91de30df2ec4426b75373eb0bde9a0e267b58f3ee761b8590777a0ffbe0454a6f7a0db46aad012e368941bc4608ebb1da4d5633f098c0c534e07ce759fe66
|
data/lib/rbbt/monitor.rb
CHANGED
@@ -175,8 +175,9 @@ module Rbbt
|
|
175
175
|
#cmd = "find -L '#{ taskdir }/' -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' 2>/dev/null"
|
176
176
|
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"
|
177
177
|
|
178
|
-
CMD.cmd(cmd, :pipe => true)
|
178
|
+
CMD.cmd(cmd, :pipe => true).read.split("\n")
|
179
179
|
end
|
180
|
+
files = files.sort_by{|f| Open.mtime f}
|
180
181
|
TSV.traverse files, :type => :array, :into => jobs, :_bar => "Finding jobs in #{ taskdir }" do |file|
|
181
182
|
_files << file
|
182
183
|
if m = file.match(/(.*)\.(info|pid|files)$/)
|
data/lib/rbbt/tsv.rb
CHANGED
@@ -33,6 +33,8 @@ module TSV
|
|
33
33
|
key, fields_str = field_options.split("~")
|
34
34
|
|
35
35
|
fields = fields_str.nil? ? [] : fields_str.split(/,\s*/)
|
36
|
+
|
37
|
+
rest = ":type=" << rest if rest =~ /^:?\w+$/
|
36
38
|
rest_options = rest.nil? ? {} : Misc.string2hash(rest)
|
37
39
|
|
38
40
|
{:key_field => key, :fields => fields}.merge(rest_options)
|
data/lib/rbbt/tsv/melt.rb
CHANGED
@@ -3,7 +3,8 @@ module TSV
|
|
3
3
|
dumper = TSV::Dumper.new :key_field => "ID", :fields => [key_field] + info_fields, :type => :list
|
4
4
|
dumper.init
|
5
5
|
TSV.traverse tsv, :into => dumper, :fields => info_fields do |k,values|
|
6
|
-
values = [values] if tsv.type == :
|
6
|
+
values = [values] if tsv.type == :single
|
7
|
+
values = values.collect{|v| [v]} if tsv.type == :list
|
7
8
|
values = Misc.zip_fields(values) if tsv.type == :double
|
8
9
|
|
9
10
|
res = []
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rbbt-util
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.26.
|
4
|
+
version: 5.26.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Miguel Vazquez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-05-
|
11
|
+
date: 2019-05-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|