heroku_hatchet 4.0.12 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721106d8d9d4a9bcbad680de78cf4d71fe1f35091a23170801df815e79dd465a
-  data.tar.gz: d617e9d31847ff2aa30129f338a967b6c621853e8298c6e488fc473a1d2793c3
+  metadata.gz: 895d00a42bbb18d86b4bf075a16ab8e536ef6ef67f353c630acaeb5f79b4fd94
+  data.tar.gz: d3549371277c1e76b9f6c6448de2957fd31d7a41fd9fd5fb6d0fddf4c0967b79
 SHA512:
-  metadata.gz: 1a6410e04d8a3f585f12e7ed067191314cdb208a5b6a0916ce0ac79595dbaf75d1522c74c8621ac27aa7571945400aded90fc1640737a5a23dbc4880ea283d23
-  data.tar.gz: 39812cdaa659c3759b53fea93afb1bd4b3a893c8945f4d8804774510043433fed8d4204def577e2930d13e22bfd332864b51ab2fba214fe02ab80fcfa2f10557
+  metadata.gz: 0157e99984e519299ce19ac65b885598ee27cd8c062898a138acddd74b57b2f08c2dc7f6d72e3e256b9d12bfe3fdd2287a65ff6b4109bbf68f4dbdcc1d9f2126
+  data.tar.gz: 1302a1147e81c625a3b517748a65b366db90158c75bd7de79e746bbc72f0857d90b2709c3645bfae512c79076fcef7cab02ba60d7d8beb696ff46549a032fecd

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
 - 2.3.1
 before_script:
   - bundle exec hatchet ci:setup
-script: bundle exec parallel_test test/hatchet -n 9
+script: bundle exec parallel_test test/hatchet -n 11
 after_script: bundle exec rake hatchet:teardown_travis
 env:
   global:

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 ## HEAD
 
+## 4.0.13
+
+- Introduce `App#in_directory_fork` for safe execution of code that might mutate the process env vars (https://github.com/heroku/hatchet/pull/65)
+
 ## 4.0.12
 
 - Fix deadlock when a single process kills the same app twice (https://github.com/heroku/hatchet/pull/63)
-- Add ability to debug deadlock with HATCHET_DEBUG_DEADLOCK env var.
+- Add ability to debug deadlock with `HATCHET_DEBUG_DEADLOCK` env var.
 
 ## 4.0.11
 

data/hatchet.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest",       "~> 5.1"
   gem.add_development_dependency "rake",           "~> 10"
   gem.add_development_dependency "mocha",          "~> 1"
-  gem.add_development_dependency "parallel_tests", "~> 0"
+  gem.add_development_dependency "parallel_tests", "~> 2"
   gem.add_development_dependency "travis",         "~> 1"
 end

data/lib/hatchet/app.rb

@@ -218,6 +218,32 @@ module Hatchet
       end
     end
 
+    # A safer alternative to in_directory
+    # this method is used to run code that may mutate the
+    # current process anything run in this block is executed
+    # in a different fork
+    def in_directory_fork(&block)
+      Tempfile.create("stdout") do |tmp_file|
+        pid = fork do
+          $stdout.reopen(tmp_file, "w")
+          $stderr.reopen(tmp_file, "w")
+          $stdout.sync = true
+          $stderr.sync = true
+          in_directory do |dir|
+            yield dir
+          end
+          Kernel.exit!(0) # needed for https://github.com/seattlerb/minitest/pull/683
+        end
+        Process.waitpid(pid)
+
+        if $?.success?
+          puts File.read(tmp_file)
+        else
+          raise File.read(tmp_file)
+        end
+      end
+    end
+
     # creates a new app on heroku, "pushes" via anvil or git
     # then yields to self so you can call self.run or
     # self.deployed?

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "4.0.12"
+  VERSION = "4.0.13"
 end

data/test/hatchet/ci_test.rb

@@ -1,23 +1,11 @@
 require 'test_helper'
 
 class CITest < Minitest::Test
-
-  def test_ci_create_app_with_stack
-    Hatchet::GitApp.new("rails5_ruby_schema_format").run_ci do |test_run|
-      assert_match "Ruby buildpack tests completed successfully", test_run.output
-      assert_equal :succeeded, test_run.status
-    end
-  end
-
   def test_error_with_bad_app
     error = assert_raise(Hatchet::FailedTestError) do
       Hatchet::GitApp.new("rails5_ci_fails_no_database").run_ci {}
     end
 
-    assert_match "PG::ConnectionBad: could not connect to server" ,error.message
-
-    Hatchet::GitApp.new("rails5_ci_fails_no_database", allow_failure: true).run_ci do |test_run|
-      assert_equal :errored, test_run.status
-    end
+    assert_match "PG::ConnectionBad: could not connect to server", error.message
   end
 end

data/test/hatchet/ci_three_test.rb

@@ -0,0 +1,9 @@
+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|
+      assert_equal :errored, test_run.status
+    end
+  end
+end

data/test/hatchet/ci_too_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+# Split out to be faster
+class CITestToo < Minitest::Test
+  def test_ci_create_app_with_stack
+    Hatchet::GitApp.new("rails5_ruby_schema_format").run_ci do |test_run|
+      assert_match "Ruby buildpack tests completed successfully", test_run.output
+      assert_equal :succeeded, test_run.status
+    end
+  end
+end

data/test/hatchet/local_repo_test.rb

@@ -1,6 +1,18 @@
 require 'test_helper'
 
-class AppTest < Minitest::Test
+class LocalRepoTest < Minitest::Test
+  def test_in_directory_fork
+    env_name = SecureRandom.hex
+    ENV[env_name] = env_name
+
+    Hatchet::App.new("default_ruby").in_directory_fork do
+      ENV.delete(env_name)
+      assert_nil ENV[env_name]
+    end
+
+    assert_equal env_name, ENV[env_name]
+  end
+
   def test_repos_checked_into_git
     app = Hatchet::App.new("test/different-folder-for-checked-in-repos/default_ruby")
     app.in_directory do

data/test/test_helper.rb

@@ -23,3 +23,5 @@ end
 
 
 ENV['HATCHET_BUILDPACK_BRANCH'] = "master"
+
+require 'parallel_tests/test/runtime_logger' if ENV['RECORD_RUNTIME']

data/tmp/parallel_runtime_test.log

@@ -0,0 +1,3 @@
+test/hatchet/edit_repo_test.rb:5.40
+test/hatchet/local_repo_test.rb:9.60
+test/hatchet/heroku_api_test.rb:21.88

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,8 @@ files:
 - test/hatchet/allow_failure_git_test.rb
 - test/hatchet/app_test.rb
 - test/hatchet/ci_test.rb
+- test/hatchet/ci_three_test.rb
+- test/hatchet/ci_too_test.rb
 - test/hatchet/config_test.rb
 - test/hatchet/edit_repo_test.rb
 - test/hatchet/git_test.rb
@@ -228,6 +230,7 @@ files:
 - test/hatchet/lock_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
 - test/test_helper.rb
+- tmp/parallel_runtime_test.log
 homepage: https://github.com/heroku/hatchet
 licenses:
 - MIT
@@ -262,6 +265,8 @@ test_files:
 - test/hatchet/allow_failure_git_test.rb
 - test/hatchet/app_test.rb
 - test/hatchet/ci_test.rb
+- test/hatchet/ci_three_test.rb
+- test/hatchet/ci_too_test.rb
 - test/hatchet/config_test.rb
 - test/hatchet/edit_repo_test.rb
 - test/hatchet/git_test.rb