shipit-engine 0.42.0 → 0.43.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92deb69f7e1cf311777e4de1f80c95055d85b13bf28bba0cfa867d998a469620
-  data.tar.gz: d201434b2619d1d1cd5b089656b5acbeeadc842cab75da2d4051f51a2013d497
+  metadata.gz: a115bf18d2ceef6d9174c41bf746c8c0e7481b9967f546ee26ff9dfad8cde608
+  data.tar.gz: 5e3856d83fdd58ec6f169ce4a01e2782606cddeda43b24705075e62237c79709
 SHA512:
-  metadata.gz: 701903483ad7438eb46f1624c75bdcc893d9be84cf2f3926c0987cc257bd55b95e4c4e0703c85bf2db8c0ae7429c4e03ae1fe28e294a24cdca26f4d321e82d11
-  data.tar.gz: 80a26fdee216be7713a1aa6389e3ec9b304f494514eed6d14d24bf7dd6b4466821ce8b54c12d4a3e291f49bfc20585a178d2eef581e74f846ac1c532e00d9b35
+  metadata.gz: b1763e4292845af68b81ff1e60dc34377a962834a797975293429726371b9a8868be7a47193a777e3e10bcfb171dc429d09b86aaf83f202e065716245c650214
+  data.tar.gz: 9a6f799a3d538f45c781443798f7076a52e98499d6e56cc477b250ca5a390759b3344c6d5a1809cc894bb88ad456d64b6d3910ab3322b371b88ed314dd83b538

data/app/models/shipit/commit.rb

@@ -173,23 +173,21 @@ module Shipit
         stack.github_api.check_runs(github_repo_name, sha, per_page: 100)
       end
 
-      return response if stack.github_api.last_response.rels[:next].nil?
+      yield response.check_runs
 
-      loop do
+      until stack.github_api.last_response.rels[:next].nil?
         page = stack.handle_github_redirections do
           stack.github_api.get(stack.github_api.last_response.rels[:next].href)
         end
-        response.check_runs.concat(page.check_runs)
-        break if stack.github_api.last_response.rels[:next].nil?
+        yield page.check_runs
       end
-
-      response
     end
 
     def refresh_check_runs!
-      response = paginated_check_runs
-      response.check_runs.each do |check_run|
-        create_or_update_check_run_from_github!(check_run)
+      paginated_check_runs do |check_runs|
+        check_runs.each do |check_run|
+          create_or_update_check_run_from_github!(check_run)
+        end
       end
     end
 

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

@@ -26,9 +26,18 @@ module Shipit
       end
 
       def bundle_install
-        bundle = %(bundle install #{frozen_flag} --jobs 4 --path #{bundle_path} --retry 2)
-        bundle += " --without=#{bundler_without.join(':')}" unless bundler_without.empty?
-        [remove_ruby_version_from_gemfile, bundle]
+        install_command = %(bundle install --jobs 4 --retry 2)
+        install_command += " --without=#{bundler_without.join(':')}" unless bundler_without.empty?
+        [
+          remove_ruby_version_from_gemfile,
+          (bundle_config_frozen if frozen_mode?),
+          bundle_config_path,
+          install_command
+        ].compact
+      end
+
+      def bundle_config_path
+        "bundle config set --local path #{bundle_path}"
       end
 
       def remove_ruby_version_from_gemfile
@@ -41,11 +50,14 @@ module Shipit
         end
       end
 
-      def frozen_flag
-        return unless gemfile_lock_exists?
-        return if config('dependencies', 'bundler', 'frozen') == false
+      def bundle_config_frozen
+        'bundle config set --local frozen true'
+      end
+
+      def frozen_mode?
+        return false unless gemfile_lock_exists?
 
-        '--frozen'
+        config('dependencies', 'bundler', 'frozen') != false
       end
 
       def bundler_without

data/lib/shipit/commands.rb

@@ -35,11 +35,18 @@ module Shipit
     private
 
     def base_env
-      @base_env ||= Shipit.env.merge(
-        'GITHUB_DOMAIN' => github.domain,
-        'GITHUB_TOKEN' => github.token,
-        'GIT_ASKPASS' => Shipit::Engine.root.join('lib', 'snippets', 'git-askpass').realpath.to_s
-      )
+      @base_env ||= begin
+        env = Shipit.env.merge(
+          'GITHUB_DOMAIN' => github.domain,
+          'GITHUB_TOKEN' => github.token
+        )
+
+        if Shipit.use_git_askpass?
+          env['GIT_ASKPASS'] = Shipit::Engine.root.join('lib', 'snippets', 'git-askpass').realpath.to_s
+        end
+
+        env
+      end
     end
 
     def github

data/lib/shipit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipit
-  VERSION = '0.42.0'
+  VERSION = '0.43.1'
 end

data/lib/shipit.rb

@@ -71,7 +71,8 @@ module Shipit
     :internal_hook_receivers,
     :preferred_org_emails,
     :task_execution_strategy,
-    :task_logger
+    :task_logger,
+    :use_git_askpass
   )
 
   def task_execution_strategy
@@ -297,6 +298,10 @@ module Shipit
     @task_logger ||= Logger.new(nil)
   end
 
+  def use_git_askpass?
+    @use_git_askpass.nil? ? true : @use_git_askpass
+  end
+
   protected
 
   def revision_file

data/test/dummy/config/environments/development.rb

@@ -48,6 +48,9 @@ Rails.application.configure do
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
+  # Disable git askpass in development
+  Shipit.use_git_askpass = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
   if Rails.application.config_for(:database)&.dig('adapter') == 'sqlite3'

data/test/dummy/config/environments/production.rb

@@ -76,4 +76,7 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Make sure git askpass is enabled in production
+  Shipit.use_git_askpass = true
 end

data/test/dummy/config/environments/test.rb

@@ -32,6 +32,9 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Disable git askpass in test
+  Shipit.use_git_askpass = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 

data/test/dummy/db/seeds.rb

@@ -53,7 +53,7 @@ module Shipit
               ]
             },
             "override": [
-              "bundle check --path=/tmp/bundler || bundle install --frozen --path=/tmp/bundler --retry=2 --without=default:production:development:test:staging:benchmark:debug"
+              "bundle config set path /tmp/bundler && (bundle check || bundle install --frozen --retry=2 --without=default:production:development:test:staging:benchmark:debug)"
             ]
           },
           "fetch": [

data/test/models/commits_test.rb

@@ -367,6 +367,75 @@ module Shipit
       assert_equal 'success', @commit.check_runs.first.state
     end
 
+    test "refresh_check_runs! handles paginated responses from github" do
+      # First page check runs
+      check_run1 = mock(
+        id: 111_111_111_111_111,
+        name: 'Test suite 1',
+        conclusion: 'success',
+        details_url: 'https://example.com/details/1',
+        html_url: 'https://example.com/run/1',
+        output: mock(
+          title: 'Tests build 1 ran successfully'
+        ),
+        completed_at: Time.now,
+        started_at: Time.now - 1.minute
+      )
+      check_run2 = mock(
+        id: 222_222_222_222_222,
+        name: 'Test suite 2',
+        conclusion: 'failure',
+        details_url: 'https://example.com/details/2',
+        html_url: 'https://example.com/run/2',
+        output: mock(
+          title: 'Tests build 2 failed'
+        ),
+        completed_at: Time.now,
+        started_at: Time.now - 2.minutes
+      )
+
+      # Second page check runs
+      check_run3 = mock(
+        id: 333_333_333_333_333,
+        name: 'Test suite 3',
+        conclusion: 'success',
+        details_url: 'https://example.com/details/3',
+        html_url: 'https://example.com/run/3',
+        output: mock(
+          title: 'Tests build 3 skipped'
+        ),
+        completed_at: Time.now,
+        started_at: Time.now - 3.minutes
+      )
+
+      next_link = stub(href: 'https://api.github.com/repos/test/repo/check-runs?page=2')
+      first_response = stub(rels: { next: next_link }, data: mock(check_runs: [check_run1, check_run2]))
+      second_response = stub(rels: {}, data: mock(check_runs: [check_run3]))
+
+      call_sequence = sequence('api_calls')
+      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, @commit.sha, per_page: 100).returns(first_response.data).in_sequence(call_sequence)
+      Shipit.github.api.expects(:last_response).returns(first_response).in_sequence(call_sequence)
+      Shipit.github.api.expects(:last_response).returns(first_response).in_sequence(call_sequence)
+      Shipit.github.api.expects(:get).with(next_link.href).returns(second_response.data).in_sequence(call_sequence)
+      Shipit.github.api.expects(:last_response).returns(second_response).in_sequence(call_sequence)
+
+      assert_difference -> { @commit.check_runs.count }, 3 do
+        @commit.refresh_check_runs!
+      end
+
+      check1 = @commit.check_runs.find_by(github_id: 111_111_111_111_111)
+      assert_not_nil check1
+      assert_equal 'success', check1.state
+
+      check2 = @commit.check_runs.find_by(github_id: 222_222_222_222_222)
+      assert_not_nil check2
+      assert_equal 'failure', check2.state
+
+      check3 = @commit.check_runs.find_by(github_id: 333_333_333_333_333)
+      assert_not_nil check3
+      assert_equal 'success', check3.state
+    end
+
     test "#creating a commit update the undeployed_commits_count" do
       walrus = shipit_users(:walrus)
       assert_equal 2, @stack.undeployed_commits_count

data/test/models/deploy_spec_test.rb

@@ -67,13 +67,14 @@ module Shipit
       @spec.stubs(:gemfile_lock_exists?).returns(true)
       command = %(
         bundle install
-        --frozen
         --jobs 4
-        --path #{DeploySpec.bundle_path}
         --retry 2
         --without=default:production:development:test:staging:benchmark:debug
       ).gsub(/\s+/, ' ').strip
+      config_command = "bundle config set --local path #{@spec.bundle_path}"
+
       assert_equal command, @spec.bundle_install.last
+      assert @spec.bundle_install.include?(config_command)
     end
 
     test '#bundle_install use `dependencies.bundler.without` if present to build the --without argument' do
@@ -81,31 +82,29 @@ module Shipit
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       command = %(
         bundle install
-        --frozen
         --jobs 4
-        --path #{DeploySpec.bundle_path}
         --retry 2
         --without=some:custom:groups
       ).gsub(/\s+/, ' ').strip
       assert_equal command, @spec.bundle_install.last
     end
 
-    test '#bundle_install has --frozen option if Gemfile.lock is present' do
+    test '#bundle_install configures frozen mode if Gemfile.lock is present' do
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       @spec.stubs(:gemfile_lock_exists?).returns(true)
-      assert @spec.bundle_install.last.include?('--frozen')
+      assert @spec.bundle_install.include?('bundle config set --local frozen true')
     end
 
-    test '#bundle_install does not have --frozen option if Gemfile.lock is not present' do
+    test '#bundle_install does not configure frozen mode if Gemfile.lock is not present' do
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       @spec.stubs(:gemfile_lock_exists?).returns(false)
-      refute @spec.bundle_install.last.include?('--frozen')
+      refute @spec.bundle_install.include?('bundle config set --local frozen true')
     end
 
-    test '#bundle_install does not have --frozen if overridden in shipit.yml' do
+    test '#bundle_install does not configure frozen mode if overridden in shipit.yml' do
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'frozen' => false } })
       @spec.stubs(:gemfile_lock_exists?).returns(true)
-      refute @spec.bundle_install.last.include?('--frozen')
+      refute @spec.bundle_install.include?('bundle config set --local frozen true')
     end
 
     test "#provisioning_handler returns `provision.handler` if present" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.1
 platform: ruby
 authors:
 - Jean Boussier