heroku_hatchet 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c903b4979a0e4002e76f54d76a91f4651d5dfb2f20701909fefa5ac48954298
-  data.tar.gz: 5f54f9ebf2ec4b23a12109638aee44cc841d244c5e3f6f76994841eb47995950
+  metadata.gz: 4eff388a9b8a640e00f9a7d71dca8c63c044eb68133a3fab77c948e52d5b8e10
+  data.tar.gz: 005704cca536d304d4c59100aa70ac92da1230fb6a5f8d2deaab5acd68670407
 SHA512:
-  metadata.gz: 7aed83bd81ea797e0626184d82d0cc0d9582db9b94741e2388020196600c0d4061ddcc17d913593c85098d2f3654979be81eb643f6710e640a9bf2d74f193893
-  data.tar.gz: 34fe3e85dc3531538d84fcdfecdc204af64f3699cae3e77d89a361c999ddd1a75d1fd736a0772bcd5727a0605971176ca7cecb8ed1c9eae53dceee37e3ae9aa5
+  metadata.gz: ddedca5de3df3a7e677a6689eb06b4d7cda13a5593b6f46bd8f621b1ae954bc3ea4cd22c6f7872822f12424dcd2884192823ff458b9e2155d4f7e8236d73c746
+  data.tar.gz: 961a6edc1894a16668b001f692fca7976eba92123e16fc110f5275f38d4d780e097762642ad833a888fa4acaa7289c4beccb695c6e75f44f037e20633e84c097

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## HEAD
 
+## 5.0.2
+
+- Fix `before_deploy` use with ci test runs (https://github.com/heroku/hatchet/pull/78)
+
+## 5.0.1
+
 - Circle CI support in `ci:setup` command (https://github.com/heroku/hatchet/pull/76)
 
 ## 5.0.0

data/lib/hatchet/app.rb

@@ -315,31 +315,30 @@ module Hatchet
     end
 
     def run_ci(timeout: 300, &block)
-      Hatchet::RETRIES.times.retry do
-        result       = create_pipeline
-        @pipeline_id = result["id"]
-      end
+      in_directory do
+        Hatchet::RETRIES.times.retry do
+          result       = create_pipeline
+          @pipeline_id = result["id"]
+        end
 
-      # when the CI run finishes, the associated ephemeral app created for the test run internally gets removed almost immediately
-      # the system then sees a pipeline with no apps, and deletes it, also almost immediately
-      # that would, with bad timing, mean our test run info poll in wait! would 403, and/or the delete_pipeline at the end
-      # that's why we create an app explictly (or maybe it already exists), and then associate it with with the pipeline
-      # the app will be auto cleaned up later
-      self.setup!
-      Hatchet::RETRIES.times.retry do
-        couple_pipeline(@name, @pipeline_id)
-      end
+        # when the CI run finishes, the associated ephemeral app created for the test run internally gets removed almost immediately
+        # the system then sees a pipeline with no apps, and deletes it, also almost immediately
+        # that would, with bad timing, mean our test run info poll in wait! would 403, and/or the delete_pipeline at the end
+        # that's why we create an app explictly (or maybe it already exists), and then associate it with with the pipeline
+        # the app will be auto cleaned up later
+        self.setup!
+        Hatchet::RETRIES.times.retry do
+          couple_pipeline(@name, @pipeline_id)
+        end
 
-      test_run = TestRun.new(
-        token:          api_key,
-        buildpacks:     @buildpacks,
-        timeout:        timeout,
-        app:            self,
-        pipeline:       @pipeline_id,
-        api_rate_limit: api_rate_limit
-      )
-      in_directory do
-        call_before_deploy
+        test_run = TestRun.new(
+          token:          api_key,
+          buildpacks:     @buildpacks,
+          timeout:        timeout,
+          app:            self,
+          pipeline:       @pipeline_id,
+          api_rate_limit: api_rate_limit
+        )
 
         Hatchet::RETRIES.times.retry do
           test_run.create_test_run

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "5.0.1"
+  VERSION = "5.0.2"
 end

data/test/hatchet/ci_three_test.rb

@@ -2,8 +2,19 @@ require 'test_helper'
 
 class CIThreeTest < Minitest::Test
   def test_error_with_bad_app
-    Hatchet::GitApp.new("rails5_ci_fails_no_database", allow_failure: true).run_ci do |test_run|
+    @before_deploy_called = false
+    @before_deploy_dir_pwd = nil
+    before_deploy = -> {
+      @before_deploy_called = true
+      @before_deploy_dir_pwd = Dir.pwd
+    }
+    Hatchet::GitApp.new("rails5_ci_fails_no_database", allow_failure: true, before_deploy: before_deploy).run_ci do |test_run|
       assert_equal :errored, test_run.status
+      assert_equal Dir.pwd, @before_deploy_dir_pwd
+
+      assert @before_deploy_called
     end
+
+    refute_equal Dir.pwd, @before_deploy_dir_pwd
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api