rbbt-util 5.21.136 → 5.21.137

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 464a28aba2c4f437dbe708ccad513c620051b6ed
4
- data.tar.gz: 5d1a66219be1b6cb197d9d4ee3525c783b112614
3
+ metadata.gz: ba7c142553e810f2dbced269f0aed2a3b52051cb
4
+ data.tar.gz: b58daa013d65a07b80ecf4e7de2cea5265ab387b
5
5
  SHA512:
6
- metadata.gz: cfcb33ad8cb6d1ccee714a2c1ffd81c9fd5f2ac88fbc038571dfe8dbf9eaae146bd93865a2a9327d220c39512724040eef725827b3bce9b0ffd088907b7ef7df
7
- data.tar.gz: b247c263b41a1b2cc876523c479e33bde89e511bbcf6e645b9949eeeb3358a0a5f22ff1bd7be51305aef1508a2548a29315a87371ec82944ec9aff8c2ec1a41f
6
+ metadata.gz: a94c595521d98f0f8bfaf15eac02e38f3a9603a65d77d29d34ed6e090b014ec6b269ff9606e6ed62e8a1de47d3b52d5cea210d79e9dba416802686a225be6cbb
7
+ data.tar.gz: 3b647173c446127c0f29584f7097b39a4f144aef923b88b2d6ccef9f262ed24b070f28e722326d45e0e382e9e887034b07d3b33fe243a2d314d0af5997ababce
@@ -329,9 +329,9 @@ class Step
329
329
 
330
330
  def get_exception
331
331
  if info[:exception].nil?
332
- raise Aborted if aborted?
333
- raise messages.last if error?
334
- return false
332
+ return Aborted if aborted?
333
+ return Exception.new(messages.last) if error?
334
+ Exception.new ""
335
335
  else
336
336
  ex_class, ex_message, ex_backtrace = info[:exception].values_at :class, :message, :backtrace
337
337
  begin
@@ -341,7 +341,7 @@ class Step
341
341
  ex
342
342
  rescue
343
343
  Log.exception $!
344
- raise ex_message
344
+ Exception.new ex_message
345
345
  end
346
346
  end
347
347
  end
@@ -814,7 +814,7 @@ module Workflow
814
814
 
815
815
  compute = options[:compute] if options
816
816
 
817
- all_d = (real_dependencies + real_dependencies.collect{|d| d.rec_dependencies} ).flatten.compact.uniq
817
+ all_d = (real_dependencies + real_dependencies.flatten.collect{|d| d.rec_dependencies} ).flatten.compact.uniq
818
818
 
819
819
  _inputs = assign_dep_inputs(_inputs, options, all_d, workflow.task_info(dep_task))
820
820
  jobname = _inputs[:jobname] if _inputs.include? :jobname
@@ -33,6 +33,7 @@ file = ARGV.shift
33
33
 
34
34
  $seen = []
35
35
  def get_step(file)
36
+ file = File.expand_path(file)
36
37
  file = file.sub(/\.(info|files)/,'')
37
38
  $seen << file
38
39
  Workflow.load_step file
@@ -79,7 +80,7 @@ def report_msg(status, name, path, info = nil)
79
80
  value = job_inputs[input]
80
81
  next if value.nil?
81
82
  value_str = Misc.fingerprint(value)
82
- str << " #{input}=#{value_str}"
83
+ str << " #{Log.color :magenta, input}=#{value_str}"
83
84
  end
84
85
  end
85
86
 
@@ -89,7 +90,7 @@ def report_msg(status, name, path, info = nil)
89
90
  value = info[field]
90
91
  next if value.nil?
91
92
  value_str = Misc.fingerprint(value)
92
- str << " #{field}=#{value_str}"
93
+ str << " #{Log.color :magenta, field}=#{value_str}"
93
94
  end
94
95
  end
95
96
 
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.136
4
+ version: 5.21.137
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-22 00:00:00.000000000 Z
11
+ date: 2018-06-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake