shipit-engine 0.31.0 → 0.35.0

data/test/fixtures/shipit/statuses.yml

@@ -134,3 +134,12 @@ canaries_fifth_success:
   created_at: <%= 7.days.ago.to_s(:db) %>
   state: success
   target_url: "http://www.example.com"
+
+review_stack_commit_success:
+  stack: review_stack
+  commit_id: 801
+  description: lets go
+  context: ci/travis
+  created_at: <%= 10.days.ago.to_s(:db) %>
+  state: success
+  target_url: "http://www.example.com"

data/test/fixtures/shipit/tasks.yml

@@ -11,6 +11,7 @@ shipit:
   created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
   ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
+  max_retries: 3
 
 shipit2:
   id: 2
@@ -28,7 +29,7 @@ shipit2:
 
 shipit_restart:
   id: 3
-  user: walrus
+  user: ~
   type: Shipit::Task
   stack: shipit
   status: success
@@ -60,6 +61,8 @@ shipit_pending:
   deletions: 406
   created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
   allow_concurrency: true
+  max_retries: 1
+  retry_attempt: 0
 
 shipit_running:
   id: 5

data/test/fixtures/shipit/users.yml

@@ -5,6 +5,13 @@ walrus:
   encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
   encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
 
+codertocat:
+  name: Coding Cat
+  email: coding@cat.com
+  login: Codertocat
+  encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
+  encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
+
 bob:
   name:  Bob the Builder
   email: bob@bob.com

data/test/fixtures/timeout

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 trap('INT') do
   puts "Recieved SIGINT, aborting."
@@ -11,5 +12,5 @@ trap('TERM') do
 end
 
 puts "Sleeping for 10 seconds"
-sleep 10
+sleep(10)
 puts "I wasn't killed? WTF"

data/test/helpers/api_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ApiHelper
   private
 

data/test/helpers/fixture_aliases_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module FixtureAliasesHelper
   def shipit_deploys(*args)
     shipit_tasks(*args)

data/test/helpers/hooks_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HooksHelper
   def expect_hook(event, stack = nil, payload = nil)
     spy_on_hook
@@ -24,7 +25,7 @@ module HooksHelper
     end
     matcher = args.map(&:inspect).join(', ')
     got = called&.args&.map(&:inspect)&.join(', ')
-    refute called, "Expected no hook matching: (#{matcher})\n  got: (#{got})"
+    refute(called, "Expected no hook matching: (#{matcher})\n  got: (#{got})")
   end
 
   private

data/test/helpers/json_helper.rb

@@ -1,29 +1,37 @@
+# frozen_string_literal: true
 module JSONHelper
   UNDEFINED = Object.new.freeze
   private_constant :UNDEFINED
 
-  def assert_json(path = nil, expected_value = UNDEFINED, document: response.body)
+  def assert_json(path = nil, expected_value = UNDEFINED, &block)
+    assert_json_document(response.body, path, expected_value, &block)
+  end
+
+  def assert_json_document(document, path, expected_value = UNDEFINED)
     value = follow_path(path.to_s.split('.'), document: document)
     if block_given?
       yield value
     elsif expected_value == UNDEFINED
       raise ArgumentError, "Missing either expected_value or a block"
     elsif expected_value.nil?
-      assert_nil value
+      assert_nil(value)
     else
-      assert_equal expected_value, value
+      assert_equal(expected_value, value)
     end
   end
 
   def assert_json_keys(path, keys = nil, document: response.body)
-    keys, path = path, nil if keys.nil?
+    if keys.nil?
+      keys = path
+      path = nil
+    end
 
     value = follow_path(path.to_s.split('.'), document: document)
     case value
     when Hash
-      assert_equal keys.sort, value.keys.sort
+      assert_equal(keys.sort, value.keys.sort)
     else
-      assert false, "Expected #{path} to be a Hash, was: #{value.inspect}"
+      assert(false, "Expected #{path} to be a Hash, was: #{value.inspect}")
     end
   end
 
@@ -33,11 +41,11 @@ module JSONHelper
     leaf = follow_path(segments, document: document)
     case leaf
     when Hash
-      refute leaf.key?(last_segment), "Expected #{leaf.inspect} not to include #{last_segment.inspect}"
+      refute(leaf.key?(last_segment), "Expected #{leaf.inspect} not to include #{last_segment.inspect}")
     when Array
-      refute leaf.size > last_segment.to_i, "Expected #{leaf.inspect} to not have element at index #{last_segment.to_i}"
+      refute(leaf.size > last_segment.to_i, "Expected #{leaf.inspect} to not have element at index #{last_segment.to_i}")
     else
-      assert false, "Expected #{leaf.inspect} to be a Hash or Array"
+      assert(false, "Expected #{leaf.inspect} to be a Hash or Array")
     end
   end
 
@@ -48,13 +56,13 @@ module JSONHelper
     segments.inject(parsed_json) do |object, key|
       case object
       when Hash
-        assert_includes object, key
+        assert_includes(object, key)
         object[key]
       when Array
-        assert object.size > key.to_i, "#{object.inspect} have no property #{key}"
+        assert(object.size > key.to_i, "#{object.inspect} have no property #{key}")
         object[key.to_i]
       else
-        assert false, "Expected #{object.inspect} to be a Hash or Array"
+        assert(false, "Expected #{object.inspect} to be a Hash or Array")
       end
     end
   end

data/test/helpers/links_helper.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 module LinksHelper
   LINKS_PATTERN = /\<(.*?)\>; rel="(\w+)"/
 
   def assert_link(rel, url)
-    assert_includes response_links, rel
-    assert_equal url, response_links[rel], %(rel="#{rel}" is incorrect)
+    assert_includes(response_links, rel)
+    assert_equal(url, response_links[rel], %(rel="#{rel}" is incorrect))
   end
 
   def assert_no_link(rel)
-    assert_nil response_links[rel], %(expected rel="#{rel}" to be nil)
+    assert_nil(response_links[rel], %(expected rel="#{rel}" to be nil))
   end
 
   private

data/test/helpers/payloads_helper.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
 module PayloadsHelper
   def payload(name)
     Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json").read
   end
+
+  def payload_parsed(name)
+    JSON.parse(payload(name))
+  end
 end

data/test/helpers/queries_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueriesHelper
   def assert_no_queries(ignored_sql = nil, &block)
     assert_queries(0, ignored_sql, &block)
@@ -8,7 +9,7 @@ module QueriesHelper
     subscriber = ActiveSupport::Notifications.subscribe('sql.active_record', counter)
     yield counter
     queries = counter.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"
-    assert_equal num, counter.log.size, "#{counter.log.size} instead of #{num} queries were executed.#{queries}"
+    assert_equal(num, counter.log.size, "#{counter.log.size} instead of #{num} queries were executed.#{queries}")
   ensure
     ActiveSupport::Notifications.unsubscribe(subscriber)
   end
@@ -35,7 +36,7 @@ module QueriesHelper
 
     # FIXME: this needs to be refactored so specific database can add their own
     # ignored SQL.  This ignored SQL is for Oracle.
-    ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
+    ignored_sql.concat([/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im])
 
     attr_reader :ignore
     attr_reader :log

data/test/jobs/cache_deploy_spec_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,7 +10,7 @@ module Shipit
     end
 
     test "#perform checkout the repository to the last recorded commit and cache the deploy spec" do
-      @stack.update!(cached_deploy_spec: DeploySpec.new('review' => {'checklist' => %w(foo bar)}))
+      @stack.update!(cached_deploy_spec: DeploySpec.new('review' => { 'checklist' => %w(foo bar) }))
 
       dir = Pathname(Dir.tmpdir)
       StackCommands.any_instance.expects(:with_temporary_working_directory).with(commit: @last_commit).yields(dir)

data/test/jobs/chunk_rollup_job_test.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
   class ChunkRollupJobTest < ActiveSupport::TestCase
     setup do
       @task = shipit_tasks(:shipit)
+      @task.write("dummy output")
       @job = ChunkRollupJob.new
     end
 
@@ -14,10 +16,10 @@ module Shipit
       @job.perform(@task)
 
       @task.reload
-      assert_equal 0, @task.chunks.count
       assert @task.output.present?
       assert_equal expected_output, @task.chunk_output
       assert @task.rolled_up
+      assert_nil Shipit.redis.get(@task.send(:output_key))
     end
 
     test "#peform ignores non-finished jobs" do
@@ -39,5 +41,18 @@ module Shipit
 
       @job.perform(@task)
     end
+
+    test "#perform takes into account data still in the DB" do
+      output_chunks = Shipit::OutputChunk.create(text: "DB output", task: @task)
+      expected_output = [output_chunks.text, @task.chunk_output].join("\n")
+
+      @job.perform(@task)
+
+      @task.reload
+      assert_equal expected_output, @task.chunk_output
+      assert @task.rolled_up
+      assert_empty Shipit::OutputChunk.where(task: @task)
+      assert_nil Shipit.redis.get(@task.send(:output_key))
+    end
   end
 end

data/test/jobs/deliver_hook_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit

data/test/jobs/destroy_repository_job_test.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+module Shipit
+  class DestroyRepositoryJobTest < ActiveSupport::TestCase
+    setup do
+      @job = DestroyRepositoryJob.new
+      @repository = Repository.first
+    end
+
+    test "perform destroys the repository" do
+      assert_difference -> { Repository.count }, -1 do
+        @job.perform(@repository)
+      end
+    end
+
+    test "perform destroys the repository's stacks" do
+      stack = Stack.first
+      Shipit.github.api.expects(:remove_hook).times(stack.github_hooks.count)
+      @repository.stacks << stack
+
+      assert_difference -> { Stack.count }, -@repository.stacks.size do
+        @job.perform(@repository)
+      end
+    end
+  end
+end

data/test/jobs/destroy_stack_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit

data/test/jobs/emit_event_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,7 +10,7 @@ module Shipit
 
     test "#perform schedule deliveries" do
       assert_enqueued_jobs(2, only: DeliverHookJob) do
-        @job.perform(event: :deploy, stack_id: @stack.id, payload: {foo: 42}.to_json)
+        @job.perform(event: :deploy, stack_id: @stack.id, payload: { foo: 42 }.to_json)
       end
     end
   end

data/test/jobs/fetch_commit_stats_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit

data/test/jobs/fetch_deployed_revision_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit

data/test/jobs/github_sync_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -90,7 +91,7 @@ module Shipit
       last = stub(sha: 123)
       first = stub(sha: 345)
       Shipit::FirstParentCommitsIterator.any_instance.stubs(:each).multiple_yields(last, first)
-      @job.stubs(lookup_commit: nil)
+      @job.stubs(lookup_commit: nil, stack: @stack)
 
       commits, parent = @job.fetch_missing_commits { stub }
       assert_nil parent
@@ -103,6 +104,7 @@ module Shipit
       Shipit::FirstParentCommitsIterator.any_instance.stubs(:each).multiple_yields(last, first)
       @job.stubs(:lookup_commit).with(123).returns(nil)
       @job.stubs(:lookup_commit).with(345).returns(first)
+      @job.stubs(stack: @stack)
 
       commits, parent = @job.fetch_missing_commits { stub }
       assert_equal first, parent

data/test/jobs/mark_deploy_healthy_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit

data/test/jobs/perform_task_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -18,9 +19,9 @@ module Shipit
     end
 
     test "#perform fetch commits from the API" do
-      @job.stubs(:capture!)
-      @job.stubs(:capture)
-      @commands = stub(:commands)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture)
+      @commands = stub
       Commands.expects(:for).with(@deploy).returns(@commands)
 
       @commands.expects(:fetched?).once.returns(FakeSuccessfulCommand.new)
@@ -38,7 +39,7 @@ module Shipit
       @deploy.stack.expects(:release_status?).at_least_once.returns(false)
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_enqueued_with(job: FetchDeployedRevisionJob, args: [@deploy.stack]) do
         @job.perform(@deploy)
@@ -49,7 +50,7 @@ module Shipit
       @deploy.stack.expects(:release_status?).at_least_once.returns(false)
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
@@ -62,7 +63,7 @@ module Shipit
 
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
@@ -76,7 +77,7 @@ module Shipit
 
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
@@ -84,7 +85,7 @@ module Shipit
     end
 
     test "marks deploy as `error` if any application error is raised" do
-      @job.expects(:capture!).raises("some error")
+      Shipit::TaskExecutionStrategy::Default.any_instance.expects(:capture!).raises("some error")
       assert_nothing_raised do
         @job.perform(@deploy)
       end
@@ -93,7 +94,7 @@ module Shipit
     end
 
     test "marks deploy as `failed` if a command exit with an error code" do
-      @job.expects(:capture!).at_least_once.raises(Command::Error.new('something'))
+      Shipit::TaskExecutionStrategy::Default.any_instance.expects(:capture!).at_least_once.raises(Command::Error.new('something'))
       @job.perform(@deploy)
       assert_equal 'failed', @deploy.reload.status
     end
@@ -132,7 +133,7 @@ module Shipit
 
         @job.perform(@deploy)
 
-        assert_equal 'timedout', @deploy.reload.status
+        assert_equal('timedout', @deploy.reload.status)
       ensure
         Shipit.timeout_exit_codes = previous_exit_codes
       end
@@ -140,7 +141,7 @@ module Shipit
 
     test "records stack support for rollbacks and fetching deployed revision" do
       @job.stubs(:capture!)
-      @commands = stub(:commands)
+      @commands = stub
       @commands.stubs(:fetched?).returns([])
       @commands.stubs(:fetch).returns([])
       @commands.stubs(:clone).returns([])