shipit-engine 0.28.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e854d10e7f525e0a9af5a02bfb432ae6cd091079a8adae14894fc2e42415f2
-  data.tar.gz: 250798a87f4662d2a13e01090a31f4fc3bf82df6b206468002ca5098c792d951
+  metadata.gz: 842f0db76bf2cd73d310aebd6b3abed371658c76731c383573e4a061de4e64bd
+  data.tar.gz: 2c640e960809d4a29d441f0bc20f2724d406f60d4f13573aad9f1b7d234b547e
 SHA512:
-  metadata.gz: 8872ae9ba8ed5dcbf9de6dca1d46d40f87d9b870a5927e4b31ab62f794713b9ec030f4b8e13cf344ab2fc588d501e6d35532f13019f70815247a11fdfac0e8c8
-  data.tar.gz: 146fc5d4fec1d577d5b49bbee57b3dc9d9f391522be6e6f8877dcf80b62438eafa908454439124843ba5034e96afaaae93632b3e61f8ef1211542d297d7a4666
+  metadata.gz: faaeb16d6eb385ab64d1035c6d1a08e4d6646482bf4e87bdfe1031edb2955e52a0daa73b1dc5757e6b9253d4c51c3538db7aca388eddc8c20f1b683ee5dcfa67
+  data.tar.gz: b31c919542c163a44dd30338acdfe19b61cdd5b3bac87a9b3ed87f57e3d0f0b82602869b681e59b5401d1206f8941b44a4599e4859745a6a1dda772fcd40d2d3

data/app/controllers/concerns/shipit/active_model_serializers_patch.rb

@@ -0,0 +1,12 @@
+module Shipit
+  module ActiveModelSerializersPatch
+    private
+
+    def namespace_for_serializer
+      # TODO: This is a monkey patch for active_model_serializers 0.9.7.
+      # It's really outdated and newer versions aren't really a suitable replacement.
+      # We should look into simply getting rid of it.
+      @namespace_for_serializer ||= self.class.module_parent unless self.class.module_parent == Object
+    end
+  end
+end

data/app/controllers/shipit/stacks_controller.rb

@@ -9,7 +9,7 @@ module Shipit
     def index
       @user_stacks = current_user.stacks_contributed_to
 
-      @stacks = Stack.order('(undeployed_commits_count > 0) desc', tasks_count: :desc).to_a
+      @stacks = Stack.order(Arel.sql('(undeployed_commits_count > 0) desc'), tasks_count: :desc).to_a
     end
 
     def show

data/app/jobs/shipit/perform_task_job.rb

@@ -63,7 +63,9 @@ module Shipit
     def checkout_repository
       unless @commands.fetched?(@task.until_commit).tap(&:run).success?
         @task.acquire_git_cache_lock do
-          capture! @commands.fetch
+          unless @commands.fetched?(@task.until_commit).tap(&:run).success?
+            capture! @commands.fetch
+          end
         end
       end
       capture_all! @commands.clone

data/app/models/shipit/deploy_spec/bundler_discovery.rb

@@ -31,7 +31,7 @@ module Shipit
 
       def remove_ruby_version_from_gemfile
         # Heroku apps often specify a ruby version.
-        if /darwin/ =~ RUBY_PLATFORM
+        if /darwin/i.match?(RUBY_PLATFORM)
           # OSX is nitpicky about the -i.
           %q(/usr/bin/sed -i '' '/^ruby\s/d' Gemfile)
         else

data/app/models/shipit/pull_request.rb

@@ -6,7 +6,7 @@ module Shipit
 
     WAITING_STATUSES = %w(fetching pending).freeze
     QUEUED_STATUSES = %w(pending revalidating).freeze
-    REJECTION_REASONS = %w(ci_failing merge_conflict requires_rebase).freeze
+    REJECTION_REASONS = %w(ci_missing ci_failing merge_conflict requires_rebase).freeze
     InvalidTransition = Class.new(StandardError)
     NotReady = Class.new(StandardError)
 
@@ -149,6 +149,7 @@ module Shipit
 
     def reject_unless_mergeable!
       return reject!('merge_conflict') if merge_conflict?
+      return reject!('ci_missing') if any_status_checks_missing?
       return reject!('ci_failing') if any_status_checks_failed?
       return reject!('requires_rebase') if stale?
       false
@@ -190,7 +191,11 @@ module Shipit
 
     def any_status_checks_failed?
       status = StatusChecker.new(head, head.statuses_and_check_runs, stack.cached_deploy_spec)
-      status.failure? || status.error? || status.missing?
+      status.failure? || status.error?
+    end
+
+    def any_status_checks_missing?
+      StatusChecker.new(head, head.statuses_and_check_runs, stack.cached_deploy_spec).missing?
     end
 
     def waiting?

data/app/models/shipit/stack.rb

@@ -66,7 +66,7 @@ module Shipit
     after_commit :sync_github, on: :create
     after_commit :schedule_merges_if_necessary, on: :update
 
-    validates :repo_name, uniqueness: {scope: %i(repo_owner environment),
+    validates :repo_name, uniqueness: {scope: %i(repo_owner environment), case_sensitive: false,
                                        message: 'cannot be used more than once with this environment'}
     validates :repo_owner, :repo_name, :environment, presence: true, ascii_only: true
     validates :repo_owner, format: {with: /\A[a-z0-9_\-\.]+\z/}, length: {maximum: REPO_OWNER_MAX_SIZE}
@@ -354,8 +354,8 @@ module Shipit
 
     def clear_git_cache!
       tmp_path = "#{git_path}-#{SecureRandom.hex}"
+      return unless File.exist?(git_path)
       acquire_git_cache_lock do
-        return unless File.exist?(git_path)
         File.rename(git_path, tmp_path)
       end
       FileUtils.rm_rf(tmp_path)

data/lib/shipit/command.rb

@@ -149,18 +149,16 @@ module Shipit
     def read_stream(io)
       touch_last_output_at
       loop do
-        begin
           yield_control
           yield io.read_nonblock(MAX_READ)
           touch_last_output_at
-        rescue IO::WaitReadable
+      rescue IO::WaitReadable
           if output_timed_out?
             @timed_out = true
             raise TimedOut
           end
           IO.select([io], nil, nil, 1)
           retry
-        end
       end
     rescue EOFError
     end

data/lib/shipit/engine.rb

@@ -37,6 +37,10 @@ module Shipit
           provider(:github, *Shipit.github.oauth_config)
         end
       end
+
+      app.config.after_initialize do
+        ActionController::Base.include(Shipit::ActiveModelSerializersPatch)
+      end
     end
   end
 end

data/lib/shipit/github_app.rb

@@ -125,7 +125,8 @@ module Shipit
     end
 
     def new_client(options = {})
-      client = Octokit::Client.new(options.reverse_merge(api_endpoint: api_endpoint))
+      options.reverse_merge(api_endpoint: api_endpoint) if api_endpoint
+      client = Octokit::Client.new(options)
       client.middleware = faraday_stack
       client
     end

data/lib/shipit/stack_commands.rb

@@ -46,7 +46,9 @@ module Shipit
 
       if !commit || !fetched?(commit).tap(&:run).success?
         @stack.acquire_git_cache_lock do
-          fetch.run!
+          unless fetched?(commit).tap(&:run).success?
+            fetch.run!
+          end
         end
       end
 

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.28.1'.freeze
+  VERSION = '0.29.0'.freeze
 end

data/lib/tasks/shipit.rake

@@ -1,7 +1,6 @@
 namespace :shipit do
   desc "Deploy from a running instance. "
   task deploy: :environment do
-    begin
       stack = ENV['stack']
       revision = ENV['revision']
 
@@ -18,10 +17,9 @@ namespace :shipit do
       end
 
       Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
-    rescue ArgumentError
+  rescue ArgumentError
       p "Use this command as follows:"
       p "bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'"
       raise
-    end
   end
 end

data/test/controllers/api/outputs_controller_test.rb

@@ -13,7 +13,7 @@ module Shipit
 
         get :show, params: {stack_id: @stack.to_param, task_id: task.id}
         assert_response :ok
-        assert_equal 'text/plain', response.content_type
+        assert_equal 'text/plain', response.media_type
         assert_equal task.chunk_output, response.body
       end
     end

data/test/controllers/deploys_controller_test.rb

@@ -19,7 +19,7 @@ module Shipit
     test "deploys can be observed as raw text" do
       get :show, params: {stack_id: @stack, id: @deploy.id, format: 'txt'}
       assert_response :success
-      assert_equal("text/plain", @response.content_type)
+      assert_equal("text/plain", @response.media_type)
     end
 
     test ":new is success" do

data/test/controllers/tasks_controller_test.rb

@@ -59,7 +59,7 @@ module Shipit
     test "triggered tasks can be observed as raw text" do
       get :show, params: {stack_id: @stack, id: @task.id}, format: 'txt'
       assert_response :success
-      assert_equal("text/plain", @response.content_type)
+      assert_equal("text/plain", @response.media_type)
     end
 
     test ":abort call abort! on the deploy" do

data/test/dummy/config/application.rb

@@ -12,7 +12,7 @@ end
 
 module Shipit
   class Application < Rails::Application
-    config.load_defaults 5.2
+    config.load_defaults 6.0
   end
 end
 

data/test/dummy/db/schema.rb

@@ -2,11 +2,11 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 

data/test/dummy/db/seeds.rb

@@ -112,8 +112,8 @@ module Shipit
         message:      Faker::Company.catch_phrase,
         authored_at:  Time.now,
         committed_at: Time.now,
-        additions: Faker::Number.number(3),
-        deletions: Faker::Number.number(3),
+        additions: Faker::Number.number(digits: 3),
+        deletions: Faker::Number.number(digits: 3),
       )
 
       if (i % 4) != 0
@@ -144,19 +144,19 @@ module Shipit
     end
 
     stack.pull_requests.create!(
-      number: Faker::Number.number(3),
+      number: Faker::Number.number(digits: 3),
       title: Faker::Company.catch_phrase,
       merge_status: 'pending',
       merge_requested_at: 5.minute.ago,
       merge_requested_by: users.sample,
-      github_id: Faker::Number.number(8),
+      github_id: Faker::Number.number(digits: 8),
       api_url: 'https://api.github.com/repos/shopify/shipit-engine/pulls/62',
       state: 'open',
-      branch: "feature-#{Faker::Number.number(3)}",
+      branch: "feature-#{Faker::Number.number(digits: 3)}",
       head_id: nil,
       mergeable: true,
-      additions: Faker::Number.number(3),
-      deletions: Faker::Number.number(3),
+      additions: Faker::Number.number(digits: 3),
+      deletions: Faker::Number.number(digits: 3),
     )
   end
 
@@ -173,8 +173,8 @@ module Shipit
         since_commit_id: commits.first.id,
         until_commit_id: commits.last.id,
         status:          "success",
-        additions: Faker::Number.number(3),
-        deletions: Faker::Number.number(3),
+        additions: Faker::Number.number(digits: 3),
+        deletions: Faker::Number.number(digits: 3),
         started_at: Random.rand(15.minutes.to_i).seconds.ago,
         ended_at: Time.now.utc,
         user: users.sample,

data/test/models/commits_test.rb

@@ -143,7 +143,7 @@ module Shipit
 
     test "updating broadcasts an update event" do
       expect_event(@stack)
-      @commit.update_attributes(message: "toto")
+      @commit.update(message: "toto")
     end
 
     test "updating state to success triggers new deploy when stack has continuous deployment" do

data/test/models/hook_test.rb

@@ -50,26 +50,22 @@ module Shipit
     end
 
     test ".emit calls #deliver on internal hooks" do
-      begin
         original_receivers = Shipit.internal_hook_receivers
         FakeReceiver = Module.new
         FakeReceiver.expects(:deliver).with(:deploy, @stack, 'foo' => 42)
 
         Shipit.internal_hook_receivers << FakeReceiver
         Hook.emit(:deploy, @stack, 'foo' => 42)
-      ensure
+    ensure
         Shipit.internal_hook_receivers = original_receivers
-      end
     end
 
     test ".emit calls no internal hooks if there are no internal_hook_receivers" do
-      begin
         original_receivers = Shipit.internal_hook_receivers
         Shipit.internal_hook_receivers = nil
         Hook.emit(:deploy, @stack, 'foo' => 42)
-      ensure
+    ensure
         Shipit.internal_hook_receivers = original_receivers
-      end
     end
   end
 end

data/test/models/pull_request_test.rb

@@ -183,23 +183,29 @@ module Shipit
       refute_predicate @pr, :rejected?
     end
 
-    test "#reject_unless_mergeable! reject the PR if it has a missing CI status" do
+    test "#reject_unless_mergeable! reject the PR if it has a missing required CI status" do
+      @pr.stack.cached_deploy_spec.stubs(:required_statuses).returns(['ci/circle'])
       @pr.head.statuses.where(context: 'ci/circle').delete_all
 
-      assert_predicate @pr, :all_status_checks_passed?
+      refute_predicate @pr, :all_status_checks_passed?
       refute_predicate @pr, :any_status_checks_failed?
-      assert_equal false, @pr.reject_unless_mergeable!
-      refute_predicate @pr, :rejected?
+      assert_predicate @pr, :any_status_checks_missing?
+      assert_equal true, @pr.reject_unless_mergeable!
+      assert_predicate @pr, :rejected?
+      assert_equal 'ci_missing', @pr.rejection_reason
     end
 
     test "#reject_unless_mergeable! reject the PR if it has a missing CI status (multi-status)" do
+      @pr.stack.cached_deploy_spec.stubs(:required_statuses).returns(['ci/circle'])
       @pr.head.statuses.where(context: 'ci/circle').delete_all
       @pr.head.statuses.create!(stack: @pr.stack, state: 'success', context: 'ci/travis')
 
-      assert_predicate @pr, :all_status_checks_passed?
+      refute_predicate @pr, :all_status_checks_passed?
       refute_predicate @pr, :any_status_checks_failed?
-      assert_equal false, @pr.reject_unless_mergeable!
-      refute_predicate @pr, :rejected?
+      assert_predicate @pr, :any_status_checks_missing?
+      assert_equal true, @pr.reject_unless_mergeable!
+      assert_predicate @pr, :rejected?
+      assert_equal 'ci_missing', @pr.rejection_reason
     end
 
     test "#reject_unless_mergeable! rejects the PR if it is stale" do

data/test/test_helper.rb

@@ -11,7 +11,7 @@ ActiveRecord::Migrator.migrations_paths = [
   File.expand_path('../../db/migrate', __FILE__),
 ]
 require 'rails/test_help'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 require 'spy/integration'
 
 # Load fixtures from the engine

data/test/unit/command_test.rb

@@ -25,8 +25,12 @@ module Shipit
     end
 
     test "#interpolate_environment_variables fallback to ENV" do
-      command = Command.new('cap $LANG deploy', env: {'ENVIRONMENT' => 'production'}, chdir: '.')
-      assert_equal [%(cap #{ENV['LANG']} deploy)], command.interpolated_arguments
+      previous = ENV['SHIPIT_TEST']
+      ENV['SHIPIT_TEST'] = 'quux'
+      command = Command.new('cap $SHIPIT_TEST deploy', env: {'ENVIRONMENT' => 'production'}, chdir: '.')
+      assert_equal [%(cap quux deploy)], command.interpolated_arguments
+    ensure
+      ENV['SHIPIT_TEST'] = previous
     end
 
     test "#timeout is 5 minutes by default" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.29.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: explicit-parameters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: '4.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: '4.14'
 - !ruby/object:Gem::Dependency
   name: omniauth-github
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
@@ -268,42 +268,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: redis-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -366,14 +366,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: validate_url
   requirement: !ruby/object:Gem::Requirement
@@ -469,6 +469,7 @@ files:
 - app/assets/webfonts/CheckoutSymbols-Regular.svg
 - app/assets/webfonts/CheckoutSymbols-Regular.ttf
 - app/assets/webfonts/CheckoutSymbols-Regular.woff
+- app/controllers/concerns/shipit/active_model_serializers_patch.rb
 - app/controllers/concerns/shipit/api/cacheable.rb
 - app/controllers/concerns/shipit/api/paginable.rb
 - app/controllers/concerns/shipit/api/rendering.rb
@@ -522,7 +523,7 @@ files:
 - app/jobs/shipit/fetch_commit_stats_job.rb
 - app/jobs/shipit/fetch_deployed_revision_job.rb
 - app/jobs/shipit/github_sync_job.rb
-- app/jobs/shipit/mark_deploy_healty_job.rb
+- app/jobs/shipit/mark_deploy_healthy_job.rb
 - app/jobs/shipit/merge_pull_requests_job.rb
 - app/jobs/shipit/perform_commit_checks_job.rb
 - app/jobs/shipit/perform_task_job.rb