shipit-engine 0.28.1 → 0.33.0

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/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

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/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/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>