rbbt-util 5.21.135 → 5.21.136

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: 6632ef8c5619f991fe5745a1cccb5b4a78b9cc8a
4
- data.tar.gz: adba52cadfc266a6b74ed5ac9c88e50421ddf608
3
+ metadata.gz: 464a28aba2c4f437dbe708ccad513c620051b6ed
4
+ data.tar.gz: 5d1a66219be1b6cb197d9d4ee3525c783b112614
5
5
  SHA512:
6
- metadata.gz: 9c950a962f67d85924b54e6622713d391f5b265848da7d2ba737e4ffaf5c8227b4f7dcb6525efb2884776fe324b4503801d85107bf7b18523367025b257afd05
7
- data.tar.gz: 9a7e9d39bb698bcbbd8dc936bf8a241d86e774aed867d7f2d0d303c68124f5232996b13f75fd3b14e58e9c032f3db9ded28c96fcd21a2c0b6f18b6eeccaeac1d
6
+ metadata.gz: cfcb33ad8cb6d1ccee714a2c1ffd81c9fd5f2ac88fbc038571dfe8dbf9eaae146bd93865a2a9327d220c39512724040eef725827b3bce9b0ffd088907b7ef7df
7
+ data.tar.gz: b247c263b41a1b2cc876523c479e33bde89e511bbcf6e645b9949eeeb3358a0a5f22ff1bd7be51305aef1508a2548a29315a87371ec82944ec9aff8c2ec1a41f
@@ -344,15 +344,16 @@ class WorkflowRESTClient
344
344
  end
345
345
  end
346
346
  @inputs = new_inputs
347
+ @info = nil
347
348
  end
348
349
 
349
350
  def recursive_clean
351
+ Log.warn "Not doing recursive cleans"
350
352
  return
351
353
  begin
354
+ _restart
352
355
  params = {:_update => :recursive_clean}
353
- init_job(nil, params)
354
356
  WorkflowRESTClient.get_raw(url, params)
355
- _restart
356
357
  rescue Exception
357
358
  Log.exception $!
358
359
  end
@@ -361,9 +362,9 @@ class WorkflowRESTClient
361
362
 
362
363
  def _clean
363
364
  begin
365
+ _restart
364
366
  params = {:_update => :clean}
365
367
  WorkflowRESTClient.clean_url(url, params) if @url
366
- _restart
367
368
  rescue Exception
368
369
  Log.exception $!
369
370
  end
data/lib/rbbt/workflow.rb CHANGED
@@ -354,7 +354,7 @@ module Workflow
354
354
  end
355
355
 
356
356
  def set_step_dependencies(step)
357
- if step.info.include? :dependencies
357
+ if step.info[:dependencies]
358
358
  Misc.insist do
359
359
  step.dependencies = step.info[:dependencies].collect do |task, job, path|
360
360
  next if job.nil?
@@ -407,7 +407,7 @@ module Workflow
407
407
 
408
408
  def self.load_step(path)
409
409
  step = Step.new path
410
- step.dependencies = step.info[:dependencies].collect do |task,name,dep_path|
410
+ step.dependencies = (step.info[:dependencies] || []).collect do |task,name,dep_path|
411
411
  Workflow.load_step dep_path
412
412
  end
413
413
  step
@@ -98,7 +98,7 @@ TSV.traverse jobs, :_bar => "Checking job status" do |file,i|
98
98
  status = :dead if status != "done" and pid and not Misc.pid_exists?(pid)
99
99
  status = :sync if status != "done" and File.exist? file
100
100
 
101
- status = :dirty if info[:status] == "done" and dirty and Workflow.load_step(file).dirty?
101
+ status = :dirty if info[:status].to_s == "done" and dirty and Workflow.load_step(file).dirty?
102
102
 
103
103
  status = status.to_s
104
104
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.21.135
4
+ version: 5.21.136
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez