rbbt-util 5.13.28 → 5.13.29

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: 7ce0e6973095090f400a387ed87caebb92709f5f
4
- data.tar.gz: f950e625f890d418286ebea3c1b6341001f5ab6b
3
+ metadata.gz: 17adbad9eb7b34f9e8e73dd6d07100524d087d2a
4
+ data.tar.gz: eff0d8f0b268e2ce676f1f0fee5fb74b39edb180
5
5
  SHA512:
6
- metadata.gz: 716762403d10d35f2cce69b3d00a0d9877a671e4cdaefb79b57b8779dc6a39d97c750967a0a8dc686b1eb2e1ecbaa5a1a60d5e733edaeeafdae89eb383a4d54a
7
- data.tar.gz: 669d729262610ed60f7bff13212c994447d587593b8b7ff66e0f2fe28515d348f2f42219f398ae92871356d596c6505cc5e9da46c03407d6bdfef39c08f26889
6
+ metadata.gz: 01362bc1fce56034de6132d1ba60b3e1eab70d943e65b71195fd6be85397bdb947077b7dedc4cdfcb795b889bdae3f160462ed8d8e2d37d37b332905aca3c34e
7
+ data.tar.gz: 66c449d2b05aadc792bf9a8b401ec8dd57dee7408ac1144d281edf651b1f71db4d10e8e52c57d735d935dd10a1fb61c984101c7acc2a10430843386ce4595414
@@ -125,7 +125,7 @@ module Misc
125
125
  try = 0
126
126
  begin
127
127
  yield
128
- rescue
128
+ rescue Exception
129
129
  if msg
130
130
  Log.warn("Insisting after exception: #{$!.message} -- #{msg}")
131
131
  else
@@ -2,8 +2,8 @@ if ENV["RBBT_NO_LOCKFILE_REFRESH"] == "true"
2
2
  Lockfile.refresh = false
3
3
  Lockfile.max_age = 60 * 60 * 5
4
4
  else
5
- Lockfile.refresh = 3
6
- Lockfile.max_age = 10
5
+ Lockfile.refresh = 5
6
+ Lockfile.max_age = 5 * 60
7
7
  Lockfile.suspend = 3
8
8
  end
9
9
 
@@ -144,7 +144,7 @@ class Step
144
144
  end
145
145
 
146
146
  unless dependency.result or dependency.done?
147
- dependency.run(true)
147
+ dependency.run(true).grace
148
148
  end
149
149
  rescue Aborted
150
150
  Log.error "Aborted dep. #{Log.color :red, dependency.task.name.to_s}"
data/lib/rbbt/workflow.rb CHANGED
@@ -275,7 +275,7 @@ module Workflow
275
275
  defaults = task_info(taskname)[:input_defaults]
276
276
 
277
277
  inputs.each do |k,v|
278
- real_inputs[k] = v if task_inputs.include?(k) and defaults[k].to_s != v.to_s and not (FalseClass === v and defaults[k].nil?)
278
+ real_inputs[k] = v if (task_inputs.include?(k.to_sym) or task_inputs.include?(k.to_s)) and (defaults[k].to_s != v.to_s and not (FalseClass === v and defaults[k].nil?))
279
279
  end
280
280
 
281
281
  if real_inputs.empty?
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.13.28
4
+ version: 5.13.29
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-30 00:00:00.000000000 Z
11
+ date: 2014-05-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake