kuroko2 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80baa8f9a1ca15294cc73f9f726f5584433d6acb
-  data.tar.gz: 57be564404077de0d32b829687cc579ee925a02f
+  metadata.gz: d66f084f8f4eabb9f6a0c0b26dad87b4009a4f97
+  data.tar.gz: 0256ee9b074d99821adbd5c1a8bf3bb280c29574
 SHA512:
-  metadata.gz: 7e657c7824576cecaa2e3cbc2a01abdad723efe66f4dd6da7fa0fe4f68f215f8f46dc3ca3ed7982bb79fb299d736d2363dda21846e604aa61e5c8df03dde934f
-  data.tar.gz: 296957b071325388c8407d6dabeaabe85b1d6ce1498db6f0d80af9eefb4ed2c161c2e17f5592978057189751d5809b579bcfb00e84ccf040329b20594f7513b3
+  metadata.gz: 4412638419a0984cde3aaf825f92b95a4e65eae33f660968635440decb04362b659b06a7a8aa0b18796a3f00dd551fa09a553d92fbe195edcda806f642d1fcf2
+  data.tar.gz: 0cb2e9266689d1636c67b5e7eae2ef56556d1b9188b0e2e56abd3c1fff739de7c041feb3ea98a8afe3382f1d0813c8da773773125aed2d244076a693be8d8884

data/README.md

@@ -38,6 +38,7 @@ Documentation is available at [docs/index.md](docs/index.md).
 - t8m8
 - yohfee
 - takonomura
+- errm
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/app/controllers/kuroko2/execution_histories_controller.rb

@@ -0,0 +1,73 @@
+class Kuroko2::ExecutionHistoriesController < Kuroko2::ApplicationController
+  def index
+    @histories = histories.page(params[:page])
+  end
+
+  def timeline
+  end
+
+  def dataset
+    set_period
+    @histories = histories.where('started_at < ?', @end_at).where('finished_at > ?', @start_at)
+  end
+
+  private
+
+  def query_params
+    params.permit(:queue, :hostname)
+  end
+
+  def histories
+    histories = Kuroko2::ExecutionHistory.ordered.includes(:job_definition, :job_instance)
+
+    queue = query_params[:queue]
+    histories = histories.where(queue: queue) if queue.present?
+
+    hostname = query_params[:hostname]
+    histories = histories.where(hostname: hostname) if hostname.present?
+
+    histories
+  end
+
+  def period_params
+    params.permit(:period, :end_at, :start_at)
+  end
+
+  def end_at
+    if period_params[:end_at].present?
+      begin
+        return period_params[:end_at].to_datetime
+      rescue ArgumentError
+        # do nothing
+      end
+    end
+    Time.current
+  end
+
+  def start_at
+    if period_params[:start_at].present?
+      begin
+        return period_params[:start_at].to_datetime
+      rescue ArgumentError
+        # do nothing
+      end
+    end
+    case period_params[:period]
+    when /\A(\d+)m\z/
+      $1.to_i.minutes.ago(@end_at)
+    when /\A(\d+)h\z/
+      $1.to_i.hours.ago(@end_at)
+    when /\A(\d+)d\z/
+      $1.to_i.days.ago(@end_at)
+    when /\A(\d+)w\z/
+      $1.to_i.weeks.ago(@end_at)
+    else
+      1.hour.ago(@end_at)
+    end
+  end
+
+  def set_period
+    @end_at = end_at
+    @start_at = start_at
+  end
+end

data/app/controllers/kuroko2/workers_controller.rb

@@ -1,5 +1,22 @@
 class Kuroko2::WorkersController < Kuroko2::ApplicationController
+  before_action :set_worker, only: %i(update)
+
   def index
     @workers = Kuroko2::Worker.ordered.all
   end
+
+  def update
+    @worker.update_attributes(worker_params)
+    redirect_to workers_path
+  end
+
+  private
+
+  def set_worker
+    @worker = Kuroko2::Worker.find(params[:id])
+  end
+
+  def worker_params
+    params.permit(:suspended)
+  end
 end

data/app/models/kuroko2/execution_history.rb

@@ -0,0 +1,8 @@
+class Kuroko2::ExecutionHistory < Kuroko2::ApplicationRecord
+  include Kuroko2::TableNameCustomizable
+
+  belongs_to :job_definition
+  belongs_to :job_instance
+
+  scope :ordered, -> { order(started_at: :desc) }
+end

data/app/views/kuroko2/execution_histories/dataset.json.jbuilder

@@ -0,0 +1,10 @@
+json.start @start_at.strftime('%Y-%m-%d %H:%M:%S')
+json.end   @end_at.strftime('%Y-%m-%d %H:%M:%S')
+json.data do
+  json.array! @histories do |history|
+    json.id history.id
+    json.content "<a href='#{job_definition_job_instance_path(history.job_definition, history.job_instance)}'>##{history.job_definition.id} #{h(history.job_definition.name)}</a>"
+    json.start history.started_at.strftime('%Y-%m-%d %H:%M:%S')
+    json.end history.finished_at.strftime('%Y-%m-%d %H:%M:%S')
+  end
+end

data/app/views/kuroko2/execution_histories/index.html.slim

@@ -0,0 +1,39 @@
+- content_for :title, 'Execution Histories'
+- content_for :content_title do
+  <i class="fa fa-history"></i> Execution Histories
+- @scope = @histories
+
+.box#execution-histories
+  .box-header
+    .row
+      .col-md-9
+        h3.box-title Execution Histories
+      .col-md-3.right-button
+        = link_to raw('<i class="fa fa-clock-o"></i> Show Timeline'), timeline_execution_histories_path(params.permit(:queue, :hostname)), class: 'btn btn-default btn-small btn-block js-to-timeline'
+  - if @histories.empty?
+    .box-body
+      .text-muted.well.well-sm.no-shadow There are no execution histories yet.
+  - else
+    .box-body.table-responsive
+      table.table.table-hover
+        thead
+          tr
+            th.col-md-2 Hostname
+            th.col-md-1 WID
+            th.col-md-2 Queue
+            th.col-md-2 Job
+            th.col-md-2 Command
+            th.col-md-2 Started at
+            th.col-md-1 Elapsed Time
+        tbody
+          - for history in @histories
+            tr
+              td= history.hostname
+              td= history.worker_id
+              td= history.queue
+              td.no-decorate= link_to "##{history.job_definition.id} #{history.job_definition.name}", job_definition_job_instance_path(history.job_definition, history.job_instance)
+              td= history.shell
+              td= l(history.started_at, format: :short)
+              td= distance_of_time(history.started_at, history.finished_at)
+    .box-footer#pagination
+      = paginate @histories, theme: 'list'

data/app/views/kuroko2/execution_histories/timeline.html.slim

@@ -0,0 +1,33 @@
+- content_for :title, "Execution Timeline"
+- content_for :content_title do
+    <i class="fa fa-clock-o"></i> Execution Timeline
+
+.row
+  .col-md-12
+    .box
+      .box-header
+        nav class="navbar navbar-default"
+          div class="container-fluid"
+            div class="navbar-header"
+              a class="navbar-brand" href="#" Period
+            div class="" id="period-nav"
+              ul class="nav navbar-nav"
+                li class="#{params[:period] == '30m' ? 'active' : ''}"
+                  = link_to '30 minutes', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '30m'))
+                li class="#{params[:period] == '1h' || !params[:period] ? 'active' : ''}"
+                  = link_to '1 hour', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '1h'))
+                li class="#{params[:period] == '3h' ? 'active' : ''}"
+                  = link_to '3 hours', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '3h'))
+                li class="#{params[:period] == '6h' ? 'active' : ''}"
+                  = link_to '6 hours', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '6h'))
+                li class="#{params[:period] == '12h' ? 'active' : ''}"
+                  = link_to '12 hours', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '12h'))
+                li class="#{params[:period] == '1d' ? 'active' : ''}"
+                  = link_to '1 day', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '1d'))
+                li class="#{params[:period] == '3d' ? 'active' : ''}"
+                  = link_to '3 days', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '3d'))
+                li class="#{params[:period] == '1w' ? 'active' : ''}"
+                  = link_to '1 week', timeline_execution_histories_path(params.permit(:queue, :hostname, :end_at).merge(period: '1w'))
+
+      .box-body
+        div#timeline data-dataset-path="#{dataset_execution_histories_path(params.permit(:queue, :hostname, :start_at, :end_at, :period))}"

data/app/views/kuroko2/workers/index.html.slim

@@ -13,15 +13,18 @@
           th.col-md-1 WID
           th.col-md-2 Queue
           th.col-md-1 Status
-          th.col-md-5 Execution
+          th.col-md-4 Execution
+          th.col-md-1  
           th.col-md-1  
         - for worker in @workers
           tr
-            td= worker.hostname
+            td.no-decorate= link_to worker.hostname, execution_histories_path(hostname: worker.hostname)
             td= worker.worker_id
-            td= worker.queue
+            td.no-decorate= link_to worker.queue, execution_histories_path(queue: worker.queue)
             td
-              - if worker.working
+              - if worker.suspended
+                span.label.label-warning SUSPENDED
+              - elsif worker.working
                 span.label.label-primary WORKING
               - else
                 ' 
@@ -39,3 +42,22 @@
                           role: 'button', class: 'btn btn-sm btn-default')
               - else
                 ' 
+            td
+              - if !worker.suspendable
+                ' 
+              - elsif !worker.suspended
+                = button_to('Suspend',
+                            worker_path(worker),
+                            method: :patch,
+                            params: { suspended: true },
+                            role: 'button',
+                            class: 'btn btn-xs btn-default',
+                            data: { confirm: 'Continue suspending the worker?' })
+              - else
+                = button_to('Unsuspend',
+                            worker_path(worker),
+                            method: :patch,
+                            params: { suspended: false },
+                            role: 'button',
+                            class: 'btn btn-xs btn-default',
+                            data: { confirm: 'Continue unsuspending the worker?' })

data/bin/cleanup_old_execution_histories.rb

@@ -0,0 +1,9 @@
+old_histories = Kuroko2::ExecutionHistory.where('finished_at < ?', 2.weeks.ago)
+
+count = old_histories.count
+
+Kuroko2::ExecutionHistories.transaction do
+  old_histories.destroy_all
+end
+
+puts "Destroyed #{count} histories"

data/config/routes.rb

@@ -22,7 +22,7 @@ Kuroko2::Engine.routes.draw do
     get 'page/:page', action: :index, on: :collection, as: 'paged'
   end
 
-  resources :workers, only: :index
+  resources :workers, only: %i(index update)
   resources :job_instances, path: 'instances', only: %w() do
     get :working, action: :working, on: :collection
   end
@@ -32,6 +32,11 @@ Kuroko2::Engine.routes.draw do
     get :dataset, action: :dataset, on: :collection, defaults: { format: 'json' }
   end
 
+  resources :execution_histories, only: :index do
+    get :timeline, action: :timeline, on: :collection
+    get 'timeline/dataset', action: :dataset, on: :collection, defaults: { format: 'json' }, as: 'dataset'
+  end
+
   get '/sign_in', to: 'sessions#new', as: 'sign_in'
   delete '/sign_out', to: 'sessions#destroy', as: 'sign_out'
 

data/db/migrate/031_add_suspended_to_workers.rb

@@ -0,0 +1,6 @@
+class AddSuspendedToWorkers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :workers, :suspendable, :boolean, default: false, null: false, after: :execution_id
+    add_column :workers, :suspended, :boolean, default: false, null: false, after: :suspendable
+  end
+end

data/db/migrate/031_create_execution_histories.rb

@@ -0,0 +1,19 @@
+class CreateExecutionHistories < ActiveRecord::Migration[5.0]
+  def change
+    create_table :execution_histories do |t|
+      t.string :hostname, limit: 180
+      t.integer :worker_id, limit: 1
+      t.string :queue, limit: 180, default: "@default", null: false
+      t.integer :job_definition_id, null: false
+      t.integer :job_instance_id, null: false
+      t.text :shell, null: false
+      t.datetime :started_at, null: false
+      t.datetime :finished_at, null: false
+    end
+
+    add_column :executions, :hostname, :string, limit: 180
+    add_column :executions, :worker_id, :integer, limit: 1
+
+    add_index :execution_histories, [:worker_id, :started_at], using: :btree
+  end
+end

data/lib/autoload/kuroko2/command/executor.rb

@@ -19,7 +19,8 @@ module Kuroko2
                    elsif worker_id == (Command::Executor.num_workers - 1)
                      Command::Monitor.new(hostname: @hostname, worker_id: worker_id)
                    else
-                     @worker = Worker.where(hostname: @hostname, worker_id: worker_id, queue: @queue).first_or_create!
+                     @worker = Worker.where(hostname: @hostname, worker_id: worker_id, queue: @queue).first_or_initialize
+                     @worker.update!(suspendable: true)
                      Command::Shell.new(hostname: @hostname, worker_id: worker_id, worker: @worker, queue: @queue)
                    end
       end

data/lib/autoload/kuroko2/command/shell.rb

@@ -14,6 +14,7 @@ module Kuroko2
 
       def execute
         @worker.reload
+        return nil if @worker.suspended?
         unless @worker.execution_id?
           if (execution = Execution.poll(@queue))
             do_execute(execution)
@@ -32,6 +33,7 @@ module Kuroko2
       def do_execute(execution)
         begin
           @worker.update_column(:execution_id, execution.id)
+          execution.update(hostname: @hostname, worker_id: @worker_id)
 
           invoke(execution)
         rescue SystemCallError => e

data/lib/autoload/kuroko2/workflow/notifier/concerns/chat_message_builder.rb

@@ -13,7 +13,7 @@ module Kuroko2
           end
 
           def finished_text
-            "Finished to execute '#{@definition.name}'"
+            "Finished executing '#{@definition.name}'"
           end
 
           def launched_text
@@ -21,7 +21,7 @@ module Kuroko2
           end
 
           def back_to_normal_text
-            "Backed to normal '#{@definition.name}'"
+            "'#{@definition.name}' is back to normal"
           end
 
           def retrying_text
@@ -33,7 +33,7 @@ module Kuroko2
           end
 
           def long_elapsed_time_text
-            "The running time is longer than expected '#{@definition.name}'."
+            "The running time of '#{@definition.name}' is longer than expected."
           end
 
           def additional_text

data/lib/autoload/kuroko2/workflow/task/execute.rb

@@ -61,6 +61,17 @@ module Kuroko2
               instance.logs.error(message)
             end
 
+            Kuroko2::ExecutionHistory.create(
+              hostname: execution.hostname,
+              worker_id: execution.worker_id,
+              queue: execution.queue,
+              job_definition: execution.job_definition,
+              job_instance: execution.job_instance,
+              shell: execution.shell,
+              started_at: execution.started_at,
+              finished_at: execution.finished_at,
+            )
+
             execution.with_lock do
               execution.destroy
               execution.success? ? :next : :failure

data/lib/kuroko2/version.rb

@@ -1,3 +1,3 @@
 module Kuroko2
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/spec/command/shell_spec.rb

@@ -62,6 +62,16 @@ module Kuroko2::Command
         end
       end
 
+      context 'when all workers are suspended' do
+        let(:worker) { create(:worker, suspended: true) }
+
+        it 'skips execution' do
+          is_expected.to be_nil
+          execution.reload
+          expect(execution.started_at).to be_nil
+        end
+      end
+
       describe 'memory expectancy calculation' do
         let(:worker) { create(:worker) }
         let(:memory_expectancy) { execution.job_definition.memory_expectancy }

data/spec/controllers/execution_histories_controller_spec.rb

@@ -0,0 +1,177 @@
+require 'rails_helper'
+
+describe Kuroko2::ExecutionHistoriesController do
+  routes { Kuroko2::Engine.routes }
+
+  before { sign_in }
+
+  let!(:histories) { create_list(:execution_history, 3) }
+
+  describe '#index' do
+    subject! { get :index }
+
+    it do
+      expect(response).to have_http_status(:ok)
+      expect(response).to render_template('index')
+
+      expect(assigns(:histories)).to match_array histories
+    end
+
+    context 'with valid queue' do
+      subject! { get :index, params: { queue: '@default' } }
+
+      it do
+        expect(assigns(:histories)).to match_array histories
+      end
+    end
+
+    context 'with unknown queue' do
+      subject! { get :index, params: { queue: 'unknown' } }
+
+      it do
+        expect(assigns(:histories)).to be_empty
+      end
+    end
+
+    context 'with valid hostname' do
+      subject! { get :index, params: { hostname: 'rspec' } }
+
+      it do
+        expect(assigns(:histories)).to match_array histories
+      end
+    end
+
+    context 'with unknown hostname' do
+      subject! { get :index, params: { hostname: 'unknown' } }
+
+      it do
+        expect(assigns(:histories)).to be_empty
+      end
+    end
+  end
+
+  describe '#timeline' do
+    subject! { get :timeline }
+
+    it do
+      expect(response).to have_http_status(:ok)
+      expect(response).to render_template('timeline')
+    end
+  end
+
+  describe '#dataset' do
+    subject! { get :dataset, xhr: true }
+
+    it do
+      expect(response).to have_http_status(:ok)
+
+      expect(assigns(:histories)).to match_array histories
+      expect(assigns(:end_at)).not_to be_nil
+      expect(assigns(:start_at)).to eq(assigns(:end_at) - 1.hour)
+    end
+
+    context 'with valid queue' do
+      subject! { get :dataset, xhr: true, params: { queue: '@default' } }
+
+      it do
+        expect(assigns(:histories)).to match_array histories
+      end
+    end
+
+    context 'with unknown queue' do
+      subject! { get :dataset, xhr: true, params: { queue: 'unknown' } }
+
+      it do
+        expect(assigns(:histories)).to be_empty
+      end
+    end
+
+    context 'with valid hostname' do
+      subject! { get :dataset, xhr: true, params: { hostname: 'rspec' } }
+
+      it do
+        expect(assigns(:histories)).to match_array histories
+      end
+    end
+
+    context 'with unknown hostname' do
+      subject! { get :dataset, xhr: true, params: { hostname: 'unknown' } }
+
+      it do
+        expect(assigns(:histories)).to be_empty
+      end
+    end
+
+    context 'with period' do
+      subject! { get :dataset, xhr: true, params: { period: period }}
+
+      context '30 minutes' do
+        let(:period) { '30m' }
+        it do
+          expect(assigns(:histories)).to match_array histories
+          expect(assigns(:start_at)).to eq(assigns(:end_at) - 30.minutes)
+        end
+      end
+      context '1 hour' do
+        let(:period) { '1h' }
+        it do
+          expect(assigns(:histories)).to match_array histories
+          expect(assigns(:start_at)).to eq(assigns(:end_at) - 1.hour)
+        end
+      end
+
+      context '1 day' do
+        let(:period) { '1d' }
+        it do
+          expect(assigns(:histories)).to match_array histories
+          expect(assigns(:start_at)).to eq(assigns(:end_at) - 1.day)
+        end
+      end
+
+      context '1 week' do
+        let(:period) { '1w' }
+        it do
+          expect(assigns(:histories)).to match_array histories
+          expect(assigns(:start_at)).to eq(assigns(:end_at) - 1.week)
+        end
+      end
+    end
+
+    context 'with end_at' do
+      let(:end_at) { Time.current + 5.minute }
+      subject! { get :dataset, xhr: true, params: { end_at: end_at } }
+
+      it do
+        expect(assigns(:histories)).to match_array histories
+        expect(assigns(:end_at).strftime("%d-%m-%Y %H:%M:%S")).to eq end_at.strftime("%d-%m-%Y %H:%M:%S")
+      end
+
+      context 'with invalid' do
+        let(:end_at) { 'invalid' }
+
+        it do
+          expect(assigns(:histories)).to match_array histories
+        end
+      end
+    end
+
+    context 'with start_at' do
+      let(:start_at) { 1.hour.ago(Time.current) }
+      subject! { get :dataset, xhr: true, params: { start_at: start_at } }
+
+      it do
+        expect(assigns(:histories)).to match_array histories
+        expect(assigns(:start_at).strftime("%d-%m-%Y %H:%M:%S")).to eq start_at.strftime("%d-%m-%Y %H:%M:%S")
+      end
+
+      context 'with invalid' do
+        let(:start_at) { 'invalid' }
+
+        it do
+          expect(assigns(:histories)).to match_array histories
+          expect(assigns(:start_at)).to eq(assigns(:end_at) - 1.hour)
+        end
+      end
+    end
+  end
+end

data/spec/controllers/workers_controller_spec.rb

@@ -2,4 +2,18 @@ require 'rails_helper'
 
 RSpec.describe Kuroko2::WorkersController, :type => :controller do
   routes { Kuroko2::Engine.routes }
+
+  before { sign_in }
+
+  let(:worker) { create(:worker) }
+
+  describe '#update' do
+    subject! { patch :update, params: { id: worker.id, suspended: true } }
+
+    it do
+      expect(response).to redirect_to(workers_path)
+
+      expect(assigns(:worker).suspended).to be_truthy
+    end
+  end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 30) do
+ActiveRecord::Schema.define(version: 31) do
 
   create_table "admin_assignments", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
     t.integer "user_id", null: false
@@ -20,6 +20,18 @@ ActiveRecord::Schema.define(version: 30) do
     t.index ["user_id", "job_definition_id"], name: "user_id", unique: true
   end
 
+  create_table "execution_histories", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+    t.string "hostname", limit: 180
+    t.integer "worker_id", limit: 1
+    t.string "queue", limit: 180, default: "@default", null: false
+    t.integer "job_definition_id", null: false
+    t.integer "job_instance_id", null: false
+    t.text "shell", null: false
+    t.datetime "started_at", null: false
+    t.datetime "finished_at", null: false
+    t.index ["worker_id", "started_at"], name: "index_kuroko2_execution_histories_on_worker_id_and_started_at"
+  end
+
   create_table "executions", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
     t.string "uuid", limit: 36, null: false
     t.integer "job_definition_id"
@@ -38,6 +50,8 @@ ActiveRecord::Schema.define(version: 30) do
     t.datetime "mailed_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string "hostname", limit: 180
+    t.integer "worker_id", limit: 1
     t.index ["job_definition_id", "token_id"], name: "index_kuroko2_executions_on_job_definition_id_and_token_id", unique: true
     t.index ["started_at"], name: "started_at"
   end
@@ -196,6 +210,8 @@ ActiveRecord::Schema.define(version: 30) do
     t.string "queue", limit: 180, default: "@default", null: false
     t.boolean "working", default: false, null: false
     t.integer "execution_id"
+    t.boolean "suspendable", default: false, null: false
+    t.boolean "suspended", default: false, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["hostname", "worker_id"], name: "hostname", unique: true

data/spec/factories/execution_history_factory.rb

@@ -0,0 +1,15 @@
+FactoryGirl.define do
+  factory :execution_history, class: Kuroko2::ExecutionHistory do
+    hostname 'rspec'
+    worker_id 1
+    queue '@default'
+
+    job_definition { create(:job_definition) }
+    job_instance { create(:job_instance, job_definition: job_definition) }
+
+    shell 'echo $NAME'
+
+    started_at { Time.current }
+    finished_at { Time.current }
+  end
+end

data/spec/factories/worker_factory.rb

@@ -4,5 +4,6 @@ FactoryGirl.define do
     sequence(:worker_id)
     queue "@default"
     working true
+    suspendable true
   end
 end

data/spec/features/execution_histories_spec.rb

@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe 'Shows execution histories', type: :feature do
+  before { sign_in }
+
+  let!(:worker) { create(:worker, hostname: 'rspec') }
+  let(:job_definition) { create(:job_definition) }
+  let!(:histories) { create_list(:execution_history, 3, job_definition: job_definition) }
+
+  it 'shows list of execution histories' do
+    visit kuroko2.workers_path
+    expect(page).to have_content('Kuroko Workers')
+    expect(page).to have_content('rspec')
+    expect(page).to have_content('@default')
+
+    click_on 'rspec'
+
+    expect(page).to have_content('Execution Histories')
+    expect(page).to have_selector('#execution-histories table tbody tr', count: 3)
+    expect(page).to have_content('rspec')
+    expect(page).to have_content('@default')
+    expect(page).to have_content(job_definition.name)
+  end
+
+  it 'shows timeline of execution histories' do
+    visit kuroko2.execution_histories_path(hostname: 'rspec')
+
+    expect(page).to have_content('Execution Histories')
+    expect(page).to have_content('Show Timeline')
+
+    click_on 'Show Timeline'
+
+    expect(page).to have_content('Execution Timeline')
+    expect(page).to have_content(job_definition.name)
+  end
+end

