heroku_hatchet 8.0.1 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4233a137df7685f1e411471db8c53a72c9c6e77e5b9a901d0d8bb1c0147f06a
-  data.tar.gz: ffd93abf69b7a46ccbdda5148710e237b9c41171abef209ea56f187d7a52c501
+  metadata.gz: 55e330ebf3f600cecc72f6d26e2b213548af020bf5865d073a52445198d15ab8
+  data.tar.gz: b77b96b88f4601c5fc419f0e3418373a162e6037ad63bad1b969a1169bfc58f6
 SHA512:
-  metadata.gz: 61cc153424acbdf88c61b41ef9b4206fbb1e59c171ad30fded428d40bfe2edc728cdb2db72ca95526d1d5c5225d38eacacb6794b8c811b40988cac58480b0e74
-  data.tar.gz: 615e586767703298020a5d2a0172b9793a681a7cc681f45e6c6e42082e9db8c4a32f6e647fb006d8e9b7d8618b6c0dace7df6109cbca20e5e7fe0c34f991ed62
+  metadata.gz: 48530f31d678cea882ba4e383bee510daccdd048632c8fc900f6633ff88feef46c12c676a8dca41bc2cbf641dc27854cafbfd09e6ace0ece1efc9bb55cc7db1c
+  data.tar.gz: aaaf6b0ababd386ed3f27f9679714bc53859d76da5ec902da16d026fa2e41c04621e61d5233f622f04a5c8e67bdcada1b4c4e3394012af3ad510105dc9801533

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @heroku/languages

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.7", "3.0", "3.1"]
+        ruby-version: ["2.7", "3.0", "3.1", "3.2", "3.3"]
     runs-on: ubuntu-22.04
     env:
       HATCHET_APP_LIMIT: 100

data/.github/workflows/hatchet_app_cleaner.yml

@@ -0,0 +1,31 @@
+name: Hatchet app cleaner
+
+on:
+  schedule:
+    # Daily at 6am UTC.
+    - cron: "0 6 * * *"
+  # Allow the workflow to be manually triggered too.
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  hatchet-app-cleaner:
+    runs-on: ubuntu-latest
+    env:
+      HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
+      HEROKU_DISABLE_AUTOUPDATE: 1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Ruby and dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "3.1"
+      - name: Run Hatchet destroy
+        # Only apps older than 10 minutes are destroyed, to ensure that any
+        # in progress CI runs are not interrupted.
+        run: bundle exec hatchet destroy --older-than 10

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## HEAD
 
