heroku_hatchet 7.3.0 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f133f985be889073e9f62caf69e73e05373eecaed11cb13a209fe6bd80874f1c
-  data.tar.gz: 910dd76398351f6ecf19e6a882b7652fe531e6a19843fa64d3f5e57ef5e68696
+  metadata.gz: 6c1b161f5f43f135f7eb4e6c803b6228b15e51904001a744572cca572e26a799
+  data.tar.gz: e804ea689f9934308978e4804799fee00a0d252d3e64cb62eb29a20c4d05659f
 SHA512:
-  metadata.gz: 952b664cbb78a6b7250f98a3532a5754bf3fe16526ef915594504d6c9ee77ddf97ac204ab9438d3223da33f431c27e335c9495c86c74baeb69db45fd22682f63
-  data.tar.gz: e282d36a9196b74f9999c7c7b57ae55cd1da508f09187058baf92fa711800e882c806299f472ac06cceda88cfe2eba63b3e7eb67c0ac0e657436fc1c207f0e02
+  metadata.gz: b2b9364b374e384b3e5d16f159774d4b1da90d3a79c5c3afad6092d05209a13bd8d52c2d34c97feb4da0b989339d120a4562c65b121e7ec6b3d843ae3657cefe
+  data.tar.gz: '026904fd62500a2874d57f9c8462aee651f62dd1467c6281bc7061312d2a683203f8e1237577d2bb66ab3f4d5174bdf2fe408e3c165a950a1cf4a386673f4a29'

data/.circleci/config.yml

@@ -29,9 +29,9 @@ references:
         bundle clean
 
 jobs:
-  "ruby-2.5":
+  "ruby-2.2":
     docker:
-      - image: circleci/ruby:2.5
+      - image: circleci/ruby:2.2
     steps:
       - checkout
       - <<: *restore
@@ -39,9 +39,9 @@ jobs:
       - <<: *hatchet_setup
       - <<: *unit
       - <<: *save
-  "ruby-2.6":
+  "ruby-2.5":
     docker:
-      - image: circleci/ruby:2.6
+      - image: circleci/ruby:2.5
     steps:
       - checkout
       - <<: *restore
@@ -64,6 +64,6 @@ workflows:
   version: 2
   build:
     jobs:
+      - "ruby-2.2"
       - "ruby-2.5"
-      - "ruby-2.6"
       - "ruby-2.7"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## HEAD
 
+## 7.3.1
+
+- Fix Ruby incompatibility introduced by using `&.` and `rescue` without
+  `begin`/`end` without a `required_ruby_version` in hatchet.gemspec.
+  (https://github.com/heroku/hatchet/pull/139)
+
 ## 7.3.0
 
 - Deprecations

data/bin/hatchet

@@ -52,7 +52,7 @@ class HatchetCLI < Thor
       Threaded.later do
         commit = lock_hash[directory]
         directory = File.expand_path(directory)
-        if !Dir[directory]&.empty?
+        if !(Dir[directory] && Dir[directory].empty?)
           puts "== pulling '#{git_repo}' into '#{directory}'\n"
           pull(directory, git_repo)
         else

data/hatchet.gemspec

@@ -17,17 +17,17 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.required_ruby_version = '>= 2.2.0'
 
   gem.add_dependency "platform-api",  "~> 3"
   gem.add_dependency "rrrretry",      "~> 1"
   gem.add_dependency "excon",         "~> 0"
-  gem.add_dependency "thor",          "~> 0"
+  gem.add_dependency "thor",          "~> 1"
   gem.add_dependency "threaded",      "~> 0"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake",           ">= 10"
   gem.add_development_dependency "mocha",          ">= 1"
   gem.add_development_dependency "parallel_split_test"
-  gem.add_development_dependency "travis",         ">= 1"
   gem.add_development_dependency "rspec-retry"
 end

data/lib/hatchet.rb

@@ -46,3 +46,22 @@ module Hatchet
     end
   end
 end
+
+unless ::String.instance_methods.include?(:strip_heredoc)
+  # We can get rid of this when all rubies can support <<~ syntax
+  class ::String
+    def strip_heredoc
+      gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, "".freeze)
+    end
+  end
+end
+
+unless ::String.instance_methods.include?(:match?)
+  # We can get rid of this when all rubies can support String#match? method
+  class ::String
+    def match?(value)
+      self =~ value
+    end
+  end
+end
+

data/lib/hatchet/config.rb

@@ -46,7 +46,7 @@ module Hatchet
     def path_for_name(name)
       possible_paths = [repos[name.to_s], "repos/#{name}", name].compact
       path = possible_paths.detect do |path|
-        !Dir[path]&.empty?
+        !(Dir[path] && Dir[path].empty?)
       end
       raise BadRepoName.new(name, possible_paths) if path.nil? || path.empty?
       path

data/lib/hatchet/git_app.rb

@@ -9,14 +9,16 @@ module Hatchet
       output = ""
 
       ShellThrottle.new(platform_api: @platform_api).call do
-        output = git_push_heroku_yall
-      rescue FailedDeploy => e
-        case e.output
-        when /reached the API rate limit/, /429 Too Many Requests/
-          throw(:throttle)
-        else
-          raise e unless @allow_failure
-          output = e.output
+        begin
+          output = git_push_heroku_yall
+        rescue FailedDeploy => e
+          case e.output
+          when /reached the API rate limit/, /429 Too Many Requests/
+            throw(:throttle)
+          else
+            raise e unless @allow_failure
+            output = e.output
+          end
         end
       end
 

data/lib/hatchet/reaper.rb

@@ -55,7 +55,7 @@ module Hatchet
       # To be safe try to delete an app even if we're not over the limit
       # since the exception may have been caused by going over the maximum account limit
       if app_exception_message
-          io.puts <<~EOM
+          io.puts <<-EOM.strip_heredoc
             WARNING: Running reaper due to exception on app
                      #{stats_string}
                      Exception: #{app_exception_message}
@@ -122,7 +122,7 @@ module Hatchet
 
         # Sleep, try again later
         @reaper_throttle.call(max_sleep: age.sleep_for_ttl) do |sleep_for|
-          io.puts <<~EOM
+          io.puts <<-EOM.strip_heredoc
             WARNING: Attempting to destroy an app without maintenance mode on, but it is not old enough. app: #{app["name"]}, app_age: #{age.in_minutes} minutes
                      This can happen if App#teardown! is not called on an application, which will leave it in an 'unfinished' state
                      This can also happen if you're trying to run more tests concurrently than your currently set value for HATCHET_APP_COUNT

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "7.3.0"
+  VERSION = "7.3.1"
 end

data/spec/hatchet/allow_failure_git_spec.rb

@@ -5,7 +5,7 @@ describe "AllowFailureGitTest" do
     let(:release_fail_proc) {
       Proc.new do
         File.open("Procfile", "w+") do |f|
-          f.write <<~EOM
+          f.write <<-EOM.strip_heredoc
             release: echo "failing on release" && exit 1
           EOM
         end

data/spec/hatchet/lock_spec.rb

@@ -57,7 +57,7 @@ describe "isolated lock tests" do
       end
 
       dir.join("hatchet.lock").open("w+") do |f|
-        f.puts <<~EOM
+        f.puts <<-EOM.strip_heredoc
         ---
         - - "./repos/foo/lock_fail_main_default_is_master"
           - main

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: threaded
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
@@ -237,14 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.