shipit-engine 0.28.0 → 0.32.0

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Shipit
+  module Webhooks
+    module Handlers
+      class PushHandler < Handler
+        params do
+          requires :ref
+        end
+        def process
+          stacks.where(branch: branch).each(&:sync_github)
+        end
+
+        private
+
+        def branch
+          params.ref.gsub('refs/heads/', '')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module Shipit
+  module Webhooks
+    module Handlers
+      class StatusHandler < Handler
+        params do
+          requires :sha, String
+          requires :state, String
+          accepts :description, String
+          accepts :target_url, String
+          accepts :context, String
+          accepts :created_at, String
+
+          accepts :branches, Array do
+            requires :name, String
+          end
+        end
+
+        def process
+          Commit.where(sha: params.sha).each do |commit|
+            commit.create_status_from_github!(params)
+          end
+        end
+      end
+    end
+  end
+end

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)

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/pull_request_serializer.rb

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

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,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class StackSerializer < ActiveModel::Serializer
     include ConditionalAttributes
@@ -5,7 +6,8 @@ module Shipit
     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
+               :updated_at, :locked_since, :last_deployed_at, :branch, :merge_queue_enabled, :is_archived,
+               :archived_since
 
     def url
       api_stack_url(object)
@@ -39,6 +41,10 @@ module Shipit
       object.locked?
     end
 
+    def is_archived
+      object.archived?
+    end
+
     def deploy_spec
       object.cached_deploy_spec.cacheable.config
     end

data/app/serializers/shipit/tail_task_serializer.rb

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

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)
 
     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,7 +1,8 @@
+# frozen_string_literal: true
 class AsciiOnlyValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    value.encode(Encoding::ASCII)
-  rescue Encoding::UndefinedConversionError
-    record.errors.add(attribute, :ascii)
+    if value && !value.ascii_only?
+      record.errors.add(attribute, :ascii)
+    end
   end
 end

data/app/validators/subset_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class SubsetValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     superset = options[:of]

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 %>
@@ -12,6 +12,8 @@
   <%= javascript_include_tag :shipit %>
   <%= yield :update_subscription %>
   <%= csrf_meta_tags %>
+
+  <%= render 'layouts/head' %>
 </head>
 <body>
   <% flash.each do |name, msg| %>
@@ -33,7 +35,7 @@
 
   <div id="layout-content">
     <% github_status = Shipit::GithubStatus.status
-       unless github_status.nil? || github_status[:status] == 'good' %>
+       unless github_status.nil? || github_status[:status] == 'operational' %>
       <div class="banner github-status banner--orange hidden">
         <div class="banner__inner wrapper">
           <div class="banner__content">
@@ -52,11 +54,11 @@
     <% end %>
 
     <header class="header">
-      <%= link_to "Shipit v#{Shipit::VERSION}", "https://github.com/Shopify/shipit-engine/tree/v#{Shipit::VERSION}", class: 'powered-by' %>
+      <%= link_to "Powered by Shipit v#{Shipit::VERSION}", "https://github.com/Shopify/shipit-engine/tree/v#{Shipit::VERSION}", class: 'powered-by' %>
       <div class="wrapper">
         <div class="header__inner">
           <a href="/" class="logo">
-            <span class="visually-hidden">Shipit</span>
+            <span class="visually-hidden"><%= Shipit.app_name %></span>
           </a>
           <div class="header__page-title">
             <%= yield :page_title %>

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/api_clients/index.html.erb

@@ -0,0 +1,36 @@
+
+<div class="wrapper">
+  <section>
+    <%= link_to "Create new api client", new_api_client_path, class: 'btn'%>
+  </section>
+</div>
+<div class="wrapper">
+  <section>
+    <ul class="task-list">
+    <% @api_clients.each do |api_client|%>
+      <li>
+        <p>
+          <%= link_to api_client.name, api_client_path(api_client) %>
+          created by <%= api_client.creator.name %> on <%= api_client.created_at%>
+        </p>
+       </li>
+    <% end %>
+    </ul>
+  </section>
+</div>
+
+<div class="wrapper">
+  <section class="pagination">
+    <% if params[:since].present? %>
+      <%= link_to 'Start', @links[:first], class: 'header__btn btn' %>
+    <% else %>
+      <%= link_to 'Start', '', class: 'header__btn btn btn--disabled disabled' %>
+    <% end %>
+
+    <% if url = @links[:next] %>
+      <%= link_to 'Older', url, class: 'header__btn btn' %>
+    <% else %>
+      <%= link_to 'Older', '', class: 'header__btn btn btn--disabled disabled' %>
+    <% end %>
+  </section>
+</div>

data/app/views/shipit/api_clients/new.html.erb

@@ -0,0 +1,33 @@
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <p>New Api Client</p>
+    </header>
+  </section>
+
+  <%= form_for @api_client, url: api_clients_path(@api_client) do |f| %>
+    <section>
+      <%= label_tag "App Name" %>
+      <%= f.text_field :name, placeholder: 'e.g. spy', required: true %>
+    </section>
+
+    <section>
+      <%= label_tag "Permissions" %>
+      <ul class="deploy-checklist">
+        <% Shipit::ApiClient::PERMISSIONS.each do |permission| %>
+          <li class="deploy-checklist__item">
+            <%= check_box_tag 'api_client[permissions][]', permission, false,
+              class: 'deploy-checklist__item__checkbox', id: "checkbox_" + permission %>
+            <label class="deploy-checklist__item__label" for="checkbox_<%= permission %>">
+              <%= permission %>
+            </label>
+          </li>
+        <% end %>
+      </ul>
+    </section>
+
+    <section class="submit-section">
+      <%= f.submit "Create", :class => ['btn', 'primary'] %>
+    </section>
+  <% end %>
+</div>

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

@@ -0,0 +1,35 @@
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <h2>Api client: <b><%= @api_client.name %></b></h2>
+    </header>
+
+    <p>Created by <%= @api_client.creator.name %> on <%= @api_client.created_at %></p>
+  </section>
+
+  <section>
+    <h3>Authentication token:</h3>
+    <code style="background-color: yellow">
+      <b><%= @api_client.authentication_token %></b>
+    </code>
+  </section>
+
+  <section>
+    <%= form_for @api_client, url: api_client_path(@api_client) do |f| %>
+      <h3> Permissions </h3>
+      <ul class="deploy-checklist">
+        <% Shipit::ApiClient::PERMISSIONS.each do |permission| %>
+          <li class="deploy-checklist__item">
+            <%= check_box_tag 'api_client[permissions][]', permission, @api_client.permissions.include?(permission),
+              class: 'deploy-checklist__item__checkbox', id: "checkbox_" + permission %>
+            <label class="deploy-checklist__item__label" for="checkbox_<%= permission %>">
+              <%= permission %>
+            </label>
+          </li>
+        <% end %>
+      </ul>
+      <%= f.submit "Update", :class => ['btn', 'primary'] %>
+      <% end %>
+  </section>
+
+</div>

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/new.html.erb

@@ -9,18 +9,6 @@
     <%= render 'shipit/deploys/summary', commits: @deploy.commits %>
   </section>
 
-  <% unless @deploy.commits_since.empty?  %>
-    <section class="less-important">
-
-      <p>The following commits are <strong>not</strong> included in this deploy.
-      Please ensure that none of these commits are needed for what
-      <strong>is</strong> being deployed (for example, if they contain the revert
-      of a broken change).</p>
-
-      <%= render 'shipit/deploys/summary', commits: @deploy.commits_since %>
-    </section>
-  <% end %>
-
   <%= render_monitoring @stack %>
 
   <%= render_checks @commit %>
@@ -37,4 +25,21 @@
       <%= f.submit class: 'btn btn--primary btn--large trigger-deploy' %>
     </section>
   <% end %>
+
+  <% unless @deploy.commits_since.empty?  %>
+    <section class="less-important">
+      <header class="section-header">
+        <h2>Commits not included in this deploy</h2>
+      </header>
+
+      <div>
+        <p>The following commits are <strong>not</strong> included in this deploy.
+        Please ensure that none of these commits are needed for what
+        <strong>is</strong> being deployed (for example, if they contain the revert
+        of a broken change).</p>
+
+        <%= render 'shipit/deploys/summary', commits: @deploy.commits_since %>
+      </div>
+    </section>
+  <% end %>
 </div>

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_status/logged_out.erb

@@ -3,7 +3,7 @@
     <%= render 'anchor', color: '#bd2c00' %>
   </div>
   <h4 class="status-heading text-red">
-    Please log in to <%= link_to 'Shipit', '/', target: '_blank', rel: 'noopener' %>
+    Please log in to <%= link_to Shipit.app_name, '/', target: '_blank', rel: 'noopener' %>
   </h4>
   <span class="status-meta">
     Here Comes The Walrus is unable to check merge status.

data/app/views/shipit/stacks/_header.html.erb

@@ -5,23 +5,26 @@
 
 
 <% content_for :primary_navigation do %>
-  <%= link_to 'Refresh statuses & commits', stack_refresh_path(stack), method: 'post', class: "header__btn btn" %>
+  <%= link_to t('stack.nav.refresh'), stack_refresh_path(stack), method: 'post', class: "header__btn btn" %>
 <% end %>
 
 <% content_for :secondary_navigation do %>
   <ul class="nav__list nav__list--primary">
     <li class="nav__list__item">
-      <%= link_to "Commits & Deploys", stack_path(stack) %>
+      <%= link_to t('stack.nav.commits'), stack_path(stack) %>
     </li>
     <li class="nav__list__item">
-      <%= link_to 'Settings', stack_settings_path(stack) %>
+      <%= link_to t('stack.nav.settings'), stack_settings_path(stack) %>
     </li>
     <li class="nav__list__item">
-      <%= link_to 'Timeline', index_stack_tasks_path(stack) %>
+      <%= link_to t('stack.nav.timeline'), index_stack_tasks_path(stack) %>
+    </li>
+    <li class="nav__list__item">
+      <%= link_to t('stack.nav.statistics'), stack_statistics_path(stack) %>
     </li>
     <% if stack.merge_queue_enabled? %>
       <li class="nav__list__item">
-        <%= link_to "Merge Queue (#{stack.pull_requests.queued.count})", stack_pull_requests_path(stack) %>
+        <%= link_to t('stack.nav.merge_queue', count: stack.pull_requests.queued.count), stack_pull_requests_path(stack) %>
       </li>
     <% end %>
 
@@ -35,25 +38,37 @@
               <%= link_to "#{definition.action}…", new_stack_tasks_path(stack, definition_id: definition.id), class: "trigger-deploy" %>
             </li>
           <% end %>
+          <li class="nav__list__sub__item">
+            <%= link_to "All tasks", stack_tasks_list_path(stack), class: "trigger-deploy" %>
+          </li>
         </ul>
       </li>
     <% end %>
+
+    <%= render partial: 'shipit/stacks/links', locals: { stack: stack } %>
   </ul>
 
   <ul class="nav__list nav__list--secondary">
     <% if stack.links.present? %>
-      <% stack.links.each do |name, url| %>
-        <li class="nav__list__item">
-          <%= link_to name.humanize, url, :target => '_blank', :class => "#{name.dasherize}-url" %>
-        </li>
-      <% end %>
+      <li class="nav__list__item nav__list__item--has-children">
+
+        <%=  t('stack.nav.links') %>
+
+        <ul class="nav__sub__list">
+          <% stack.links.each do |name, url| %>
+            <li class="nav__list__sub__item">
+              <%= link_to name.humanize, url, :target => '_blank', :class => "#{name.dasherize}-url" %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
     <% end %>
     <li class="nav__list__item">
-      <%= link_to 'View on GitHub', github_repo_url(stack.repo_owner, stack.repo_name) %>
+      <%= link_to t('stack.nav.view_on_github'), github_repo_url(stack.repo_owner, stack.repo_name) %>
     </li>
     <% if stack.deploy_url.present? %>
       <li class="nav__list__item">
-        <%= sanitize link_to 'View website', stack.deploy_url, :target => '_blank', :class => 'deploy-url' %>
+        <%= sanitize link_to t('stack.nav.deploy_link'), stack.deploy_url, :target => '_blank', :class => 'deploy-url' %>
       </li>
     <% end %>
   </ul>