rbbt-util 5.21.3 → 5.21.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fed32dc5ba8e0d0742a2e28807a2f928cd8c06b5
4
- data.tar.gz: 55d7d7cf1351277c9f2a884163b68135f415a667
3
+ metadata.gz: 5d43c18c5356618db1c7e2eed07e3b36d78ea9a2
4
+ data.tar.gz: 98f603bb50ea1c28bf43f270dc31d9ff89f4a7c5
5
5
  SHA512:
6
- metadata.gz: 79d15751f9a62614261e5cda71ff66b489616f9a2c973692b5bac45f6b7a167a30451b5a8b657382c267fd7f74284e87ac7c62a14787c3bdd583755d507fd9d7
7
- data.tar.gz: 8449188566365eacd5b286ebaaba2f6df65a2b78bc6dab306ea06d15620c854da5e8a5429724f9d8b526716cd41e16d1f4eeec50cd1a880e32328eb9d087d2c1
6
+ metadata.gz: 6f978e2e64d4b4562b196ddfd9cf18c44a99ce4b816822b93643e9df9360296cdcb1583892124e1563fc6fff7652b46ae199ec580c7fde2b56cdaa2cafdb94c4
7
+ data.tar.gz: f9aa689208b9997cbc10c42d16d39b9df17938fd70a01adcf2ac0acb515220db662c27995ee68838bf49f1329a3cec8ab2d4db919e3151d3307d0474da048ce6
@@ -108,11 +108,22 @@ module AnnotatedArray
108
108
  res
109
109
  end
110
110
 
111
- def select
111
+ def select(func_name = nil)
112
112
  res = []
113
113
 
114
- each do |value|
115
- res << value if yield(value)
114
+ if func_name
115
+ each do |elem|
116
+ value = elem.send(func_name)
117
+ if block_given?
118
+ res << elem if yield(value)
119
+ else
120
+ res << elem if value
121
+ end
122
+ end
123
+ else
124
+ each do |elem|
125
+ res << elem if yield(elem)
126
+ end
116
127
  end
117
128
 
118
129
  annotate(res)
@@ -25,6 +25,10 @@ class WorkflowRESTClient
25
25
  @mutex = Mutex.new
26
26
  end
27
27
 
28
+ def clean_name
29
+ @base_name
30
+ end
31
+
28
32
  def run(no_load = false)
29
33
  no_load = @is_stream ? :stream : true if no_load
30
34
 
@@ -296,6 +296,8 @@ module TSV
296
296
  data[key] ||= []
297
297
  data[key] += value
298
298
  end
299
+ else
300
+ raise "Unkown type #{type}"
299
301
  end
300
302
  end
301
303
  end
@@ -317,6 +319,8 @@ module TSV
317
319
  data.entity_templates[field] = entity_templates[field] if entity_templates.include? field
318
320
  end
319
321
  data.type = zipped ? (merge ? :double : :list) : type
322
+
323
+ data
320
324
  end
321
325
  end
322
326
 
data/lib/rbbt/util/cmd.rb CHANGED
@@ -118,6 +118,12 @@ module CMD
118
118
  sin.close
119
119
  end
120
120
 
121
+ if no_wait
122
+ pids = []
123
+ else
124
+ pids = [pid]
125
+ end
126
+
121
127
  if pipe
122
128
  Thread.new do
123
129
  while line = serr.gets
@@ -127,7 +133,8 @@ module CMD
127
133
  end
128
134
 
129
135
  #SmartIO.tie sout, pid, cmd, post, in_content, sin, serr
130
- ConcurrentStream.setup sout, :pids => [pid], :autojoin => no_wait, :no_fail => no_fail
136
+ #
137
+ ConcurrentStream.setup sout, :pids => pids, :autojoin => no_wait, :no_fail => no_fail
131
138
 
132
139
  sout
133
140
  else
@@ -139,7 +146,7 @@ module CMD
139
146
  serr.close
140
147
  end
141
148
 
142
- ConcurrentStream.setup sout, :pids => [pid], :autojoin => no_wait, :no_fail => no_fail
149
+ ConcurrentStream.setup sout, :pids => pids, :autojoin => no_wait, :no_fail => no_fail
143
150
  out = StringIO.new sout.read
144
151
  sout.close unless sout.closed?
145
152
 
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.21.3
4
+ version: 5.21.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-29 00:00:00.000000000 Z
11
+ date: 2016-08-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake