shipit-engine 0.29.0 → 0.30.0

data/app/models/shipit/task.rb

@@ -16,8 +16,8 @@ module Shipit
     belongs_to :user, optional: true
     belongs_to :aborted_by, class_name: 'User', optional: true
     belongs_to :stack, counter_cache: true
-    belongs_to :until_commit, class_name: 'Commit'
-    belongs_to :since_commit, class_name: 'Commit'
+    belongs_to :until_commit, class_name: 'Commit', required: false
+    belongs_to :since_commit, class_name: 'Commit', required: false
 
     deferred_touch stack: :updated_at
 
@@ -29,14 +29,18 @@ module Shipit
     scope :success, -> { where(status: 'success') }
     scope :completed, -> { where(status: COMPLETED_STATUSES) }
     scope :active, -> { where(status: ACTIVE_STATUSES) }
+    scope :not_active, -> { where(status: COMPLETED_STATUSES + UNSUCCESSFUL_STATUSES) }
     scope :exclusive, -> { where(allow_concurrency: false) }
     scope :unsuccessful, -> { where(status: UNSUCCESSFUL_STATUSES) }
+    scope :last_seven_days, -> { where("created_at > ?", 7.days.ago) }
+    scope :previous_seven_days, -> { where(created_at: 14.days.ago..7.days.ago) }
 
     scope :due_for_rollup, -> { completed.where(rolled_up: false).where('created_at <= ?', 1.hour.ago) }
 
     after_save :record_status_change
     after_create :prevent_concurrency, unless: :allow_concurrency?
-    after_commit :emit_hooks
+    after_commit :emit_hooks, on: :create
+    after_commit :emit_hooks_if_status_changed, on: :update
 
     class << self
       def durations
@@ -303,9 +307,13 @@ module Shipit
       end
     end
 
-    def emit_hooks
+    def emit_hooks_if_status_changed
       return unless @status_changed
       @status_changed = nil
+      emit_hooks
+    end
+
+    def emit_hooks
       Hook.emit(hook_event, stack, hook_event => self, status: status, stack: stack)
     end
 
@@ -327,6 +335,20 @@ module Shipit
       end
     end
 
+    def commit_range?
+      since_commit && until_commit
+    end
+
+    def includes_commit?(commit)
+      return false unless commit_range?
+
+      if since_commit == until_commit
+        commit.id == since_commit.id
+      else
+        commit.id > since_commit.id && commit.id <= until_commit.id
+      end
+    end
+
     private
 
     def prevent_concurrency

data/app/models/shipit/webhooks.rb

@@ -0,0 +1,32 @@
+module Shipit
+  module Webhooks
+    class << self
+      def default_handlers
+        {
+          'push' => [Handlers::PushHandler],
+          'status' => [Handlers::StatusHandler],
+          'membership' => [Handlers::MembershipHandler],
+          'check_suite' => [Handlers::CheckSuiteHandler],
+        }
+      end
+
+      def handlers
+        @handlers ||= reset_handlers!
+      end
+
+      def reset_handlers!
+        @handlers = default_handlers
+      end
+
+      def register_handler(event, callable = nil, &block)
+        handlers[event] ||= []
+        handlers[event] << callable if callable
+        handlers[event] << block if block_given?
+      end
+
+      def for_event(event)
+        handlers.fetch(event) { [] }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Shipit
+  module Webhooks
+    module Handlers
+      class CheckSuiteHandler < Handler
+        params do
+          requires :check_suite do
+            requires :head_sha, String
+            requires :head_branch, String
+          end
+        end
+        def process
+          stacks.where(branch: params.check_suite.head_branch).each do |stack|
+            stack.commits.where(sha: params.check_suite.head_sha).each(&:schedule_refresh_check_runs!)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Shipit
+  module Webhooks
+    module Handlers
+      class Handler
+        class << self
+          attr_reader :param_parser
+
+          def params(&block)
+            @param_parser = ExplicitParameters::Parameters.define(&block)
+          end
+        end
+
+        def self.call(params)
+          new(params).process
+        end
+
+        attr_reader :params, :payload
+
+        def initialize(payload)
+          @payload = payload
+          @params = self.class.param_parser.parse!(payload)
+        end
+
+        def process
+          raise NotImplementedError
+        end
+
+        private
+
+        def stacks
+          @stacks ||= Repository.from_github_repo_name(repository_name)&.stacks || Stack.none
+        end
+
+        def repository_name
+          payload.dig('repository', 'full_name')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Shipit
+  module Webhooks
+    module Handlers
+      class MembershipHandler < Handler
+        params do
+          requires :action, String
+          requires :team do
+            requires :id, Integer
+            requires :name, String
+            requires :slug, String
+            requires :url, String
+          end
+          requires :organization do
+            requires :login, String
+          end
+          requires :member do
+            requires :login, String
+          end
+        end
+        def process
+          team = find_or_create_team!
+          member = User.find_or_create_by_login!(params.member.login)
+
+          case params.action
+          when 'added'
+            team.add_member(member)
+          when 'removed'
+            team.members.delete(member)
+          else
+            raise ArgumentError, "Don't know how to perform action: `#{action.inspect}`"
+          end
+        end
+
+        private
+
+        def find_or_create_team!
+          Team.find_or_create_by!(github_id: params.team.id) do |team|
+            team.github_team = params.team
+            team.organization = params.organization.login
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+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,26 @@
+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/shipit/stack_serializer.rb

@@ -5,7 +5,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 +40,10 @@ module Shipit
       object.locked?
     end
 
+    def is_archived
+      object.archived?
+    end
+
     def deploy_spec
       object.cached_deploy_spec.cacheable.config
     end

data/app/validators/ascii_only_validator.rb

@@ -1,7 +1,7 @@
 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/views/layouts/shipit.html.erb

@@ -12,6 +12,8 @@
   <%= javascript_include_tag :shipit %>
   <%= yield :update_subscription %>
   <%= csrf_meta_tags %>
+
+  <%= render 'layouts/head' %>
 </head>
 <body>
   <% flash.each do |name, msg| %>
@@ -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/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/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 %>
 
@@ -38,6 +41,8 @@
         </ul>
       </li>
     <% end %>
+
+    <%= render partial: 'shipit/stacks/links', locals: { stack: stack } %>
   </ul>
 
   <ul class="nav__list nav__list--secondary">
@@ -49,11 +54,11 @@
       <% end %>
     <% 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>