kuroko2 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f8904d52f7ed97320ff851e35b91b5913d8baf
-  data.tar.gz: c1fe3a881e302a1823a47aa37176756ae8de7470
+  metadata.gz: 05a36b6a990355277232fb05c8fee73420178657
+  data.tar.gz: ff0313b72bea3ff95c7961f92193ae7350cbee68
 SHA512:
-  metadata.gz: 13794a4c4d2ceb7ae4ed9d38a1bc76fda67a853756c3cdc2a855141fab8d83fceb26b48de303747a0527e8c3cdef7d04e1748019892e436ad2253e074af0c776
-  data.tar.gz: af34902e44039abf0efbdb912674a3196e8f7a7279aa968c09b4e0ba40270daeb2fe5a6c5e6eeaf6404593834d6a11e85d11acfcc75f7fa8fe11cd102ae972d7
+  metadata.gz: 94d255d97eed6354e37040ebff9c4bd2e4692c44f79bf3b7a9596a6ac5a12cd3c7b0585f3550b647b8453454a9b3d8352bc16427373576e03815761424b6df75
+  data.tar.gz: 9069f81f985f8b57b9885230be1eecfa6561f3fd0987afcfa041e4826f46560b89feb4817ea7b3832fbc90351cb84ab431cd115fbc1004f5edda3d4344feabdf

data/app/assets/javascripts/kuroko2/definition_linker.js

