shipit-engine 0.28.1 → 0.33.0

data/app/controllers/shipit/api/tasks_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class TasksController < BaseController
@@ -5,22 +6,22 @@ module Shipit
       require_permission :deploy, :stack, only: :trigger
 
       def index
-        render_resources stack.tasks
+        render_resources(stack.tasks)
       end
 
       def show
-        render_resource stack.tasks.find(params[:id])
+        render_resource(stack.tasks.find(params[:id]))
       end
 
       params do
         accepts :env, Hash, default: {}
       end
       def trigger
-        render_resource stack.trigger_task(params[:task_name], current_user, env: params.env), status: :accepted
+        render_resource(stack.trigger_task(params[:task_name], current_user, env: params.env), status: :accepted)
       rescue Shipit::Task::ConcurrentTaskRunning
-        render status: :conflict, json: {
+        render(status: :conflict, json: {
           message: 'A task is already running.',
-        }
+        })
       end
     end
   end

data/app/controllers/shipit/api_clients_controller.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+module Shipit
+  class ApiClientsController < ShipitController
+    include Pagination
+
+    def index
+      paginator = paginate(ApiClient.order(created_at: :desc).all)
+      @api_clients = paginator.to_a
+      @links = paginator.links
+    end
+
+    def new
+      @api_client = ApiClient.new
+    end
+
+    def create
+      @api_client = ApiClient.new(create_params.merge(creator_id: current_user.id))
+      unless @api_client.save
+        flash[:warning] = @api_client.errors.full_messages.to_sentence
+      end
+
+      respond_with(@api_client)
+    end
+
+    def show
+      @api_client = ApiClient.find(params[:id])
+    end
+
+    def update
+      @api_client = ApiClient.find(params[:id])
+      options = if @api_client.update(update_params)
+        { flash: { success: 'Successfully updated' } }
+      else
+        { flash: { warning: @stack.errors.full_messages.to_sentence } }
+      end
+
+      redirect_to(params[:return_to].presence || api_client_path(@api_client), options)
+    end
+
+    private
+
+    def create_params
+      params.require(:api_client).permit(:name, permissions: [])
+    end
+
+    def update_params
+      params.require(:api_client).permit(permissions: [])
+    end
+  end
+end

data/app/controllers/shipit/ccmenu_url_controller.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
 require 'uri'
 
 module Shipit
   class CCMenuUrlController < ShipitController
     def fetch
       uri = URI(api_stack_ccmenu_url(stack_id: stack.to_param))
-      uri.query = {'token' => client.authentication_token}.to_query
-      render json: {ccmenu_url: uri.to_s}
+      uri.query = { 'token' => client.authentication_token }.to_query
+      render(json: { ccmenu_url: uri.to_s })
     end
 
     private
 
     def client
       @client ||= ApiClient.create_with(permissions: %w(read:stack))
-                           .find_or_create_by!(creator: current_user, name: 'CCMenu Client')
+        .find_or_create_by!(creator: current_user, name: 'CCMenu Client')
     end
 
     def stack

data/app/controllers/shipit/commit_checks_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitChecksController < ShipitController
     def show
@@ -15,7 +16,7 @@ module Shipit
         url = stack_tail_commit_checks_path(stack, sha: commit.sha, since: next_offset)
       end
 
-      render json: {url: url, output: output, status: checks.status}
+      render(json: { url: url, output: output, status: checks.status })
     end
 
     private

data/app/controllers/shipit/commits_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CommitsController < ShipitController
     def update
@@ -9,7 +10,7 @@ module Shipit
         end
       end
 
-      head :ok
+      head(:ok)
     end
 
     private

data/app/controllers/shipit/deploys_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeploysController < ShipitController
     include ChunksHelper
@@ -16,7 +17,7 @@ module Shipit
     def show
       respond_to do |format|
         format.html
-        format.text { render plain: @deploy.chunk_output }
+        format.text { render(plain: @deploy.chunk_output) }
       end
     end
 
@@ -29,7 +30,7 @@ module Shipit
       )
       respond_with(@deploy.stack, @deploy)
     rescue Task::ConcurrentTaskRunning
-      redirect_to new_stack_deploy_path(@stack, sha: @until_commit.sha)
+      redirect_to(new_stack_deploy_path(@stack, sha: @until_commit.sha))
     end
 
     def rollback
@@ -38,7 +39,7 @@ module Shipit
 
     def revert
       previous_deploy = @stack.deploys.success.where(until_commit_id: @deploy.since_commit_id).order(id: :desc).first!
