barbeque 0.0.1 → 0.0.10

data/app/controllers/barbeque/job_retries_controller.rb

@@ -0,0 +1,10 @@
+class Barbeque::JobRetriesController < Barbeque::ApplicationController
+  def show
+    @job_execution = Barbeque::JobExecution.find(params[:job_execution_id])
+    @message = @job_execution.execution_log['message']
+
+    @job_retry = Barbeque::JobRetry.find(params[:id])
+    @stdout = @job_retry.execution_log['stdout']
+    @stderr = @job_retry.execution_log['stderr']
+  end
+end

data/app/helpers/barbeque/job_definitions_helper.rb

@@ -0,0 +1,14 @@
+module Barbeque::JobDefinitionsHelper
+  def distance_of_time(from, to)
+    return '' if from.nil? || to.nil?
+
+    secs  = (to - from).to_i
+    mins  = secs / 60
+    hours = mins / 60
+    days  = hours / 24
+
+    text = "%02d:%02d:%02d" % [hours % 24, mins % 60, secs % 60]
+    text.prepend("#{days}days ") if days > 0
+    text
+  end
+end

data/app/helpers/barbeque/job_executions_helper.rb

@@ -0,0 +1,18 @@
+module Barbeque::JobExecutionsHelper
+  def status_label(status)
+    color =
+      case status
+      when 'success'
+        'success'
+      when 'failed'
+        'danger'
+      when 'retried'
+        'warning'
+      when 'pending'
+        'info'
+      else
+        'default'
+      end
+    content_tag(:span, status.upcase, class: "label label-#{color}")
+  end
+end

data/app/models/{api → barbeque/api}/application_resource.rb

@@ -1,4 +1,6 @@
-class Api::ApplicationResource
+require 'garage'
+
+class Barbeque::Api::ApplicationResource
   include Garage::Representer
   include Garage::Authorizable
 

data/app/models/{api → barbeque/api}/job_execution_resource.rb

@@ -1,4 +1,4 @@
-class Api::JobExecutionResource < Api::ApplicationResource
+class Barbeque::Api::JobExecutionResource < Barbeque::Api::ApplicationResource
   property :message_id
 
   property :status

data/app/models/{api → barbeque/api}/job_retry_resource.rb

@@ -1,4 +1,4 @@
-class Api::JobRetryResource < Api::ApplicationResource
+class Barbeque::Api::JobRetryResource < Barbeque::Api::ApplicationResource
   property :message_id
 
   property :status

data/app/models/barbeque/api/revision_lock_resource.rb

@@ -0,0 +1,7 @@
+class Barbeque::Api::RevisionLockResource < Barbeque::Api::ApplicationResource
+  property :revision
+
+  def revision
+    Barbeque::DockerImage.new(@model.docker_image).tag
+  end
+end

data/app/models/{app.rb → barbeque/app.rb}

@@ -1,4 +1,4 @@
-class App < ApplicationRecord
+class Barbeque::App < Barbeque::ApplicationRecord
   validates :name, presence: true, uniqueness: true
   validates :docker_image, presence: true
 

data/app/models/barbeque/job_definition.rb

@@ -0,0 +1,26 @@
+class Barbeque::JobDefinition < Barbeque::ApplicationRecord
+  belongs_to :app
+  has_many :job_executions, dependent: :destroy
+  has_one :slack_notification, dependent: :destroy
+
+  validates :job, uniqueness: { scope: :app_id }
+
+  attr_readonly :app_id
+  attr_readonly :job
+
+  serialize :command, Array
+
+  accepts_nested_attributes_for :slack_notification, allow_destroy: true
+
+  DATE_HOUR_SQL = 'date_format(created_at, "%Y-%m-%d %H:00:00")'
+
+  def execution_stats(from, to)
+    job_executions.where(created_at: from .. to).group(DATE_HOUR_SQL).order(DATE_HOUR_SQL).pluck("#{DATE_HOUR_SQL}, count(1), avg(timestampdiff(second, created_at, finished_at))").map do |date_hour, count, avg_time|
+      {
+        date_hour: Time.zone.parse("#{date_hour} UTC"),
+        count: count,
+        avg_time: avg_time,
+      }
+    end
+  end
+end

data/app/models/{job_execution.rb → barbeque/job_execution.rb}

@@ -1,6 +1,4 @@
-require 'job_executor/storage'
-
-class JobExecution < ApplicationRecord
+class Barbeque::JobExecution < Barbeque::ApplicationRecord
   belongs_to :job_definition
   belongs_to :job_queue
   has_one :slack_notification, through: :job_definition
@@ -16,7 +14,12 @@ class JobExecution < ApplicationRecord
 
   paginates_per 15
 
+  # @return [Hash] - A hash created by `JobExecutor::Job#log_result`
+  def execution_log
+    @execution_log ||= Barbeque::ExecutionLog.load(execution: self)
+  end
+
   def to_resource
-    Api::JobExecutionResource.new(self)
+    Barbeque::Api::JobExecutionResource.new(self)
   end
 end

data/app/models/{job_queue.rb → barbeque/job_queue.rb}

@@ -1,4 +1,4 @@
-class JobQueue < ApplicationRecord
+class Barbeque::JobQueue < Barbeque::ApplicationRecord
   SQS_NAME_PREFIX = ENV['BARBEQUE_SQS_NAME_PREFIX'] || 'Barbeque-'
   SQS_NAME_MAX_LENGTH = 80
 

data/app/models/{job_retry.rb → barbeque/job_retry.rb}

@@ -1,4 +1,4 @@
-class JobRetry < ApplicationRecord
+class Barbeque::JobRetry < Barbeque::ApplicationRecord
   belongs_to :job_execution
   has_one :job_definition, through: :job_execution
   has_one :app, through: :job_definition
@@ -11,7 +11,12 @@ class JobRetry < ApplicationRecord
     retried: 3,
   }
 
+  # @return [Hash] - A hash created by `JobExecutor::Retry#log_result`
+  def execution_log
+    @execution_log ||= Barbeque::ExecutionLog.load(execution: self)
+  end
+
   def to_resource
-    Api::JobRetryResource.new(self)
+    Barbeque::Api::JobRetryResource.new(self)
   end
 end

data/app/models/{slack_notification.rb → barbeque/slack_notification.rb}

@@ -1,4 +1,4 @@
-class SlackNotification < ApplicationRecord
+class Barbeque::SlackNotification < Barbeque::ApplicationRecord
   belongs_to :job_definition, optional: true
 
   validates :channel, presence: true

data/app/services/barbeque/message_enqueuing_service.rb

@@ -0,0 +1,41 @@
+require 'aws-sdk'
+
+class Barbeque::MessageEnqueuingService
+  DEFAULT_QUEUE = ENV['BARBEQUE_DEFAULT_QUEUE'] || 'default'
+
+  # @param [String] application
+  # @param [String] job
+  # @param [Object] message
+  # @param optional [String] queue
+  def initialize(application:, job:, message:, queue: nil)
+    @application = application
+    @job         = job
+    @queue       = queue || DEFAULT_QUEUE
+    @message     = message
+  end
+
+  # @return [String] message_id
+  def run
+    queue = Barbeque::JobQueue.find_by!(name: @queue)
+    response = client.send_message(
+      queue_url:    queue.queue_url,
+      message_body: build_message.to_json,
+    )
+    response.message_id
+  end
+
+  private
+
+  def build_message
+    {
+      'Type'        => 'JobExecution',
+      'Application' => @application,
+      'Job'         => @job,
+      'Message'     => @message,
+    }
+  end
+
+  def client
+    @client ||= Aws::SQS::Client.new
+  end
+end

data/app/services/barbeque/message_retrying_service.rb

@@ -0,0 +1,32 @@
+require 'aws-sdk'
+
+class Barbeque::MessageRetryingService
+  DEFAULT_DELAY_SECONDS = 0
+
+  def initialize(message_id:, delay_seconds: nil)
+    @message_id    = message_id
+    @delay_seconds = delay_seconds || DEFAULT_DELAY_SECONDS
+  end
+
+  def run
+    execution = Barbeque::JobExecution.find_by!(message_id: @message_id)
+    client.send_message(
+      queue_url:     execution.job_queue.queue_url,
+      message_body:  build_message.to_json,
+      delay_seconds: @delay_seconds,
+    )
+  end
+
+  private
+
+  def build_message
+    {
+      'Type'           => 'JobRetry',
+      'RetryMessageId' => @message_id,
+    }
+  end
+
+  def client
+    @client ||= Aws::SQS::Client.new
+  end
+end

data/app/views/barbeque/apps/_form.html.haml

@@ -0,0 +1,34 @@
+.box.box-primary
+  .box-header
+    %h3.box-title.with_padding
+      #{action_name.capitalize} Application
+
+  .box-body
+    = form_for @app do |f|
+      - if @app.errors.any?
+        %strong #{pluralize(@app.errors.count, 'error')} prohibited this application from being saved:
+        %ul
+          - @app.errors.full_messages.each do |msg|
+            %li= msg
+
+      .row.form-group
+        .col-md-4
+          = f.label :name
+          - if @app.persisted?
+            -# Name can't be changed after it's created.
+            .app_name= @app.name
+          - else
+            = f.text_field :name, class: 'form-control'
+
+      .row.form-group
+        .col-md-4
+          = f.label :docker_image
+          = f.text_field :docker_image, class: 'form-control'
+
+      .row.form-group
+        .col-md-8
+          = f.label :description
+          = f.text_area :description, class: 'form-control', rows: 10
+
+      .form-group
+        = f.submit 'Save', class: 'btn btn-primary'

data/app/views/barbeque/apps/edit.html.haml

@@ -0,0 +1,3 @@
+= render 'form'
+
+= link_to 'Back', root_path

data/app/views/barbeque/apps/index.html.haml

@@ -0,0 +1,24 @@
+.box.box-primary
+  .box-header
+    %h3.box-title.with_padding
+      All Applications
+    = link_to new_app_path, class: 'btn btn-primary pull-right' do
+      New Application
+
+  .box-body
+    %table.table.table-bordered
+      %thead
+        %tr
+          %th Name
+          %th Docker image
+          %th Description
+          %th
+
+      %tbody
+        - @apps.each do |app|
+          %tr
+            %td= app.name
+            %td= app.docker_image
+            %td= app.description
+            %td
+              = link_to 'View Details', app, class: 'btn btn-default btn-sm'

data/app/views/barbeque/apps/new.html.haml

@@ -0,0 +1,3 @@
+= render 'form'
+
+= link_to 'Back', root_path

data/app/views/barbeque/apps/show.html.haml

@@ -0,0 +1,47 @@
+.box.box-primary
+  .box-header
+    %h3.box-title.with_padding
+      Application Details
+
+  .box-body
+    %p#notice= notice
+
+    %table.table.table-bordered
+      %tbody
+        %tr
+          %th Name
+          %td= @app.name
+        %tr
+          %th Docker image
+          %td= @app.docker_image
+        %tr
+          %th Description
+          %td= @app.description
+
+    = link_to 'Edit', edit_app_path(@app), class: 'btn btn-primary'
+    = link_to 'Destroy', app_path(@app),
+      class: 'btn', method: :delete, data: { confirm: 'Are you sure to delete application?' }
+
+.box
+  .box-header
+    %h3.box-title.with_padding Job Definitions
+    = link_to 'New Job Definition', new_job_definition_path(job_definition: { app_id: @app.id }), class: 'btn btn-primary pull-right'
+  .box-body
+    %table.table.table-bordered
+      %thead
+        %tr
+          %th Application
+          %th Job
+          %th Description
+          %th
+
+      %tbody
+        - @app.job_definitions.each do |job_definition|
+          %tr
+            %td= job_definition.app.name
+            %td= job_definition.job
+            %td= job_definition.description
+            %td
+              = link_to 'View Details', job_definition, class: 'btn btn-default btn-sm'
+
+= link_to 'Back', root_path

data/app/views/barbeque/job_definitions/_form.html.haml

@@ -0,0 +1,45 @@
+.box.box-primary
+  .box-header
+    %h3.box-title.with_padding
+      #{action_name.capitalize} Job Definition
+
+  .box-body
+    = form_for @job_definition do |f|
+      - if @job_definition.errors.any?
+        %strong #{pluralize(@job_definition.errors.count, 'error')} prohibited this job_definition from being saved:
+        %ul
+          - @job_definition.errors.full_messages.each do |msg|
+            %li= msg
+
+      .row.form-group
+        .col-md-4
+          = f.label :app_id
+          - if @job_definition.persisted?
+            .job_definition_app_name= @job_definition.app.name
+          - else
+            = f.collection_select :app_id, Barbeque::App.pluck(:id, :name), :first, :second,
+              { prompt: true }, class: 'form-control'
+
+      .row.form-group
+        .col-md-4
+          = f.label :job
+          - if @job_definition.persisted?
+            .job_definition_job= @job_definition.job
+          - else
+            = f.text_field :job, class: 'form-control', placeholder: 'SomeAsyncJob'
+
+      .row.form-group
+        .col-md-8
+          = f.label :command
+          = f.text_field :command, value: Shellwords.join(@job_definition.command),
+            class: 'form-control', placeholder: 'bundle exec rake ...'
+
+      .row.form-group
+        .col-md-8
+          = f.label :description
+          = f.text_area :description, class: 'form-control', rows: 10
+
+      = render 'slack_notification_field', job_definition: @job_definition
+
+      .form-group
+        = f.submit 'Save', class: 'btn btn-primary'

data/app/views/barbeque/job_definitions/_slack_notification_field.html.haml

@@ -0,0 +1,35 @@
+= fields_for job_definition do |job_definition_f|
+  = job_definition_f.fields_for :slack_notification do |f|
+    = f.hidden_field :id
+
+    .row
+      .col-md-8
+        %label Slack Notification
+
+    - use_slack_notification = f.object.persisted?
+    .row.form-group
+      .col-md-8.use_slack_notification_wrapper
+        = f.label :_destroy_true do
+          = f.radio_button :_destroy, true, class: 'use_slack_notification', checked: !use_slack_notification
+          No
+        = f.label :_destroy_false do
+          = f.radio_button :_destroy, false, class: 'use_slack_notification', checked: use_slack_notification
+          Yes
+
+    .slack_notification_field{ class: ('active' if use_slack_notification) }
+      .row.form-group
+        .col-md-8
+          = f.text_field :channel, placeholder: '#slack-channel', class: 'form-control'
+
+      .row.form-group
+        .col-md-8
+          = f.check_box :notify_success
+          = f.label :notify_success, 'Notify success event to Slack'
+
+      .row
+        .col-md-8
+          Failure notification text
+      .row.form-group
+        .col-md-8
+          = f.text_field :failure_notification_text,
+            placeholder: '@YourName', class: 'form-control'