rbbt-rest 1.8.79 → 1.8.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1284fe17503755d4cfcfb0ac9be1639914ee97
-  data.tar.gz: 2c0098b202c99737c078b35f4abd2d94ae865144
+  metadata.gz: ad4f4ec2103bd057911acd538cfcac7ffdaeb6e7
+  data.tar.gz: 283c5e4abced60e47c9199c47f6506ba957fa7f4
 SHA512:
-  metadata.gz: 5fb5fe71f89a873c3263b15861e4f99deb65448a98197398ff0670f845d234d5b52937e906d532ba977e8957477ccb332822493ec0b8785c06d265e40ae35d80
-  data.tar.gz: 9eefc7b6f1f1c4407b221a04ae53416de931fa96c1ab6076b62ae2d20d2c4a60dd38396386635b5b4b6ce53e2402243cf10b25893d82d851c235d0600a314175
+  metadata.gz: 16ed2ae4875c835542d4cc3e125ae19c0f0584e3dbf63a029a753f86d0dddddcd92f27a34c4ca240825e8237dfb3d7a94567a7194c11fb2529dae29fd56534da
+  data.tar.gz: eaef24ed1e1fc1bb941b6dd3195d2012f9bac6f5ca4f2d95cadf9a83bc9a7dd7e75b42428284b992c8d5ca761da2bcd0f293d6c17ee613dc85c575081e8a5b06

data/lib/rbbt/rest/workflow.rb

@@ -152,10 +152,14 @@ module Sinatra
         recursive_clean_job(workflow, job) and halt 200 if update.to_s == "recursive_clean"
 
         begin
+          status = job.status
+
           started = job.started?
           waiting = job.waiting?
+
           done = job.done?
-          error = job.error? || job.aborted?
+
+          error = job.error? || job.aborted? || job.dirty?
           started = started || done || error
 
           if done
@@ -178,7 +182,7 @@ module Sinatra
                 raise RbbtRESTHelpers::Retry
               end
             else
-              halt 404, "Job not found: #{job.status}"
+              halt 404, "Job not found: #{status}"
             end
           end
         rescue RbbtRESTHelpers::Retry
@@ -196,7 +200,7 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
-        raise RbbtException.new "Job not found: #{job.path}" unless job.started? or job.waiting? or job.error? or job.aborted?
+        raise RbbtException.new "Job not found: #{job.path} (#{job.status})" unless job.started? or job.waiting? or job.error? or job.aborted?
 
         begin
           check_step job unless job.done?

data/share/views/job_result/job_control.haml

@@ -5,26 +5,3 @@
     %a.ui.small.basic.blue.button(href="/#{[workflow.to_s, task, jobname, "files"] * "/"}") job files
   %a.ui.small.basic.blue.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_format=raw") get raw result file
 
--#
-  - files = job.files 
-  - files.reject!{|f| File.basename(File.dirname(f)) == ".html"}
-
-  - if files.any?
-    %dt.ui.header Files
-    %dd.job_files.ui.basic.segment
-      - files_by_dir = {}
-      - files.each do |file|
-        - dir = File.dirname(file)
-        - files_by_dir[dir] ||= []
-        - files_by_dir[dir]  << file
-      .ui.buttons
-        - (files_by_dir["."] || []).sort.each do |file|
-          %a.small.ui.button(href="/#{[workflow.to_s, task, jobname, "file", file] * "/"}")= file
-      - (files_by_dir.keys - ["."]).each do |dir|
-        %dl
-          %dt.ui.header #{dir}/
-          %dd
-            .ui.buttons
-              - files_by_dir[dir].each do |file|
-                %a.small.ui.button(href="/#{[workflow.to_s, task, jobname, "file", file] * "/"}")= File.basename(file)
-             

data/share/views/job_result/tsv.haml

@@ -10,7 +10,7 @@
   - header = result.all_fields
 
   = workflow_partial('partials/table', workflow, task, 
-    locals.merge(:table_id => table_id, :page => page, :table_class => table_class, :rows => rows, :total_size => total_size, :header => result.all_fields, :row_ids => :use, :table_url => jobname ? File.join('/', workflow.to_s, task, jobname) : nil))
+    locals.merge(:table_id => table_id, :page => page, :table_class => table_class, :rows => rows, :total_size => total_size, :header => result.all_fields, :row_ids => :use, :table_url => jobname ? to(File.join('/', workflow.to_s, task, jobname)) : nil))
 
 - else
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.79
+  version: 1.8.80
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake