heroku_hatchet 7.3.3 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38e2cd43133aeb405a133834284c026c0e4a1347e33f84e805ed7b9fd2674fc9
-  data.tar.gz: b1f88b0a62250a4cb2d9e22a89fe101356c5360aa37d786a51faebb2fac23824
+  metadata.gz: 4e33ffcf73b42d412f81525fdce9b77baa34da4083a6662cb14ddb098a0535dc
+  data.tar.gz: 3d73f585c00dd74cd4733802af979ba75e2c04e4cb93118128fdaf6efe9bc53b
 SHA512:
-  metadata.gz: b36428d7f0e5288ac434d3fa66c3bf70b067742f4e150ebc4208d2e1e9b23761c7fd94cee0c8713909e07c63845014b7b139dd86f82d0118a53978b0033a83f7
-  data.tar.gz: 3250c42cdd66bfbcfc4b129a0cf4083b30b94308614bf5ae4c765ced438522e814a6205dde298b51132eb6057581329054fde9d7bbd49208dda2d9cf89bd3e8d
+  metadata.gz: f9ef93379dd21e7808f30d9a2ed6179a76aa12679d5a1129a1ed394682c3e046abcc6c8b87ae8d3112edc5ff77965f90d42550be6d09a49ed89b7ad7270fdf14
+  data.tar.gz: 6cd06944d64ca9ae96ed8b25744000de748a5235dc52fab838368b9afc75c28af6dc9c1432106a99f972b4044d94762ce573fcaef2fa91f062a68aad2000b05a

data/.github/workflows/check_changelog.yml

@@ -1,13 +1,22 @@
 name: Check Changelog
 
 on:
- pull_request:
-  types: [opened, reopened, edited, synchronize]
+  pull_request:
+    types: [opened, reopened, edited, labeled, unlabeled, synchronize]
+
 jobs:
-  build:
+  check-changelog:
     runs-on: ubuntu-latest
+    if: |
+      !contains(github.event.pull_request.body, '[skip changelog]') &&
+      !contains(github.event.pull_request.body, '[changelog skip]') &&
+      !contains(github.event.pull_request.body, '[skip ci]') &&
+      !contains(github.event.pull_request.labels.*.name, 'skip changelog') &&
+      !contains(github.event.pull_request.labels.*.name, 'dependencies') &&
+      !contains(github.event.pull_request.labels.*.name, 'automation')
     steps:
-    - uses: actions/checkout@v1
-    - name: Check that CHANGELOG is touched
-      run: |
-        cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md
+      - uses: actions/checkout@v3
+      - name: Check that CHANGELOG is touched
+        run: |
+          git fetch origin ${{ github.base_ref }} --depth 1 && \
+          git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

data/.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+on:
+  push:
+    # Avoid duplicate builds on PRs.
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ["2.7", "3.0", "3.1"]
+    runs-on: ubuntu-22.04
+    env:
+      HATCHET_APP_LIMIT: 100
+      HATCHET_RETRIES: 3
+      HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
+      IS_RUNNING_ON_CI: 1
+      HATCHET_EXPENSIVE_MODE: 1
+      PARALLEL_SPLIT_TEST_PROCESSES: 25
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }} and dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Hatchet setup
+        run: bundle exec hatchet ci:setup
+      - name: Run test suite
+        run: bundle exec parallel_split_test spec/

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## HEAD
 
