shipit-engine 0.28.0 → 0.32.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class LocksController < BaseController
@@ -8,10 +9,10 @@ module Shipit
       end
       def create
         if stack.locked?
-          render json: {message: 'Already locked'}, status: :conflict
+          render(json: { message: 'Already locked' }, status: :conflict)
         else
           stack.lock(params.reason, current_user)
-          render_resource stack
+          render_resource(stack)
         end
       end
 
@@ -20,12 +21,12 @@ module Shipit
       end
       def update
         stack.lock(params.reason, current_user)
-        render_resource stack
+        render_resource(stack)
       end
 
       def destroy
         stack.unlock
-        render_resource stack
+        render_resource(stack)
       end
     end
   end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class OutputsController < BaseController
       require_permission :read, :stack
 
       def show
-        render plain: task.chunk_output
+        render(plain: task.chunk_output)
       end
 
       private

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class PullRequestsController < BaseController
@@ -5,21 +6,21 @@ module Shipit
       require_permission :deploy, :stack, only: %i(update destroy)
 
       def index
-        render_resources stack.pull_requests.includes(:head).order(id: :desc)
+        render_resources(stack.pull_requests.includes(:head).order(id: :desc))
       end
 
       def show
-        render_resource stack.pull_requests.find_by!(number: params[:id])
+        render_resource(stack.pull_requests.find_by!(number: params[:id]))
       end
 
       def update
         pull_request = PullRequest.request_merge!(stack, params[:id], current_user)
         if pull_request.waiting?
-          head :accepted
+          head(:accepted)
         elsif pull_request.merged?
-          render status: :method_not_allowed, json: {
+          render(status: :method_not_allowed, json: {
             message: "This pull request was already merged.",
-          }
+          })
         else
           raise "Pull Request is neither waiting nor merged, this should be impossible"
         end
@@ -29,7 +30,7 @@ module Shipit
         if pull_request = stack.pull_requests.where(number: params[:id]).first
           pull_request.cancel! if pull_request.waiting?
         end
-        head :no_content
+        head(:no_content)
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class ReleaseStatusesController < BaseController
@@ -5,7 +6,7 @@ module Shipit
 
       params do
         requires :status, String
-        validates :status, inclusion: {in: %w(success failure)}
+        validates :status, inclusion: { in: %w(success failure) }
       end
       def create
         deploy = stack.deploys_and_rollbacks.find(params[:deploy_id])
@@ -15,7 +16,7 @@ module Shipit
         when 'failure'
           deploy.report_faulty!(user: current_user)
         end
-        render_resource deploy, status: :created
+        render_resource(deploy, status: :created)
       end
     end
   end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Shipit
+  module Api
+    class RollbacksController < BaseController
+      require_permission :deploy, :stack
+
+      params do
+        requires :sha, String, length: { in: 6..40 }
+        accepts :force, Boolean, default: false
+        accepts :env, Hash, default: {}
+      end
+      def create
+        commit = stack.commits.by_sha(params.sha) || param_error!(:sha, 'Unknown revision')
+        param_error!(:force, "Can't rollback a locked stack") if !params.force && stack.locked?
+        deploy = stack.deploys.find_by(until_commit: commit) || param_error!(:sha, 'Cant find associated deploy')
+        deploy_env = stack.filter_deploy_envs(params.env)
+
+        response = nil
+        if !params.force && stack.active_task?
+          param_error!(:force, "Can't rollback, deploy in progress")
+        elsif stack.active_task?
+          active_task = stack.active_task
+          active_task.abort!(aborted_by: current_user, rollback_once_aborted_to: deploy)
+          response = active_task
+        else
+          response = deploy.trigger_rollback(current_user, env: deploy_env, force: params.force)
+        end
+
+        render_resource(response, status: :accepted)
+      end
+    end
+  end
+end

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 module Shipit
   module Api
     class StacksController < BaseController
       require_permission :read, :stack, only: %i(index show)
-      require_permission :write, :stack, only: %i(create destroy)
+      require_permission :write, :stack, only: %i(create update destroy)
 
       def index
-        render_resources stacks
+        render_resources(stacks)
       end
 
       params do
@@ -16,25 +17,56 @@ module Shipit
         accepts :deploy_url, String
         accepts :ignore_ci, Boolean
         accepts :merge_queue_enabled, Boolean
+        accepts :continuous_deployment, Boolean
       end
       def create
-        render_resource Stack.create(params)
+        stack = Stack.new(create_params)
+        stack.repository = repository
+        stack.save
+        render_resource(stack)
+      end
+
+      params do
+        accepts :deploy_url, String
+        accepts :ignore_ci, Boolean
+        accepts :merge_queue_enabled, Boolean
+        accepts :continuous_deployment, Boolean
+      end
+      def update
+        stack.update(params)
+        render_resource(stack)
       end
 
       def show
-        render_resource stack
+        render_resource(stack)
       end
 
       def destroy
         stack.schedule_for_destroy!
-        head :accepted
+        head(:accepted)
       end
 
       private
 
+      def create_params
+        params.reject { |key, _| %i(repo_owner repo_name).include?(key) }
+      end
+
       def stack
         @stack ||= stacks.from_param!(params[:id])
       end
+
+      def repository
+        @repository ||= Repository.find_or_create_by(owner: repo_owner, name: repo_name)
+      end
+
+      def repo_owner
+        params[:repo_owner]
+      end
+
+      def repo_name
+        params[:repo_name]
+      end
     end
   end
 end

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
@@ -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)

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_status_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class MergeStatusController < ShipitController
     skip_authentication only: %i(check show)
@@ -12,25 +13,25 @@ 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?
+          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?
+      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?
       end
-      render stack_status, layout: !request.xhr?
+      render(stack_status, layout: !request.xhr?)
     end
 
     def check
@@ -42,7 +43,7 @@ module Shipit
             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
@@ -108,10 +113,10 @@ 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