shipit-engine 0.32.0 → 0.35.1

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

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

@@ -4,7 +4,7 @@
     <%= render 'anchor', color: '#cea61b' %>
   </div>
   <h4 class="status-heading text-pending">
-    <% if pull_request.waiting? %>
+    <% if merge_request.waiting? %>
       Will be merged shortly after the backlog is shipped!
     <% else %>
       Please hold off merging!

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

@@ -4,7 +4,7 @@
     <%= render 'anchor', color: '#d73a49' %>
   </div>
   <h4 class="status-heading text-red">
-    <% if pull_request.waiting? %>
+    <% if merge_request.waiting? %>
       Will be merged shortly after the CI is fixed!
     <% else %>
       Please hold off merging!

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

@@ -4,7 +4,7 @@
     <%= render 'anchor', color: '#bd2c00' %>
   </div>
   <h4 class="status-heading text-red">
-    <% if pull_request.waiting? %>
+    <% if merge_request.waiting? %>
       Will be merged shortly after the lock is removed!
     <% else %>
       Please hold off merging!

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

@@ -5,8 +5,8 @@
   </div>
 
   <h4 class="status-heading">
-    <% if pull_request.waiting? %>
-      <% if pull_request.all_status_checks_passed? %>
+    <% if merge_request.waiting? %>
+      <% if merge_request.all_status_checks_passed? %>
         Will be merged shortly!
       <% else %>
         Will be merged when required checks are passing.

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

@@ -0,0 +1,19 @@
+<% content_for :page_title do %>
+  <span><%= repository.owner %></span>
+  <h1><%= repository.name %></h1>
+<% end %>
+
+<% content_for :primary_navigation do %>
+  <%= link_to 'Add a stack', repository_stacks_new_path(repository), class: 'btn secondary' %>
+<% end %>
+
+<% content_for :secondary_navigation do %>
+  <ul class="nav__list nav__list--primary">
+    <li class="nav__list__item">
+      <%= link_to 'Stacks', repository_path(repository) %>
+    </li>
+    <li class="nav__list__item">
+      <%= link_to 'Settings', repository_settings_path(repository) %>
+    </li>
+  </ul>
+<% end %>

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

@@ -0,0 +1,31 @@
+<% content_for :page_title do %>
+  <h1>Repositories</h1>
+<% end %>
+<% content_for :primary_navigation do %>
+  <%= link_to 'Add a repository', new_repository_path, class: 'btn secondary' %>
+<% end %>
+
+<div class="wrapper <%= 'filtering-enabled' if @repositories.size > 10 %>">
+  <section>
+    <header class="section-header repository-search-header">
+      <input class="repository-search" placeholder="Search <%= @repositories.size %> repositories" />
+    </header>
+    <ul class="repository-table-header">
+      <li class="col">Owner<li>
+        <li class="col">Name</li>
+    </ul>
+    <ul class="repository-lst">
+      <% @repositories.each do |repository| %>
+        <li class="search-item <%= contributor_class(current_user.repositories_contributed_to, repository.id) %>" data-search="<%= repository.github_repo_name %>" data-repository-id="<%= repository.id %>">
+          <%= link_to repository_path(repository), class: 'commits-path' do %>
+            <span class="col"><%= repository.owner %></span>
+            <span class="col"><%= repository.name %></span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+
+    <%= link_to 'show all repositories', '#', class: 'btn secondary show-all-repositories' %></p>
+  </section>
+
+</div>

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

@@ -0,0 +1,23 @@
+<% content_for :page_title do %>
+  <h1>Create a repository</h1>
+<% end %>
+
+<div class="wrapper">
+  <section>
+    <div class="setting-section">
+      <%= form_for @repository do |f| %>
+        <div class="field-wrapper">
+          <%= label_tag "Repo" %>
+          <br>
+          <%= Shipit.github.url %>
+          /
+          <%= f.text_field :owner, placeholder: 'e.g. Shopify', required: true, class: "repo" %>
+          /
+          <%= f.text_field :name, required: true, pattern: "^[a-zA-Z0-9\-_\.]+$", class: "repo" %>
+        </div>
+
+        <div class="field-wrapper"><%= f.submit class: 'btn' %></div>
+      <% end %>
+    </div>
+  </section>
+</div>

data/app/views/shipit/repositories/settings.html.erb

@@ -0,0 +1,53 @@
+<%= render partial: 'shipit/repositories/header', locals: { repository: @repository } %>
+
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <h2>Settings (Repository <%= @repository.github_repo_name %>)</h2>
+    </header>
+
+    <div class="setting-section">
+      <%= form_for @repository do |f| %>
+        <div class="field-wrapper">
+          <%= f.check_box :review_stacks_enabled %>
+          <%= f.label :review_stacks_enabled, "Dynamically provision stacks for Pull Requests?" %>
+        </div>
+
+        <div class="field-wrapper">
+          <p>
+            <%= f.label :provisioning_behavior, "Provisioning behavior", aria: { describedby: 'provisioningBehaviorHelp' } %>
+            <%= f.select :provisioning_behavior, Shipit::Repository.provisioning_behaviors.map { |key, value| [ key.titleize, key] } %>
+          </p>
+          <p>
+            <small class="form-text text-muted" id="provisioningBehaviorHelp">
+              When "Allow All", the provisioning label has no effect on dynamic stack provisioning - ALL Pull Requests dynamically provision stacks.
+            </small>
+          </p>
+          <p>
+            <small class="form-text text-muted">
+              When "Allow With Label", dynamic provisioning occurs ONLY for Pull Requests whose labels include the 'Provisioning Label'.
+            </small>
+          </p>
+          <p>
+            <small class="form-text text-muted">
+              When "Prevent With Label", dynamic provisioning will occur for every Pull Request EXCEPT those whose labels include the 'Provisioning Label'.
+            </small>
+          </p>
+        </div>
+
+        <div class="field-wrapper">
+          <%= f.label :provisioning_label_name, "Provisioning label" %>
+          <%= f.text_field :provisioning_label_name %>
+        </div>
+
+        <%= f.submit class: "btn", value: "Save" %>
+      <% end %>
+    </div>
+
+    <div class="setting-section">
+      <h5>Delete this repository</h5>
+      <p>This action will delete the repository and its stacks from Ship it permanently. Be careful.</p>
+      <%= button_to "Delete…", repository_path(@repository), class: 'btn btn--delete', data: {confirm: 'Are you sure?'}, method: :delete %>
+    </div>
+  </section>
+</div>

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

@@ -0,0 +1,30 @@
+<% subscribe events_path(channels: ["repository.#{@repository.id}"]), '#layout-content' %>
+
+<%= render partial: 'shipit/repositories/header', locals: {repository: @repository} %>
+
+<div class="wrapper">
+  <section>
+    <% cache [@repository, params[:show_archived]] do %>
+      <section>
+        <header class="section-header">
+          <h2>Stacks</h2>
+        </header>
+        <ul class="repository-table-header">
+          <li class="col">Name</li>
+          <li class="col">Environment</li>
+          <li class="col">Branch</li>
+          <li class="col">Deploy URL</li>
+        </ul>
+        <ul class="repository-lst">
+          <%= render @stacks %>
+        </ul>
+
+        <%= link_to 'show all stacks', '#', class: 'btn secondary show-all-stacks' %></p>
+        <% if @show_archived %>
+          <%= link_to 'hide archived stacks', '?', class: 'btn secondary' %></p>
+        <% else %>
+          <%= link_to 'show archived stacks', '?show_archived=1', class: 'btn secondary' %></p>
+        <% end %>
+      </section>
+    <% end %>
+</div>

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

@@ -49,6 +49,19 @@
   </div>
 <% end %>
 
+<% if stack.awaiting_provision? %>
+  <div class="banner banner--orange">
+    <div class="banner__inner wrapper">
+      <div class="banner__content">
+        <h2 class="banner__title">
+          <i class="icon icon--list"></i>
+          This stack is in a queue waiting on provisioning. This may be because too many review stacks exist for this repository.
+        </h2>
+      </div>
+    </div>
+  </div>
+<% end %>
+
 <% if stack.continuous_delivery_delayed? %>
   <div class="banner">
     <div class="banner__inner wrapper">
@@ -56,7 +69,8 @@
         <h2 class="banner__title">Continuous Delivery Delayed!</h2>
         <p class="banner__text">
           Continuous Delivery for this stack is currently paused because
-          <%= link_to 'the pre-deploy checks failed', stack_commit_checks_path(stack, sha: stack.next_commit_to_deploy.sha) %>.
+
+          <%= link_to_if stack.deployment_checks_passed?, 'the pre-deploy checks failed', stack_commit_checks_path(stack, sha: stack.next_commit_to_deploy.sha) %>.
           You can either wait for them to pass, or trigger a deploy manually.
         </p>
       </div>

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

@@ -22,9 +22,12 @@
     <li class="nav__list__item">
       <%= link_to t('stack.nav.statistics'), stack_statistics_path(stack) %>
     </li>
+    <li class="nav__list__item">
+      <%= link_to 'Repository', repository_path(stack.repository) %>
+    </li>
     <% if stack.merge_queue_enabled? %>
       <li class="nav__list__item">
-        <%= link_to t('stack.nav.merge_queue', count: stack.pull_requests.queued.count), stack_pull_requests_path(stack) %>
+        <%= link_to t('stack.nav.merge_queue', count: stack.merge_requests.queued.count), stack_merge_requests_path(stack) %>
       </li>
     <% end %>
 
@@ -64,7 +67,7 @@
       </li>
     <% end %>
     <li class="nav__list__item">
-      <%= link_to t('stack.nav.view_on_github'), github_repo_url(stack.repo_owner, stack.repo_name) %>
+      <%= link_to t('stack.nav.view_on_github'), stack_github_url(stack) %>
     </li>
     <% if stack.deploy_url.present? %>
       <li class="nav__list__item">

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

@@ -0,0 +1,8 @@
+<li class="search-item <%= stack.archived? ? 'archived' : '' %> <%= stack.undeployed_commits? ? 'undeployed' : '' %> <%= contributor_class(current_user.stacks_contributed_to, stack.id) %>" data-search="<%= stack.repo_name %> <%= stack.environment %> <%= stack.deploy_url %>" data-stack-id="<%= stack.id %>">
+  <%= link_to stack_path(stack), class: 'commits-path' do %>
+    <span class="col"><%= stack.repo_name %></span>
+    <small class="col"><%= stack.environment.capitalize %></small>
+    <small class="col"><%= stack.branch %></small>
+    <small class="col"><%= stack.deploy_url %></small>
+  <% end %>
+</li>

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

@@ -2,6 +2,7 @@
   <h1><%= Shipit.app_name %></h1>
 <% end %>
 <% content_for :primary_navigation do %>
+  <%= link_to 'Repositories', repositories_path, class: 'btn secondary' %>
   <%= link_to 'Add a stack', new_stack_path, class: 'btn secondary' %>
 <% end %>
 
@@ -21,7 +22,7 @@
         <li class="stack search-item <%= stack.archived? ? 'archived' : '' %> <%= stack.undeployed_commits? ? 'undeployed' : '' %> <%= @user_stacks.include?(stack.id) ? 'contributor' : 'not-matching' %>" data-search="<%= stack.repo_name %> <%= stack.environment %> <%= stack.deploy_url %>" data-stack-id="<%= stack.id %>">
           <%= link_to stack_path(stack), class: 'commits-path' do %>
             <span class="col"><%= stack.repo_name %></span>
-            <small class="col"><%= stack.environment.capitalize %></small>
+            <small class="col"><%= stack.environment %></small>
             <small class="col"><%= stack.branch %></small>
             <small class="col"><%= stack.deploy_url %></small>
           <% end %>

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

@@ -17,7 +17,7 @@
         </div>
         <div class="field-wrapper">
           <%= f.label :branch %>
-          <%= f.text_field :branch, placeholder: 'master' %>
+          <%= f.text_field :branch, placeholder: '<default branch>' %>
         </div>
         <div class="field-wrapper">
           <%= f.label :environment %>

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

@@ -7,7 +7,7 @@
     </header>
 
     <div class="setting-section">
-      <%= form_for @stack do |f| %>
+      <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
         <div class="field-wrapper">
           <%= f.label :environment %>
           <%= f.text_field :environment, placeholder: 'production' %>
@@ -43,7 +43,7 @@
 
     <div class="setting-section">
       <h5>Lock deploys</h5>
-      <%= form_for @stack do |f| %>
+      <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
         <div class="field-wrapper">
           <%= f.label :lock_reason, 'Reason for lock' %>
           <%= f.text_area :lock_reason %>
@@ -55,7 +55,7 @@
         <% end %>
       <% end %>
       <% if @stack.locked? %>
-        <%= form_for @stack do |f| %>
+        <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
           <%= f.hidden_field :lock_reason, value: nil %>
           <%= f.submit class: "btn btn--primary", value: "Unlock" %>
         <%- end -%>
@@ -85,14 +85,14 @@
       <% if @stack.archived? %>
         <h5>Restore Stack</h5>
         <p>This action will de-archive the Stack, restoring it in the stack list and unlocking it.</p>
-        <%= form_for @stack do |f| %>
+        <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
           <%= f.hidden_field :archived, value: false %>
           <%= f.submit class: "btn", value: "Restore" %>
         <% end %>
       <% else %>
         <h5>Archive Stack</h5>
         <p>This action will archive the Stack, hiding it from the stack list and locking it. It can still be found if you know the URL and de-archived.</p>
-        <%= form_for @stack do |f| %>
+        <%= form_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
           <%= f.hidden_field :archived, value: true %>
           <%= f.submit class: "btn", value: "Archive" %>
         <% end %>

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

@@ -12,7 +12,7 @@
         <% if params[:force] %>
           <%= link_to t('emergency_mode.disable'), stack_path(@stack) %>
         <% else %>
-          <%= link_to t('emergency_mode.enable'), stack_path(@stack, force: 1), title: t('emergency_mode.enable_description') %>
+          <%= link_to t('emergency_mode.enable'), stack_path(@stack, force: 1, noredirect: 1), title: t('emergency_mode.enable_description') %>
         <% end %>
       </div>
     </header>

data/app/views/shipit/tasks/_task_output.html.erb

@@ -43,6 +43,6 @@
   </div>
 
   <div class="clusterize-scroll task-output-container task-output-container-main-page">
-    <pre class="nowrap" data-status="<%= task.status %>"><code class="clusterize-content" data-output="<%= task.chunk_output %>" data-next-chunks-url="<%= next_chunks_url(task) %>"></code></pre>
+    <pre class="nowrap" data-status="<%= task.status %>"><code class="clusterize-content" data-output="<%= task.chunk_output %>" data-next-chunks-url="<%= next_chunks_url(task, last_byte: task.chunk_output_size) %>"></code></pre>
   </div>
 </div>

data/config/routes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 Shipit::Engine.routes.draw do
   stack_id_format = %r{[^/]+/[^/]+/[^/]+}
+  repository_id_format = %r{[^/]+/[^/]+}
   sha_format = /[\da-f]{6,40}/
   root to: 'stacks#index'
 
@@ -32,7 +33,7 @@ Shipit::Engine.routes.draw do
       end
       resources :rollbacks, only: %i(create)
       resources :commits, only: %i(index)
-      resources :pull_requests, only: %i(index show update destroy)
+      resources :merge_requests, only: %i(index show update destroy)
       post '/task/:task_name' => 'tasks#trigger', as: :trigger_task
       resources :hooks, only: %i(index create show update destroy)
     end
@@ -46,12 +47,20 @@ Shipit::Engine.routes.draw do
 
   # Browser extension
   get '/merge_status', action: :show, controller: :merge_status, as: :merge_status
-  put '/merge_status/*stack_id/pull/:number', action: :enqueue, controller: :merge_status, id: stack_id_format, as: :enqueue_pull_request
-  delete '/merge_status/*stack_id/pull/:number', action: :dequeue, controller: :merge_status, id: stack_id_format, as: :dequeue_pull_request
+  put '/merge_status/*stack_id/pull/:number', action: :enqueue, controller: :merge_status, id: stack_id_format, as: :enqueue_merge_request
+  delete '/merge_status/*stack_id/pull/:number', action: :dequeue, controller: :merge_status, id: stack_id_format, as: :dequeue_merge_request
 
   # Humans
   resources :api_clients
-  resources :stacks, only: %i(new create index)
+
+  resources :repositories, only: %i(new index create)
+  scope '/repositories/*id', id: repository_id_format, as: :repository do
+    get '/' => 'repositories#show'
+    patch '/' => 'repositories#update'
+    delete '/' => 'repositories#destroy'
+    get :settings, controller: :repositories
+    get 'stacks/new' => 'repositories#new_stack'
+  end
 
   scope '/github/auth/github', as: :github_authentication, controller: :github_authentication do
     get '/', action: :request
@@ -60,6 +69,7 @@ Shipit::Engine.routes.draw do
     get :logout
   end
 
+  resources :stacks, only: %i(new create index)
   scope '/*id', id: stack_id_format, as: :stack do
     get '/' => 'stacks#show'
     patch '/' => 'stacks#update'
@@ -107,7 +117,7 @@ Shipit::Engine.routes.draw do
       resources :release_statuses, only: %i(create)
     end
 
-    resources :pull_requests, only: %i(index destroy create)
+    resources :merge_requests, only: %i(index destroy create)
   end
   get '/stacks/:id' => 'stacks#lookup'