+## 7.4.0
+
+- Supports "basic" scaledown (https://github.com/heroku/hatchet/pull/193)
+- Breaking: Support for Ruby 2.2 is soft removed going forward only Ruby versions on the currently released stack will be supported
+- Bugfix: `heroku run` calls are now properly rate throttled and retried https://github.com/heroku/hatchet/pull/187
+
+## 7.3.4
+
+- Memoize `Hatchet::App.default_buildpack` (https://github.com/heroku/hatchet/pull/183)
+- Fix repository path lookup when custom Hatchet directory set (https://github.com/heroku/hatchet/issues/181)
+- Handle additional variations of rate limit error messages (https://github.com/heroku/hatchet/pull/182)
+- Add `HATCHET_DEFAULT_STACK` for configuring the default stack (https://github.com/heroku/hatchet/pull/184)
+- Fix typo in the reaper `"Duplicate destroy attempted"` message (https://github.com/heroku/hatchet/pull/175)
+- Set `init.defaultBranch` in ci:setup to suppress `git init` warning in Git 2.30+ (https://github.com/heroku/hatchet/issues/172)
+- Switch `heroku ci:install_heroku` to the Heroku CLI standalone installer rather than the APT install method (https://github.com/heroku/hatchet/issues/171)
+
 ## 7.3.3
 
 - Quiet personal tokens (https://github.com/heroku/hatchet/pull/148)
@@ -344,7 +360,6 @@
 
     after_script: bundle exec rake hatchet:teardown_travis
 
-
 ## 0.1.1
 
 - Allow auto retries of pushes by setting environment variable `HATCHET_RETRIES=3`

data/README.md

@@ -504,7 +504,7 @@ The `Hatchet::Runner.new` takes several arguments.
 
 ### Init options
 
-- stack (String): The stack you want to deploy to on Heroku.
+- stack (String): The Heroku [stack](https://devcenter.heroku.com/articles/stack) to use for the app. If this is not set, the stack will be determined from `HATCHET_DEFAULT_STACK`, or else the Heroku platform's [default stack](https://devcenter.heroku.com/articles/stack#default-stack).
 
 ```ruby
 Hatchet::Runner.new("default_ruby", stack: "heroku-16").deploy do |app|
@@ -598,6 +598,7 @@ app.get_config("DEPLOY_TASKS") # => "run:bloop"
 
 - `app.set_lab()`: Enables the specified lab/feature on the app
 - `app.add_database()`: adds a database to the app, defaults to the "dev" database
+- `app.update_stack()`: Change the app's stack to that specified (for example `"heroku-20"`). Will take effect on the next build.
 - `app.run()`: Runs a `heroku run bash` session with the arguments, covered above.
 - `app.run_multi()`: Runs a `heroku run bash` session in the background and yields the results. This requires the `run_multi` flag of the app to be set to `true`, which will charge your application (the `HATCHET_EXPENSIVE_MODE` env var must also be set to use this feature). Example above.
 - `app.create_app`: Can be used to manually create the app without deploying it (You probably want `setup!` though)
@@ -727,6 +728,7 @@ HATCHET_ALIVE_TTL_MINUTES=7
 - `HATCHET_APP_LIMIT`: The maximum number of **hatchet** apps that Hatchet will allow in the given account before running the reaper. For local execution, keep this low as you don't want your account dominated by hatchet apps. For CI, you want it to be much larger, 80-100 since it's not competing with non-hatchet apps. Your test runner account needs to be a dedicated account.
 - `HEROKU_API_KEY`: The API key of your test account user. If you run locally without this set, it will use your personal credentials.
 - `HEROKU_API_USER`: The email address of your user account. If you run locally without this set, it will use your personal credentials.
+- `HATCHET_DEFAULT_STACK`: The default Heroku stack to be used when an explicit `stack` is not passed to `App.new`. If this is not set, apps will instead use Heroku platform's [default stack](https://devcenter.heroku.com/articles/stack#default-stack).
 - `HATCHET_RUN_MULTI`: If enabled, this will scale up deployed apps to "standard-1x" once deployed instead of running on the free tier. This enables the `run_multi` method capability, however scaling up is not free. WARNING: Setting this env var will incur charges to your Heroku account. We recommended never to enable this setting unless you work for Heroku. To use this you must also set `HATCHET_EXPENSIVE_MODE=1`
 - `HATCHET_EXPENSIVE_MODE`: This is intended to be a "safety" environment variable. If it is not set, Hatchet will prevent you from using the `run_multi: true` setting or the `HATCHET_RUN_MULTI` environment variables. There are still ways to incur charges without this feature, but unless you're absolutely confident your test setup will not leave "orphan" apps that are billing you, do not enable this setting. Even then, only set this value if you work for Heroku. To recap WARNING: setting this is expensive.
 

data/etc/ci_setup.rb

@@ -30,6 +30,8 @@ run_cmd "bundle exec hatchet ci:install_heroku"
 run_cmd "bundle exec hatchet install"
 run_cmd "git config --get user.email > /dev/null || git config --global user.email #{ENV.fetch('HEROKU_API_USER').shellescape}"
 run_cmd "git config --get user.name > /dev/null || git config --global user.name 'BuildpackTester'"
+# Suppress the `git init` warning in Git 2.30+ when no default branch name is set.
+run_cmd "git config --global init.defaultBranch main"
 
 puts "== Done =="
 

data/etc/setup_heroku.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 set -euo pipefail
-curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh
+curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install.sh | sh

data/lib/hatchet/app.rb

@@ -49,7 +49,7 @@ module Hatchet
     DEFAULT_REPO_NAME = Object.new
 
     def initialize(repo_name = DEFAULT_REPO_NAME,
-                   stack: "",
+                   stack: ENV["HATCHET_DEFAULT_STACK"],
                    name: default_name,
                    debug: nil,
                    debugging: nil,
@@ -112,8 +112,9 @@ module Hatchet
       @directory
     end
 
+    @default_buildpack = nil
     def self.default_buildpack
-      [HATCHET_BUILDPACK_BASE.call, HATCHET_BUILDPACK_BRANCH.call].join("#")
+      @default_buildpack ||= [HATCHET_BUILDPACK_BASE.call, HATCHET_BUILDPACK_BRANCH.call].join("#")
     end
 
     def allow_failure?
@@ -359,7 +360,7 @@ module Hatchet
 
       if @run_multi_is_setup
         @run_multi_array.map(&:join)
-        platform_api.formation.update(name, "web", {"size" => "free"})
+        platform_api.formation.update(name, "web", {"size" => "basic"})
       end
 
     ensure

data/lib/hatchet/config.rb

@@ -44,7 +44,7 @@ module Hatchet
 
     # use this method to turn "codetriage" into repos/rails3/codetriage
     def path_for_name(name)
-      possible_paths = [repos[name.to_s], "repos/#{name}", name].compact
+      possible_paths = [repos[name.to_s], "#{repo_directory_path}/#{name}", name].compact
       path = possible_paths.detect do |path|
         !(Dir[path] && Dir[path].empty?)
       end

data/lib/hatchet/git_app.rb

@@ -13,7 +13,7 @@ module Hatchet
           output = git_push_heroku_yall
         rescue FailedDeploy => e
           case e.output
-          when /reached the API rate limit/, /429 Too Many Requests/
+          when /reached the API rate limit/, /429 Too Many Requests/, /HTTP 429/, /HTTP code = 429/
             throw(:throttle)
           else
             raise e unless @allow_failure

data/lib/hatchet/heroku_run.rb

@@ -1,4 +1,39 @@
+require 'open3'
+
 module Hatchet
+  class BashResult
+    attr_reader :stdout, :stderr, :status
+
+    def initialize(stdout:, stderr:, status:, set_global_status: false)
+      @stdout = stdout
+      @stderr = stderr
+      @status = status.respond_to?(:exitstatus) ? status.exitstatus : status.to_i
+      `exit #{@status}` if set_global_status
+    end
+
+    # @return [Boolean]
+    def success?
+      @status == 0
+    end
+
+    def failed?
+      !success?
+    end
+
+    # Testing helper methods
+    def include?(value)
+      stdout.include?(value)
+    end
+
+    def match?(value)
+      stdout.match?(value)
+    end
+
+    def match(value)
+      stdout.match(value)
+    end
+  end
+
   # Used for running Heroku commands
   #
   # Example:
@@ -28,18 +63,21 @@ module Hatchet
       @command = build_heroku_command(command, heroku || {})
       @retry_on_empty = retry_on_empty
       @stderr = stderr
-      @output = ""
-      @status = nil
+      @result = nil
       @empty_fail_count = 0
     end
 
+    def result
+      raise "You must run `call` on this object first" unless @result
+      @result
+    end
+
     def output
-      raise "You must run `call` on this object first" unless @status
-      @output
+      result.stdout
     end
 
     def status
-      raise "You must run `call` on this object first" unless @status
+      result
       @status
     end
 
@@ -68,12 +106,13 @@ module Hatchet
     private def execute!
       ShellThrottle.new(platform_api: @app.platform_api).call do |throttle|
         run_shell!
-        throw(:throttle) if output.match?(/reached the API rate limit/)
+        throw(:throttle) if @result.stderr.match?(/reached the API rate limit/)
       end
     end
 
     private def run_shell!
-      @output = `#{@command}`
+      stdout, stderr, status = Open3.capture3(@command)
+      @result = BashResult.new(stdout: stdout, stderr: stderr, status: status, set_global_status: true)
       @status = $?
     end
 

data/lib/hatchet/reaper.rb

@@ -170,14 +170,14 @@ module Hatchet
       body = e.response.body
       request_id = e.response.headers["Request-Id"]
       if body =~ /Couldn\'t find that app./
-        io.puts "Duplicate destoy attempted #{name.inspect}: #{id}, status: 404, request_id: #{request_id}"
+        io.puts "Duplicate destroy attempted #{name.inspect}: #{id}, status: 404, request_id: #{request_id}"
         raise AlreadyDeletedError.new
       else
         raise e
       end
     rescue Excon::Error::Forbidden => e
       request_id = e.response.headers["Request-Id"]
-      io.puts "Duplicate destoy attempted #{name.inspect}: #{id}, status: 403, request_id: #{request_id}"
+      io.puts "Duplicate destroy attempted #{name.inspect}: #{id}, status: 403, request_id: #{request_id}"
       raise AlreadyDeletedError.new
     end
 

data/lib/hatchet/templates/check_changelog.erb

@@ -1,13 +1,22 @@
 name: Check Changelog
 
 on:
- pull_request:
-  types: [opened, reopened, edited, synchronize]
+  pull_request:
+    types: [opened, reopened, edited, labeled, unlabeled, synchronize]
+
 jobs:
-  build:
+  check-changelog:
     runs-on: ubuntu-latest
+    if: |
+      !contains(github.event.pull_request.body, '[skip changelog]') &&
+      !contains(github.event.pull_request.body, '[changelog skip]') &&
+      !contains(github.event.pull_request.body, '[skip ci]') &&
+      !contains(github.event.pull_request.labels.*.name, 'skip changelog') &&
+      !contains(github.event.pull_request.labels.*.name, 'dependencies') &&
+      !contains(github.event.pull_request.labels.*.name, 'automation')
     steps:
-    - uses: actions/checkout@v1
-    - name: Check that CHANGELOG is touched
-      run: |
-        cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md
+      - uses: actions/checkout@v3
+      - name: Check that CHANGELOG is touched
+        run: |
+          git fetch origin ${{ github.base_ref }} --depth 1 && \
+          git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

data/lib/hatchet/templates/dependabot.erb

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 updates:
   - package-ecosystem: "bundler"
     directory: "/"

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "7.3.3"
+  VERSION = "7.4.0"
 end

data/spec/hatchet/app_spec.rb

@@ -58,13 +58,30 @@ describe "AppTest" do
     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-16"
+    stack = "heroku-18"
     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
+
   it "marks itself 'finished' when done in block mode" do
     app = Hatchet::Runner.new("default_ruby")
 

data/spec/hatchet/ci_spec.rb

@@ -27,8 +27,10 @@ describe "CIFourTest" do
   end
 
   it "error with bad app" do
+    pending("upgrade rails 5 app to newer")
+
     expect {
-      Hatchet::GitApp.new("rails5_ci_fails_no_database").run_ci { }
+      Hatchet::GitApp.new("rails5_ci_fails_no_database", stack: "heroku-18").run_ci { }
     }.to raise_error(/PG::ConnectionBad: could not connect to server/)
   end
 
@@ -41,7 +43,7 @@ describe "CIFourTest" do
       @before_deploy_dir_pwd = Dir.pwd
     end
 
-    Hatchet::GitApp.new("rails5_ci_fails_no_database", allow_failure: true, before_deploy: before_deploy).run_ci do |test_run|
+    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
@@ -51,6 +53,8 @@ describe "CIFourTest" do
   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")

data/spec/hatchet/config_spec.rb

@@ -6,6 +6,10 @@ describe "ConfigTest" do
     expect(@config.path_for_name("rails3_mri_193")).to(eq("repo_fixtures/repos/rails3/rails3_mri_193"))
   end
 
+  it("config path for name with full repo name") do
+    expect(@config.path_for_name("rails3/rails3_mri_193")).to(eq("repo_fixtures/repos/rails3/rails3_mri_193"))
+  end
+
   it("config dirs") do
     { "repo_fixtures/repos/bundler/no_lockfile" => "https://github.com/sharpstone/no_lockfile.git", "repo_fixtures/repos/default/default_ruby" => "https://github.com/sharpstone/default_ruby.git", "repo_fixtures/repos/rails2/rails2blog" => "https://github.com/sharpstone/rails2blog.git", "repo_fixtures/repos/rails3/rails3_mri_193" => "https://github.com/sharpstone/rails3_mri_193.git" }.each do |key, value|
       assert_include(key, value, @config.dirs)

data/spec/unit/heroku_run_spec.rb

@@ -50,7 +50,7 @@ describe "HerokuRun" do
       run_obj = Hatchet::HerokuRun.new("ruby -v", app: @app, stderr: stderr)
 
       def run_obj.run_shell!
-        @output = ""
+        @result = Hatchet::BashResult.new(stdout: "", stderr: "", status: 1)
         @status = Object.new
       end
 
@@ -65,7 +65,7 @@ describe "HerokuRun" do
       run_obj = Hatchet::HerokuRun.new("ruby -v", app: @app, stderr: stderr)
 
       def run_obj.run_shell!
-        @output = "not empty"
+        @result = Hatchet::BashResult.new(stdout: "not empty", stderr: "", status: 1)
         @status = Object.new
       end
 
@@ -80,7 +80,7 @@ describe "HerokuRun" do
       run_obj = Hatchet::HerokuRun.new("ruby -v", app: @app, stderr: stderr, retry_on_empty: false)
 
       def run_obj.run_shell!
-        @output = ""
+        @result = Hatchet::BashResult.new(stdout: "", stderr: "", status: 1)
         @status = Object.new
       end
 
@@ -90,6 +90,24 @@ describe "HerokuRun" do
       expect(stderr.string).to_not include("retrying the command.")
     end
 
+    it "retries work when message is delivered via stderr" do
+      stderr = StringIO.new
+      run_obj = Hatchet::HerokuRun.new("ruby -v", app: @app, stderr: stderr, retry_on_empty: false)
+
+      def run_obj.run_shell!
+        @throttle_retry_count ||= 0
+        @throttle_retry_count += 1
+        @command = "echo 'lol'" if @throttle_retry_count > 1
+
+        super
+      end
+
+      run_obj.instance_variable_set(:@command, "ruby -e 'STDERR.puts %Q{reached the API rate limit}'")
+      run_obj.call
+
+      expect(run_obj.instance_variable_get(:@throttle_retry_count)).to eq(2)
+    end
+
     it "retries 0 times on empty result when disabled via ENV var" do
       begin
         original_env = ENV["HATCHET_DISABLE_EMPTY_RUN_RETRY"]
@@ -98,7 +116,7 @@ describe "HerokuRun" do
         run_obj = Hatchet::HerokuRun.new("ruby -v", app: @app, stderr: stderr)
 
         def run_obj.run_shell!
-          @output = ""
+          @result = Hatchet::BashResult.new(stdout: "", stderr: "", status: 1)
           @status = Object.new
         end
 

data/spec/unit/shell_throttle_spec.rb

@@ -43,7 +43,7 @@ describe "ShellThrottle" do
   end
 
   describe "git push throttle" do
-    it "rate throttles `git push` " do
+    it "rate throttles `git push` with output variation 1" do
       app = Hatchet::GitApp.new("default_ruby")
       def app.git_push_heroku_yall
         @_git_push_heroku_yall_call_count ||= 0
@@ -67,7 +67,7 @@ describe "ShellThrottle" do
       expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
     end
 
-    it "rate throttles `git push` with different output" do
+    it "rate throttles `git push` with output variation 2" do
       app = Hatchet::GitApp.new("default_ruby")
       def app.git_push_heroku_yall
         @_git_push_heroku_yall_call_count ||= 0
@@ -90,5 +90,53 @@ describe "ShellThrottle" do
 
       expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
     end
+
+    it "rate throttles `git push` with output variation 3" do
+      app = Hatchet::GitApp.new("default_ruby")
+      def app.git_push_heroku_yall
+        @_git_push_heroku_yall_call_count ||= 0
+        @_git_push_heroku_yall_call_count += 1
+        if @_git_push_heroku_yall_call_count >= 2
+          "Success"
+        else
+          raise Hatchet::App::FailedDeployError.new(
+            self,
+            "message",
+            output: "error: RPC failed; HTTP 429 curl 22 The requested URL returned error: 429"
+          )
+        end
+      end
+
+      def app.sleep_called?; @sleep_called; end
+      def app.what_is_git_push_heroku_yall_call_count; @_git_push_heroku_yall_call_count; end
+
+      app.push_without_retry!
+
+      expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
+    end
+
+    it "rate throttles `git push` with output variation 4" do
+      app = Hatchet::GitApp.new("default_ruby")
+      def app.git_push_heroku_yall
+        @_git_push_heroku_yall_call_count ||= 0
+        @_git_push_heroku_yall_call_count += 1
+        if @_git_push_heroku_yall_call_count >= 2
+          "Success"
+        else
+          raise Hatchet::App::FailedDeployError.new(
+            self,
+            "message",
+            output: "error: RPC failed; result=22, HTTP code = 429"
+          )
+        end
+      end
+
+      def app.sleep_called?; @sleep_called; end
+      def app.what_is_git_push_heroku_yall_call_count; @_git_push_heroku_yall_call_count; end
+
+      app.push_without_retry!
+
+      expect(app.what_is_git_push_heroku_yall_call_count).to be(2)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 7.3.3
+  version: 7.4.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -158,8 +158,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/workflows/check_changelog.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.

data/.circleci/config.yml

@@ -1,69 +0,0 @@
-version: 2
-references:
-  unit: &unit
-    run:
-      name: Run test suite
-      command: PARALLEL_SPLIT_TEST_PROCESSES=25 bundle exec parallel_split_test spec/
-      environment:
-        HATCHET_EXPENSIVE_MODE: 1 # !!!! WARNING !!!! ONLY RUN THIS IF YOU WORK FOR HEROKU !!!! WARNING !!!!
-  restore: &restore
-    restore_cache:
-      keys:
-        - v1_bundler_deps-{{ .Environment.CIRCLE_JOB }}
-  save: &save
-    save_cache:
-      paths:
-        - ./vendor/bundle
-      key: v1_bundler_deps-{{ .Environment.CIRCLE_JOB }} # CIRCLE_JOB e.g. "ruby-2.5"
-  hatchet_setup: &hatchet_setup
-    run:
-      name: Hatchet setup
-      command: |
-        bundle exec hatchet ci:setup
-  bundle: &bundle
-    run:
-      name: install dependencies
-      command: |
-        bundle install --jobs=4 --retry=3 --path vendor/bundle
-        bundle update
-        bundle clean
-
-jobs:
-  "ruby-2.2":
-    docker:
-      - image: circleci/ruby:2.2
-    steps:
-      - checkout
-      - <<: *restore
-      - <<: *bundle
-      - <<: *hatchet_setup
-      - <<: *unit
-      - <<: *save
-  "ruby-2.5":
-    docker:
-      - image: circleci/ruby:2.5
-    steps:
-      - checkout
-      - <<: *restore
-      - <<: *bundle
-      - <<: *hatchet_setup
-      - <<: *unit
-      - <<: *save
-  "ruby-2.7":
-    docker:
-      - image: circleci/ruby:2.7
-    steps:
-      - checkout
-      - <<: *restore
-      - <<: *bundle
-      - <<: *hatchet_setup
-      - <<: *unit
-      - <<: *save
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - "ruby-2.2"
-      - "ruby-2.5"
-      - "ruby-2.7"