shipit-engine 0.8.9 → 0.9.0

data/app/views/bootstrap/shipit/missing_settings.html.erb

@@ -0,0 +1,97 @@
+<% content_for :page_title do %>
+Shipit
+<% end %>
+
+<div class="jumbotron bg-warning">
+  <div class="container">
+    <h1 class="display-4">Oops! You're not ready to ship just yet.</h1>
+    <p class="lead">
+      Shipit is missing some of the information it needs to work properly.
+      Once you've added the configuration, make sure you restart the Rails server.
+    </p>
+  </div>
+</div>
+
+<div class="container">
+  <section>
+    <header>
+      <h2>GitHub application</h2>
+    </header>
+
+    <% if Shipit.github_oauth_id.blank? || Shipit.github_oauth_secret.blank? %>
+      <p><%= missing_github_oauth_message %></p>
+    <% end %>
+    <p id="github_oauth_id">
+      ID:
+    <% if Shipit.github_oauth_id.present? %>
+       Success!
+    <% else %>
+      <span class="missing">
+        <%= missing_github_oauth_id_message %>
+      </span>
+    <% end %>
+    </p>
+
+    <p id="github_oauth_secret">
+    Secret:
+    <% if Shipit.github_oauth_secret.present? %>
+      Success!
+    <% else %>
+      <span class="missing">
+        <%= missing_github_oauth_secret_message %>
+      </span>
+    <% end %>
+    </p>
+  </section>
+
+  <section>
+    <header>
+      <h2>GitHub API</h2>
+    </header>
+
+    <p id="github_api">
+      Token:
+      <% if Shipit.github_api_credentials.present? %>
+        Success!
+      <% else %>
+        <span class="missing">
+          <%= missing_github_api_credentials_message %>
+        </span>
+      <% end %>
+    </p>
+  </section>
+
+  <section>
+    <header>
+      <h2>Redis</h2>
+    </header>
+
+    <p id="redis_url">
+      Redis:
+      <% if Shipit.redis_url.present? %>
+        Success!
+      <% else %>
+        <span class="missing">
+          <%= missing_redis_url_message %>
+        </span>
+      <% end %>
+    </p>
+  </section>
+
+  <section>
+    <header>
+      <h2>Host</h2>
+    </header>
+
+    <p id="host">
+      Host:
+      <% if Shipit.host.present? %>
+        Success!
+      <% else %>
+        <span class="missing">
+          <%= missing_host_message %>
+        </span>
+      <% end %>
+    </p>
+  </section>
+</div>

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

@@ -0,0 +1,44 @@
+<% content_for :page_title do %>
+Create a stack
+<% end %>
+
+<div class='container'>
+  <section>
+    <header>
+      <h1>Create a stack</h1>
+    </header>
+    <%= form_for @stack do |f| %>
+      <fieldset class='form-group'>
+        <%= label_tag :stack_repo_owner, 'Repo' %>
+        <div class='input-group'>
+          <div class='input-group-addon'><%= Shipit.github_url %>/</div>
+          <%= f.text_field :repo_owner, placeholder: 'e.g. Shopify', required: true, class: 'form-control' %>
+          <div class='input-group-addon'>/</div>
+          <%= f.text_field :repo_name, placeholder: 'e.g. shipit-engine', required: true, pattern: "^[a-zA-Z0-9\-_\.]+$", class: 'form-control' %>
+        </div>
+      </fieldset>
+      <fieldset class='form-group'>
+        <%= f.label :branch %>
+        <%= f.text_field :branch, placeholder: 'master', class: 'form-control' %>
+      </fieldset>
+      <fieldset class='form-group'>
+        <%= f.label :environment %>
+        <%= f.text_field :environment, placeholder: 'production', class: 'form-control' %>
+      </fieldset>
+      <fieldset class='form-group'>
+        <%= f.label :deploy_url %>
+        <%= f.text_field :deploy_url, placeholder: 'https://', class: 'form-control' %>
+        <small class='text-muted'>Where is this stack deployed to?</small>
+      </fieldset>
+      <fieldset  class='form-group checkbox'>
+        <%= label_tag :stack_ignore_ci do %>
+          <%= f.check_box :ignore_ci, class: 'checkbox' %>
+          Allow deploys regardless of CI status
+        <% end %>
+      </fieldset>
+      <fieldset>
+        <%= f.submit class: 'btn btn-primary' %>
+      </fieldset>
+    <% end %>
+  </section>
+</div>

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

@@ -48,7 +48,7 @@
     </div>
   </header>
 
-  <div class="main" data-layout-content>
+  <div class="main <%= content_for(:main_classes) %>" data-layout-content>
     <%= yield %>
   </div>
 </body>

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

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en" data-controller="<%= controller_name %>" data-action="<%= action_name %>">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title><%= [Shipit.app_name, @stack.try!(:repo_name)].compact.join(' - ') %></title>
+
+    <%= favicon_link_tag %>
+    <%= stylesheet_link_tag :shipit_bs, media: 'all' %>
+    <%= javascript_include_tag :shipit_bs %>
+
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <% flash.each do |name, msg| %>
+      <%= content_tag :div, msg, class: ["flash-#{name}", :flash] %>
+    <% end %>
+
+    <nav class="navbar navbar-fixed-top navbar-light bg-faded">
+      <%= link_to "Shipit", root_path, class: "navbar-brand" %>
+
+      <ul class="nav navbar-nav">
+        <li class="nav-item active">
+          <%= link_to "#", class: "nav-link" do %>
+            <%= yield :page_title %>
+          <% end %>
+        </li>
+      </ul>
+
+      <div class="pull-xs-right">
+        <%= link_to "Shipit v#{Shipit::VERSION}", "https://github.com/Shopify/shipit-engine/tree/v#{Shipit::VERSION}" %>
+      </div>
+
+      <div class="container pull-xs-right">
+        <%= yield :primary_navigation %>
+      </div>
+    </nav>
+
+    <div class="main">
+      <%= yield %>
+    </div>
+  </body>
+</html>

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

@@ -5,13 +5,14 @@
     <span class="commit-title"><%= render_commit_message_with_link commit %></span>
     <p class="commit-meta">
       <span class="sha"><%= render_commit_id_link(commit) %></span>
-      <%= timeago_tag(commit.committed_at, force: true) %>
-      <span class="utc-timecode">at <%= commit.committed_at.strftime('%H:%M:%S') %> UTC</span>
       <% if commit.additions? && commit.deletions? %>
         <span class="code-additions">+<%= commit.additions %></span>
         <span class="code-deletions">-<%= commit.deletions %></span>
       <% end %>
     </p>
+    <p class="commit-meta">
+      <%= timeago_tag(commit.committed_at, force: true) %>
+    </p>
   </div>
   <div class="commit-actions">
     <%= deploy_button(commit) %>

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

@@ -13,12 +13,21 @@
       </a>
     </span>
     <p class="commit-meta">
+      <%= deploy.rollback? ? 'rolled back' : 'deployed' %>
       <span class="sha"><%= link_to_github_deploy(deploy) %></span>
-      <%= deploy.rollback? ? 'rolled back' : 'deployed' %> <%= timeago_tag(deploy.created_at, force: true) %>
-      <span class="utc-timecode">at <%= deploy.created_at.strftime('%H:%M:%S') %> UTC</span>
       <span class="code-additions">+<%= deploy.additions %></span>
       <span class="code-deletions">-<%= deploy.deletions %></span>
     </p>
+    <p class="commit-meta">
+      <% if read_only %>
+        <span class="utc-timecode">on <%= deploy.created_at.strftime('%Y-%m-%d %H:%M:%S') %> UTC</span>
+      <% else %>
+        <%= timeago_tag(deploy.created_at, force: true) %>
+      <% end %>
+      <% if deploy.duration? %>
+        in <%= deploy.duration %>
+      <% end %>
+    </p>
   </div>
   <% unless read_only %>
     <div class="commit-actions">

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