-      redirect_to rollback_stack_deploy_path(@stack, previous_deploy)
+      redirect_to(rollback_stack_deploy_path(@stack, previous_deploy))
     end
 
     def short_commit_sha(task)
@@ -54,7 +55,7 @@ module Shipit
     end
 
     def load_stack
-      @stack ||= Stack.from_param!(params[:stack_id])
+      @stack ||= Stack.from_param!(params[:stack_id]).becomes(Stack)
     end
 
     def load_until_commit

data/app/controllers/shipit/github_authentication_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class GithubAuthenticationController < ActionController::Base
     include Shipit::Engine.routes.url_helpers
@@ -6,16 +7,16 @@ module Shipit
       return_url = request.env['omniauth.origin'] || root_path
       auth = request.env['omniauth.auth']
 
-      return render 'failed', layout: false if auth.blank?
+      return render('failed', layout: false) if auth.blank?
 
       session[:user_id] = sign_in_github(auth)
 
-      redirect_to return_url
+      redirect_to(return_url)
     end
 
     def logout
       reset_session
-      redirect_to root_path
+      redirect_to(root_path)
     end
 
     private

data/app/controllers/shipit/merge_requests_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Shipit
+  class MergeRequestsController < ShipitController
+    def index
+      @merge_requests = stack.merge_requests.queued
+    end
+
+    def create
+      if pr_number = MergeRequest.extract_number(stack, params[:number_or_url])
+        merge_request = MergeRequest.request_merge!(stack, pr_number, current_user)
+        flash[:success] = "Pull request ##{merge_request.number} added to the queue."
+      else
+        flash[:warning] = "Invalid or missing pull request number."
+      end
+      redirect_to(stack_merge_requests_path)
+    end
+
+    def destroy
+      merge_request = stack.merge_requests.find(params[:id])
+      merge_request.cancel!
+      flash[:success] = 'Merge canceled'
+      redirect_to(stack_merge_requests_path)
+    end
+
+    private
+
+    def stack
+      @stack ||= Stack.from_param!(params[:stack_id])
+    end
+  end
+end

data/app/controllers/shipit/merge_status_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class MergeStatusController < ShipitController
     skip_authentication only: %i(check show)
@@ -11,38 +12,38 @@ module Shipit
 
       if stack
         return render('logged_out') unless current_user.logged_in?
-        if stale?(last_modified: [stack.updated_at, pull_request.updated_at].max, template: false)
-          render stack_status, layout: !request.xhr?
+        if stale?(last_modified: [stack.updated_at, merge_request.updated_at].max, template: false)
+          render(stack_status, layout: !request.xhr?)
         end
       else
-        render html: ''
+        render(html: '')
       end
     rescue ArgumentError
-      render html: ''
+      render(html: '')
     end
 
     def enqueue
-      PullRequest.request_merge!(stack, params[:number], current_user)
-      render stack_status, layout: !request.xhr?
+      MergeRequest.request_merge!(stack, params[:number], current_user)
+      render(stack_status, layout: !request.xhr?)
     end
 
     def dequeue
-      if pull_request = stack.pull_requests.find_by_number(params[:number])
-        pull_request.cancel! if pull_request.waiting?
+      if merge_request = stack.merge_requests.find_by_number(params[:number])
+        merge_request.cancel! if merge_request.waiting?
       end
-      render stack_status, layout: !request.xhr?
+      render(stack_status, layout: !request.xhr?)
     end
 
     def check
       respond_to do |format|
         format.html do
           if stack_status == 'success'
-            render plain: 'ok'
+            render(plain: 'ok')
           else
-            render plain: stack_status, status: 503
+            render(plain: stack_status, status: 503)
           end
         end
-        format.json { render json: {stack_status: stack_status} }
+        format.json { render(json: { stack_status: stack_status }) }
       end
     end
 
@@ -60,10 +61,14 @@ module Shipit
       @stack ||= if params[:stack_id]
         Stack.from_param!(params[:stack_id])
       else
-        scope = Stack.order(merge_queue_enabled: :desc, id: :asc).where(
-          repo_owner: referrer_parser.repo_owner,
-          repo_name: referrer_parser.repo_name,
-        )
+        # Null ordering is inconsistent across DBMS's, this case statement is ugly but supported universally
+        scope = Stack.order(Arel.sql('CASE WHEN locked_since IS NULL THEN 1 ELSE 0 END, locked_since'))
+          .order(merge_queue_enabled: :desc, id: :asc).includes(:repository).where(
+            repositories: {
+              owner: referrer_parser.repo_owner,
+              name: referrer_parser.repo_name,
+            },
+          )
         scope = if params[:branch]
           scope.where(branch: params[:branch])
         else
@@ -77,10 +82,10 @@ module Shipit
       @referrer_parser ||= ReferrerParser.new(params[:referrer])
     end
 
-    def pull_request
-      return @pull_request if defined?(@pull_request)
-      @pull_request = pull_request_number && stack.pull_requests.find_by_number(pull_request_number)
-      @pull_request ||= UnknownPullRequest.new
+    def merge_request
+      return @merge_request if defined?(@merge_request)
+      @merge_request = pull_request_number && stack.merge_requests.find_by_number(pull_request_number)
+      @merge_request ||= UnknownMergeRequest.new
     end
 
     def pull_request_number
@@ -93,14 +98,14 @@ module Shipit
     end
 
     helper_method :pull_request_number
-    helper_method :pull_request
+    helper_method :merge_request
     helper_method :queue_enabled?
     helper_method :stack
     helper_method :stack_status
 
     # FIXME: for some reason if invoked in the view, those path helpers will link to /events?...
-    helper_method :enqueue_pull_request_path
-    helper_method :dequeue_pull_request_path
+    helper_method :enqueue_merge_request_path
+    helper_method :dequeue_merge_request_path
 
     class ReferrerParser
       URL_PATTERN = %r{\Ahttps://github\.com/([^/]+)/([^/]+)/pull/(\d+)}
@@ -108,17 +113,17 @@ module Shipit
       attr_reader :repo_owner, :repo_name, :pull_request_number
 
       def initialize(referrer)
-        if URL_PATTERN =~ referrer.to_s
-          @repo_owner = $1.downcase
-          @repo_name = $2.downcase
-          @pull_request_number = $3.to_i
+        if (match_info = URL_PATTERN.match(referrer.to_s))
+          @repo_owner = match_info[1].downcase
+          @repo_name = match_info[2].downcase
+          @pull_request_number = match_info[3].to_i
         else
           raise ArgumentError, "Invalid referrer: #{referrer.inspect}"
         end
       end
     end
 
-    class UnknownPullRequest
+    class UnknownMergeRequest
       attr_reader :updated_at
 
       def initialize

data/app/controllers/shipit/release_statuses_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class ReleaseStatusesController < ShipitController
     before_action :load_stack
@@ -10,9 +11,9 @@ module Shipit
       when 'failure'
         @deploy.report_faulty!(user: current_user)
       else
-        render status: :unprocessable_entity, json: {message: "Invalid `status` parameter"}
+        render(status: :unprocessable_entity, json: { message: "Invalid `status` parameter" })
       end
-      render status: :created, json: @deploy.last_release_status
+      render(status: :created, json: @deploy.last_release_status)
     end
 
     private

data/app/controllers/shipit/repositories_controller.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Shipit
+  class RepositoriesController < ShipitController
+    before_action :load_repository, only: %i(destroy settings update new_stack)
+
+    def index
+      @user_repositories = current_user.repositories_contributed_to
+
+      @repositories = Repository.order(:owner, :name).to_a
+    end
+
+    def show
+      @repository = Repository.from_param!(params[:id])
+
+      @stacks = @repository.stacks
+
+      @show_archived = params[:show_archived]
+      @stacks = @stacks.not_archived unless @show_archived
+    end
+
+    def create
+      @repository = Repository.new(create_params)
+      unless @repository.save
+        flash[:warning] = @repository.errors.full_messages.to_sentence
+      end
+      respond_with(@repository)
+    end
+
+    def new
+      @repository = Repository.new
+    end
+
+    def destroy
+      @repository.schedule_for_destroy!
+      redirect_to(repositories_url)
+    end
+
+    def update
+      options = {}
+      unless @repository.update(update_params)
+        options = { flash: { warning: @repository.errors.full_messages.to_sentence } }
+      end
+
+      redirect_to(params[:return_to].presence || repository_settings_path(@repository), options)
+    end
+
+    def settings
+    end
+
+    def new_stack
+      @stack = @repository.stacks.new
+      render("shipit/stacks/new")
+    end
+
+    private
+
+    def create_params
+      params.require(:repository).permit(:owner, :name)
+    end
+
+    def update_params
+      params.require(:repository).permit(
+        :review_stacks_enabled,
+        :provisioning_behavior,
+        :provisioning_label_name,
+      )
+    end
+
+    def load_repository
+      @repository = Repository.from_param!(params[:id])
+    end
+  end
+end