rbbt-util 5.17.4 → 5.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fe012a90bd3fda632307cdd2bc21e3020b1814
-  data.tar.gz: c5d10734f03329aa7894c55287e8b2fb796cfa7f
+  metadata.gz: ebbbcd7563b7c4c3bd68ac9ebef1d81318430cf4
+  data.tar.gz: f3f0e6c0b52149de5fc1d2dfda1e88afda0963e1
 SHA512:
-  metadata.gz: 3dcd0d695669e781a8f6fa009e9db1b603becdbf50c787f46a3cc21813bf4a57e0be11ada30023994e40de48e1b6367227d19081e2343950008e28ab117077ac
-  data.tar.gz: 1a42db795b2f52a78b2bf1fde307f3d5a85bdbb363430eb28b87aabf0becaf45302331d0e5bf05e0698119b8258c37c7f349ef978cf241151255fcce0b154cdf
+  metadata.gz: 8756e82fa2249eae15ffe96ee0cb81b94964f4e0eb84fd1588248440ed12cb9b3030c2801741b66cb44d456fe5ac396784d48789f5b12bcab3bc02ff58d69f16
+  data.tar.gz: 72210aa14174435437a7420472f231782aa150c990036fcbadd46a44e96b136ebdd5ab6be5146700869d06e38868cbbee2a0aa00c80d24c45ef25a3ce45058be

data/share/rbbt_commands/system/clean

@@ -76,7 +76,6 @@ jobs = Rbbt.job_info workflow, task
 workflows = {}
 
 jobs.each do |file,i|
-  next if i[:done]
   info = begin
            Open.open(i[:info_file]) do |f|
              Marshal.load(f)
@@ -87,12 +86,13 @@ jobs.each do |file,i|
 
   pid = info[:pid]
 
-  status = info[:status]
-  status = :missing if status == :done and not File.exists? file
+  status = info[:status].to_s
+  status = :missing if status == "done" and not File.exists? file
   status = :dead if status != "done" and pid and not Misc.pid_exists?(pid)
+  status = :sync if status != "done" and File.exists? file
 
   status = status.to_s
-  next unless status =~ /\berror$/ or status =~ /\bmissing$/ or status =~ /\baborted$/ or status =~ /\bdead$/ or status == "" or (force and status == 'noinfo')
+  next unless status =~ /\berror$/ or status =~ /\bmissing$/ or status =~ /\baborted$/ or status =~ /\bdead$/ or status =~ /\bsync$/ or status == "" or (force and status == 'noinfo')
   puts "  Removing #{ file } - #{status}" 
   Step.clean(file) 
 end

data/share/rbbt_commands/system/status

@@ -116,7 +116,7 @@ jobs = Rbbt.job_info workflow, task
 workflows = {}
 
 jobs.each do |file,info|
-  next unless all or not info[:done]
+  next unless all or not info[:done] or not File.exists? file
   workflow = info[:workflow]
   task = info[:task]
   workflows[workflow] ||= {}
@@ -141,7 +141,13 @@ workflows.sort.each do |workflow,tasks|
       status = info[:status]
       status = :missing if status == :done and not File.exists? file
       status = status.to_s
-      status << Log.color(:red, " (dead)") if status != "done" and pid and not Misc.pid_exists?(pid)
+      if status != "done" and pid and not Misc.pid_exists?(pid)
+        if File.exists? file
+          status << Log.color(:red, " (out of sync)") 
+        else
+          status << Log.color(:red, " (dead)") 
+        end
+      end
       str = file.dup
       str << " #{ status_msg status }"
       str << "; #{pid_msg pid}" unless status == "done"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.4
+  version: 5.17.5
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake