shipit-engine 0.15.0 → 0.16.0

data/app/views/shipit/pull_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_pull_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 @pull_requests %>
+    </ul>
+  </section>
+</div>

data/app/views/shipit/shared/_author.html.erb

@@ -0,0 +1,7 @@
+<a href="<%= github_user_url(author.login) %>" class="commit-author">
+  <%= github_avatar(author, size: 80, class: 'commit-author__avatar') %>
+  <div class="commit-author__name">
+    <span class="commit-author__name__real-name"><%= author.name %></span>
+    <span class="commit-author__name__username"><%= author.login %></span>
+  </div>
+</a>

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

@@ -22,6 +22,11 @@
     <li class="nav__list__item">
       <%= link_to 'Timeline', index_stack_tasks_path(stack) %>
     </li>
+    <% if stack.merge_queue_enabled? %>
+      <li class="nav__list__item">
+        <%= link_to "Pull Requests (#{stack.pull_requests.queued.count})", stack_pull_requests_path(stack) %>
+      </li>
+    <% end %>
   </ul>
   <ul class="nav__list nav__list--secondary">
     <% if stack.links.present? %>

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

@@ -23,6 +23,11 @@
           <%= f.label :continuous_deployment, 'Enable continuous deployment' %>
         </div>
 
+        <div class="field-wrapper">
+          <%= f.check_box :merge_queue_enabled %>
+          <%= f.label :merge_queue_enabled, 'Enable merge queue' %>
+        </div>
+
         <div class="field-wrapper">
           <%= f.check_box :ignore_ci %>
           <%= f.label :ignore_ci, "Don't require CI to deploy" %>
@@ -66,6 +71,14 @@
       </table>
     </div>
 
+    <div class="setting-section setting-ccmenu">
+      <h5>Miscellaneous</h5>
+      <div class="field-wrapper">
+        <label>CCMenu URL</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)} %>
+    </div>
 
     <div class="setting-section">
       <h5>Delete this stack</h5>

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

@@ -1,3 +1,5 @@
+<% subscribe events_path(channels: ["stack.#{@stack.id}"]), '#layout-content' %>
+
 <%= render partial: 'shipit/stacks/header', locals: { stack: @stack } %>
 
 <% if !@stack.ignore_ci && !@stack.ci_enabled? %>
@@ -63,8 +65,7 @@
   </div>
 <% end %>
 
-<div class="wrapper" data-event-stream="<%= events_path(channels: ["stack.#{@stack.id}"]) %>">
-
+<div class="wrapper">
   <section>
     <header class="section-header">
       <h2>Undeployed Commits</h2>

data/app/views/shipit/statuses/_group.html.erb

@@ -7,7 +7,7 @@
       <strong class="status-item__service"><%= group.description %></strong>
     </div>
     <% group.statuses.each do |status| %>
-      <div class="status-item status-item--<%= status.state %> <%= :ignored if status.ignored? %>">
+      <div class="status-item status-item--<%= status.state %> <%= :ignored if status.allowed_to_fail? %>">
         <i class="status-item__icon"></i>
         <a href="<%= status.target_url %>" target="_blank">
           <strong class="status-item__service"><%= status.context %></strong>

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

@@ -1,7 +1,7 @@
 <%- read_only ||= false -%>
 
 <li class="task" id="task-<%= task.id %>" data-status="<%= task.status %>">
-  <%= render 'shipit/commits/commit_author', commit: task %>
+  <%= render 'shipit/shared/author', author: task.author %>
   <a href="<%= stack_task_path(@stack, task) %>" class="status status--<%= task.status %>" data-tooltip="<%= task.status.capitalize %>">
     <i class="status__icon"></i>
     <span class="visually-hidden"><%= task.status %></span>

data/config/initializers/inflections.rb

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

data/config/locales/en.yml

@@ -43,9 +43,7 @@ en:
       rollback: Impossible to detect how to rollback this application. Please define `rollback.override` in your shipit.yml
       fetch: Impossible to detect how to fetch the deployed revision for this application. Please define `fetch` in your shipit.yml
   missing_status:
-    description:
-      one: "%{missing_statuses} is required for deploy but was not sent"
-      other: "%{missing_statuses} are required for deploy but were not sent"
+    description: "%{context} is required for deploy but was not sent yet."
   deploys:
     description: "deploy of %{sha}"
   rollbacks:

data/config/routes.rb

@@ -30,12 +30,14 @@ Shipit::Engine.routes.draw do
     end
 
     scope '/stacks/*stack_id', stack_id: stack_id_format, as: :stack do
+      get '/ccmenu' => 'ccmenu#show', as: :ccmenu
       resource :lock, only: %i(create update destroy)
       resources :tasks, only: %i(index show) do
         resource :output, only: :show
       end
       resources :deploys, only: %i(create)
       resources :commits, only: %i(index)
+      resources :pull_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,6 +45,10 @@ Shipit::Engine.routes.draw do
     resources :hooks, only: %i(index create show update destroy)
   end
 
+  scope '/ccmenu/*stack_id', stack_id: stack_id_format, as: :ccmenu_url do
+    get '/' => 'ccmenu_url#fetch'
+  end
+
   # Humans
   scope '/github/auth/github', as: :github_authentication, controller: :github_authentication do
     get '/', action: :request
@@ -87,6 +93,8 @@ Shipit::Engine.routes.draw do
         get :revert
       end
     end
+
+    resources :pull_requests, only: %i(index destroy create)
   end
   get '/stacks/:id' => 'stacks#lookup'
 end

data/db/migrate/20170130113633_create_shipit_pull_requests.rb

@@ -0,0 +1,25 @@
+class CreateShipitPullRequests < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pull_requests do |t|
+      t.references :stack, foreign_key: true, null: false
+      t.integer :number, null: false
+      t.string :title, limit: 256
+      t.integer :github_id, limit: 8
+      t.string :api_url, limit: 1024
+      t.string :state
+      t.references :head, foreign_key: {to_table: :commits}
+      t.boolean :mergeable, null: true
+      t.integer :additions, null: false, default: 0
+      t.integer :deletions, null: false, default: 0
+      t.string :merge_status, null: false, limit: 30
+      t.string :rejection_reason, null: true
+      t.datetime :merge_requested_at, null: false
+      t.references :merge_requested_by, foreign_key: {to_table: :users}
+      t.timestamps
+
+      t.index [:stack_id, :number], unique: true
+      t.index [:stack_id, :github_id], unique: true
+      t.index [:stack_id, :merge_status]
+    end
+  end
+end

data/db/migrate/20170208143657_add_pull_request_number_and_title_to_commits.rb

@@ -0,0 +1,7 @@
+class AddPullRequestNumberAndTitleToCommits < ActiveRecord::Migration[5.0]
+  def change
+    add_column :commits, :pull_request_number, :integer, null: true
+    add_column :commits, :pull_request_title, :string, limit: 1024, null: true
+    add_column :commits, :pull_request_id, :integer, null: true, index: true
+  end
+end

data/db/migrate/20170208154609_backfill_merge_commits.rb

@@ -0,0 +1,13 @@
+class BackfillMergeCommits < ActiveRecord::Migration[5.0]
+  def change
+    ActiveRecord::Base.no_touching do
+      Shipit::Commit.find_in_batches do |commits|
+        commits.each do |commit|
+          commit.identify_pull_request
+          commit.save!
+        end
+        print '.'
+      end
+    end
+  end
+end

data/db/migrate/20170209160355_add_branch_to_pull_requests.rb

@@ -0,0 +1,5 @@
+class AddBranchToPullRequests < ActiveRecord::Migration[5.0]
+  def change
+    add_column :pull_requests, :branch, :string, null: true
+  end
+end

data/db/migrate/20170215123538_add_merge_queue_enabled_to_stacks.rb

@@ -0,0 +1,5 @@
+class AddMergeQueueEnabledToStacks < ActiveRecord::Migration[5.0]
+  def change
+    add_column :stacks, :merge_queue_enabled, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20170220152410_improve_users_indexing.rb

@@ -0,0 +1,6 @@
+class ImproveUsersIndexing < ActiveRecord::Migration[5.0]
+  def change
+    add_index :users, :updated_at
+    add_index :users, :github_id
+  end
+end

data/db/migrate/20170221102128_improve_tasks_indexing.rb

@@ -0,0 +1,8 @@
+class ImproveTasksIndexing < ActiveRecord::Migration[5.0]
+  def change
+    # index_active_tasks should superseed this, but for some reason
+    # MySQL tend to chose the wrong index. This one while wasting a bit of memory
+    # makes it do a better choice.
+    add_index :tasks, %i(stack_id allow_concurrency)
+  end
+end

data/db/migrate/20170221130336_add_last_revalidated_at_on_pull_requests.rb

@@ -0,0 +1,10 @@
+class AddLastRevalidatedAtOnPullRequests < ActiveRecord::Migration[5.0]
+  def up
+    add_column :pull_requests, :revalidated_at, :datetime
+    Shipit::PullRequest.update_all('revalidated_at = merge_requested_at')
+  end
+
+  def down
+    remove_column :pull_requests, :revalidated_at
+  end
+end

data/lib/shipit.rb

@@ -56,6 +56,8 @@ module Shipit
 
   delegate :table_name_prefix, to: :secrets
 
+  attr_accessor :disable_api_authentication
+
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
   end

data/lib/shipit/version.rb

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

data/lib/tasks/cron.rake

@@ -4,6 +4,7 @@ namespace :cron do
     Shipit::Stack.refresh_deployed_revisions
     Shipit::Stack.schedule_continuous_delivery
     Shipit::GithubStatus.refresh_status
+    Shipit::PullRequest.schedule_merges
   end
 
   task hourly: [:rollup, :purge_deliveries, :refresh_users]

data/test/controllers/api/ccmenu_controller_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+module Shipit
+  module Api
+    class CCMenuControllerTest < ActionController::TestCase
+      setup do
+        authenticate!
+        @stack = shipit_stacks(:shipit)
+      end
+
+      test "a request with insufficient permissions will render a 403" do
+        @client.update!(permissions: [])
+        get :show, params: {stack_id: @stack.to_param}
+        assert_response :forbidden
+        assert_json 'message', 'This operation requires the `read:stack` permission'
+      end
+
+      test "#show renders the xml" do
+        get :show, params: {stack_id: @stack.to_param}
+        assert_response :ok
+        assert_payload 'name', @stack.to_param
+      end
+
+      test "can authenticate with query string token" do
+        request.headers['Authorization'] = 'bleh'
+        get :show, params: {stack_id: @stack.to_param, token: @client.authentication_token}
+        assert_response :ok
+        assert_payload 'name', @stack.to_param
+      end
+
+      test "xml contains required attributes" do
+        get :show, params: {stack_id: @stack.to_param}
+        project = get_project_from_xml(response.body)
+        %w(name activity lastBuildStatus lastBuildLabel lastBuildTime webUrl).each do |attribute|
+          assert_includes project, attribute, "Response missing required attribute: #{attribute}"
+        end
+      end
+
+      test "locked stacks show as failed" do
+        @stack.lock('test', @user)
+        get :show, params: {stack_id: @stack.to_param}
+        assert_payload 'lastBuildStatus', 'Failure'
+      end
+
+      private
+
+      def get_project_from_xml(xml)
+        Hash.from_xml(xml)['Projects']['Project']
+      end
+
+      def assert_payload(k, v)
+        @project ||= get_project_from_xml(response.body)
+        assert_equal v, @project[k]
+      end
+    end
+  end
+end

data/test/controllers/api/commits_controller_test.rb

@@ -9,7 +9,7 @@ module Shipit
       end
 
       test "#index returns a list of commits" do
-        commit = @stack.commits.last
+        commit = @stack.commits.reachable.last
 
         get :index, params: {stack_id: @stack.to_param}
         assert_response :ok

data/test/controllers/api/pull_requests_controller_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+
+module Shipit
+  module Api
+    class PullRequestsControllerTest < ActionController::TestCase
+      setup do
+        @stack = shipit_stacks(:shipit)
+        @pull_request = shipit_pull_requests(:shipit_pending)
+        authenticate!
+      end
+
+      test "#index returns a list of pull requests" do
+        pull_request = @stack.pull_requests.last
+
+        get :index, params: {stack_id: @stack.to_param}
+        assert_response :ok
+        assert_json '0.id', pull_request.id
+      end
+
+      test "#show returns a single pull requests" do
+        get :show, params: {stack_id: @stack.to_param, id: @pull_request.number.to_s}
+        assert_response :ok
+        assert_json 'id', @pull_request.id
+      end
+
+      test "#update responds with Accepted if the pull request was queued" do
+        assert_enqueued_with(job: RefreshPullRequestJob) do
+          put :update, params: {stack_id: @stack.to_param, id: '64'}
+        end
+        assert_response :accepted
+      end
+
+      test "#update responds with Accepted if the pull request was already queued" do
+        assert_enqueued_with(job: RefreshPullRequestJob) do
+          put :update, params: {stack_id: @stack.to_param, id: '65'}
+        end
+        assert_response :accepted
+      end
+
+      test "#update responds with method not allowed if the pull request was already merged" do
+        @pull_request.complete!
+        put :update, params: {stack_id: @stack.to_param, id: @pull_request.number.to_s}
+        assert_response :method_not_allowed
+        assert_json 'message', 'This pull request was already merged.'
+      end
+
+      test "#destroy cancels the merge if the pull request was waiting" do
+        delete :destroy, params: {stack_id: @stack.to_param, id: @pull_request.number.to_s}
+        assert_response :no_content
+        assert_predicate @pull_request.reload, :canceled?
+      end
+
+      test "#destroy silently fail if the pull request was unknown" do
+        delete :destroy, params: {stack_id: @stack.to_param, id: '83453489'}
+        assert_response :no_content
+      end
+    end
+  end
+end

data/test/controllers/ccmenu_controller_test.rb

@@ -0,0 +1,33 @@
+require 'uri'
+require 'test_helper'
+
+module Shipit
+  class CCMenuUrlControllerTest < ActionController::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @user = shipit_users(:walrus)
+      session[:user_id] = @user.id
+    end
+
+    test ":fetch returns ok with json" do
+      get :fetch, params: {stack_id: @stack.to_param}
+      assert_response :ok
+      data = JSON.parse(response.body)
+      assert_includes data, 'ccmenu_url'
+    end
+
+    test ":fetch creates a read only api client" do
+      assert_difference 'ApiClient.count' do
+        get :fetch, params: {stack_id: @stack.to_param}
+      end
+    end
+
+    test ":fetch url includes api token on query string" do
+      get :fetch, params: {stack_id: @stack.to_param}
+      data = JSON.parse(response.body)
+      client = ApiClient.last
+      query = Rack::Utils.parse_nested_query(URI(data['ccmenu_url']).query)
+      assert_equal client.authentication_token, query['token']
+    end
+  end
+end

data/test/controllers/pull_requests_controller_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+module Shipit
+  class PullRequestsControllerTest < ActionController::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @pr = shipit_pull_requests(:shipit_pending)
+      session[:user_id] = shipit_users(:walrus).id
+    end
+
+    test "#index shows pending pull requests" do
+      get :index, params: {stack_id: @stack.to_param}
+      assert_response :success
+      assert_select '.pr-list .pr', @stack.pull_requests.pending.count
+    end
+
+    test "#add can enqueue a pull request" do
+      assert_difference -> { PullRequest.count }, +1 do
+        post :create, params: {stack_id: @stack.to_param, number_or_url: '#5'}
+      end
+      assert_redirected_to stack_pull_requests_path(@stack)
+    end
+
+    test "#destroy can cancel a pending pull request" do
+      assert_predicate @pr, :pending?
+      delete :destroy, params: {stack_id: @stack.to_param, id: @pr.id}
+      assert_redirected_to stack_pull_requests_path(@stack)
+      assert_predicate @pr.reload, :canceled?
+    end
+  end
+end