data/spec/features/workers_spec.rb

@@ -44,4 +44,37 @@ RSpec.describe "Show list of workers", type: :feature do
     expect(page).not_to have_content('echo Hello!')
     expect(page).to have_selector('#workers table tbody tr td .btn', text: 'Details', count: 0)
   end
+
+  context 'toggle suspended' do
+    it js: true do
+      visit kuroko2.workers_path
+      expect(page).to have_selector('#workers table tbody tr', count: 2)
+      expect(page).not_to have_content('echo Hello!')
+      expect(page).to have_title('Kuroko Workers « Kuroko 2')
+      expect(page).to have_selector('i.fa.fa-rocket', text: '')
+      have_selector('h1', text: /Kuroko Workers/)
+
+      expect(page).to have_selector('#workers table tbody tr', count: 2)
+      expect(page).to have_selector('#workers table tbody tr td .btn[value=Suspend]', count: 1)
+      expect(page).to have_selector('#workers table tbody tr td .btn[value=Unsuspend]', count: 0)
+      expect(page).to have_selector('#workers table tbody tr td .label', text: 'WORKING', count: 1)
+      expect(page).to have_selector('#workers table tbody tr td .label', text: 'SUSPENDED', count: 0)
+
+      click_on 'Suspend'
+
+      expect(page).to have_selector('#workers table tbody tr', count: 2)
+      expect(page).to have_selector('#workers table tbody tr td .btn[value=Suspend]', count: 0)
+      expect(page).to have_selector('#workers table tbody tr td .btn[value=Unsuspend]', count: 1)
+      expect(page).to have_selector('#workers table tbody tr td .label', text: 'WORKING', count: 0)
+      expect(page).to have_selector('#workers table tbody tr td .label', text: 'SUSPENDED', count: 1)
+
+      click_on 'Unsuspend'
+
+      expect(page).to have_selector('#workers table tbody tr', count: 2)
+      expect(page).to have_selector('#workers table tbody tr td .btn[value=Suspend]', count: 1)
+      expect(page).to have_selector('#workers table tbody tr td .btn[value=Unsuspend]', count: 0)
+      expect(page).to have_selector('#workers table tbody tr td .label', text: 'WORKING', count: 1)
+      expect(page).to have_selector('#workers table tbody tr td .label', text: 'SUSPENDED', count: 0)
+    end
+  end
 end

data/spec/models/execution_history_spec.rb

@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+describe Kuroko2::ExecutionHistory do
+end

data/spec/workflow/task/execute_spec.rb

@@ -41,6 +41,7 @@ module Kuroko2::Workflow::Task
 
         expect(Kuroko2::Execution.all.size).to eq 0
         expect(Kuroko2::Log.all.count).to eq 1
+        expect(Kuroko2::ExecutionHistory.all.size).to eq 1
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuroko2
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Naoto Takai
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -566,6 +566,7 @@ files:
 - app/controllers/kuroko2/api/stats_controller.rb
 - app/controllers/kuroko2/application_controller.rb
 - app/controllers/kuroko2/dashboard_controller.rb
+- app/controllers/kuroko2/execution_histories_controller.rb
 - app/controllers/kuroko2/execution_logs_controller.rb
 - app/controllers/kuroko2/executions_controller.rb
 - app/controllers/kuroko2/job_definition_stats_controller.rb
@@ -606,6 +607,7 @@ files:
 - app/models/kuroko2/api/job_instance_resource.rb
 - app/models/kuroko2/application_record.rb
 - app/models/kuroko2/execution.rb
+- app/models/kuroko2/execution_history.rb
 - app/models/kuroko2/job_definition.rb
 - app/models/kuroko2/job_definition_tag.rb
 - app/models/kuroko2/job_instance.rb
@@ -625,6 +627,9 @@ files:
 - app/views/kaminari/list/_paginator.html.slim
 - app/views/kuroko2/dashboard/_taglist.html.slim
 - app/views/kuroko2/dashboard/index.html.slim
