shipit-engine 0.32.0 → 0.33.0

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

data/app/controllers/shipit/tasks_controller.rb

@@ -22,7 +22,7 @@ module Shipit
       task
       respond_to do |format|
         format.html
-        format.text { render plain: @task.chunk_output }
+        format.text { render(plain: @task.chunk_output) }
       end
     end
 
@@ -48,7 +48,7 @@ module Shipit
     end
 
     def tail
-      render(json: TailTaskSerializer.new(task, context: params))
+      render(json: TailTaskSerializer.new(task, context: { last_byte: params[:last_byte].to_i }))
     end
 
     def lookup
@@ -62,7 +62,7 @@ module Shipit
     def url_for_task
       base_task = @task.is_a?(Deploy) ? @task.becomes(Deploy) : @task
 
-      url_for([base_task.stack, base_task])
+      url_for([base_task.stack.becomes(Stack), base_task])
     end
 
     def task
@@ -70,7 +70,7 @@ module Shipit
     end
 
     def stack
-      @stack ||= Stack.from_param!(params[:stack_id])
+      @stack ||= Stack.from_param!(params[:stack_id]).becomes(Stack)
     end
 
     def task_params

data/app/helpers/shipit/chunks_helper.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module Shipit
   module ChunksHelper
-    def next_chunks_url(task)
+    def next_chunks_url(task, last_byte: 0)
       return if task.finished?
-      tail_stack_task_path(task.stack, task, last_id: task.chunks.last)
+      tail_stack_task_path(task.stack, task, last_byte: last_byte)
     end
   end
 end

data/app/helpers/shipit/github_url_helper.rb

@@ -51,6 +51,14 @@ module Shipit
       github_repo_url(stack.repo_owner, stack.repo_name, 'pull', number)
     end
 
+    def stack_github_url(stack)
+      if stack.respond_to?(:pull_request) && stack.pull_request
+        github_pull_request_url(stack.pull_request)
+      else
+        github_repo_url(stack.repo_owner, stack.repo_name)
+      end
+    end
+
     def link_to_github_deploy(deploy)
       url = github_commit_range_url(deploy.stack, *deploy.commit_range)
       text = deploy.commit_range.map(&:short_sha).join('...')

data/app/helpers/shipit/stacks_helper.rb

@@ -91,5 +91,9 @@ module Shipit
     def positive_negative_class(value)
       value.to_f >= 0 ? 'positive' : 'negative'
     end
+
+    def contributor_class(stacks_contributed_to, stack_id)
+      stacks_contributed_to.include?(stack_id) ? "contributor" : "not-matching"
+    end
   end
 end

data/app/jobs/shipit/create_on_github_job.rb

@@ -4,6 +4,7 @@ module Shipit
     include BackgroundJob::Unique
 
     queue_as :default
+    on_duplicate :drop
 
     # We observe that some objects regularly take longer than the default 10 seconds to create, e.g. deployments
     self.timeout = 40

data/app/jobs/shipit/destroy_repository_job.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Shipit
+  class DestroyRepositoryJob < BackgroundJob
+    queue_as :default
+
+    # repository
+    # +-- stacks
+    #     +-- api_clients
+    #     +-- commits
+    #     |   +-- commit_deployments
+    #     |   |   +-- statuses
+    #     |   +-- statuses
+    #     +-- github_hooks
+    #     +-- hooks
+    #     +-- pull_requests
+    #     +-- tasks
+    #         +-- chunks
+
+    def perform(repository)
+      repository.stacks.each { |stack| DestroyStackJob.perform_now(stack) }
+      repository.destroy!
+    end
+  end
+end

data/app/jobs/shipit/destroy_stack_job.rb

@@ -11,7 +11,7 @@ module Shipit
     # |   +-- statuses
     # +-- github_hooks
     # +-- hooks
-    # +-- pull_requests
+    # +-- merge_requests
     # +-- tasks
     #     +-- chunks
 
@@ -26,7 +26,7 @@ module Shipit
       Shipit::Commit.where(id: commits_ids).delete_all
       Shipit::GithubHook.where(stack_id: stack.id).destroy_all
       Shipit::Hook.where(stack_id: stack.id).delete_all
-      Shipit::PullRequest.where(stack_id: stack.id).delete_all
+      Shipit::MergeRequest.where(stack_id: stack.id).delete_all
       tasks_ids.each_slice(100) do |ids|
         Shipit::OutputChunk.where(task_id: ids).delete_all
         Shipit::Task.where(id: ids).delete_all

data/app/jobs/shipit/perform_task_job.rb

@@ -4,104 +4,10 @@ module Shipit
     queue_as :deploys
 
     def perform(task)
-      @task = task
-      @commands = Commands.for(@task)
-      unless @task.pending?
-        logger.error("Task ##{@task.id} already in `#{@task.status}` state. Aborting.")
-        return
-      end
-      run
-    ensure
-      @commands.clear_working_directory
-    end
-
-    def run
-      @task.ping
-      @task.run!
-      checkout_repository
-      perform_task
-      @task.write("\nCompleted successfully\n")
-      @task.report_complete!
-    rescue Command::TimedOut => error
-      @task.write("\n#{error.message}\n")
-      @task.report_timeout!(error)
-    rescue Command::Error => error
-      @task.write("\n#{error.message}\n")
-      @task.report_failure!(error)
-    rescue StandardError => error
-      @task.report_error!(error)
-    rescue Exception => error
-      @task.report_error!(error)
-      raise
-    end
-
-    def abort!(signal: 'TERM')
-      pid = @task.pid
-      if pid
-        @task.write("$ kill #{pid}\n")
-        Process.kill(signal, pid)
-      else
-        @task.write("Can't abort, no recorded pid, WTF?\n")
-      end
-    rescue SystemCallError => error
-      @task.write("kill: (#{pid}) - #{error.message}\n")
-    end
-
-    def check_for_abort
-      @task.should_abort? do |times_killed|
-        if times_killed > 3
-          abort!(signal: 'KILL')
-        else
-          abort!
-        end
-      end
-    end
-
-    def perform_task
-      capture_all!(@commands.install_dependencies)
-      capture_all!(@commands.perform)
-    end
-
-    def checkout_repository
-      unless @commands.fetched?(@task.until_commit).tap(&:run).success?
-        # acquire_git_cache_lock can take upto 15 seconds
-        # to process. Try to make sure that the job isn't
-        # marked dead while we attempt to acquire the lock.
-        @task.ping
-        @task.acquire_git_cache_lock do
-          @task.ping
-          unless @commands.fetched?(@task.until_commit).tap(&:run).success?
-            capture!(@commands.fetch)
-          end
-        end
-      end
-      capture_all!(@commands.clone)
-      capture!(@commands.checkout(@task.until_commit))
-    end
-
-    def capture_all!(commands)
-      commands.map { |c| capture!(c) }
-    end
-
-    def capture!(command)
-      command.start do
-        @task.ping
-        check_for_abort
-      end
-      @task.write("$ #{command}\npid: #{command.pid}\n")
-      @task.pid = command.pid
-      command.stream! do |line|
-        @task.write(line)
-      end
-      @task.write("\n")
-      command.success?
-    end
-
-    def capture(command)
-      capture!(command)
-      command.success?
-    rescue Command::Error
-      false
+      Shipit
+        .task_execution_strategy
+        .new(task)
+        .execute
     end
   end
 end

data/app/jobs/shipit/process_merge_requests_job.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module Shipit
+  class ProcessMergeRequestsJob < BackgroundJob
+    include BackgroundJob::Unique
+    on_duplicate :drop
+
+    queue_as :default
+
+    def perform(stack)
+      merge_requests = stack.merge_requests.to_be_merged.to_a
+      merge_requests.each do |merge_request|
+        merge_request.refresh!
+        merge_request.reject_unless_mergeable!
+        merge_request.cancel! if merge_request.closed?
+        merge_request.revalidate! if merge_request.need_revalidation?
+      end
+
+      return false unless stack.allows_merges?
+
+      merge_requests.select(&:pending?).each do |merge_request|
+        merge_request.refresh!
+        next unless merge_request.all_status_checks_passed?
+        begin
+          merge_request.merge!
+        rescue MergeRequest::NotReady
+          ProcessMergeRequestsJob.set(wait: 10.seconds).perform_later(stack)
+          return false
+        end
+      end
+    end
+  end
+end

data/app/jobs/shipit/refresh_merge_request_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Shipit
+  class RefreshMergeRequestJob < BackgroundJob
+    queue_as :default
+
+    def perform(merge_request)
+      merge_request.refresh!
+      ProcessMergeRequestsJob.perform_later(merge_request.stack)
+    end
+  end
+end

data/app/models/shipit/anonymous_user.rb

@@ -35,6 +35,10 @@ module Shipit
       Shipit.authentication_disabled?
     end
 
+    def repositories_contributed_to
+      []
+    end
+
     def stacks_contributed_to
       []
     end

data/app/models/shipit/check_run.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Shipit
   class CheckRun < ApplicationRecord
-    CONCLUSIONS = %w(success failure neutral cancelled timed_out action_required stale).freeze
+    CONCLUSIONS = %w(success failure neutral cancelled timed_out action_required stale skipped).freeze
     include DeferredTouch
     include Status::Common
 
@@ -44,7 +44,7 @@ module Shipit
       case conclusion
       when nil, 'action_required'
         'pending'
-      when 'success', 'neutral'
+      when 'success', 'neutral', 'skipped'
         'success'
       when 'failure', 'cancelled', 'stale'
         'failure'

data/app/models/shipit/command_line_user.rb

@@ -35,6 +35,10 @@ module Shipit
       Shipit.authentication_disabled?
     end
 
+    def repositories_contributed_to
+      []
+    end
+
     def stacks_contributed_to
       []
     end

data/app/models/shipit/commit.rb

@@ -13,11 +13,11 @@ module Shipit
     has_many :check_runs, -> { order(created_at: :desc) }, dependent: :destroy, inverse_of: :commit
     has_many :commit_deployments, dependent: :destroy
     has_many :release_statuses, dependent: :destroy
-    belongs_to :pull_request, inverse_of: :merge_commit, optional: true
+    belongs_to :merge_request, inverse_of: :merge_commit, optional: true
 
     deferred_touch stack: :updated_at
 
-    before_create :identify_pull_request
+    before_create :identify_merge_request
     after_commit { broadcast_update }
     after_create { stack.update_undeployed_commits_count }
 
@@ -113,7 +113,7 @@ module Shipit
 
     def message=(message)
       limit = self.class.columns_hash['message'].limit
-      if limit && message && message.size > limit
+      if limit && message && message.bytesize > limit
         message = message.truncate_bytes(limit)
       end
       super(message)
@@ -287,13 +287,13 @@ module Shipit
       stack.deploys.unsuccessful.where(until_commit_id: id).any?
     end
 
-    def identify_pull_request
+    def identify_merge_request
       return unless message_parser.pull_request?
-      if pull_request = stack.pull_requests.find_by(number: message_parser.pull_request_number)
-        self.pull_request = pull_request
-        self.pull_request_number = pull_request.number
-        self.pull_request_title = pull_request.title
-        self.author = pull_request.merge_requested_by if pull_request.merge_requested_by
+      if merge_request = stack.merge_requests.find_by(number: message_parser.pull_request_number)
+        self.merge_request = merge_request
+        self.pull_request_number = merge_request.number
+        self.pull_request_title = merge_request.title
+        self.author = merge_request.merge_requested_by if merge_request.merge_requested_by
       end
 
       self.pull_request_number = message_parser.pull_request_number unless self[:pull_request_number]
@@ -301,8 +301,8 @@ module Shipit
     end
 
     def deploy_requested_at
-      if pull_request&.merged?
-        pull_request.merge_requested_at
+      if merge_request&.merged?
+        merge_request.merge_requested_at
       else
         created_at
       end