@@ -1,6 +1,6 @@
 jQuery(function ($) {
   function setDeifinitionLink(script) {
-    script = script.replace(/sub_process:\s+(\d+)\s*\n/, function(match, jobId) {
+    script = script.replace(/sub_process:\s+(\d+)\s*$/gm, function(match, jobId) {
       return '<a href="/definitions/' + jobId + '">' + match + '</a>';
     });
 

data/app/assets/stylesheets/kuroko2/application.scss

@@ -13,6 +13,10 @@
   padding-top: 10px;
 }
 
+.spacer-right-3 {
+  margin-right: 3px;
+}
+
 .nowrap {
   white-space: nowrap;
 }

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

@@ -19,10 +19,11 @@ class Kuroko2::Api::JobInstancesController < Kuroko2::Api::ApplicationController
       raise HTTP::Forbidden.new("#{definition.name} is not allowed to be executed via API")
     end
 
-    instance = definition.job_instances.create(
+    instance = definition.create_instance(
       script: definition.script.prepend(env_script),
+      launched_by: "instances API (#{basic_user_name})"
     )
-    instance.logs.info("Launched by instances API (#{basic_user_name})")
+
     Kuroko2::Api::JobInstanceResource.new(instance)
   end
 

data/app/controllers/kuroko2/dashboard_controller.rb

@@ -1,6 +1,6 @@
 class Kuroko2::DashboardController < Kuroko2::ApplicationController
   def index
-    @definitions = current_user.job_definitions
+    @definitions = current_user.job_definitions.includes(:tags, :job_instances, :job_schedules)
 
     @input_tags  = params[:tag] || []
     if @input_tags.present?

data/app/controllers/kuroko2/job_definitions_controller.rb

@@ -2,7 +2,7 @@ class Kuroko2::JobDefinitionsController < Kuroko2::ApplicationController
   before_action :set_definition, only: [:show, :edit, :update, :destroy]
 
   def index
-    rel = Kuroko2::JobDefinition
+    rel = Kuroko2::JobDefinition.joins(:admins).includes(:tags, :job_instances, :job_schedules, :admins)
     query = query_params[:q]
 
     if query.present?
@@ -83,7 +83,7 @@ class Kuroko2::JobDefinitionsController < Kuroko2::ApplicationController
   end
 
   def definition_params
-    params.require(:job_definition).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)
+    params.require(:job_definition).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 query_params

data/app/controllers/kuroko2/job_instances_controller.rb

@@ -9,24 +9,18 @@ class Kuroko2::JobInstancesController < Kuroko2::ApplicationController
   end
 
   def create
+    creation_params = { launched_by: current_user.name }
     if params[:job_definition].present?
-      @instance = @definition.job_instances.create(params.require(:job_definition).permit(:script))
-    else
-      @instance = @definition.job_instances.create
+      creation_params.merge!(params.require(:job_definition).permit(:script).to_h.symbolize_keys)
     end
 
-    if @instance
-      @instance.logs.info("Launched by #{current_user.name}.")
-
-      redirect_to job_definition_job_instance_path(@definition, @instance)
-    else
-      raise HTTP::BadRequest
-    end
+    @instance = @definition.create_instance(creation_params)
+    redirect_to job_definition_job_instance_path(@definition, @instance)
   end
 
   def show
-    @logs   = @instance.logs
-    @tokens = @instance.tokens
+    @logs   = @instance.logs.order(:id)
+    @tokens = @instance.tokens.order(:id)
 
     if params[:mode] == :naked
       render partial: 'instance', layout: false
@@ -37,11 +31,7 @@ class Kuroko2::JobInstancesController < Kuroko2::ApplicationController
 
   def destroy
     if @instance.cancelable?
-      ActiveRecord::Base.transaction { @instance.cancel }
-
-      message = "This job was canceled by #{current_user.name}."
-      @instance.logs.warn(message)
-      Kuroko2.logger.warn(message)
+      ActiveRecord::Base.transaction { @instance.cancel(by: current_user.name) }
     end
 
     redirect_to job_definition_job_instance_path(@definition, @instance)
@@ -54,7 +44,7 @@ class Kuroko2::JobInstancesController < Kuroko2::ApplicationController
         execution.update_column(:execution_id, nil) if execution
       end
 
-      @instance.cancel
+      @instance.cancel(by: current_user.name)
     end
 
     message = "Force canceled by #{current_user.name}."

data/app/controllers/kuroko2/tokens_controller.rb

@@ -14,12 +14,12 @@ class Kuroko2::TokensController < Kuroko2::ApplicationController
   def update
     @instance = @token.job_instance
 
-    case params[:invoke]
-    when 'skip'
+    case
+    when params[:invoke] == 'skip' && @token.skippable?
       @instance.logs.info("Skipped by #{current_user.name}.")
 
       @engine.skip(@token)
-    when 'retry'
+    when params[:invoke] == 'retry' && @token.retryable?
       @instance.logs.info("Retry by #{current_user.name}.")
 
       @engine.retry(@token)

data/app/controllers/kuroko2/users_controller.rb

@@ -1,5 +1,6 @@
 class Kuroko2::UsersController < Kuroko2::ApplicationController
-  before_action :set_user, only: [:destroy]
+  before_action :set_user, only: [:edit, :update, :destroy]
+  before_action :require_group_user, only: [:edit, :update, :destroy]
 
   def index
     @user  = Kuroko2::User.new
@@ -23,6 +24,17 @@ class Kuroko2::UsersController < Kuroko2::ApplicationController
     @related_tags = @definitions.includes(:tags).map(&:tags).flatten.uniq
   end
 
+  def edit
+  end
+
+  def update
+    if @user.update(user_params)
+      redirect_to user_path(@user)
+    else
+      render action: :edit
+    end
+  end
+
   def create
     @user = Kuroko2::User.new(user_params)
     @user.provider = Kuroko2::User::GROUP_PROVIDER
@@ -59,4 +71,8 @@ class Kuroko2::UsersController < Kuroko2::ApplicationController
   def page_params
     params.permit(:page)
   end
+
+  def require_group_user
+    head :bad_request if @user.google_account?
+  end
 end

data/app/models/kuroko2/job_definition.rb

@@ -77,6 +77,7 @@ class Kuroko2::JobDefinition < Kuroko2::ApplicationRecord
     with: /\A#[^\.\s]+\z/, allow_blank: true,
     message: ' must start with # and must not include any dots or spaces'
   }
+  validates :webhook_url, format: { with: /\A#{URI::regexp(%w(http https))}\z/, allow_blank: true }
 
   def proceed_multi_instance?
     tokens = Kuroko2::Token.where(job_definition_id: self.id)
@@ -93,6 +94,16 @@ class Kuroko2::JobDefinition < Kuroko2::ApplicationRecord
     end
   end
 
+  def create_instance(script: nil, launched_by:, token: nil )
+    message = "Launched by #{launched_by}"
+
+    if token.present?
+      message = "(token #{token.uuid}) #{message}"
+    end
+
+    job_instances.create!(script: script, log_message: message)
+  end
+
   private
 
   def confirm_active_instances

data/app/models/kuroko2/job_instance.rb

@@ -3,6 +3,8 @@ class Kuroko2::JobInstance < Kuroko2::ApplicationRecord
 
   belongs_to :job_definition
 
+  attr_accessor :log_message
+
   has_many :logs, dependent: :delete_all do
     def info(message)
       add('INFO', message)
@@ -26,6 +28,7 @@ class Kuroko2::JobInstance < Kuroko2::ApplicationRecord
   has_one :memory_consumption_log, dependent: :destroy
 
   before_create :copy_script
+  after_create :notify_launch
   after_create :generate_token
 
   scope :working, -> { where(finished_at: nil, canceled_at: nil) }
@@ -43,10 +46,16 @@ class Kuroko2::JobInstance < Kuroko2::ApplicationRecord
     tokens.first.try(:cancelable?)
   end
 
-  def cancel
+  def cancel(by:)
     self.tokens.destroy(*self.tokens)
     self.executions.destroy(*self.executions)
     self.touch(:canceled_at)
+
+    message = "This job was canceled by #{by}."
+    self.logs.warn(message)
+    Kuroko2.logger.warn(message)
+
+    Kuroko2::Workflow::Notifier.notify(:cancellation, self) if job_definition.hipchat_notify_finished?
   end
 
   # Log given value if it is greater than stored one.
@@ -84,6 +93,14 @@ class Kuroko2::JobInstance < Kuroko2::ApplicationRecord
     self.script = job_definition.try(:script) if self.script.blank?
   end
 
+  def notify_launch
+    if log_message
+      Kuroko2.logger.info(log_message)
+      self.logs.info(log_message)
+      Kuroko2::Workflow::Notifier.notify(:launch, self)
+    end
+  end
+
   def generate_token
     unless self.job_definition
       raise 'No parent association is found'
@@ -112,7 +129,7 @@ class Kuroko2::JobInstance < Kuroko2::ApplicationRecord
       self.logs.warn(message)
       Kuroko2.logger.warn(message)
 
-      Kuroko2::Workflow::Notifier.notify(:cancellation, self)
+      Kuroko2::Workflow::Notifier.notify(:cancellation, self) if job_definition.notify_cancellation
     end
   end
 end

data/app/models/kuroko2/job_schedule.rb

@@ -47,7 +47,7 @@ class Kuroko2::JobSchedule < Kuroko2::ApplicationRecord
       end
     end
 
-    scheduled_times
+    scheduled_times.map(&:in_time_zone)
   end
 
   def suspend_times(time_from, time_to)
@@ -81,11 +81,8 @@ class Kuroko2::JobSchedule < Kuroko2::ApplicationRecord
         elsif suspend_times.include?(time)
           Kuroko2.logger.info("Skipped schedule suspended \"##{definition.id} #{definition.name}\" that is scheduled at #{I18n.l(time, format: :short)} by `#{schedule.cron}`")
         else
-          message = "Launched \"##{definition.id} #{definition.name}\" that is scheduled at #{I18n.l(time, format: :short)} by `#{schedule.cron}`"
-          Kuroko2.logger.info(message)
-
-          instance = definition.job_instances.create
-          instance.logs.info(message)
+          launched_by = "\"##{definition.id} #{definition.name}\" that is scheduled at #{I18n.l(time, format: :short)} by `#{schedule.cron}`"
+          definition.create_instance(launched_by: launched_by)
         end
       end
     end

data/app/models/kuroko2/job_suspend_schedule.rb

@@ -19,7 +19,7 @@ class Kuroko2::JobSuspendSchedule < Kuroko2::ApplicationRecord
       end
     end
 
-    suspend_times
+    suspend_times.map(&:in_time_zone)
   end
 
   private

data/app/models/kuroko2/token.rb

@@ -90,6 +90,14 @@ class Kuroko2::Token < Kuroko2::ApplicationRecord
     end
   end
 
+  def skippable?
+    failure? || waiting?
+  end
+
+  def retryable?
+    failure?
+  end
+
   private
 
   def set_default_values

data/app/views/kuroko2/execution_logs/index.json.jbuilder

@@ -1,7 +1,7 @@
 json.token @response.next_forward_token
 json.events do
   json.array! @response.events do |event|
-    json.timestamp l(Time.at(event.timestamp/1000), format: :short)
+    json.timestamp Time.at(event.timestamp/1000).in_time_zone
     begin
       log = JSON.parse(event.message)
       json.message rinku_auto_link(html_escape(log['message']), :urls)

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

@@ -32,14 +32,19 @@
 
     label Notification
     .form-group
+      label Hipchat Room Name
       = form.text_field :hipchat_room, class: 'form-control', placeholder: 'Hipchat Room name'
     .form-group
+      label Slack Channel
       = form.text_field :slack_channel, class: 'form-control', placeholder: '#slack-channel'
+    .form-group
+      label Webhook URL
+      = form.text_field :webhook_url, class: 'form-control', placeholder: 'http://example.com/webhook/endpoint'
 
     .checkbox
       label
         = form.check_box :hipchat_notify_finished
-        ' Notify success event to Slack/Hipchat
+        ' Notify all event to Slack/Hipchat/Webhook
 
     .checkbox
       label

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

@@ -4,9 +4,9 @@
       tr
         th #
         th.col-md-3 Name
-        th.col-md-3 Next Job
-        th.col-md-2 Latest Status
-        th.col-md-8 data-defaultsort='disabled' Description
+        th.col-md-2 Next Job
+        th.col-md-1 Latest Status
+        th.col-md-5 data-defaultsort='disabled' Tags / Description
         th.col-md-1 data-defaultsort='disabled'  
     tbody
       - for definition in definitions
@@ -19,8 +19,15 @@
           - else
             td data-value="9999999999" --
           td= labeled_status(definition.job_instances.take)
-          td= first_line(definition.description)
           td
-            = link_to raw('<i class="fa fa-chevron-right"></i> View Details'), definition, class: 'btn btn-sm btn-default'
+            - definition.tags.each do |tag|
+              =link_to tag.name, { 'tag': [tag.name] }, class: 'label label-default spacer-right-3'
+            = first_line(definition.description)
+          td
+            = link_to definition, class: 'btn btn-sm btn-default' do
+              i class="fa fa-chevron-right"
+              | &nbsp;
+              span class="small" View Details
+
 - else
   .text-muted.well.well-sm.no-shadow There are no favorite job definitions.

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

@@ -26,7 +26,7 @@
           th #
           th.col-md-3 Name
           th.col-md-3 Administrators
-          th.col-md-5 Description
+          th.col-md-5 Tags / Description
           th.col-md-1  
         - for definition in definitions
           tr
@@ -39,9 +39,16 @@
               - definition.admins.each do |user|
                 = link_to user.name, user_path(user)
                 br
-            td= first_line(definition.description)
             td
-              = link_to raw('<i class="fa fa-chevron-right"></i> View Details'), definition, class: 'btn btn-sm btn-default'
+              - definition.tags.each do |tag|
+                =link_to tag.name, job_definitions_path('tag': [tag.name]), class: 'label label-default spacer-right-3'
+              = first_line(definition.description)
+            td
+              = link_to definition, class: 'btn btn-sm btn-default' do
+                i class="fa fa-chevron-right"
+                | &nbsp;
+                span class="small" View Details
+
   - else
     - if params[:q].present?
       .text-muted.well.well-sm.no-shadow No results found for the query.

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

@@ -19,7 +19,7 @@
 
         h4= 'Tags'
         - for tag in @definition.tags
-          =link_to tag.name, job_definitions_path(tag: [tag.name]), class: 'badge'
+          =link_to tag.name, job_definitions_path(tag: [tag.name]), class: 'label label-default spacer-right-3'
 
         h3= 'Administrator'.pluralize(@definition.admins.count)
         ul.media-list
@@ -43,16 +43,18 @@
           - if @definition.hipchat_room.present? || @definition.slack_channel.present?
             - if @definition.hipchat_notify_finished?
               li
-                'Notify all event to Slack/Hipchat
+                'Notify all event to Slack/Hipchat/Webhook
                 ul
+                  li webhook url: #{@definition.webhook_url}
                   li hipchat room: #{@definition.hipchat_room}
                   li slack channel: #{@definition.slack_channel}
                   - if @definition.hipchat_additional_text
                     li Failure notification text: #{@definition.hipchat_additional_text}
             - else
               li
-                'Notify failure event to Slack/Hipchat
+                'Notify failure event to Slack/Hipchat/Webhook
                 ul
+                  li webhook url: #{@definition.webhook_url}
                   li hipchat room: #{@definition.hipchat_room}
                   li slack channel: #{@definition.slack_channel}
                   - if @definition.hipchat_additional_text

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

@@ -5,7 +5,7 @@ json.data do
     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.start instance.created_at.strftime('%Y-%m-%d %H:%M:%S')
-    json.end (instance.error_at || instance.canceled_at || instance.finished_at).try!(: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
   end
 end