shipit-engine 0.16.0 → 0.17.0

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

@@ -1,4 +1,4 @@
-<li class="commit" id="commit-<%= commit.id %>">
+<li class="commit <%= 'locked' if commit.locked? %>" id="commit-<%= commit.id %>">
   <%= render 'shipit/shared/author', author: commit.author %>
   <%= render commit.status %>
   <div class="commit-details">
@@ -14,6 +14,14 @@
       <%= timeago_tag(commit.committed_at, force: true) %>
     </p>
   </div>
+  <div class="commit-lock" >
+    <%= link_to stack_commit_path(commit.stack, commit), class: 'action-lock-commit', data: {tooltip: t('commit.lock')} do %>
+      <i class="icon icon--lock"></i>
+    <% end %>
+    <%= link_to stack_commit_path(commit.stack, commit), class: 'action-unlock-commit', data: {tooltip: t('commit.unlock'), confirm: t('commit.confirm_unlock')} do %>
+      <i class="icon icon--lock"></i>
+    <% end %>
+  </div>
   <div class="commit-actions">
     <%= deploy_button(commit) %>
   </div>

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

@@ -11,7 +11,7 @@
 
   <section>
     <header class="section-header">
-      <h2>Commits included in this rollback</h2>
+      <h2>Commits that will be rolled back</h2>
     </header>
 
     <p><%= link_to_github_deploy(@rollback) %></p>

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

@@ -6,9 +6,6 @@
 
 <% content_for :primary_navigation do %>
   <%= link_to 'Refresh statuses & commits', stack_refresh_path(stack), method: 'post', class: "header__btn btn" %>
-  <% stack.task_definitions.each do |definition| %>
-      <%= link_to "#{definition.action}…", new_stack_tasks_path(stack, definition_id: definition.id), class: %w(header__btn stack-action btn trigger-deploy) %>
-  <% end %>
 <% end %>
 
 <% content_for :secondary_navigation do %>
@@ -27,7 +24,22 @@
         <%= link_to "Pull Requests (#{stack.pull_requests.queued.count})", stack_pull_requests_path(stack) %>
       </li>
     <% end %>
+
+    <% if stack.task_definitions.present? %>
+      <li class="nav__list__item nav__list__item--has-children">
+        Tasks
+
+        <ul class="nav__sub__list">
+          <% stack.task_definitions.each do |definition| %>
+            <li class="nav__list__sub__item">
+              <%= link_to "#{definition.action}…", new_stack_tasks_path(stack, definition_id: definition.id), class: "trigger-deploy" %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
+    <% end %>
   </ul>
+
   <ul class="nav__list nav__list--secondary">
     <% if stack.links.present? %>
       <% stack.links.each do |name, url| %>

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

@@ -74,7 +74,7 @@
     <div class="setting-section setting-ccmenu">
       <h5>Miscellaneous</h5>
       <div class="field-wrapper">
-        <label>CCMenu URL</label>
+        <label>CCMenu URL (choose “Use URL as entered above” during CCMenu setup)</label>
         <input id="ccmenu-url" class="hidden" type="text" disabled />
       </div>
       <%= button_to "Fetch URL", "", class: 'btn', data: {remote: ccmenu_url_url(stack_id: @stack.to_param)} %>

data/config/locales/en.yml

@@ -20,21 +20,25 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
+  commit:
+    lock: This commit is safe to deploy. Click to mark it as unsafe.
+    unlock: This commit is unsafe to deploy. Click to mark it as safe.
+    confirm_unlock: Mark this commit as safe to deploy?
   deploy_button:
     hint:
       max_commits: It is recommended not to deploy more than %{maximum} commits at once.
     caption:
-      pending: CI Pending...
-      failure: CI Failure
-      error: CI Error
+      pending: Pending CI
+      failure: Failing CI
+      error: Failing CI
       unknown: Not Run
       locked: Locked
-      deploying: A Deploy is in Progress...
+      deploying: A Deploy is in Progress
       allowed: Deploy
       missing: Missing CI
   redeploy_button:
     caption:
-      deploying: A Deploy is in Progress...
+      deploying: A Deploy is in Progress
       allowed: Redeploy
       locked: Locked
   deploy_spec:

data/config/routes.rb

@@ -73,6 +73,7 @@ Shipit::Engine.routes.draw do
     get '/commit/:sha/checks/tail' => 'commit_checks#tail', as: :tail_commit_checks, defaults: {format: :json}
 
     resources :rollbacks, only: %i(create)
+    resources :commits, only: %i(update)
     resources :tasks, only: %i(show) do
       collection do
         get '' => 'tasks#index', as: :index

data/db/migrate/20170310164315_add_merged_at_on_pull_requests.rb

@@ -0,0 +1,9 @@
+class AddMergedAtOnPullRequests < ActiveRecord::Migration[5.0]
+  def up
+    add_column :pull_requests, :merged_at, :datetime
+  end
+
+  def down
+    remove_column :pull_requests, :merged_at
+  end
+end

data/db/migrate/20170314145604_add_last_deployed_at_to_stack.rb

@@ -0,0 +1,9 @@
+class AddLastDeployedAtToStack < ActiveRecord::Migration[5.0]
+  def up
+    add_column :stacks, :last_deployed_at, :datetime
+  end
+
+  def down
+    remove_column :stacks, :last_deployed_at
+  end
+end

data/db/migrate/20170320124156_add_locked_to_commits.rb

@@ -0,0 +1,5 @@
+class AddLockedToCommits < ActiveRecord::Migration[5.0]
+  def change
+    add_column :commits, :locked, :boolean, default: false, null: false
+  end
+end

data/lib/shipit/task_commands.rb

@@ -37,6 +37,7 @@ module Shipit
         'BUNDLE_PATH' => Rails.root.join('data', 'bundler').to_s,
         'SHIPIT_LINK' => permalink,
         'LAST_DEPLOYED_SHA' => @stack.last_deployed_commit.sha,
+        'TASK_ID' => @task.id.to_s,
       ).merge(deploy_spec.machine_env).merge(@task.env)
     end
 

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.0'.freeze
 end

data/test/controllers/api/ccmenu_controller_test.rb

@@ -42,6 +42,12 @@ module Shipit
         assert_payload 'lastBuildStatus', 'Failure'
       end
 
+      test "stacks with no deploys render correctly" do
+        stack = Stack.create!(repo_owner: 'foo', repo_name: 'bar')
+        get :show, params: {stack_id: stack.to_param}
+        assert_payload 'lastBuildStatus', 'Success'
+      end
+
       private
 
       def get_project_from_xml(xml)

data/test/controllers/api/stacks_controller_test.rb

@@ -101,6 +101,12 @@ module Shipit
         assert_response :ok
         assert_json 'id', @stack.id
       end
+
+      test "#show returns last_deployed_at column for stack" do
+        get :show, params: {id: @stack.to_param}
+        assert_response :ok
+        assert_json 'last_deployed_at', @stack.last_deployed_at
+      end
     end
   end
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -24,11 +24,22 @@ module Shipit
         assert_json 'id', task.id
       end
 
+      test "#trigger returns 404 with unknown task" do
+        post :trigger, params: {stack_id: @stack.to_param, task_name: 'shave_the_yak'}
+        assert_response :not_found
+      end
+
       test "#trigger triggers a custom task" do
         post :trigger, params: {stack_id: @stack.to_param, task_name: 'restart'}
         assert_response :accepted
         assert_json 'type', 'task'
         assert_json 'status', 'pending'
+
+        expected_env = {
+          "FOO" => "1",
+          "BAR" => "0",
+        }
+        assert_equal expected_env, Shipit::Task.last.env
       end
 
       test "#trigger refuses to trigger a task with tasks not whitelisted" do
@@ -44,6 +55,26 @@ module Shipit
         assert_response :accepted
         assert_json 'type', 'task'
         assert_json 'status', 'pending'
+
+        expected_env = {
+          "FOO" => "bar",
+          "BAR" => "0",
+        }
+        assert_equal expected_env, Shipit::Task.last.env
+      end
+
+      test "#trigger triggers a task with explicitly passed and default variables" do
+        env = {'WALRUS' => 'overridden value'}
+        post :trigger, params: {stack_id: @stack.to_param, task_name: 'restart', env: env}
+        assert_response :accepted
+
+        # FOO and BAR are variables with a default value
+        expected_env = {
+          "FOO" => "1",
+          "BAR" => "0",
+          "WALRUS" => "overridden value",
+        }
+        assert_equal expected_env, Shipit::Task.last.env
       end
 
       test "#trigger returns a 404 when the task doesn't exist" do

data/test/controllers/commits_controller_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+module Shipit
+  class CommitsControllerTest < ActionController::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @commit = shipit_commits(:first)
+      session[:user_id] = shipit_users(:walrus).id
+    end
+
+    test "#update allows to lock a commit" do
+      refute_predicate @commit, :locked?
+      patch :update, params: {stack_id: @stack.to_param, id: @commit.id, commit: {locked: true}}
+      assert_response :ok
+      assert_predicate @commit.reload, :locked?
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170221130336) do
+ActiveRecord::Schema.define(version: 20170320124156) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -59,6 +59,7 @@ ActiveRecord::Schema.define(version: 20170221130336) do
     t.integer  "pull_request_number"
     t.string   "pull_request_title",  limit: 1024
     t.integer  "pull_request_id"
+    t.boolean  "locked",                            default: false, null: false
     t.index ["author_id"], name: "index_commits_on_author_id"
     t.index ["committer_id"], name: "index_commits_on_committer_id"
     t.index ["created_at"], name: "index_commits_on_created_at"
@@ -145,6 +146,7 @@ ActiveRecord::Schema.define(version: 20170221130336) do
     t.datetime "updated_at",                                     null: false
     t.string   "branch"
     t.datetime "revalidated_at"
+    t.datetime "merged_at"
     t.index ["head_id"], name: "index_pull_requests_on_head_id"
     t.index ["merge_requested_by_id"], name: "index_pull_requests_on_merge_requested_by_id"
     t.index ["stack_id", "github_id"], name: "index_pull_requests_on_stack_id_and_github_id", unique: true
@@ -173,6 +175,7 @@ ActiveRecord::Schema.define(version: 20170221130336) do
     t.datetime "continuous_delivery_delayed_since"
     t.datetime "locked_since"
     t.boolean  "merge_queue_enabled",                             default: false,        null: false
+    t.datetime "last_deployed_at"
     t.index ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true
   end
 

data/test/fixtures/shipit/commits.yml

@@ -53,7 +53,7 @@ fourth:
 fifth:
   id: 5
   sha: 567578b362bf2b4df5903e1c7960929361c3abcd
-  message: "fix all teh things"
+  message: "fix all the things"
   stack: shipit
   author: walrus
   committer: walrus

data/test/fixtures/shipit/pull_requests.yml

@@ -54,3 +54,36 @@ shipit_pending_not_mergeable_yet:
   mergeable: null
   additions: 23
   deletions: 43
+
+shipit_pending_closed:
+  stack: shipit
+  number: 65
+  merge_status: pending
+  merge_requested_by: walrus
+  merge_requested_at: <%= 3.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 3.minute.ago.to_s(:db) %>
+  github_id: 43243243243243
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/65
+  state: closed
+  branch: feature-64
+  head_id: 8
+  mergeable: null
+  additions: 23
+  deletions: 43
+
+shipit_pending_merged:
+  stack: shipit
+  number: 66
+  merge_status: pending
+  merge_requested_by: walrus
+  merge_requested_at: <%= 3.minute.ago.to_s(:db) %>
+  merged_at: <%= 2.minute.ago.to_s(:db) %>
+  revalidated_at: <%= 3.minute.ago.to_s(:db) %>
+  github_id: 43243243243232
+  api_url: https://api.github.com/repos/shopify/shipit-engine/pulls/66
+  state: closed
+  branch: feature-64
+  head_id: 8
+  mergeable: null
+  additions: 23
+  deletions: 43

data/test/fixtures/shipit/stacks.yml

@@ -26,7 +26,8 @@ shipit:
           "description": "Restart app and job servers",
           "variables": [
             {"name": "FOO", "title": "Set to 0 to foo", "default": 1},
-            {"name": "BAR", "title": "Set to 1 to bar", "default": 0}
+            {"name": "BAR", "title": "Set to 1 to bar", "default": 0},
+            {"name": "WALRUS", "title": "Walrus without a default value"}
           ],
           "steps": [
             "cap $ENVIRONMENT deploy:restart"
@@ -49,6 +50,7 @@ shipit:
         "allow_failures": ["ci/ok_to_fail"]
       }
     }
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 cyclimse:
@@ -82,6 +84,7 @@ cyclimse:
         }
       }
     }
+  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
   updated_at: <%= 8.days.ago.to_s(:db) %>
 
 undeployed_stack:

data/test/jobs/github_sync_job_test.rb

@@ -36,6 +36,55 @@ module Shipit
       assert shipit_commits(:fifth).reload.detached?
     end
 
+    test "#perform locks all commits leading to a revert" do
+      @stack.deploys_and_rollbacks.destroy_all
+
+      initial_queue = [
+        ["fix all the things", false],
+        ["yoloshipit!", false],
+        ["fix it!", false],
+        ["sheep it!", false],
+        ["lets go", false],
+      ]
+      assert_equal initial_queue, @stack.undeployed_commits.map { |c| [c.title, c.locked?] }
+
+      author = stub(
+        id: 1234,
+        login: 'bob',
+        name: 'Bob the Builder',
+        email: 'bob@bob.com',
+        date: '2011-04-14T16:00:49Z',
+      )
+      @job.expects(:fetch_missing_commits).returns([
+        [
+          stub(
+            sha: '36514755579bfb5bc313f403b216f4347a027990',
+            author: author,
+            committer: author,
+            stats: nil,
+            commit: stub(
+              sha: '36514755579bfb5bc313f403b216f4347a027990',
+              message: 'Revert "fix it!"',
+              author: author,
+              committer: author,
+            ),
+          ),
+        ],
+        shipit_commits(:fifth),
+      ])
+      @job.perform(stack_id: @stack.id)
+
+      final_queue = [
+        ['Revert "fix it!"', false],
+        ["fix all the things", true],
+        ["yoloshipit!", true],
+        ["fix it!", true],
+        ["sheep it!", false],
+        ["lets go", false],
+      ]
+      assert_equal final_queue, @stack.reload.undeployed_commits.map { |c| [c.title, c.locked?] }
+    end
+
     test "#fetch_missing_commits returns the commits in the reverse order if it doesn't know the parent" do
       last = stub(sha: 123)
       first = stub(sha: 345)

data/test/jobs/merge_pull_requests_job_test.rb

@@ -9,6 +9,8 @@ module Shipit
       @pending_pr = shipit_pull_requests(:shipit_pending)
       @unmergeable_pr = shipit_pull_requests(:shipit_pending_unmergeable)
       @not_ready_pr = shipit_pull_requests(:shipit_pending_not_mergeable_yet)
+      @closed_pr = shipit_pull_requests(:shipit_pending_closed)
+      @merged_pr = shipit_pull_requests(:shipit_pending_merged)
     end
 
     test "#perform rejects unmergeable PRs and merge the others" do
@@ -20,6 +22,8 @@ module Shipit
       }.to_json)
       branch_url = "https://api.github.com/repos/shopify/shipit-engine/git/refs/heads/feature-62"
       FakeWeb.register_uri(:delete, branch_url, status: %w(204 No content))
+      pulls_url = "https://api.github.com/repos/shopify/shipit-engine/pulls?base=feature-62"
+      FakeWeb.register_uri(:get, pulls_url, status: %w(200 OK), body: '[]')
 
       @job.perform(@stack)
 
@@ -55,5 +59,19 @@ module Shipit
       end
       assert_predicate @pending_pr.reload, :pending?
     end
+
+    test "#perform cancels merge requests for closed PRs" do
+      @pending_pr.cancel!
+      PullRequest.any_instance.stubs(:refresh!)
+      @job.perform(@stack)
+      assert_predicate @closed_pr.reload, :canceled?
+    end
+
+    test "#perform completes merge requests for already merged PRs" do
+      @pending_pr.cancel!
+      PullRequest.any_instance.stubs(:refresh!)
+      @job.perform(@stack)
+      assert_predicate @merged_pr.reload, :merged?
+    end
   end
 end