rbbt-rest 1.8.73 → 1.8.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0a85202110e13c7cef87c4603a66276664ae3ec
-  data.tar.gz: 789f9c4df0237c49e55cdeffce393edcc6aeceb8
+  metadata.gz: 26f50bb97e2ddbf2a2ec6e1ffb4c364b0e8214c6
+  data.tar.gz: f95b31690cd68e0af0c6ffaf999188f0e6a24deb
 SHA512:
-  metadata.gz: 55b368b27199e1101b051555b342e89d025cfd92f5c51176e07f7d9668dc3cbb9ca13a1fbc35da69c3bb3505a43b1055731c743186d815795513185490adef59
-  data.tar.gz: 980e2ad32343654a84932c6b472e8eca571f5dd3874219401c62818e8bf46b9cdcdb81d4842f6775701016b9812853801812cf036215532a8b5fcfb4580992ec
+  metadata.gz: c394da16c8e9a26fec93a45a1cec75bc46a59a90066bf162c99f8c6c94c863223c5ced2c40d5b09c45f261826b48312c2ed4d6a81b45b621f53e55d523d1baee
+  data.tar.gz: 42c006207252cd964ded888f579662f1281c739d0242025b79ec5a3928abcee1a094b741be195bef4d486ae0aa4b05dc637e76ae3ce6bc0e290a4f1e879ac945

data/lib/rbbt/rest/common/cache.rb

@@ -130,6 +130,7 @@ module RbbtRESTHelpers
         when "table"
           halt 200, tsv2html(fragment_file)
         when "json"
+          content_type "application/json" 
           halt 200, tsv_process(load_tsv(fragment_file).first).to_json
         when "tsv"
           content_type "text/tab-separated-values"

data/lib/rbbt/rest/workflow.rb

@@ -153,13 +153,15 @@ module Sinatra
 
         begin
           started = job.started?
+          waiting = job.waiting?
           done = job.done?
           error = job.error? || job.aborted?
+          started = started || done || error
 
           if done
             show_result job, workflow, task, params
           else
-            if started
+            if started || waiting
               exec_type = execution_type(workflow, task) 
               case
               when error
@@ -194,7 +196,7 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
-        raise RbbtException.new "Job not found: #{job.path}" unless job.started?
+        raise RbbtException.new "Job not found: #{job.path}" unless job.started? or job.waiting? or job.error? or job.aborted?
 
         begin
           check_step job unless job.done?

data/share/views/compass/app.sass

@@ -129,7 +129,7 @@ dl > dd
   margin-left: 1em
 
 
-.dependencies
+.dependencies, .job_info
   .status
     color: gold
   .status.waiting, .status.noinfo

data/share/views/error.haml

@@ -12,22 +12,26 @@
     - clean_url = add_GET_param(remove_GET_param(request.env["REQUEST_URI"], "_layout"), "_update", "reload")
     %a.ui.blue.button.reload(href=clean_url) Reload
 
+  - info_url = request.env["REQUEST_URI"].sub(/\?.*/,'') + '/info'
+  %a.ui.blue.button.reload(href=info_url) Info
+
 - backtrace = job.info[:backtrace]
 - if backtrace and backtrace.any?
 
-  %ul.error_backtrace.clean_list.ui.segment
+  .error_backtrace.clean_list.ui.segment
     .ui.header Backtrace
     %pre.ui.content
       - require 'rbbt/util/colorize'
       - pallete = {}
       - matches = %w(views workflows rbbt).collect{|w| /\/#{w}/ }
       - colors = Colorize.distinct(matches)
-      - backtrace.each do |line|
-        - color = nil
-        - matches.each_with_index do |m,i|
-          - if m.match(line)
-            - color = colors[i].darken(0.3).to_s 
-            - break
+      %ul
+        - backtrace.each do |line|
+          - color = nil
+          - matches.each_with_index do |m,i|
+            - if m.match(line)
+              - color = colors[i].darken(0.3).to_s 
+              - break
 
-        - style = color ? ';color:'+color : ""
-        %li(style="font-size:0.9em;font-family:monospace#{style}")= line.sub('`',"'")
+          - style = color ? ';color:'+color : ""
+          %li(style="font-size:0.9em;font-family:monospace#{style}")= line.sub('`',"'")

data/share/views/job_info.haml

@@ -1,10 +1,38 @@
 - new_info = {}
-- info.each{|k,v| new_info[k] = v unless k.to_s == 'dependencies'}
-= hash2dl(new_info)
+- info.each{|k,v| new_info[k] = v unless k.to_s == 'dependencies' || k.to_s == 'exception' || k.to_s == 'backtrace'}
+- exception = info[:exception]
+
+- status = info[:status]
+.job_info.clean_list.ui.segment
+  .ui.header 
+    Info:
+    %span.status(class=status)= job.name
+  = hash2dl(new_info)
+
+- if exception
+  - backtrace = exception[:backtrace]
+  .error_backtrace.clean_list.ui.segment
+    .ui.header Backtrace
+    %pre.ui.content
+      - require 'rbbt/util/colorize'
+      - pallete = {}
+      - matches = %w(views workflows rbbt).collect{|w| /\/#{w}/ }
+      - colors = Colorize.distinct(matches)
+      %ul
+        - backtrace.each do |line|
+          - color = nil
+          - matches.each_with_index do |m,i|
+            - if m.match(line)
+              - color = colors[i].darken(0.3).to_s 
+              - break
+
+          - style = color ? ';color:'+color : ""
+          %li(style="font-size:0.9em;font-family:monospace#{style}")= line.sub('`',"'")
 
 - if info[:dependencies] and info[:dependencies].any?
-  %h3 Dependencies
-  = partial_render('partials/dependencies', :job => job)
+  .ui.segment
+    %h3 Dependencies
+    = partial_render('partials/dependencies', :job => job)
   -#%ul
 
     - task_exports = workflow.synchronous_exports + workflow.asynchronous_exports

data/share/views/partials/dependencies.haml

@@ -32,7 +32,7 @@
           - url = path.split("?").first
           %a(href=url) #{ name }  
 
-        - elsif wf and wf.task_exports.include? dep.task_name.to_sym
+        - elsif wf and Sinatra::RbbtRESTWorkflow::WORKFLOWS.include?(wf) and wf.task_exports.include? dep.task_name.to_sym
           - url = "/" + [dep_workflow.to_s, dep.task_name.to_s, dep.name.to_s] * "/"
           %a(href=url) #{ name }  
 

data/share/views/public/js/helpers/helpers.js

@@ -98,6 +98,7 @@ function require_js(url, success, script){
     var _success = function(script_text){ required_js.push(url); console.log("Required and loaded JS: " + url); if (typeof success == 'function'){ success(script) }; }
     if (typeof rbbt.proxy != 'undefined')
       url = rbbt.proxy + url
+    url = rbbt.url_add_script_name(url)
     $.ajax({url: url, cache:cache, dataType:'script', async: async, success: _success} ).fail(function(jqxhr, settings, exception){ console.log('Failed to load ' + url + ': ' + exception)});
   }
  }

metadata

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