+## 8.0.3
+
+- Add support for Ruby 3.2 and 3.3 (https://github.com/heroku/hatchet/pull/203 and https://github.com/heroku/hatchet/pull/208)
+
+## 8.0.2
+
+- Bugfix: Allow nested deploy blocks with new teardown logic (https://github.com/heroku/hatchet/pull/201)
+
 ## 8.0.1
 
 - Bugfix: Lock and sleep and refresh API when duplicate app deletion detected (https://github.com/heroku/hatchet/pull/198)

data/etc/ci_setup.rb

@@ -12,7 +12,7 @@ end
 puts "== Setting Up CI =="
 
 netrc_file = "#{ENV['HOME']}/.netrc"
-unless File.exists?(netrc_file)
+unless File.exist?(netrc_file)
   File.open(netrc_file, 'w') do |file|
     file.write <<-EOF
 machine git.heroku.com

data/lib/hatchet/app.rb

@@ -77,6 +77,7 @@ module Hatchet
       @buildpacks.map! {|b| b == :default ? self.class.default_buildpack : b}
       @run_multi = run_multi
       @max_retries_count = retries
+      @outer_deploy_block = nil
 
       if run_multi && !ENV["HATCHET_EXPENSIVE_MODE"]
         raise "You're attempting to enable `run_multi: true` mode, but have not enabled `HATCHET_EXPENSIVE_MODE=1` env var to verify you understand the risks"
@@ -424,13 +425,14 @@ module Hatchet
     def deploy(&block)
       in_directory do
         annotate_failures do
+          @outer_deploy_block ||= block # deploy! can be called multiple times. Only teardown once
           in_dir_setup!
-          self.push_with_retry!
+          push_with_retry!
           block.call(self, api_rate_limit.call, output) if block_given?
         end
       end
     ensure
-      self.teardown! if block_given?
+      self.teardown! if block_given? && @outer_deploy_block == block
     end
 
     def push

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "8.0.1"
+  VERSION = "8.0.3"
 end

data/spec/hatchet/app_spec.rb

@@ -1,20 +1,6 @@
 require("spec_helper")
 
 describe "AppTest" do
-  it "annotates rspec expectation failures" do
-    app = Hatchet::Runner.new("default_ruby")
-    error = nil
-    begin
-      app.annotate_failures do
-        expect(true).to eq(false)
-      end
-    rescue RSpec::Expectations::ExpectationNotMetError => e
-      error = e
-    end
-
-    expect(error.message).to include(app.name)
-  end
-
   it "does not modify local files by mistake" do
     Dir.mktmpdir do |dir_1|
       app = Hatchet::Runner.new(dir_1)
@@ -29,7 +15,6 @@ describe "AppTest" do
         entries_array -= ["..", ".", "foo.txt"]
         expect(entries_array).to be_empty
 
-
         entries_array = Dir.entries(dir_1)
         entries_array -= ["..", ".", "foo.txt"]
         expect(entries_array).to be_empty
@@ -37,51 +22,13 @@ describe "AppTest" do
     end
   end
 
-  it "calls reaper if cannot create an app" do
-    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
-    def app.heroku_api_create_app(*args); raise StandardError.new("made you look"); end
-
-    reaper = app.reaper
-
-    def reaper.destroy_older_apps(*args, **kwargs, &block); @app_exception_message = true; end
-    def reaper.clean_old_was_called?; @app_exception_message; end
-
-    expect {
-      app.create_app
-    }.to raise_error("made you look")
-
-    expect(reaper.clean_old_was_called?).to be_truthy
-  end
-
-  it "app with default" do
-    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
-    expect(app.buildpacks.first).to match("https://github.com/heroku/heroku-buildpack-ruby")
-  end
-
-  it "default_buildpack is only computed once" do
-    expect(Hatchet::App.default_buildpack.object_id).to eq(Hatchet::App.default_buildpack.object_id)
-  end
-
   it "create app with stack" do
-    stack = "heroku-18"
+    stack = "heroku-20"
     app = Hatchet::App.new("default_ruby", stack: stack)
     app.create_app
     expect(app.platform_api.app.info(app.name)["build_stack"]["name"]).to eq(stack)
   end
 
-  it "create app with HATCHET_DEFAULT_STACK set" do
-    begin
-      original_default_stack = ENV["HATCHET_DEFAULT_STACK"]
-      default_stack = "heroku-18"
-      ENV["HATCHET_DEFAULT_STACK"] = default_stack
-      app = Hatchet::App.new("default_ruby")
-      app.create_app
-      expect(app.platform_api.app.info(app.name)["build_stack"]["name"]).to eq(default_stack)
-    ensure
-      ENV["HATCHET_DEFAULT_STACK"] = original_default_stack
-    end
-  end
-
   describe "before deploy" do
     it "dir" do
       @called = false

data/spec/hatchet/ci_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
-describe "CIFourTest" do
-  it "error with bad app" do
+describe "CI" do
+  it "runs rakefile contents" do
     string = SecureRandom.hex
 
     app = Hatchet::GitApp.new("default_ruby")
@@ -17,47 +17,4 @@ describe "CIFourTest" do
       expect(test_run.output).to_not match("Installing rake")
     end
   end
-
-  it "error with bad app" do
-    pending("upgrade rails 5 app to newer")
-
-    expect {
-      Hatchet::GitApp.new("rails5_ci_fails_no_database", stack: "heroku-18").run_ci { }
-    }.to raise_error(/PG::ConnectionBad: could not connect to server/)
-  end
-
-  it "error with bad app" do
-    @before_deploy_called = false
-    @before_deploy_dir_pwd = nil
-
-    before_deploy = -> do
-      @before_deploy_called = true
-      @before_deploy_dir_pwd = Dir.pwd
-    end
-
-    Hatchet::GitApp.new("rails5_ci_fails_no_database", stack: "heroku-18", allow_failure: true, before_deploy: before_deploy).run_ci do |test_run|
-      expect(test_run.status).to eq(:errored)
-      expect(@before_deploy_dir_pwd).to eq(Dir.pwd)
-      expect(@before_deploy_called).to be_truthy
-    end
-
-    expect(@before_deploy_dir_pwd).to_not eq(Dir.pwd)
-  end
-
-  it "ci create app with stack" do
-    pending("upgrade rails 5 app to newer")
-
-    app = Hatchet::GitApp.new("rails5_ruby_schema_format")
-    app.run_ci do |test_run|
-      expect(test_run.output).to match("Ruby buildpack tests completed successfully")
-      expect(test_run.status).to eq(:succeeded)
-      expect(app.pipeline_id).to_not be_nil
-
-      api_rate_limit = app.api_rate_limit.call
-      couplings = api_rate_limit.pipeline_coupling.list_by_pipeline(app.pipeline_id)
-      coupled_app = api_rate_limit.app.info(couplings.first["app"]["id"])
-      expect(coupled_app["name"]).to eq(app.name)
-    end
-    expect(app.pipeline_id).to be_nil
-  end
 end

data/spec/unit/app_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+# Tests in this file do not deploy to Heroku
+describe "App unit tests" do
+  it "annotates rspec expectation failures" do
+    app = Hatchet::Runner.new("default_ruby")
+    error = nil
+    begin
+      app.annotate_failures do
+        expect(true).to eq(false)
+      end
+    rescue RSpec::Expectations::ExpectationNotMetError => e
+      error = e
+    end
+
+    expect(error.message).to include(app.name)
+  end
+
+  it "calls reaper if cannot create an app" do
+    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
+    def app.heroku_api_create_app(*args); raise StandardError.new("made you look"); end
+
+    reaper = app.reaper
+
+    def reaper.destroy_older_apps(*args, **kwargs, &block); @app_exception_message = true; end
+    def reaper.clean_old_was_called?; @app_exception_message; end
+
+    expect {
+      app.create_app
+    }.to raise_error("made you look")
+
+    expect(reaper.clean_old_was_called?).to be_truthy
+  end
+
+  it "app with default" do
+    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
+    expect(app.buildpacks.first).to match("https://github.com/heroku/heroku-buildpack-ruby")
+  end
+
+  it "default_buildpack is only computed once" do
+    expect(Hatchet::App.default_buildpack.object_id).to eq(Hatchet::App.default_buildpack.object_id)
+  end
+
+  it "nested deploy block only calls teardown once" do
+    @deploy = 0
+    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
+    def app.in_dir_setup!; ;end # Don't create an app
+    def app.push_with_retry!; end # Don't try pushing to it
+    def app.teardown!; @teardown ||=0; @teardown += 1 end
+    def app.get_teardown_count; @teardown; end
+
+    app.deploy do |app|
+      @deploy += 1
+      app.deploy do |app|
+        @deploy += 1
+      end
+      app.deploy do |app|
+        @deploy += 1
+      end
+    end
+
+    expect(app.get_teardown_count).to eq(1)
+    expect(@deploy).to eq(3)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.3
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -158,8 +158,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/workflows/check_changelog.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/hatchet_app_cleaner.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -206,6 +208,7 @@ files:
 - spec/hatchet/local_repo_spec.rb
 - spec/hatchet/lock_spec.rb
 - spec/spec_helper.rb
+- spec/unit/app_spec.rb
 - spec/unit/default_ci_branch_spec.rb
 - spec/unit/heroku_run_spec.rb
 - spec/unit/init_spec.rb
@@ -231,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.
@@ -246,6 +249,7 @@ test_files:
 - spec/hatchet/local_repo_spec.rb
 - spec/hatchet/lock_spec.rb
 - spec/spec_helper.rb
+- spec/unit/app_spec.rb
 - spec/unit/default_ci_branch_spec.rb
 - spec/unit/heroku_run_spec.rb
 - spec/unit/init_spec.rb