kuroko2 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe10912ca61191700c1d3e4d3bc23f1f4e29faa6
-  data.tar.gz: 9651a35f813987706a7f21dd0cfda78e24dd9eef
+  metadata.gz: 80baa8f9a1ca15294cc73f9f726f5584433d6acb
+  data.tar.gz: 57be564404077de0d32b829687cc579ee925a02f
 SHA512:
-  metadata.gz: 5925f797d1a86c93ea05a536c259eef76b2eb88ef784dc35447747ee0264978e3acc350055222994033c1dcb20c8282ec0f41982870155bcf38f9b1ec3ece6bc
-  data.tar.gz: 7f59ae45fd8dfd1d3b0b72ebcb7487c8a27d6a70f9d29e2258b2510f0cedce61e1852c14c4938b0168b9a244de4f764f74f40bf7c21c6a5d03a39d85e3ac1a30
+  metadata.gz: 7e657c7824576cecaa2e3cbc2a01abdad723efe66f4dd6da7fa0fe4f68f215f8f46dc3ca3ed7982bb79fb299d736d2363dda21846e604aa61e5c8df03dde934f
+  data.tar.gz: 296957b071325388c8407d6dabeaabe85b1d6ce1498db6f0d80af9eefb4ed2c161c2e17f5592978057189751d5809b579bcfb00e84ccf040329b20594f7513b3

data/README.md

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

data/app/controllers/kuroko2/api/application_controller.rb

@@ -15,6 +15,10 @@ class Kuroko2::Api::ApplicationController < ActionController::Base
     respond_with_error(401, 'unauthorized', exception.message)
   end
 
+  rescue_from HTTP::UnprocessableEntity do |exception|
+    respond_with_error(422, 'unprocessable_entity', exception.message)
+  end
+
   rescue_from WeakParameters::ValidationError do |exception|
     respond_with_error(400, 'bad_request', exception.message)
   end

data/app/controllers/kuroko2/api/job_definitions_controller.rb

@@ -0,0 +1,64 @@
+class Kuroko2::Api::JobDefinitionsController < Kuroko2::Api::ApplicationController
+  include Garage::RestfulActions
+
+  private
+
+  def require_resources
+  end
+
+  def create_resource
+    definition = Kuroko2::JobDefinition.new(definition_params(params))
+    user_ids = admin_id_params(params)
+    definition.admins = Kuroko2::User.active.with(user_ids)
+
+    if definition.save
+      definition.admins.each do |user|
+        user.stars.create(job_definition: definition) if user.google_account?
+      end
+
+      @resource = Kuroko2::Api::JobDefinitionResource.new(definition)
+    else
+      raise HTTP::UnprocessableEntity.new("#{definition.name}: #{definition.errors.full_messages.join()}")
+    end
+  end
+
+  def require_resource
+    definition = Kuroko2::JobDefinition.find(params[:id])
+    @resource = Kuroko2::Api::JobDefinitionResource.new(definition)
+  end
+
+  def update_resource
+    definition = Kuroko2::JobDefinition.find(params[:id])
+
+    if definition.update(definition_params(params))
+      @resource = Kuroko2::Api::JobDefinitionResource.new(definition)
+    else
+      raise HTTP::UnprocessableEntity.new("#{definition.name}: #{definition.errors.full_messages.join()}")
+    end
+  end
+
+  def definition_params(params)
+    params.permit(
+      :name,
+      :description,
+      :script,
+      :notify_cancellation,
+      :hipchat_room,
+      :hipchat_notify_finished,
+      :suspended,
+      :prevent_multi,
+      :prevent_multi_on_failure,
+      :hipchat_additional_text,
+      :text_tags,
+      :api_allowed,
+      :slack_channel,
+      :webhook_url)
+  end
+
+  def admin_id_params(params)
+    params.permit(user_id: []).
+      try!(:[], :user_id).
+      try!(:reject, &:blank?).
+      try!(:map, &:to_i) || []
+  end
+end

data/app/controllers/kuroko2/job_definitions_controller.rb

@@ -33,8 +33,15 @@ class Kuroko2::JobDefinitionsController < Kuroko2::ApplicationController
   end
 
   def new
-    @definition = Kuroko2::JobDefinition.new
-    @definition.admins << current_user
+    dup_from = Kuroko2::JobDefinition.find_by(id: params[:dup_from])
+    if dup_from.present?
+      @definition = dup_from.dup
+      @definition.admins = dup_from.admins
+      @definition.tags = dup_from.tags
+    else
+      @definition = Kuroko2::JobDefinition.new
+    end
+    @definition.admins << current_user unless @definition.admins.include?(current_user)
   end
 
   def create

data/app/errors/http/unprocessable_entity.rb

@@ -0,0 +1,4 @@
+module HTTP
+  class UnprocessableEntity < StandardError
+  end
+end

data/app/models/kuroko2/api/job_definition_resource.rb

@@ -0,0 +1,11 @@
+class Kuroko2::Api::JobDefinitionResource < Kuroko2::Api::ApplicationResource
+  property :id
+
+  property :name
+
+  property :description
+
+  property :script
+
+  delegate :id, :name, :description, :script, to: :model
+end

data/app/models/kuroko2/job_definition.rb

@@ -81,7 +81,7 @@ class Kuroko2::JobDefinition < Kuroko2::ApplicationRecord
   end
 
   def text_tags
-    tags.pluck(:name).join(',')
+    tags.map(&:name).join(',')
   end
 
   def text_tags=(text_tags)

data/app/views/kuroko2/job_definitions/_alert.html.slim

@@ -1,7 +1,7 @@
 - if @definition.errors.any?
   .alert.alert-danger
     i.fa.fa-ban
-    h4 #{pluralize(@definition.errors.count, "error")} prohibited this employee from being saved:
+    h4 #{pluralize(@definition.errors.count, "error")} prohibited this job definition from being saved:
     ul
     - @definition.errors.full_messages.each do |message|
       li= message

data/app/views/kuroko2/job_definitions/_list.html.slim

@@ -12,7 +12,10 @@
       - for definition in definitions
         tr
           td= definition.id
-          td.no-decorate= link_to definition.name, definition
+          td.no-decorate
+            - if definition.suspended
+              span.label.label-warning.spacer-right-3 SUSPENDED
+            = link_to definition.name, definition
           - if !definition.suspended? && !definition.job_schedules.empty?
             - next_job_schedule = definition.job_schedules.map(&:next).min
             - if next_job_schedule

data/app/views/kuroko2/job_definitions/_search_results.html.slim

@@ -34,7 +34,10 @@
               span.star-holder
                 = star_link_for(definition)
             td= definition.id
-            td.no-decorate= link_to definition.name, definition
+            td.no-decorate
+              - if definition.suspended
+                span.label.label-warning.spacer-right-3 SUSPENDED
+              = link_to definition.name, definition
             td.no-decorate
               - definition.admins.each do |user|
                 = link_to user.name, user_path(user)

data/app/views/kuroko2/job_definitions/show.html.slim

@@ -80,9 +80,11 @@
 
       .box-footer
         .row
-          .col-md-6
+          .col-md-4
             = link_to 'Edit Job definition', edit_job_definition_path(@definition), class: 'btn btn-default btn-block', role: 'button'
-          .col-md-6
+          .col-md-4
+            = link_to 'Duplicate Job definition', new_job_definition_path(dup_from: @definition.id), class: 'btn btn-default btn-block', role: 'button'
+          .col-md-4
             = link_to 'Destroy Job definition', @definition, method: :delete, class: 'btn btn-default btn-block', role: 'button', data: { confirm: 'Are you sure?' }
   .col-md-5#schedules-holder
     = render template: 'kuroko2/job_schedules/index'

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

@@ -3,7 +3,7 @@ json.end   @end_at.strftime('%Y-%m-%d %H:%M:%S')
 json.data do
   json.array! @instances do |instance|
     json.id instance.id
-    json.content "<a href='#{job_definition_job_instance_path(instance.job_definition, instance)}'>##{instance.job_definition.id} #{instance.job_definition.name}</a>"
+    json.content "<a href='#{job_definition_job_instance_path(instance.job_definition, instance)}'>##{instance.job_definition.id} #{html_escape(instance.job_definition.name)}</a>"
     json.start instance.created_at.strftime('%Y-%m-%d %H:%M:%S')
     json.end (instance.error_at || instance.canceled_at || instance.finished_at || Time.current).try!(:strftime, '%Y-%m-%d %H:%M:%S')
     json.group instance.job_definition.id

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

@@ -16,7 +16,7 @@
 - if @user.errors.any?
   .alert.alert-danger
     i.fa.fa-ban
-    h4 #{pluralize(@user.errors.count, "error")} prohibited this employee from being saved:
+    h4 #{pluralize(@user.errors.count, "error")} prohibited this user from being saved:
     ul
     - @user.errors.full_messages.each do |message|
       li= message

data/config/routes.rb

@@ -42,8 +42,8 @@ Kuroko2::Engine.routes.draw do
   get '/osd' => 'dashboard#osd', as: :osd
 
   scope :v1, module: 'api', as: 'api' do
-    resources :job_definitions, path: 'definitions', only: [] do
-      resources :job_instances, path: 'instances', only: [:show, :create]
+    resources :job_definitions, path: 'definitions', only: %w(create show update) do
+      resources :job_instances, path: 'instances', only: %w(show create)
     end
 
     namespace :stats do

data/db/migrate/030_add_notify_back_to_normal.rb

@@ -0,0 +1,5 @@
+class AddNotifyBackToNormal < ActiveRecord::Migration[5.0]
+  def change
+    add_column :job_instances, :retrying, :boolean, default: false, null: false
+  end
+end

data/lib/autoload/kuroko2/workflow/engine.rb

@@ -25,7 +25,7 @@ module Kuroko2
           node = extract_node(token)
 
           message = "(token #{token.uuid}) Retry current node: '#{node.type}: #{node.option}'"
-          token.job_instance.update_column(:error_at, nil)
+          token.job_instance.update_columns(error_at: nil, retrying: true)
           token.job_instance.logs.info(message)
 
           token.mark_as_working
@@ -119,7 +119,11 @@ module Kuroko2
           token.mark_as_finished
           unless token.parent
             token.job_instance.touch(:finished_at)
-            Notifier.notify(:finished, token.job_instance)
+            if token.job_instance.retrying?
+              Notifier.notify(:back_to_normal, token.job_instance)
+            else
+              Notifier.notify(:finished, token.job_instance)
+            end
             token.destroy!
           end
         end

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

@@ -20,6 +20,10 @@ module Kuroko2
             "Launched '#{@definition.name}'"
           end
 
+          def back_to_normal_text
+            "Backed to normal '#{@definition.name}'"
+          end
+
           def retrying_text
             "Retrying the current task in '#{@definition.name}'"
           end

data/lib/autoload/kuroko2/workflow/notifier/hipchat.rb

@@ -79,6 +79,11 @@ module Kuroko2
           end
         end
 
+        def notify_back_to_normal
+          message = build_message(level: 'SUCCESS', text: message_builder.back_to_normal_text)
+          send_to_hipchat(message)
+        end
+
         def notify_long_elapsed_time
           message = build_message(level: 'WARNING', text: message_builder.long_elapsed_time_text)
           send_to_hipchat(message, color: 'red')

data/lib/autoload/kuroko2/workflow/notifier/mail.rb

@@ -37,6 +37,10 @@ module Kuroko2
           # do nothing
         end
 
+        def notify_back_to_normal
+          # do nothing
+        end
+
         def notify_long_elapsed_time
           Kuroko2::Notifications.notify_long_elapsed_time(@job_instance).deliver_now
         end

data/lib/autoload/kuroko2/workflow/notifier/slack.rb

@@ -88,6 +88,13 @@ module Kuroko2
           end
         end
 
+        def notify_back_to_normal
+          send_attachment_message_to_slack(
+            level: 'SUCCESS',
+            text: message_builder.back_to_normal_text,
+          )
+        end
+
         def notify_long_elapsed_time
           send_attachment_message_to_slack(
             level: 'WARNING',

data/lib/autoload/kuroko2/workflow/notifier/webhook.rb

@@ -100,6 +100,16 @@ module Kuroko2
           end
         end
 
+        def notify_back_to_normal
+          request(
+            build_payload(
+              action: 'notify_back_to_normal',
+              level: 'SUCCESS',
+              subject: message_builder.back_to_normal_text,
+            )
+          )
+        end
+
         def notify_long_elapsed_time
           request(
             build_payload(

data/lib/kuroko2/version.rb

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

data/spec/controllers/job_definitions_controller_spec.rb

@@ -38,6 +38,68 @@ describe Kuroko2::JobDefinitionsController do
 
       expect(assigns(:definition)).to be_new_record
     end
+
+    context 'with dup_from params' do
+      subject! { get :new, params: { dup_from: definition.id } }
+      it do
+        expect(response).to have_http_status(:ok)
+        expect(response).to render_template('new')
+
+        expect(assigns(:definition)).to be_new_record
+        expect(assigns(:definition).name).to eq definition.name
+        expect(assigns(:definition).admins).to eq definition.admins + [controller.current_user]
+        expect(assigns(:definition).tags).to eq definition.tags
+      end
+
+      context 'with current_user and another admin user' do
+        let!(:admin_user) { create(:user) }
+        let!(:definition) { create(:job_definition, admins: [admin_user, controller.current_user]) }
+        it do
+          expect(response).to have_http_status(:ok)
+          expect(response).to render_template('new')
+
+          expect(assigns(:definition)).to be_new_record
+          expect(assigns(:definition).name).to eq definition.name
+          expect(assigns(:definition).admins).to match_array [admin_user, controller.current_user]
+        end
+
+        context 'with only another admin user' do
+          let!(:definition) { create(:job_definition, admins: [admin_user]) }
+          it do
+            expect(response).to have_http_status(:ok)
+            expect(response).to render_template('new')
+
+            expect(assigns(:definition)).to be_new_record
+            expect(assigns(:definition).name).to eq definition.name
+            expect(assigns(:definition).admins).to match_array [admin_user, controller.current_user]
+          end
+        end
+      end
+
+      context 'with tags' do
+        let!(:definition) { create(:job_definition, text_tags: 'First,Second') }
+        it do
+          expect(response).to have_http_status(:ok)
+          expect(response).to render_template('new')
+
+          expect(assigns(:definition)).to be_new_record
+          expect(assigns(:definition).name).to eq definition.name
+          expect(assigns(:definition).text_tags).to eq definition.text_tags
+        end
+      end
+
+      context 'with invalid id' do
+        subject! { get :new, params: { dup_from: 'invalid' } }
+        it do
+          expect(response).to have_http_status(:ok)
+          expect(response).to render_template('new')
+
+          expect(assigns(:definition)).to be_new_record
+          expect(assigns(:definition).name).to be_blank
+          expect(assigns(:definition).admins).to eq [controller.current_user]
+        end
+      end
+    end
   end
 
   describe '#create' do