+- app/views/kuroko2/execution_histories/dataset.json.jbuilder
+- app/views/kuroko2/execution_histories/index.html.slim
+- app/views/kuroko2/execution_histories/timeline.html.slim
 - app/views/kuroko2/execution_logs/index.json.jbuilder
 - app/views/kuroko2/executions/index.html.slim
 - app/views/kuroko2/job_definition_stats/execution_time.json.jbuilder
@@ -667,6 +672,7 @@ files:
 - app/views/layouts/kuroko2/application.html.slim
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
+- bin/cleanup_old_execution_histories.rb
 - bin/cleanup_old_instances.rb
 - bin/remind_failure.rb
 - config/initializers/000_kuroko2.rb
@@ -697,6 +703,8 @@ files:
 - db/migrate/028_change_exit_status_to_unsigned_tinyint.rb
 - db/migrate/029_add_execution_id_to_process_signals.rb
 - db/migrate/030_add_notify_back_to_normal.rb
+- db/migrate/031_add_suspended_to_workers.rb
+- db/migrate/031_create_execution_histories.rb
 - lib/autoload/kuroko2/command/executor.rb
 - lib/autoload/kuroko2/command/kill.rb
 - lib/autoload/kuroko2/command/monitor.rb
@@ -756,6 +764,7 @@ files:
 - spec/command/monitor_spec.rb
 - spec/command/shell_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
+- spec/controllers/execution_histories_controller_spec.rb
 - spec/controllers/executions_controller_spec.rb
 - spec/controllers/job_definition_stats_controller_spec.rb
 - spec/controllers/job_definitions_controller_spec.rb
@@ -1737,6 +1746,7 @@ files:
 - spec/dummy/tmp/capybara/capybara-201707041237543496360175.png
 - spec/execution_logger/cloud_watch_logs_spec.rb
 - spec/factories/execution_factory.rb
+- spec/factories/execution_history_factory.rb
 - spec/factories/job_definition_factory.rb
 - spec/factories/job_instance_factory.rb
 - spec/factories/job_schedule_factory.rb
@@ -1749,6 +1759,7 @@ files:
 - spec/factories/user_factory.rb
 - spec/factories/worker_factory.rb
 - spec/features/dashborad_spec.rb
+- spec/features/execution_histories_spec.rb
 - spec/features/job_definition_spec.rb
 - spec/features/job_instance_spec.rb
 - spec/features/sign_in_and_out_spec.rb
@@ -1764,6 +1775,7 @@ files:
 - spec/mailers/notifications_spec.rb
 - spec/memory_sampler_spec.rb
 - spec/models/admin_assignment_spec.rb
+- spec/models/execution_history_spec.rb
 - spec/models/execution_spec.rb
 - spec/models/job_definition_spec.rb
 - spec/models/job_instance_spec.rb
@@ -1836,6 +1848,7 @@ test_files:
 - spec/command/monitor_spec.rb
 - spec/command/shell_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
+- spec/controllers/execution_histories_controller_spec.rb
 - spec/controllers/executions_controller_spec.rb
 - spec/controllers/job_definition_stats_controller_spec.rb
 - spec/controllers/job_definitions_controller_spec.rb
@@ -2817,6 +2830,7 @@ test_files:
 - spec/dummy/tmp/capybara/capybara-201707041237543496360175.png
 - spec/execution_logger/cloud_watch_logs_spec.rb
 - spec/factories/execution_factory.rb
+- spec/factories/execution_history_factory.rb
 - spec/factories/job_definition_factory.rb
 - spec/factories/job_instance_factory.rb
 - spec/factories/job_schedule_factory.rb
@@ -2829,6 +2843,7 @@ test_files:
 - spec/factories/user_factory.rb
 - spec/factories/worker_factory.rb
 - spec/features/dashborad_spec.rb
+- spec/features/execution_histories_spec.rb
 - spec/features/job_definition_spec.rb
 - spec/features/job_instance_spec.rb
 - spec/features/sign_in_and_out_spec.rb
@@ -2844,6 +2859,7 @@ test_files:
 - spec/mailers/notifications_spec.rb
 - spec/memory_sampler_spec.rb
 - spec/models/admin_assignment_spec.rb
+- spec/models/execution_history_spec.rb
 - spec/models/execution_spec.rb
 - spec/models/job_definition_spec.rb
 - spec/models/job_instance_spec.rb