shipit-engine 0.30.0 → 0.34.0

data/app/models/shipit/webhooks/handlers/push_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers
@@ -6,7 +7,10 @@ module Shipit
           requires :ref
         end
         def process
-          stacks.where(branch: branch).each(&:sync_github)
+          stacks
+            .not_archived
+            .where(branch: branch)
+            .find_each(&:sync_github)
         end
 
         private

data/app/models/shipit/webhooks/handlers/status_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Webhooks
     module Handlers

data/app/serializers/concerns/shipit/conditional_attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module ConditionalAttributes
     extend ActiveSupport::Concern

data/app/serializers/shipit/anonymous_user_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class AnonymousUserSerializer < UserSerializer
   end

data/app/serializers/shipit/command_line_user_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommandLineUserSerializer < UserSerializer
   end

data/app/serializers/shipit/commit_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitSerializer < ShortCommitSerializer
     include GithubUrlHelper

data/app/serializers/shipit/deploy_serializer.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   class DeploySerializer < TaskSerializer
     include GithubUrlHelper
 
     has_many :commits
 
-    attributes :compare_url, :rollback_url, :additions, :deletions
+    attributes :compare_url, :rollback_url, :additions, :deletions, :rollback_once_aborted_to
 
     def html_url
       stack_deploy_url(object.stack, object)
@@ -21,5 +22,11 @@ module Shipit
     def type
       :deploy
     end
+
+    def rollback_once_aborted_to
+      return nil unless object.rollback_once_aborted_to
+
+      DeploySerializer.new(object.rollback_once_aborted_to)
+    end
   end
 end

data/app/serializers/shipit/hook_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class HookSerializer < ActiveModel::Serializer
     include ConditionalAttributes

data/app/serializers/shipit/merge_request_serializer.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Shipit
+  class MergeRequestSerializer < ActiveModel::Serializer
+    include GithubUrlHelper
+    include ConditionalAttributes
+
+    has_one :merge_requested_by
+    has_one :head, serializer: ShortCommitSerializer
+
+    attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
+      :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
+
+    def html_url
+      github_pull_request_url(object)
+    end
+
+    def include_rejection_reason?
+      object.rejection_reason?
+    end
+  end
+end

data/app/serializers/shipit/pull_request_serializer.rb

@@ -1,20 +1,18 @@
+# frozen_string_literal: true
+
 module Shipit
   class PullRequestSerializer < ActiveModel::Serializer
     include GithubUrlHelper
     include ConditionalAttributes
 
-    has_one :merge_requested_by
+    has_one :user
     has_one :head, serializer: ShortCommitSerializer
+    has_many :assignees, serializer: UserSerializer
 
-    attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
-               :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
+    attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :html_url
 
     def html_url
-      github_pull_request_url(object)
-    end
-
-    def include_rejection_reason?
-      object.rejection_reason?
+      github_pull_request_url(object) if object.stack.present?
     end
   end
 end

data/app/serializers/shipit/review_stack_serializer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Shipit
+  class ReviewStackSerializer < Shipit::StackSerializer
+    has_one :pull_request
+  end
+end

data/app/serializers/shipit/rollback_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class RollbackSerializer < DeploySerializer
     def type

data/app/serializers/shipit/short_commit_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class ShortCommitSerializer < ActiveModel::Serializer
     attributes :sha, :message

data/app/serializers/shipit/stack_serializer.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
 module Shipit
   class StackSerializer < ActiveModel::Serializer
     include ConditionalAttributes
 
     has_one :lock_author
-    attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url, :pull_requests_url,
-               :deploy_spec, :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at,
-               :updated_at, :locked_since, :last_deployed_at, :branch, :merge_queue_enabled, :is_archived,
-               :archived_since
+
+    attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url,
+      :merge_requests_url, :deploy_spec, :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment,
+      :created_at, :updated_at, :locked_since, :last_deployed_at, :branch, :merge_queue_enabled, :is_archived,
+      :archived_since
 
     def url
       api_stack_url(object)
@@ -20,8 +22,8 @@ module Shipit
       api_stack_tasks_url(object)
     end
 
-    def pull_requests_url
-      api_stack_pull_requests_url(object)
+    def merge_requests_url
+      api_stack_merge_requests_url(object)
     end
 
     def is_locked

data/app/serializers/shipit/tail_task_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class TailTaskSerializer < ActiveModel::Serializer
     include ChunksHelper
@@ -7,7 +8,7 @@ module Shipit
 
     def url
       return @url if defined? @url
-      @url = next_chunks_url(task)
+      @url = next_chunks_url(task, last_byte: next_offset)
     end
 
     def include_url?
@@ -15,7 +16,7 @@ module Shipit
     end
 
     def output
-      task.chunks.tail(context[:last_id]).pluck(:text).join
+      @output ||= task.tail_output(last_byte)
     end
 
     def rollback_url
@@ -31,6 +32,14 @@ module Shipit
     alias_method :task, :object
     delegate :stack, to: :object
 
+    def next_offset
+      last_byte + output.bytesize
+    end
+
+    def last_byte
+      context[:last_byte].to_i
+    end
+
     def rollback
       return @rollback if defined? @rollback
       @rollback = stack.rollbacks.where(parent_id: task.id).last

data/app/serializers/shipit/task_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class TaskSerializer < ActiveModel::Serializer
     include ConditionalAttributes
@@ -5,23 +6,7 @@ module Shipit
     has_one :author
     has_one :revision, serializer: ShortCommitSerializer
 
-    attributes(*%i(
-      id
-      url
-      html_url
-      output_url
-      type
-      status
-      action
-      title
-      description
-      started_at
-      ended_at
-      updated_at
-      created_at
-      env
-      ignored_safeties
-    ))
+    attributes(:id, :url, :html_url, :output_url, :type, :status, :action, :title, :description, :started_at, :ended_at, :updated_at, :created_at, :env, :ignored_safeties, :max_retries, :retry_attempt)
 
     def revision
       object.until_commit

data/app/serializers/shipit/user_serializer.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
 module Shipit
   class UserSerializer < ActiveModel::Serializer
-    attributes :id, :name, :email, :login, :avatar_url, :created_at, :updated_at, :github_id
+    attributes :id, :name, :email, :login, :avatar_url, :created_at, :updated_at, :github_id, :anonymous
+
+    def anonymous
+      !object.logged_in?
+    end
   end
 end

data/app/validators/ascii_only_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class AsciiOnlyValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value && !value.ascii_only?

data/app/validators/subset_validator.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 class SubsetValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     superset = options[:of]
     rest = value - superset
-    record.errors.add(attribute, :subset, options) unless rest.empty?
+    record.errors.add(attribute, :subset, **options) unless rest.empty?
   end
 end

data/app/views/layouts/merge_status.html.erb

@@ -4,7 +4,7 @@
     <%= stylesheet_link_tag *(params[:stylesheets] || []).select { |url| url.start_with?('https://assets-cdn.github.com/', 'https://github.githubassets.com/') } %>
     <%= stylesheet_link_tag 'merge_status' %>
   </head>
-  <body>
+  <body data-color-mode="<%= params[:mode] %>">
     <div class="merge-status-container" data-layout-content><%= yield %></div>
     <%= javascript_include_tag 'merge_status' %>
   </body>

data/app/views/layouts/shipit.html.erb

@@ -2,7 +2,7 @@
 <html lang="<%= I18n.locale %>" data-controller="<%= controller_name %>" data-action="<%= action_name %>">
 <head>
   <% if @stack %>
-    <title><%= Shipit.app_name %> - <%= @stack.repo_name %>/<%= @stack.environment %></title>
+    <title><%= @stack.repo_name %>/<%= @stack.environment %> - <%= Shipit.app_name %></title>
   <% else %>
   <title><%= Shipit.app_name %></title>
   <% end %>

data/app/views/shipit/_variables.html.erb

@@ -7,7 +7,7 @@
       <% variables.each do |variable| %>
         <p class="variables-fields">
           <% if variable.select %>
-            <%= field.select variable.name, options_for_select([["Please select...", { disabled: "disabled", selected: true }]] + variable.select) %>
+            <%= field.select variable.name, options_for_select([["Please select...", { disabled: "disabled" }]] + variable.select, variable.default || "Please select...") %>
           <% else %>
             <%= field.text_field variable.name, value: variable.default %>
           <% end %>

data/app/views/shipit/ccmenu/project.xml.builder

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # Derived from http://timnew.me/blog/2013/04/07/multiple-project-summary-reporting-standard-cctray-xml-feed/
-status_map = {'backlogged' => 'failure', 'locked' => 'failure'}
+status_map = { 'backlogged' => 'failure', 'locked' => 'failure' }
 xml.instruct!
 xml.Projects do
   xml.Project(

data/app/views/shipit/deploys/show.html.erb

@@ -1,8 +1,8 @@
 <% content_for :task_title do %>
   <% if @deploy.rollback? %>
-    rolling back to
+    <%= @deploy.active? ? "rolling back to" : "rolled back to" %>
   <% else %>
-    deploying
+    <%= @deploy.active? ? "deploying" : "deployed" %>
   <% end %>
   <span class="short-sha"><%= link_to_github_deploy(@deploy) %></span>
   <%= timeago_tag(@deploy.created_at, force: true) %>

data/app/views/shipit/merge_requests/_merge_request.html.erb

@@ -0,0 +1,29 @@
+<li class="pr" id="pr-<%= merge_request.id %>">
+  <%= render 'shipit/shared/author', author: merge_request.merge_requested_by %>
+  <div class="pr-details">
+    <span class="pr-number">
+      <%= pull_request_link(merge_request) %>
+    </span>
+    <span class="pr-title">
+      <%= render_pull_request_title_with_link merge_request %>
+    </span>
+    <p class="pr-meta">
+      <span class="code-additions">+<%= merge_request.additions %></span>
+      <span class="code-deletions">-<%= merge_request.deletions %></span>
+    </p>
+    <p class="pr-meta">
+      Enqueued <%= timeago_tag(merge_request.merge_requested_at, force: true) %>
+      <% if merge_request.revalidating? %>
+        <em class="warning">Need revalidation.</em>
+      <% end %>
+    </p>
+  </div>
+  <% if merge_request.revalidating? %>
+    <div class="commit-actions">
+      <%= button_to 'Confirm', stack_merge_requests_path(merge_request.stack, number_or_url: merge_request.number), class: 'btn btn--warning', method: 'post' %>
+    </div>
+  <% end %>
+  <div class="commit-actions">
+    <%= button_to 'Cancel', stack_merge_request_path(merge_request.stack, merge_request), class: 'btn btn--warning', method: 'delete' %>
+  </div>
+</li>

data/app/views/shipit/{pull_requests → merge_requests}/index.html.erb

@@ -5,7 +5,7 @@
 <div class="wrapper">
   <section>
     <header class="section-header">
-      <%= form_tag stack_pull_requests_path(@stack) do %>
+      <%= form_tag stack_merge_requests_path(@stack) do %>
         <div class="field-wrapper inline">
           <%= text_field_tag :number_or_url, '', placeholder: 'PR number or URL' %>
           <%= submit_tag 'Request merge', class: 'btn' %>
@@ -14,7 +14,7 @@
     </header>
 
     <ul class="pr-list">
-      <%= render @pull_requests %>
+      <%= render @merge_requests %>
     </ul>
   </section>
 </div>

data/app/views/shipit/merge_requests/merge_requests/_pull_request.html.erb

@@ -0,0 +1,29 @@
+<li class="pr" id="pr-<%= merge_request.id %>">
+  <%= render 'shipit/shared/author', author: merge_request.merge_requested_by %>
+  <div class="pr-details">
+    <span class="pr-number">
+      <%= pull_request_link(merge_request) %>
+    </span>
+    <span class="pr-title">
+      <%= render_pull_request_title_with_link merge_request %>
+    </span>
+    <p class="pr-meta">
+      <span class="code-additions">+<%= merge_request.additions %></span>
+      <span class="code-deletions">-<%= merge_request.deletions %></span>
+    </p>
+    <p class="pr-meta">
+      Enqueued <%= timeago_tag(merge_request.merge_requested_at, force: true) %>
+      <% if merge_request.revalidating? %>
+        <em class="warning">Need revalidation.</em>
+      <% end %>
+    </p>
+  </div>
+  <% if merge_request.revalidating? %>
+    <div class="commit-actions">
+      <%= button_to 'Confirm', stack_merge_requests_path(merge_request.stack, number_or_url: merge_request.number), class: 'btn btn--warning', method: 'post' %>
+    </div>
+  <% end %>
+  <div class="commit-actions">
+    <%= button_to 'Cancel', stack_merge_request_path(merge_request.stack, merge_request), class: 'btn btn--warning', method: 'delete' %>
+  </div>
+</li>

data/app/views/shipit/merge_requests/merge_requests/index.html.erb

@@ -0,0 +1,20 @@
+<% subscribe events_path(channels: ["stack.#{@stack.id}"]), '.pr-list', '.header' %>
+
+<%= render partial: 'shipit/stacks/header', locals: { stack: @stack } %>
+
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <%= form_tag stack_merge_requests_path(@stack) do %>
+        <div class="field-wrapper inline">
+          <%= text_field_tag :number_or_url, '', placeholder: 'PR number or URL' %>
+          <%= submit_tag 'Request merge', class: 'btn' %>
+        </div>
+      <% end %>
+    </header>
+
+    <ul class="pr-list">
+      <%= render @merge_requests %>
+    </ul>
+  </section>
+</div>

data/app/views/shipit/merge_status/_merge_queue_button.html.erb

@@ -1,13 +1,13 @@
 <% classes = 'branch-action-btn float-right js-immediate-updates js-handle-pull-merging-errors' %>
-<% if pull_request.try!(&:waiting?) %>
-  <%= form_tag dequeue_pull_request_path(stack, pull_request_number), method: 'delete', class: classes, data: {remote: true} do %>
+<% if merge_request.try!(&:waiting?) %>
+  <%= form_tag dequeue_merge_request_path(stack, pull_request_number), method: 'delete', class: classes, data: {remote: true} do %>
     <%= hidden_field_tag 'referrer', params[:referrer] %>
     <button type="submit" data-disable-with="Removing from merge queue…" class="btn">
       Remove from merge queue
     </button>
   <% end %>
 <% else %>
-  <%= form_tag enqueue_pull_request_path(stack, pull_request_number), method: 'put', class: classes, data: {remote: true} do %>
+  <%= form_tag enqueue_merge_request_path(stack, pull_request_number), method: 'put', class: classes, data: {remote: true} do %>
     <%= hidden_field_tag 'referrer', params[:referrer] %>
     <button type="submit" data-disable-with="Adding to merge queue…" class="btn btn-primary">
       Add to merge queue