rbbt-rest 1.3.13 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67dce81d38feaadc05aaf7a687e1b2a404e3d8d2
-  data.tar.gz: 9afbe5fb579fa2312d2265b4120e3334403b3c95
+  metadata.gz: a408afc2c389ab8d792cfc8da6447eb15392d18d
+  data.tar.gz: 182bcd9287fbd791df683500c0c8b529530b0007
 SHA512:
-  metadata.gz: dc9822583807cf4072c9b653dea7ab6c5e01db1b01ca2c895b4982968861c6299ba493e09c50e7a2f040426d3515c88ee9dab9efe758e5fbdebc0108fb7d7fa8
-  data.tar.gz: 572b0a098081e53db8bbd431d2c76c2a025f60c3fa8d1915d5e726a03227bc8908ea2533bd5ac0c9e832d940e45d431a01ec70f2d491a94be9246e1347bdae13
+  metadata.gz: 29b5143526794fb9a99f35c74ea1b0cf8324f96cb2026ffa1825142416fa48f4fee0bf7c0a5d4483f9bdc9070ca1eaeaf68a998dff6fe7bdf3e0e7a783d01a93
+  data.tar.gz: 6abadd9366fcc0e1e6b4111a9dae83ce78c92831acd7cda810062378ec78ba4164602c66086e3cc825845b04a783c36a5ce86e44f43b04f93f9f760ca0561e64

data/lib/rbbt/rest/client/step.rb

@@ -128,7 +128,6 @@ class WorkflowRESTClient
                         exec_job 
                       else
                         init_job(:synchronous) 
-                        iii url
                         self.load
                       end
                     end

data/lib/rbbt/rest/workflow/jobs.rb

@@ -162,17 +162,20 @@ module WorkflowRESTHelpers
       end
 
       begin
-        job.run unless Open.exists? job.info_file
         job_url = to(File.join("/", workflow.to_s, task, job.name)) 
         job_url += "?_format=#{@format}" if @format
-        begin
-          Misc.insist [0.1, 0.2, 0.5, 1, 3] do
-            raise unless Open.exists? job.info_file
-          end
-        rescue
+
+        if not job.started?
+          job.run true 
+          job.join
+        end
+
+        #halt 200, job.name if format == :jobname 
+        if format == :jobname
+          job.name
+        else
+          redirect job_url
         end
-        halt 200, job.name if format == :jobname
-        redirect job_url
       rescue
         Log.exception $!
         halt 500, $!.message
@@ -184,8 +187,6 @@ module WorkflowRESTHelpers
       end
 
       begin
-        iii :fork
-
         job.fork 
 
         job_url = to(File.join("/", workflow.to_s, task, job.name)) 

data/lib/rbbt/rest/workflow.rb

@@ -142,17 +142,16 @@ module Sinatra
         recursive_clean_job(workflow, job) if update == :recursive_clean
 
         begin
-          started = job.info.any?
+          started = job.started?
           done = job.done?
-          error = job.error?
+          error = job.error? || job.aborted?
 
-          iii [:get, job.path, started, done, error]
           if done
             show_result job, workflow, task
           else
             if started
               case
-              when job.status == :error
+              when error
                 error_for job
               when execution_type(workflow, task) == :asynchronous
                 wait_on job

data/share/views/compass/app.sass

@@ -2,9 +2,9 @@
 @import "_rbbt"
 
 @import "user"
+@import "entity_card"
 @import "workflow"
 @import "finder"
-@import "entity_card"
 @import "favourites"
 @import "actions"
 @import "top_menu"
@@ -31,9 +31,15 @@ table
 .action_parameters
   +action_parameters
 
-.entity_card, .entity_list_card, .entity_map_card, .action_card
+.entity_card, .entity_list_card, .entity_map_card, .action_card, .workflow_task
   +card
 
+  & > .card > .sidebar 
+    h1, h2, h3, h4, h5, h6
+      margin: $indent
+    p
+      margin: $indent
+
   & > .card > .sidebar dl
     margin: $vindent $indent 
     +indented_dl
@@ -41,6 +47,7 @@ table
     &.rbbt_accordion
       margin: 0 0
 
+
     & > dt, dd
       border-left: 0
       border-right: 0

data/share/views/compass/rbbt/menu.sass

@@ -18,7 +18,7 @@
       color: $color_alt2 !important
 
 
-=rbbt_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text)
+=rbbt_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text, $color_menu_border: $color_menu_border)
   +_rbbt_menu_item($color_bg, $color_text)
 
   height: $size_menu_item
@@ -34,7 +34,7 @@
   height: $size_menu_item
   white-space: nowrap
 
-=rbbt_accordion_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text)
+=rbbt_accordion_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text, $color_menu_border: $color_menu_border)
   +_rbbt_menu_item($color_bg, $color_text)
   border: 1px solid $color_menu_border
   border-top: 0px 
@@ -44,7 +44,7 @@
   margin: 0
   padding: 7px
 
