shipit-engine 0.28.1 → 0.33.0

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

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

@@ -5,23 +5,29 @@
 
 
 <% 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>
+    <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 "Merge Queue (#{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 %>
 
@@ -35,25 +41,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'), stack_github_url(stack) %>
     </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>

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

@@ -0,0 +1 @@
+<%# Placeholder to be used by the host application %>

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

@@ -0,0 +1,28 @@
+<% subscribe events_path(channels: ["stack.#{@stack.id}"]), '#layout-content' %>
+
+<%= render partial: 'shipit/stacks/header', locals: {stack: @stack} %>
+<%= render partial: 'shipit/stacks/banners', locals: {stack: @stack} %>
+
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <h2>Available tasks</h2>
+    </header>
+    <ul class="task-list">
+      <% @stack.task_definitions.each do |definition| %>
+        <li class="task" id="task-<%= definition.id %>">
+          <%= link_to "#{definition.action}", new_stack_tasks_path(@stack, definition_id: definition.id), class: "trigger-deploy" %>
+        </li>
+      <% end %>
+    </ul>
+  </section>
+
+  <section>
+    <header class="section-header">
+      <h2>Previous Tasks</h2>
+    </header>
+    <ul class="commit-list">
+      <%= render @tasks %>
+    </ul>
+  </section>
+</div>

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

@@ -1,7 +1,8 @@
 <% content_for :page_title do %>
-  <h1>Shipit</h1>
+  <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 %>
 
@@ -18,10 +19,10 @@
     </ul>
     <ul class="stack-lst">
       <% @stacks.each do |stack| %>
-        <li class="search-item <%= 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 %>">
+        <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 %>
@@ -30,6 +31,11 @@
     </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>
 
 </div>

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,12 +55,13 @@
         <% 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 -%>
       <% end %>
     </div>
+
     <div class="setting-section">
       <h5>Resynchronize this stack</h5>
       <table>
@@ -80,6 +81,24 @@
       <%= button_to "Fetch URL", "", class: 'btn', data: {remote: ccmenu_url_url(stack_id: @stack.to_param)} %>
     </div>
 
+    <div class="setting-section">
+      <% 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_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_with scope: :stack, url: stack_path(@stack), method: :patch do |f| %>
+          <%= f.hidden_field :archived, value: true %>
+          <%= f.submit class: "btn", value: "Archive" %>
+        <% end %>
+      <% end %>
+    </div>
+
     <div class="setting-section">
       <h5>Delete this stack</h5>
       <p>This action will delete the stack from Ship it permanently. Be careful.</p>

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

@@ -0,0 +1,82 @@
+<%= render partial: 'shipit/stacks/header', locals: {stack: @stack} %>
+<%= render partial: 'shipit/stacks/banners', locals: {stack: @stack} %>
+
+<div class="wrapper">
+  <section>
+    <header class="section-header">
+      <h2>Statistics &ndash; Past 7 Days</h2>
+    </header>
+
+    <div class="row">
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= @deploy_stats.count %></div>
+            <div class="stats__caption">Deploys</div>
+            <div class="stats__change">
+              <div class="stats__value stats__value--<%=positive_negative_class(@diffs[:count])%>"><%= number_to_percentage(@diffs[:count], precision: 1) %></div>
+              <div class="stats__period">this week</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= number_to_percentage(@deploy_stats.success_rate, precision: 1) %></div>
+            <div class="stats__caption">Deploys success rate</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.average_duration %></div>
+            <div class="stats__caption">Average deploy time</div>
+            <div class="stats__change">
+              <div class="stats__value stats__value--<%=positive_negative_class(@diffs[:average_duration])%>"><%= number_to_percentage(@diffs[:average_duration], precision: 1) %></div>
+              <div class="stats__period">this week</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.min_duration %></div>
+            <div class="stats__caption">Min deploy time</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.median_duration %></div>
+            <div class="stats__caption">Median deploy time</div>
+            <div class="stats__change">
+              <div class="stats__value stats__value--<%=positive_negative_class(@diffs[:median_duration])%>"><%= number_to_percentage(@diffs[:median_duration], precision: 1) %></div>
+              <div class="stats__period">this week</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="box">
+        <div class="box__body">
+          <div class="stats">
+            <div class="stats__amount"><%= Shipit::Duration.new @deploy_stats.max_duration %></div>
+            <div class="stats__caption">Max deploy time</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </section>
+
+</div>

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/app/views/shipit/tasks/show.html.erb

@@ -1,5 +1,5 @@
 <% content_for :task_title do %>
-  executing <%= @task.definition.id %>
+  <%= @task.active? ? "executing" : "executed" %> <%= @task.definition.id %>
   <%= timeago_tag(@task.created_at, force: true) %>
 <% end %>
 

data/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym 'CCMenu'
+  inflect.acronym('CCMenu')
 end

data/config/locales/en.yml

@@ -20,10 +20,21 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
+  stack:
+    nav:
+      refresh: Refresh statuses & commits
+      commits: Commits & Deploys
+      settings: Settings
+      timeline: Timeline
+      statistics: Stats
+      merge_queue: "Merge Queue (%{count})"
+      view_on_github: View on GitHub
+      links: More
+      deploy_link: View website
   commit:
-    lock: This commit is safe to deploy. Click to mark it as unsafe.
-    unlock: This commit was marked as unsafe to deploy. Click to mark it as safe.
-    unlock_with_author: "%{author} marked this commit as unsafe to deploy. Click to mark it as safe."
+    lock: Click to mark this commit as unsafe to deploy.
+    unlock: Click to mark this commit as safe to deploy.
+    unlock_with_author: "%{author} marked this commit as unsafe to deploy. Click to mark this commit as safe to deploy."
     confirm_unlock: Mark this commit as safe to deploy?
   release:
     validate: Mark the release as healthy
@@ -72,12 +83,14 @@ en:
       ascii: "contains non-ASCII characters"
   deployment_description:
     deploy:
-      pending: "%{author} triggered the deploy of %{stack} to %{sha}"
+      in_progress: "%{author} triggered the deploy of %{stack} to %{sha}"
+      pending: "%{author} created the deploy of %{stack} to %{sha}"
       success: "%{author} deployed %{stack} to %{sha}"
       failure: "Deploy of %{stack} to %{sha} by %{author} failed"
       error: "Deploy of %{stack} to %{sha} by %{author} failed"
     rollback:
-      pending: "%{author} triggered the rollback of %{stack} to %{sha}"
+      in_progress: "%{author} triggered the deploy of %{stack} to %{sha}"
+      pending: "%{author} created the rollback of %{stack} to %{sha}"
       success: "%{author} rolled back %{stack} to %{sha}"
       failure: "Rollback of %{stack} to %{sha} by %{author} failed"
       error: "Rollback of %{stack} to %{sha} by %{author} failed"

data/config/routes.rb

@@ -1,5 +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'
 
@@ -17,6 +19,7 @@ Shipit::Engine.routes.draw do
     scope '/stacks/*id', id: stack_id_format, as: :stack do
       get '/' => 'stacks#show'
       delete '/' => 'stacks#destroy'
+      patch '/' => 'stacks#update'
     end
 
     scope '/stacks/*stack_id', stack_id: stack_id_format, as: :stack do
@@ -28,8 +31,9 @@ Shipit::Engine.routes.draw do
       resources :deploys, only: %i(index create) do
         resources :release_statuses, only: %i(create)
       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
@@ -43,11 +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 :stacks, only: %i(new create index)
+  resources :api_clients
+
+  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
@@ -56,11 +69,14 @@ 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'
     delete '/' => 'stacks#destroy'
     get :settings, controller: :stacks
+    get :all_tasks, controller: :stacks, as: :tasks_list
+    get :statistics, controller: :stacks
     post :refresh, controller: :stacks
     get :refresh, controller: :stacks # For easier design, sorry :/
     post :clear_git_cache, controller: :stacks
@@ -72,7 +88,9 @@ Shipit::Engine.routes.draw do
 
   scope '/*stack_id', stack_id: stack_id_format, as: :stack do
     get '/commit/:sha/checks' => 'commit_checks#show', as: :commit_checks
-    get '/commit/:sha/checks/tail' => 'commit_checks#tail', as: :tail_commit_checks, defaults: {format: :json}
+    get '/commit/:sha/checks/tail' => 'commit_checks#tail', as: :tail_commit_checks, defaults: { format: :json }
+
+    get '/stats' => 'stats#show', as: :stats
 
     resources :rollbacks, only: %i(create)
     resources :commits, only: %i(update)
@@ -85,7 +103,7 @@ Shipit::Engine.routes.draw do
 
       member do
         post :abort
-        get :tail, defaults: {format: :json}
+        get :tail, defaults: { format: :json }
       end
     end
 
@@ -99,7 +117,11 @@ 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'
+
+  scope '/*repo', repo: %r{[^/]+/[^/]+}, as: :stack_search do
+    get '/' => 'stacks#index'
+  end
 end