@@ -5,7 +5,7 @@
     deploying
   <% end %>
   <span class="short-sha"><%= render_commit_id_link(@deploy.until_commit) %></span>
-  <%= timeago_tag(@deploy.created_at, force: true) %> at <%= @deploy.created_at %>
+  <%= timeago_tag(@deploy.created_at, force: true) %>
 <% end %>
 
 <%= render partial: 'shipit/tasks/task_output', locals: {task: @deploy} %>

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

@@ -6,7 +6,7 @@
   <section>
     <div class="setting-section">
       <%= form_for @stack do |f| %>
-        <p>
+        <div class="field-wrapper">
           <%= label_tag "Repo" %>
           <br>
           <%= Shipit.github_url %>
@@ -14,25 +14,25 @@
           <%= f.text_field :repo_owner, placeholder: 'e.g. Shopify', required: true, class: "repo" %>
           /
           <%= f.text_field :repo_name, required: true, pattern: "^[a-zA-Z0-9\-_\.]+$", class: "repo" %>
-        </p>
-        <p>
+        </div>
+        <div class="field-wrapper">
           <%= f.label :branch %>
           <%= f.text_field :branch, placeholder: 'master' %>
-        </p>
-        <p>
+        </div>
+        <div class="field-wrapper">
           <%= f.label :environment %>
           <%= f.text_field :environment, placeholder: 'production' %>
-        </p>
-        <p>
+        </div>
+        <div class="field-wrapper">
           <%= f.label :deploy_url %>
+          <span class="form-hint"><small>Where is this stack deployed to?</small></span>
           <%= f.text_field :deploy_url, placeholder: 'https://' %>
-          <span class="form-hint">Where is this stack deployed to?</span>
-        </p>
-        <p>
+        </div>
+        <div class="field-wrapper">
           <%= f.check_box :ignore_ci %>
           <%= f.label :ignore_ci, "Allow deploys regardless of CI status" %>
-        </p>
-        <p><%= f.submit class: 'btn' %></p>
+        </div>
+        <div class="field-wrapper"><%= f.submit class: 'btn' %></div>
       <% end %>
     </div>
   </section>

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

@@ -8,6 +8,11 @@
 
     <div class="setting-section">
       <%= form_for @stack do |f| %>
+        <div class="field-wrapper">
+          <%= f.label :environment %>
+          <%= f.text_field :environment, placeholder: 'production' %>
+        </div>
+
         <div class="field-wrapper">
           <%= f.label :deploy_url, 'Deploy URL (Where is this stack deployed to?)' %>
           <%= f.text_field :deploy_url, placeholder: 'https://' %>

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

@@ -42,7 +42,7 @@
           Deploys are locked by <%= @stack.lock_author.name %>
         </h2>
         <p class="banner__text">
-          <%= auto_link @stack.lock_reason %>
+          <%= auto_link emojify(@stack.lock_reason) %>
         </p>
       </div>
     </div>

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

@@ -1,3 +1,5 @@
+<%- read_only ||= false -%>
+
 <li class="task" id="task-<%= task.id %>" data-status="<%= task.status %>">
   <%= render 'shipit/commits/commit_author', commit: task %>
   <a href="<%= stack_task_path(@stack, task) %>" class="status status--<%= task.status %>" data-tooltip="<%= task.status.capitalize %>">
@@ -12,8 +14,14 @@
       </a>
     </span>
     <p class="commit-meta">
-      ran a command <%= timeago_tag(task.created_at, force: true) %>
-      <span class="utc-timecode">at <%= task.created_at.strftime('%H:%M:%S') %> UTC</span>
+      ran a command
+    </p>
+    <p class="commit-meta">
+      <% if read_only %>
+        <span class="utc-timecode">on <%= task.created_at.strftime('%Y-%m-%d %H:%M:%S') %> UTC</span>
+      <% else %>
+        <%= timeago_tag(task.created_at, force: true) %>
+      <% end %>
     </p>
   </div>
 </li>

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