-=rbbt_tab_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text)
+=rbbt_tab_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text, $color_menu_border: $color_menu_border)
   +_rbbt_menu_item($color_bg, $color_text)
 
   height: $size_menu_item

data/share/views/compass/theme.sass

@@ -17,6 +17,7 @@ $color_menu_text: #020202
 
 .dark
   +rebase($base3,$base2,$base1,$base0,$base00,$base01,$base02,$base03)
+
 .light
   +rebase($base03,$base02,$base01,$base00,$base0,$base1,$base2,$base3)
 

data/share/views/compass/top_menu.sass

@@ -62,6 +62,7 @@ $padding_top_menu: 5px
       &.user
         float: right
       background-color: $color_menu_bg
+
       dl.rbbt_menu > dd
         box-shadow: 1px 3px -4px 4px rgba(0, 0, 0, 0.1)
 

data/share/views/compass/user.sass

@@ -5,3 +5,13 @@
         right: 0
         margin-right: -1px
         padding: $vindent $indent
+        &.workflows
+          padding: 0
+          dl
+            overflow: hidden
+            ul
+              margin: 0
+              & > li
+                @media #{only-large}
+                  +ellipsis_text
+                display: block 

data/share/views/compass/workflow.sass

@@ -2,8 +2,22 @@ ul.tasks > li
   display: block !important
 
 .workflow_task
+  +card
+  .sidebar
+    .workflow_tasks
+      +rbbt_accordion
+  
+  .description
+    +grid_row
+    +clearfix
+    .task_description
+      
+
   .title
-    span.workflow
+    .task_name
+    .workflow_link
+      display: inline-block
+      margin: $indent
       font-weight: 600
 
     span.task
@@ -14,9 +28,14 @@ ul.tasks > li
 
   .form
     @extend .action_parameters
+    margin: 0px !important
     select#_format
       width: 5em
       float: right
+  .examples
+    ul
+      li
+        +rbbt_menu_item($color_bg: $base3, $color_menu_border: $base3)
 
 dd.job_control, dd.job_files
   +clearfix

data/share/views/form.haml

@@ -2,24 +2,26 @@
 - action = to(File.join('/', workflow.to_s, task.to_s))
 - task_info = workflow.task_info(task)
 
-.workflow_task
+.workflow_task(id=id)
   .title
-    %h3 
-      = workflow
-      %span.task= Misc.humanize task
-  - if task_info[:description]
-    .description
-      :markdown
-        #{task_info[:description]}
+    %h3
+      =Misc.humanize task
+      .workflow_link
+        %a(href="/#{workflow.to_s}")= workflow
+  .description
+    - if task_info[:description]
+      .task_description
+        :markdown
+          #{task_info[:description]}
+
   .form
     = partial_render('partials/form', :id => id, :action => action, :method => 'post', 
       :enctype => "multipart/form-data", :info => task_info, :klass => 'workflow_task')
-  
+
   - if workflow.libdir.examples[task.to_s].exists?
     .examples
 
-      %p
-        Click the links bellow to load example data:
+      Click the links bellow to load example data:
         
       :javascript
         example_inputs = [];
@@ -36,11 +38,13 @@
 
       :javascript
         deffer(function(){
+          var form = $('.workflow_task[id=#{id}] > .form > form')
+
           $("a.load_example").click(function(){
             var link = $(this);
             var name = $(link).attr('name');
             var inputs = example_inputs[name];
-            var form = link.parents('.workflow_task').find('.form')
+            form[0].reset()
 
             for (var input in inputs){
               var value = inputs[input]

data/share/views/layout/top_menu/user.haml

@@ -11,5 +11,30 @@
   %dd
     %ul.jobs
 
+  - if defined? Sinatra::RbbtRESTWorkflow and Sinatra::RbbtRESTWorkflow::WORKFLOWS
+    - expoted_workflows = Sinatra::RbbtRESTWorkflow::WORKFLOWS.collect do |workflow|
+      - next if workflow.asynchronous_exports.empty? and workflow.synchronous_exports.empty? and workflow.exec_exports.empty?
+      - workflow
+
+    - expoted_workflows.compact!
+    - if expoted_workflows.any?
+      %dt.next Workflows
+      %dd.workflows
+        %dl.rbbt_vertical_menu
+          - expoted_workflows.each do |workflow|
+            %dt.next
+              = workflow.to_s
+            %dd
+              %p= workflow.documentation[:description].split(/\n\n/).first if workflow.documentation[:description]
+
+              %ul
+                - tasks = workflow.exec_exports + workflow.synchronous_exports + workflow.asynchronous_exports
+
+                - tasks.sort.each do |task|
+                  %li
+                    %a(href="#{File.join("/", workflow.to_s, task.to_s)}")= task
+                    - info = workflow.task_info(task)
+                    - if info[:description]
+                      = info[:description].split(/\n\s*\n/).first
   %dt
     %a(href='/help') Help

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake