gush-control 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3171bdb3e43daa544ed8588ee72d2d37481ac667
-  data.tar.gz: ae5e2f8dc1416749174539fdaf5a6159168cf987
+  metadata.gz: 0a589286bf32cc78c297cc5ec41a053dd9a9f97d
+  data.tar.gz: 3b524f58cd25e7e5db24aeecce402e4200681d77
 SHA512:
-  metadata.gz: 790d8184780fcf8f17ffde0a96375bdaaf948f8c6af70123af7bac17553120855391c1ef92b1cd5149b50457efbe9374809706409121ba8f8dd2960af39bf279
-  data.tar.gz: 1fb9815f197e66a45621d47630476382efc2557a4ba0b62f28e87687ac5d8ca8eec95439e668d1c18263e958c1af1e06d1f50c9ad4b5882a7e8c2d4e31c4ac2a
+  metadata.gz: fdd3ac0e6ad2bb937b37638043ff4580cbd4a54a212ad967a1bd413fd0152467d977439f7d195bcc7f254469df7774c4e830e294a6a4411276c6cbe47b49d3f0
+  data.tar.gz: a2d95dec4e0ea270c4a824a37f52008980749e0cab33c5c286e799f800f2bb6b3a27c6afaed236007c5396a19bba90687f4227f9f5ff94f2e1707ae142505ebb

data/lib/gush/control/app.rb

@@ -96,11 +96,13 @@ module Gush
         @workflow.jobs.each do |job|
           name = job.class.to_s
           @jobs << {
-            name:     name,
-            finished: job.finished?,
-            running:  job.running?,
-            enqueued: job.enqueued?,
-            failed:   job.failed?
+            name:         name,
+            finished:     job.finished?,
+            started_at:   format_time(job.started_at),
+            finished_at:  format_time(job.finished_at),
+            running:      job.running?,
+            enqueued:     job.enqueued?,
+            failed:       job.failed?
           }
 
           if job.incoming.empty?
@@ -168,6 +170,10 @@ module Gush
         Thread.current[:redis] ||= Redis.new(url: settings.client.configuration.redis_url)
       end
 
+      def format_time(timestamp)
+        Time.at(timestamp) if timestamp
+      end
+
       def remove_workflow_and_logs(workflow)
         remove_workflow(workflow)
         remove_logs(workflow)

data/lib/gush/control/assets/javascripts/application.coffee

@@ -1,6 +1,7 @@
 window.Gush = new Gush
+
 $(document).ready ->
-  window.Gush.initialize()
+  window.Gush.initialize(jobs)
   Foundation.global.namespace = ''
   $(document).foundation()
 
@@ -38,17 +39,11 @@ $(document).ready ->
 
   $(this).on "click", ".jobs-filter dd a", (event) ->
     event.preventDefault()
-    filter = $(this).html().toLowerCase()
-    table = $("table.nodes tbody")
-
+    filter = $(this).data('filter')
     $(this).closest('dl').find('dd').removeClass('active')
     $(this).parent().addClass('active')
+    Gush.filterJobs(filter)
 
-    table.find("tr").hide()
-    if filter == "all"
-      table.find("tr").show()
-    else
-      table.find("tr.#{filter}").show()
 
   $(this).on "click", "a.remove-completed", (event) ->
     event.preventDefault()

data/lib/gush/control/assets/javascripts/gush.coffee

@@ -3,10 +3,10 @@ class @Gush
     @workflows = {}
     @machines = {}
 
-  initialize: ->
+  initialize: (jobs) ->
     @registerSockets()
     @displayCurrentWorkflows()
-    @displayJobsOverview()
+    @displayJobsOverview(jobs)
 
   registerSockets: ->
     @registerWorkersSocket()
@@ -18,11 +18,26 @@ class @Gush
     ($("table.workflows").data("workflows") || []).each (workflow) =>
       @_addWorkflow(workflow)
 
-  displayJobsOverview: ->
+  filterJobs: (filter) ->
+    table = $("table.jobs tbody")
+
+    table.find("tr").hide()
+    if filter == "all"
+      table.find("tr").show()
+    else
+      table.find("tr.#{filter}").show()
+
+  refreshJobList: ->
+    filter = $('.jobs-filter dd.active a').data('filter')
+    @filterJobs(filter)
+
+  displayJobsOverview: (jobs) ->
     if jobs?
+      $("table.jobs tbody").html("")
       jobs.each (job) ->
         j = new Job(job)
         $("table.jobs tbody").append(j.render())
+      @refreshJobList()
 
   registerWorkersSocket: ->
     workersSocket = new WebSocket(@_socketUrl("subscribe/workers.status"))
@@ -156,6 +171,7 @@ class @Gush
 
   _onStatus: (message) =>
     message = JSON.parse(message.data)
+    console.log message
     switch message.status
       when "started"
         @_onJobStart(message)
@@ -168,6 +184,7 @@ class @Gush
       else
         console.error("Unkown job status:", message.status, "data: ", message)
 
+
   _onWorkflowStatusChange: (message) =>
     message = JSON.parse(message.data)
     workflow = @workflows[message.workflow_id]
@@ -185,11 +202,9 @@ class @Gush
 
   _onJobStart: (message) =>
     @_updateGraphStatus(message.workflow_id)
-    @_updateJobStatus(message.job, "Running")
 
   _onJobSuccess: (message) =>
     @_updateGraphStatus(message.workflow_id)
-    @_updateJobStatus(message.job, "Finished")
 
     workflow = @workflows[message.workflow_id]
     if workflow
@@ -200,7 +215,6 @@ class @Gush
 
   _onJobFail: (message) =>
     @_updateGraphStatus(message.workflow_id)
-    @_updateJobStatus(message.job, "Failed")
 
     workflow = @workflows[message.workflow_id]
     if workflow
@@ -221,16 +235,14 @@ class @Gush
         console.log(response)
       success: (response) =>
         graph = new Graph("canvas-#{workflow_id}")
+        @displayJobsOverview(response.jobs)
         response.jobs.each (job) ->
           klasses = switch
             when job.failed then "status-finished status-failed"
             when job.finished then "status-finished"
-            when job.enqueued then "status-running"
+            when job.enqueued then "status-enqueued"
           graph.markNode(job.name, klasses)
 
-  _updateJobStatus: (name, status) ->
-    $(".jobs tbody").find("td:contains('#{name}')").next("td").html(status).parent().removeClass().addClass(status.toLowerCase())
-
   _socketUrl: (path) ->
     "ws://#{window.location.host}/#{path}"
 

data/lib/gush/control/assets/javascripts/job.coffee

@@ -33,4 +33,11 @@ class @Job
     @data.hasOwnProperty("finished")
 
   render: ->
-    Templates.job({name: @data.name, status: @status(), class: @status().toLowerCase()} ) if @isValid()
+    if @isValid()
+      Templates.job
+        name: @data.name
+        started_at: @data.started_at
+        finished_at: @data.finished_at
+        status: @status()
+        class: @status().toLowerCase()
+

data/lib/gush/control/assets/stylesheets/app.css

@@ -45,11 +45,6 @@ text {
 }
 
 .node.status-enqueued rect {
-  stroke: yellow;
-  fill: yellow;
-}
-
-.node.status-running rect {
   stroke: lightblue;
   fill: lightblue;
 }

data/lib/gush/control/version.rb

@@ -1,5 +1,5 @@
 module Gush
   module Control
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/gush/control/views/show.slim

@@ -32,17 +32,15 @@
     dl.sub-nav.jobs-filter
       dt Filter:
       dd.active
-        a All
+        a data-filter="all" All
       dd
-        a Waiting
+        a data-filter="waiting" Waiting
       dd
-        a Enqueued
+        a data-filter="enqueued" Enqueued
       dd
-        a Running
+        a data-filter="failed" Failed
       dd
-        a Failed
-      dd
-        a Finished
+        a data-filter="finished" Finished
     table.jobs
       thead
         th Name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gush-control
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michal Krzyzanowski