shipit-engine 0.28.1 → 0.33.0

data/app/helpers/shipit/github_url_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module GithubUrlHelper
     private
@@ -50,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/merge_status_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module MergeStatusHelper
     def display_commit_count_warning?(commits)

data/app/helpers/shipit/shipit_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module ShipitHelper
     def subscribe(url, *selectors)

data/app/helpers/shipit/stacks_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module StacksHelper
     def redeploy_button(deployed_commit)
@@ -86,5 +87,13 @@ module Shipit
         t('commit.unlock')
       end
     end
+
+    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/helpers/shipit/tasks_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module TasksHelper
     def task_description(task)

data/app/jobs/shipit/background_job.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module Shipit
   class BackgroundJob < ActiveJob::Base
     class << self
       attr_accessor :timeout
     end
 
+    # Write actions can sometimes fail intermittently, particulary for large and/or busy repositories
+    retry_on(Octokit::BadGateway, Octokit::InternalServerError)
+
     def perform(*)
       with_timeout do
         super

data/app/jobs/shipit/background_job/unique.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 module Shipit
   class BackgroundJob
     module Unique
       extend ActiveSupport::Concern
       DEFAULT_TIMEOUT = 10
 
+      ConcurrentJobError = Class.new(StandardError)
+
       included do
         around_perform { |job, block| job.acquire_lock(&block) }
         cattr_accessor :lock_timeout
@@ -19,7 +22,7 @@ module Shipit
         )
         mutex.lock(&block)
       rescue Redis::Lock::LockTimeout
-        raise unless self.class.drop_duplicate_jobs?
+        raise ConcurrentJobError unless self.class.drop_duplicate_jobs?
       end
 
       def lock_key(*args)

data/app/jobs/shipit/cache_deploy_spec_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CacheDeploySpecJob < BackgroundJob
     include BackgroundJob::Unique

data/app/jobs/shipit/chunk_rollup_job.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module Shipit
   class ChunkRollupJob < BackgroundJob
     include BackgroundJob::Unique
 
     queue_as :default
 
+    self.timeout = 60
+    self.lock_timeout = 30
+
     def perform(task)
       unless task.finished?
         logger.error("Task ##{task.id} is not finished (current state: #{task.status}). Aborting.")

data/app/jobs/shipit/clear_git_cache_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class ClearGitCacheJob < BackgroundJob
     queue_as :deploys

data/app/jobs/shipit/continuous_delivery_job.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 module Shipit
   class ContinuousDeliveryJob < BackgroundJob
     include BackgroundJob::Unique
 
-    queue_as :default
+    queue_as :deploys
+    on_duplicate :drop
 
     def perform(stack)
       return unless stack.continuous_deployment?

data/app/jobs/shipit/create_on_github_job.rb

@@ -1,11 +1,17 @@
+# frozen_string_literal: true
 module Shipit
   class CreateOnGithubJob < BackgroundJob
     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
+    self.lock_timeout = 20
 
     def perform(record)
-      record.create_on_github!
+      record.reload.create_on_github!
     end
   end
 end

data/app/jobs/shipit/create_release_statuses_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class CreateReleaseStatusesJob < BackgroundJob
     include BackgroundJob::Unique

data/app/jobs/shipit/deferred_touch_job.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module Shipit
   class DeferredTouchJob < BackgroundJob
     include BackgroundJob::Unique
 
     queue_as :default
 
+    self.timeout = 30
+    self.lock_timeout = 15
+
     def perform
       DeferredTouch.touch_now!
     end

data/app/jobs/shipit/deliver_hook_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeliverHookJob < BackgroundJob
     queue_as :hooks

data/app/jobs/shipit/destroy_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DestroyJob < BackgroundJob
     queue_as :default

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DestroyStackJob < BackgroundJob
     queue_as :default
@@ -10,22 +11,22 @@ module Shipit
     # |   +-- statuses
     # +-- github_hooks
     # +-- hooks
-    # +-- pull_requests
+    # +-- merge_requests
     # +-- tasks
     #     +-- chunks
 
     def perform(stack)
       Shipit::ApiClient.where(stack_id: stack.id).delete_all
       commits_ids = Shipit::Commit.where(stack_id: stack.id).pluck(:id)
-      commit_deployments_ids = Shipit::CommitDeployment.where(commit_id: commits_ids).pluck(:id)
+      tasks_ids = Shipit::Task.where(stack_id: stack.id).pluck(:id)
+      commit_deployments_ids = Shipit::CommitDeployment.where(task_id: tasks_ids).pluck(:id)
       Shipit::CommitDeploymentStatus.where(commit_deployment_id: commit_deployments_ids).delete_all
       Shipit::CommitDeployment.where(id: commit_deployments_ids).delete_all
       Shipit::Status.where(commit_id: commits_ids).delete_all
       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
-      tasks_ids = Shipit::Task.where(stack_id: stack.id).pluck(:id)
+      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/emit_event_job.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Shipit
   class EmitEventJob < BackgroundJob
     queue_as :hooks
 
     def perform(params)
       event, stack_id, payload = params.with_indifferent_access.values_at('event', 'stack_id', 'payload')
-      Hook.deliver(event, stack_id, JSON.load(payload))
+      Hook.deliver(event, stack_id, JSON.parse(payload))
     end
   end
 end

data/app/jobs/shipit/fetch_commit_stats_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class FetchCommitStatsJob < BackgroundJob
     queue_as :default

data/app/jobs/shipit/fetch_deployed_revision_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class FetchDeployedRevisionJob < BackgroundJob
     queue_as :deploys

data/app/jobs/shipit/github_sync_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class GithubSyncJob < BackgroundJob
     include BackgroundJob::Unique
@@ -40,7 +41,7 @@ module Shipit
         end
         commits.unshift(commit)
       end
-      return commits, nil
+      [commits, nil]
     end
 
     protected

data/app/jobs/shipit/{mark_deploy_healty_job.rb → mark_deploy_healthy_job.rb}

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class MarkDeployHealthyJob < BackgroundJob
     include BackgroundJob::Unique

data/app/jobs/shipit/perform_commit_checks_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class PerformCommitChecksJob < BackgroundJob
     include BackgroundJob::Unique

data/app/jobs/shipit/perform_task_job.rb

@@ -1,98 +1,13 @@
+# frozen_string_literal: true
 module Shipit
   class PerformTaskJob < BackgroundJob
     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.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?
-        @task.acquire_git_cache_lock do
-          capture! @commands.fetch
-        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/purge_old_deliveries_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class PurgeOldDeliveriesJob < BackgroundJob
     include BackgroundJob::Unique