kuroko2 0.2.3 → 0.3.0

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

@@ -12,13 +12,13 @@ ul class="nav nav-pills" role="tablist"
       table.table.table-condensed.table-hover data-reload="#{@instance.working? && !@instance.error?}"
         thead
           tr
-            th.col-md-1  
+            th  
             th.col-md-1 Time
             th.col-md-10 Message
           - for log in @logs
             tr
               td= labeled_log_level(log.level)
-              td.nowrap= l(log.created_at, format: :short)
+              td.nowrap= log.created_at
               td.log= rinku_auto_link(log.message, :urls)
       = javascript_include_tag 'kuroko2/instance_linker'
 
@@ -26,8 +26,8 @@ ul class="nav nav-pills" role="tablist"
       table.table.table-condensed.table-hover
         thead
           tr
-            th.col-md-1 Time
-            th.col-md-1 PID
-            th.col-md-2 Token
-            th.col-md-8 Message
+            th Time
+            th PID
+            th Token
+            th.col-md-7 Message
         tbody#execution_log_body

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

@@ -21,14 +21,14 @@
                                     params: { invoke: 'retry' },
                                     class: 'btn btn-default btn-block btn-xs',
                                     role: 'button',
-                                    disabled: !token.failure?)
+                                    disabled: !token.retryable?)
                 td.col-md-3= button_to('Skip',
                                     job_definition_job_instance_token_path(job_definition_id: @definition.id, job_instance_id: @instance.id, id: token.id),
                                     method: :patch,
                                     params: { invoke: 'skip' },
                                     class: 'btn btn-default btn-block btn-xs',
                                     role: 'button',
-                                    disabled: !token.failure?,
+                                    disabled: !token.skippable?,
                                     data: { confirm: 'Continue executing job script? If not, use "Cancel" button.' })
               - if (execution = token.execution)
                 tr

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

@@ -0,0 +1,37 @@
+- @title = "#{@user.name_was} « Users"
+- @content_title = "Edit User"
+
+- content_for :breadcrumb do
+  ol.breadcrumb
+    li= link_to raw('<i class="fa fa-users"></i> Users'), users_path
+    li= link_to 'Details', user_path(@user)
+    li.active Edit User
+
+.row
+  .col-md-12
+    .box
+      = form_for @user, method: :put do |form|
+        .box-header
+          h2.box-title ##{@user.id} #{@user.name_was}
+        .box-body.table-responsive
+          - if @user.errors.present?
+            .row
+              ul.alert.alert-danger
+                - @user.errors.full_messages.each do |message|
+                  li #{message}
+
+          .row
+            .col-md-2.visible-lg-block.visible-md-block
+              img.img-circle src='#{@user.image}' alt="#{@user.name_was}"
+            .col-md-10
+              div class="form-group #{@user.errors.has_key?(:name) ? 'has-error' : ''}"
+                = form.label :name
+                = form.text_field :name, class: 'form-control', placeholder: 'Group Name'
+              div class="form-group #{@user.errors.has_key?(:email) ? 'has-error' : ''}"
+                = form.label :email
+                = form.text_field :email, class: 'form-control', placeholder: 'group@example.com'
+        .box-footer
+          .row
+            .col-md-3.col-md-offset-9
+              .form-group
+                = form.submit 'Update', class: 'btn btn-default btn-block'

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

@@ -26,10 +26,14 @@
               - unless @user.google_account?
                 th Note
                 td This account is group account.
-      .box-footer
-        .row
-          .col-md-3.col-md-offset-9
-            = link_to 'Destroy User', @user, method: :delete, class: 'btn btn-default btn-block', role: 'button', disabled: @user.google_account?, data: { confirm: 'Are you sure?' }
+
+      - unless @user.google_account?
+        .box-footer
+          .row
+            .col-md-3.col-md-offset-6
+              = link_to 'Edit User', edit_user_path(@user), class: 'btn btn-default btn-block', role: 'button'
+            .col-md-3
+              = link_to 'Destroy User', @user, method: :delete, class: 'btn btn-default btn-block', role: 'button', data: { confirm: 'Are you sure?' }
   .col-md-7
     .box#definitions
       .box-header

data/db/migrate/026_add_webhook_url_to_job_definitions.rb

@@ -0,0 +1,5 @@
+class AddWebhookUrlToJobDefinitions < ActiveRecord::Migration
+  def change
+    add_column :job_definitions, :webhook_url, :text
+  end
+end

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

@@ -30,7 +30,7 @@ module Kuroko2
 
           Kuroko2.logger.info(message)
 
-          Notifier.notify(:working, token.job_instance)
+          Notifier.notify(:retrying, token.job_instance)
         end
       end
 
@@ -49,7 +49,7 @@ module Kuroko2
 
           Kuroko2.logger.info(message)
 
-          Notifier.notify(:working, token.job_instance)
+          Notifier.notify(:skipping, token.job_instance)
         end
       end
 
@@ -100,15 +100,13 @@ module Kuroko2
           message = "(token #{token.uuid}) Marked as 'finished'."
 
           token.job_instance.logs.info(message)
+          Kuroko2.logger.info(message)
           token.mark_as_finished
           unless token.parent
             token.job_instance.touch(:finished_at)
+            Notifier.notify(:finished, token.job_instance)
             token.destroy!
           end
-
-          Kuroko2.logger.info(message)
-
-          Notifier.notify(:finished, token.job_instance)
         end
       end
 

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

@@ -16,6 +16,18 @@ module Kuroko2
             "Finished to execute '#{@definition.name}'"
           end
 
+          def launched_text
+            "Launched '#{@definition.name}'"
+          end
+
+          def retrying_text
+            "Retrying the current task in '#{@definition.name}'"
+          end
+
+          def skipping_text
+            "Skipping the current task in '#{@definition.name}'"
+          end
+
           def long_elapsed_time_text
             "The running time is longer than expected '#{@definition.name}'."
           end

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

@@ -13,15 +13,41 @@ module Kuroko2
           @message_builder = Workflow::Notifier::Concerns::ChatMessageBuilder.new(instance)
         end
 
-        def notify_working
-          # do nothing
+        def notify_launch
+          if @definition.hipchat_notify_finished?
+            message = build_message(level: 'SUCCESS', text: message_builder.launched_text)
+            message << "<br>"
+            message << @instance.logs.reverse.detect{ |log| log.level == 'INFO' }.try!(:message)
+
+            send_to_hipchat(message, color: 'yellow')
+          end
+        end
+
+        def notify_retrying
+          if @definition.hipchat_notify_finished
+            message = build_message(level: 'SUCCESS', text: message_builder.retrying_text)
+            message << "<br>"
+            message << @instance.logs.last(2).first.message
+
+            send_to_hipchat(message, color: 'yellow')
+          end
+        end
+
+        def notify_skipping
+          if @definition.hipchat_notify_finished
+            message = build_message(level: 'SUCCESS', text: message_builder.skipping_text)
+            message << "<br>"
+            message << @instance.logs.last(2).first.message
+
+            send_to_hipchat(message, color: 'yellow')
+          end
         end
 
         def notify_cancellation
-          if @definition.notify_cancellation
+          if @definition.notify_cancellation || @definition.hipchat_notify_finished?
             message = build_message(level: 'WARNING', text: message_builder.failure_text)
             message << "<br>"
-            message << @instance.logs.last(2).first.message
+            message << @instance.logs.reverse.detect{ |log| log.level == 'WARN' }.try!(:message)
 
             send_to_hipchat(message, color: 'yellow')
           end

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

@@ -7,7 +7,15 @@ module Kuroko2
           @definition   = job_instance.job_definition
         end
 
-        def notify_working
+        def notify_launch
+          # do nothing
+        end
+
+        def notify_retrying
+          # do nothing
+        end
+
+        def notify_skipping
           # do nothing
         end
 

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

@@ -9,6 +9,7 @@ module Kuroko2
           FAILURE  = 'danger'
           CRITICAL = 'danger'
           SUCCESS  = 'good'
+          INFO     = '#439FE0'
         end
 
         def initialize(instance)
@@ -18,16 +19,42 @@ module Kuroko2
           @webhook_url = Kuroko2.config.notifiers.slack.webhook_url
         end
 
-        def notify_working
-          # do nothing
+        def notify_launch
+          if @definition.hipchat_notify_finished?
+            send_attachment_message_to_slack(
+              level: 'INFO',
+              text: message_builder.launched_text,
+              body: @instance.logs.reverse.detect{ |log| log.level == 'INFO' }.try!(:message),
+            )
+          end
+        end
+
+        def notify_retrying
+          if @definition.hipchat_notify_finished?
+            send_attachment_message_to_slack(
+              level: 'INFO',
+              text: message_builder.retrying_text,
+              body: @instance.logs.last(2).first.message,
+            )
+          end
+        end
+
+        def notify_skipping
+          if @definition.hipchat_notify_finished?
+            send_attachment_message_to_slack(
+              level: 'INFO',
+              text: message_builder.skipping_text,
+              body: @instance.logs.last(2).first.message,
+            )
+          end
         end
 
         def notify_cancellation
-          if @definition.notify_cancellation
+          if @definition.notify_cancellation || @definition.hipchat_notify_finished?
             send_attachment_message_to_slack(
               level: 'WARNING',
               text: message_builder.failure_text,
-              body: @instance.logs.last(2).first.message,
+              body: @instance.logs.reverse.detect{ |log| log.level == 'WARN' }.try!(:message),
             )
           end
         end

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

