shipit-engine 0.15.0 → 0.16.0

data/app/models/shipit/status.rb

@@ -1,5 +1,6 @@
 module Shipit
   class Status < ActiveRecord::Base
+    include Common
     include DeferredTouch
 
     STATES = %w(pending success failure error).freeze
@@ -30,22 +31,6 @@ module Shipit
       end
     end
 
-    def unknown?
-      false
-    end
-
-    def ignored?
-      stack.soft_failing_statuses.include?(context)
-    end
-
-    def group?
-      false
-    end
-
-    def simple_state
-      state == 'error' ? 'failure' : state
-    end
-
     private
 
     def enable_ci_on_stack

data/app/models/shipit/status/common.rb

@@ -0,0 +1,45 @@
+module Shipit
+  class Status
+    module Common
+      def unknown?
+        state == 'unknown'.freeze
+      end
+
+      def pending?
+        state == 'pending'.freeze
+      end
+
+      def success?
+        state == 'success'.freeze
+      end
+
+      def error?
+        state == 'error'.freeze
+      end
+
+      def failure?
+        state == 'failure'.freeze
+      end
+
+      def group?
+        false
+      end
+
+      def simple_state
+        state == 'error'.freeze ? 'failure'.freeze : state
+      end
+
+      def allowed_to_fail?
+        commit.soft_failing_statuses.include?(context)
+      end
+
+      def hidden?
+        commit.hidden_statuses.include?(context)
+      end
+
+      def required?
+        commit.required_statuses.include?(context)
+      end
+    end
+  end
+end

data/app/models/shipit/status/group.rb

@@ -0,0 +1,82 @@
+module Shipit
+  class Status
+    class Group
+      include Common
+
+      attr_reader :commit, :statuses
+
+      class << self
+        def compact(commit, statuses)
+          group = new(commit, statuses)
+          case group.size
+          when 0
+            Status::Unknown.new(commit)
+          when 1
+            group.statuses.first
+          else
+            group
+          end
+        end
+      end
+
+      def initialize(commit, statuses)
+        @commit = commit
+
+        visible_statuses = reject_hidden(statuses.to_a.uniq(&:context))
+        missing_contexts = required_statuses - visible_statuses.map(&:context)
+        visible_statuses += missing_contexts.map { |c| Status::Missing.new(commit, c) }
+
+        @statuses = visible_statuses.sort_by!(&:context)
+      end
+
+      delegate :pending?, :success?, :error?, :failure?, :unknown?, :state, :simple_state, to: :significant_status
+      delegate :each, :size, :map, to: :statuses
+      delegate :required_statuses, to: :commit
+
+      def to_a
+        @statuses.dup
+      end
+
+      def description
+        "#{success_count} / #{statuses.count} checks OK"
+      end
+
+      def target_url
+      end
+
+      def to_partial_path
+        'statuses/group'
+      end
+
+      def group?
+        true
+      end
+
+      private
+
+      def reject_hidden(statuses)
+        statuses.reject(&:hidden?)
+      end
+
+      def reject_allowed_to_fail(statuses)
+        statuses.reject(&:allowed_to_fail?)
+      end
+
+      def significant_status
+        @significant_status ||= select_significant_status(statuses)
+      end
+
+      def select_significant_status(statuses)
+        statuses = reject_allowed_to_fail(statuses)
+        return Status::Unknown.new(commit) if statuses.empty?
+        non_success_statuses = statuses.reject(&:success?)
+        return statuses.first if non_success_statuses.empty?
+        non_success_statuses.reject(&:pending?).first || non_success_statuses.first || Status::Unknown.new(commit)
+      end
+
+      def success_count
+        @statuses.count(&:success?)
+      end
+    end
+  end
+end

data/app/models/shipit/status/missing.rb

@@ -0,0 +1,30 @@
+module Shipit
+  class Status
+    class Missing
+      include Common
+
+      attr_reader :commit, :context
+
+      def initialize(commit, context)
+        @commit = commit
+        @context = context
+      end
+
+      def target_url
+        nil
+      end
+
+      def state
+        'pending'.freeze
+      end
+
+      def description
+        I18n.t('missing_status.description', context: context)
+      end
+
+      def to_partial_path
+        'shipit/statuses/status'
+      end
+    end
+  end
+end

data/app/models/shipit/status/unknown.rb

@@ -0,0 +1,33 @@
+module Shipit
+  class Status
+    class Unknown
+      include Common
+
+      attr_reader :commit
+
+      def initialize(commit)
+        @commit = commit
+      end
+
+      def state
+        'unknown'.freeze
+      end
+
+      def target_url
+        nil
+      end
+
+      def description
+        ''
+      end
+
+      def context
+        'ci/unknown'
+      end
+
+      def to_partial_path
+        'shipit/statuses/status'
+      end
+    end
+  end
+end

data/app/models/shipit/unlimited_api_client.rb

@@ -0,0 +1,10 @@
+module Shipit
+  class UnlimitedApiClient
+    def stack_id?
+      false
+    end
+
+    def check_permissions!(*)
+    end
+  end
+end

data/app/serializers/shipit/commit_serializer.rb

@@ -13,7 +13,7 @@ module Shipit
     end
 
     def status
-      object.significant_status.state
+      object.status.state
     end
 
     def html_url

data/app/serializers/shipit/pull_request_serializer.rb

@@ -0,0 +1,20 @@
+module Shipit
+  class PullRequestSerializer < 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
+
+    def html_url
+      github_pull_request_url(object)
+    end
+
+    def include_rejection_reason?
+      object.rejection_reason?
+    end
+  end
+end

data/app/serializers/shipit/stack_serializer.rb

@@ -3,8 +3,8 @@ module Shipit
     include ConditionalAttributes
 
     has_one :lock_author
-    attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url, :deploy_spec,
-               :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at,
+    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
 
     def url
@@ -19,6 +19,10 @@ module Shipit
       api_stack_tasks_url(object)
     end
 
+    def pull_requests_url
+      api_stack_pull_requests_url(object)
+    end
+
     def is_locked
       object.locked?
     end

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

@@ -5,7 +5,7 @@
   <%= favicon_link_tag %>
   <%= stylesheet_link_tag :shipit, media: 'all' %>
   <%= javascript_include_tag :shipit %>
-
+  <%= yield :update_subscription %>
   <%= csrf_meta_tags %>
 </head>
 <body>
@@ -26,51 +26,53 @@
     </div>
   </div>
 
-  <% github_status = Shipit::GithubStatus.status
-     unless github_status.nil? || github_status[:status] == 'good' %>
-    <div class="banner github-status banner--orange hidden">
-      <div class="banner__inner wrapper">
-        <div class="banner__content">
-          <h2 class="banner__title">GitHub is having issues</h2>
-            <% if github_status[:body].present? %>
-              "<i><%= github_status[:body] %></i>"
-            <% end %>
-            <% if github_status[:last_updated].present? %>
-              <%= time_ago_in_words(github_status[:last_updated]) %> ago
-            <% end %>
-        </div>
+  <div id="layout-content">
+    <% github_status = Shipit::GithubStatus.status
+       unless github_status.nil? || github_status[:status] == 'good' %>
+      <div class="banner github-status banner--orange hidden">
+        <div class="banner__inner wrapper">
+          <div class="banner__content">
+            <h2 class="banner__title">GitHub is having issues</h2>
+              <% if github_status[:body].present? %>
+                "<i><%= github_status[:body] %></i>"
+              <% end %>
+              <% if github_status[:last_updated].present? %>
+                <%= time_ago_in_words(github_status[:last_updated]) %> ago
+              <% end %>
+          </div>
 
-        <a class="banner__dismiss">&times;</a>
+          <a class="banner__dismiss">&times;</a>
+        </div>
       </div>
-    </div>
-  <% end %>
+    <% end %>
 
-  <header class="header">
-    <%= link_to "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>
-        </a>
-        <div class="header__page-title">
-          <%= yield :page_title %>
-        </div>
-        <% if content_for? :primary_navigation %>
-          <div class="header__page-actions">
-            <%= yield :primary_navigation %>
+    <header class="header">
+      <%= link_to "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>
+          </a>
+          <div class="header__page-title">
+            <%= yield :page_title %>
           </div>
+          <% if content_for? :primary_navigation %>
+            <div class="header__page-actions">
+              <%= yield :primary_navigation %>
+            </div>
+          <% end %>
+        </div>
+        <% if content_for? :secondary_navigation %>
+          <nav class="nav">
+            <%= yield :secondary_navigation %>
+          </nav>
         <% end %>
       </div>
-      <% if content_for? :secondary_navigation %>
-        <nav class="nav">
-          <%= yield :secondary_navigation %>
-        </nav>
-      <% end %>
-    </div>
-  </header>
+    </header>
 
-  <div class="main <%= content_for(:main_classes) %>" data-layout-content>
-    <%= yield %>
+    <div class="main <%= content_for(:main_classes) %>">
+      <%= yield %>
+    </div>
   </div>
 </body>
 </html>

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

@@ -0,0 +1,13 @@
+# Derived from http://timnew.me/blog/2013/04/07/multiple-project-summary-reporting-standard-cctray-xml-feed/
+status_map = {'backlogged' => 'failure', 'locked' => 'failure'}
+xml.instruct!
+xml.Projects do
+  xml.Project '', {
+    :name => stack.to_param,
+    :lastBuildStatus => status_map.fetch(stack.merge_status, stack.merge_status).capitalize,
+    :activity => deploy.running? ? 'Building' : 'Sleeping',
+    :lastBuildTime => deploy.ended_at || deploy.started_at || deploy.created_at,
+    :lastBuildLabel => deploy.id,
+    :webUrl => stack_url(stack),
+  }
+end

data/app/views/shipit/commits/_commit.html.erb

@@ -1,5 +1,5 @@
 <li class="commit" id="commit-<%= commit.id %>">
-  <%= render 'shipit/commits/commit_author', commit: commit %>
+  <%= render 'shipit/shared/author', author: commit.author %>
   <%= render commit.status %>
   <div class="commit-details">
     <span class="commit-title"><%= render_commit_message_with_link commit %></span>

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

@@ -1,7 +1,7 @@
 <%- read_only ||= false -%>
 
 <li class="task deploy" id="task-<%= deploy.id %>" data-status="<%= deploy.status %>">
-  <%= render 'shipit/commits/commit_author', commit: deploy %>
+  <%= render 'shipit/shared/author', author: deploy.author %>
   <a href="<%= stack_deploy_path(@stack, deploy) %>" class="status status--<%= deploy.status %>" data-tooltip="<%= deploy.status.capitalize %>">
     <i class="status__icon"></i>
     <span class="visually-hidden"><%= deploy.status %></span>

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

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