@@ -1,3 +1,5 @@
+<% content_for :main_classes do %>no-footer<% end %>
+
 <%= javascript_include_tag 'task' %>
 <%= include_plugins(@stack) %>
 <%= render partial: 'shipit/stacks/header', locals: { stack: @stack } %>
@@ -9,6 +11,7 @@
 <div class="deploy-main" data-task="<%= {repo: @stack.github_repo_name, description: task_description(task)}.to_json %>">
   <span class="deploy-tasks"></span>
   <div class="deploy-banner" data-status="<%= task.status %>">
+    <div class="deploy-banner-status"></div>
     <div class="deploy-banner-section stack-link">
       <%= link_to "Return to #{@stack.repo_name}/#{@stack.environment}", stack_path(@stack) %>
     </div>
@@ -17,6 +20,7 @@
       <span class="deploy-status">
         <%= content_for :task_title %>
       </span>
+      <%= link_to('(view raw output)', { format: :txt }) %>
     </div>
 
     <div class="deploy-banner-section action-buttons">
@@ -34,5 +38,11 @@
     </div>
   </div>
 
-  <pre class="nowrap" data-status="<%= task.status %>"><code data-next-chunks-url="<%= next_chunks_url(task) %>"><%= task.chunk_output %></code></pre>
+  <div class="search-bar hidden">
+    <input type="search" class="search-input" />
+  </div>
+
+  <div class="clusterize-scroll task-output-container">
+    <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>
+  </div>
 </div>

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

@@ -1,6 +1,6 @@
 <% content_for :task_title do %>
   executing <%= @task.definition.id %>
-  <%= timeago_tag(@task.created_at, force: true) %> at <%= @task.created_at %>
+  <%= timeago_tag(@task.created_at, force: true) %>
 <% end %>
 
 <%= render partial: 'shipit/tasks/task_output', locals: {task: @task} %>

data/config/routes.rb

@@ -85,4 +85,5 @@ Shipit::Engine.routes.draw do
       end
     end
   end
+  get '/stacks/:id' => 'stacks#lookup'
 end

data/db/migrate/20160324155046_add_started_at_and_ended_at_on_tasks.rb

@@ -0,0 +1,25 @@
+class AddStartedAtAndEndedAtOnTasks < ActiveRecord::Migration
+  def up
+    add_column :tasks, :started_at, :datetime, null: true
+    add_column :tasks, :ended_at, :datetime, null: true
+
+    say "Migrating #{Shipit::Task.count} tasks:"
+    Shipit::Task.find_each.with_index do |task, index|
+      unless task.started_at
+        task.update_columns(
+          started_at: task.created_at,
+          ended_at: task.updated_at, # good enough approximation but not perfect
+        )
+        puts if index % 100 == 0
+        print '.'
+      end
+    end
+    puts
+    say "Done"
+  end
+
+  def down
+    remove_column :tasks, :started_at
+    remove_column :tasks, :ended_at
+  end
+end

data/lib/shipit.rb

@@ -10,9 +10,11 @@ require 'sass-rails'
 require 'coffee-rails'
 require 'jquery-rails'
 require 'rails-timeago'
+require 'lodash-rails'
 require 'ansi_stream'
 require 'autoprefixer-rails'
 require 'rails_autolink'
+require 'gemoji'
 
 require 'omniauth-github'
 
@@ -27,6 +29,9 @@ require 'octokit'
 require 'faraday-http-cache'
 
 require 'shipit/version'
+
+require 'shipit/template_renderer_extension'
+
 require 'shipit/paginator'
 require 'shipit/null_serializer'
 require 'shipit/csv_serializer'
@@ -171,6 +176,14 @@ module Shipit
     end
   end
 
+  def feature_bootstrap?
+    secrets.features.try!(:include?, 'bootstrap')
+  end
+
+  def bootstrap_view_path
+    @bootstrap_view_path ||= Engine.root.join('app/views/bootstrap')
+  end
+
   protected
 
   def revision_file