@@ -0,0 +1,173 @@
+module Kuroko2
+  module Workflow
+    module Notifier
+      class Webhook
+        attr_reader :message_builder
+
+        HASH_ALGORITHM = 'sha256'
+        HMAC_DIGEST    = OpenSSL::Digest.new(HASH_ALGORITHM)
+
+        def initialize(instance)
+          @instance   = instance
+          @definition = instance.job_definition
+          @message_builder = Workflow::Notifier::Concerns::ChatMessageBuilder.new(instance)
+          @secret_token = Kuroko2.config.notifiers.webhook.try!(:secret_token)
+        end
+
+        def notify_launch
+          if @definition.hipchat_notify_finished?
+            request(
+              build_payload(
+                action: 'notify_launch',
+                level: 'INFO',
+                subject: message_builder.launched_text,
+                message: @instance.logs.reverse.detect{ |log| log.level == 'INFO' }.try!(:message),
+              )
+            )
+          end
+        end
+
+        def notify_retrying
+          if @definition.hipchat_notify_finished?
+            request(
+              build_payload(
+                action: 'notify_retrying',
+                level: 'INFO',
+                subject: message_builder.retrying_text,
+                message: @instance.logs.last(2).first.message,
+              )
+            )
+          end
+        end
+
+        def notify_skipping
+          if @definition.hipchat_notify_finished?
+            request(
+              build_payload(
+                action: 'notify_skipping',
+                level: 'INFO',
+                subject: message_builder.skipping_text,
+                message: @instance.logs.last(2).first.message,
+              )
+            )
+          end
+        end
+
+        def notify_cancellation
+          if @definition.notify_cancellation || @definition.hipchat_notify_finished?
+            request(
+              build_payload(
+                action: 'notify_cancellation',
+                level: 'WARNING',
+                subject: message_builder.failure_text,
+                message: @instance.logs.reverse.detect{ |log| log.level == 'WARN' }.try!(:message),
+              )
+            )
+          end
+        end
+
+        def notify_failure
+          request(
+            build_payload(
+              action: 'notify_failure',
+              level: 'FAILURE',
+              subject: message_builder.failure_text,
+              message: @instance.logs.last(2).first.message,
+            )
+          )
+        end
+
+        def notify_critical
+          request(
+            build_payload(
+              action: 'notify_critical',
+              level: 'CRITICAL',
+              subject: message_builder.failure_text,
+              message: @instance.logs.last(2).first.message,
+            )
+          )
+        end
+
+        def notify_finished
+          if @definition.hipchat_notify_finished?
+            request(
+              build_payload(
+                action: 'notify_finished',
+                level: 'SUCCESS',
+                subject: message_builder.finished_text,
+              )
+            )
+          end
+        end
+
+        def notify_long_elapsed_time
+          request(
+            build_payload(
+              action: 'notify_long_elapsed_time',
+              level: 'WARNING',
+              subject: message_builder.long_elapsed_time_text,
+            )
+          )
+        end
+
+        private
+
+        def request(body)
+          return unless @definition.webhook_url.present?
+
+          url = URI.parse(@definition.webhook_url)
+          conn = Faraday.new(url: "#{url.scheme}://#{url.host}") do |faraday|
+            faraday.port = url.port
+            faraday.adapter Faraday.default_adapter
+          end
+
+          json = body.to_json
+          response = conn.post do |req|
+            req.url(url.path)
+
+            req.headers['X-Kuroko2-Id'] = SecureRandom.uuid
+            if @secret_token.present?
+              req.headers['X-Kuroko2-Signature'] = "#{HASH_ALGORITHM}=#{OpenSSL::HMAC.hexdigest(HMAC_DIGEST, @secret_token, json)}"
+            end
+
+            req.headers['User-Agent']   = 'Kuroko2-Webhook'
+            req.headers['Content-Type'] = 'application/json'
+            req.body = json
+          end
+
+          unless response.success?
+            Kuroko2.logger.fatal("Failure sending webhook: status=#{response.status} body=#{response.body}")
+          end
+        end
+
+        def build_payload(action:, level:, subject:, message: nil)
+          {
+            action: action,
+            level: level,
+            subject: subject,
+            message: message,
+            job_instance: {
+              url: message_builder.job_instance_path,
+              id: @instance.id,
+              script: @instance.script,
+              finished_at: @instance.finished_at.try!(:iso8601),
+              canceled_at: @instance.canceled_at.try!(:iso8601),
+              error_at: @instance.error_at.try!(:iso8601),
+              created_at: @instance.created_at.try!(:iso8601),
+            },
+            job_definition: {
+              url: Kuroko2::Engine.routes.url_helpers.job_definition_url(
+                @definition,
+                host: Kuroko2.config.url_host,
+                protocol: Kuroko2.config.url_scheme,
+              ),
+              id: @definition.id,
+              name: @definition.name,
+              description: @definition.description,
+            }
+          }
+        end
+      end
+    end
+  end
+end