heroku_hatchet 5.0.3 → 6.0.0

data/spec/hatchet/edit_repo_spec.rb

@@ -0,0 +1,17 @@
+require("spec_helper")
+describe "EditRepoTest" do
+  it "can deploy git app" do
+    Hatchet::GitApp.new("default_ruby").in_directory do |app|
+      `touch foo`
+      expect($?.success?).to(eq(true))
+
+      `git add .; git commit -m foo`
+      expect($?.success?).to(eq(true))
+      expect(`ls`).to(match("foo"))
+    end
+
+    Hatchet::GitApp.new("default_ruby").in_directory do |app|
+      expect(`ls`).to_not match(/foo/)
+    end
+  end
+end

data/spec/hatchet/git_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+describe "GitAppTest" do
+  it "can deploy git app" do
+    Hatchet::GitApp.new("rails5_ruby_schema_format").deploy do |app|
+      expect(app.run("ruby -v")).to match("2.6.6")
+    end
+  end
+end

data/spec/hatchet/heroku_api_spec.rb

@@ -0,0 +1,30 @@
+require("spec_helper")
+describe "HerokuApiTest" do
+  it "config vars" do
+    begin
+      runner = Hatchet::Runner.new("no_lockfile").setup!
+      actual = runner.get_config
+      actual.delete("BUILDPACK_URL")
+      expect(actual).to eq({})
+
+      runner.set_config("foo" => "bar")
+
+      actual = runner.get_config
+      actual.delete("BUILDPACK_URL")
+      expect(actual).to eq({ "foo" => "bar" })
+    ensure
+      runner.teardown! if runner
+    end
+  end
+
+  it "config vars in init" do
+    begin
+      runner = Hatchet::Runner.new("no_lockfile", config: { foo: "bar" }).setup!
+      actual = runner.get_config
+
+      expect(actual).to eq({ "foo" => "bar" })
+    ensure
+      runner.teardown! if runner
+    end
+  end
+end

data/spec/hatchet/local_repo_spec.rb

@@ -0,0 +1,26 @@
+require("spec_helper")
+describe "LocalRepoTest" do
+  it "in directory fork" do
+    env_name = SecureRandom.hex
+    ENV[env_name] = env_name
+    Hatchet::App.new("default_ruby").in_directory_fork do
+      ENV.delete(env_name) # Does not affect parent env
+      expect(ENV[env_name]).to be_nil
+    end
+
+    expect(ENV[env_name]).to eq(env_name)
+  end
+
+  it "repos checked into git" do
+    begin
+      app = Hatchet::App.new("repo_fixtures/different-folder-for-checked-in-repos/default_ruby")
+      app.in_directory do
+        expect(Dir.exist?(".git")).to eq(false)
+        app.setup!
+        expect(Dir.exist?(".git")).to eq(true)
+      end
+    ensure
+      app.teardown! if app
+    end
+  end
+end

data/spec/hatchet/lock_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+require 'yaml'
+
+describe "LockTest" do
+  it "app with failure can be locked to prior commit" do
+    Hatchet::GitApp.new("lock_fail").deploy do |app|
+      expect(app.deployed?).to be_truthy
+    end
+  end
+
+  it "app with failure can be locked to master" do
+    puts(`bundle exec hatchet lock`)
+    lock = YAML.load_file("hatchet.lock")
+    name, branch = lock.select { |k, v| k.end_with?("lock_fail_master") }.first
+
+    expect(name).to eq("repo_fixtures/repos/lock/lock_fail_master")
+    expect(branch).to eq("master")
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'hatchet'
+require 'rspec/retry'
+require "bundler/setup"
+
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
+  config.verbose_retry       = true # show retry status in spec process
+  config.default_retry_count = 2 if ENV['IS_RUNNING_ON_CI'] # retry all tests that fail again
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+ENV['HATCHET_BUILDPACK_BRANCH'] = "master"
+
+require 'parallel_tests/test/runtime_logger' if ENV['RECORD_RUNTIME']
+
+def run!(cmd)
+  out = `#{cmd}`
+  raise "Error running #{cmd}, output: #{out}" unless $?.success?
+  out
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 6.0.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.0.0.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.0.0.pre.1
 - !ruby/object:Gem::Dependency
   name: rrrretry
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.9
-- !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: parallel_tests
+  name: parallel_split_test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: m
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -224,28 +210,18 @@ files:
 - lib/hatchet/tasks.rb
 - lib/hatchet/test_run.rb
 - lib/hatchet/version.rb
-- test/different-folder-for-checked-in-repos/default_ruby/Gemfile
-- test/different-folder-for-checked-in-repos/default_ruby/Gemfile.lock
-- test/fixtures/buildpacks/null-buildpack/bin/compile
-- test/fixtures/buildpacks/null-buildpack/bin/detect
-- test/fixtures/buildpacks/null-buildpack/bin/release
-- test/fixtures/buildpacks/null-buildpack/hatchet.json
-- test/fixtures/buildpacks/null-buildpack/readme.md
-- test/hatchet/allow_failure_git_test.rb
-- test/hatchet/app_test.rb
-- test/hatchet/ci_four_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
-- test/hatchet/heroku_api_test.rb
-- test/hatchet/labs_test.rb
-- test/hatchet/local_repo_test.rb
-- test/hatchet/lock_test.rb
-- test/hatchet/multi_cmd_runner_test.rb
-- test/test_helper.rb
+- repo_fixtures/different-folder-for-checked-in-repos/default_ruby/Gemfile
+- repo_fixtures/different-folder-for-checked-in-repos/default_ruby/Gemfile.lock
+- spec/hatchet/allow_failure_git_spec.rb
+- spec/hatchet/app_spec.rb
+- spec/hatchet/ci_spec.rb
+- spec/hatchet/config_spec.rb
+- spec/hatchet/edit_repo_spec.rb
+- spec/hatchet/git_spec.rb
+- spec/hatchet/heroku_api_spec.rb
+- spec/hatchet/local_repo_spec.rb
+- spec/hatchet/lock_spec.rb
+- spec/spec_helper.rb
 - tmp/parallel_runtime_test.log
 homepage: https://github.com/heroku/hatchet
 licenses:
@@ -271,25 +247,13 @@ signing_key:
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.
 test_files:
-- test/different-folder-for-checked-in-repos/default_ruby/Gemfile
-- test/different-folder-for-checked-in-repos/default_ruby/Gemfile.lock
-- test/fixtures/buildpacks/null-buildpack/bin/compile
-- test/fixtures/buildpacks/null-buildpack/bin/detect
-- test/fixtures/buildpacks/null-buildpack/bin/release
-- test/fixtures/buildpacks/null-buildpack/hatchet.json
-- test/fixtures/buildpacks/null-buildpack/readme.md
-- test/hatchet/allow_failure_git_test.rb
-- test/hatchet/app_test.rb
-- test/hatchet/ci_four_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
-- test/hatchet/heroku_api_test.rb
-- test/hatchet/labs_test.rb
-- test/hatchet/local_repo_test.rb
-- test/hatchet/lock_test.rb
-- test/hatchet/multi_cmd_runner_test.rb
-- test/test_helper.rb
+- spec/hatchet/allow_failure_git_spec.rb
+- spec/hatchet/app_spec.rb
+- spec/hatchet/ci_spec.rb
+- spec/hatchet/config_spec.rb
+- spec/hatchet/edit_repo_spec.rb
+- spec/hatchet/git_spec.rb
+- spec/hatchet/heroku_api_spec.rb
+- spec/hatchet/local_repo_spec.rb
+- spec/hatchet/lock_spec.rb
+- spec/spec_helper.rb

data/test/fixtures/buildpacks/null-buildpack/bin/compile

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# bin/compile <build-dir> <cache-dir>
-
-echo "-----> Nothing to do."

data/test/fixtures/buildpacks/null-buildpack/bin/detect

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# bin/detect <build-dir>
-
-echo "Null"
-exit 0

data/test/fixtures/buildpacks/null-buildpack/bin/release

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-echo "--- {}"

data/test/fixtures/buildpacks/null-buildpack/hatchet.json

@@ -1,4 +0,0 @@
-{
-  "hatchet": {"directory": "../.."},
-  "rails3": ["sharpstone/rails3_mri_193"]
-}

data/test/fixtures/buildpacks/null-buildpack/readme.md

@@ -1,41 +0,0 @@
-# Heroku Buildpack: Ø
-
-Use Ø if you need Heroku to execute a binary.
-
-## Usage
-
-Create a directory for our Heroku app:
-
-```bash
-$ mkdir -p myapp/bin
-$ cd myapp
-```
-
-Here is an example of an executable that will run on 64bit linux machine:
-
-```bash
-$ echo -e "#\!/usr/bin/env bash\n echo hello world" > ./bin/program
-$ echo -e "program: bin/program" > Procfile
-$ chmod +x ./bin/program
-$ ./bin/program
-hello world
-```
-
-Push the app to Heroku and run our executable:
-
-```bash
-$ git init; git add .; git commit -am 'init'
-$ heroku create --buildpack http://github.com/ryandotsmith/null-buildpack.git
-$ git push heroku master
-$ heroku run program
-Running `program` attached to terminal... up, run.8663
-hello world
-```
-
-## Motivation
-
-I wanted to run various executables (e.g. [log-shuttle](https://github.com/ryandotsmith/log-shuttle)) on Heroku without compiling them on Heroku. Thus, I compile programs on my linux 64 machine, or fetch the binary from the project, commit them to a repo and then run them on Heroku with the Ø buildpack.
-
-## Issues
-
-You will need to make sure that a 64bit linux machine can execute the binary.

data/test/hatchet/allow_failure_git_test.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-
-class AllowFailureGitTest < Minitest::Test
-  def test_allowed_failure
-    Hatchet::GitApp.new("no_lockfile", allow_failure: true).deploy do |app|
-      refute app.deployed?
-      assert_match "Gemfile.lock required", app.output
-    end
-  end
-
-  def test_failure_with_no_flag
-    assert_raise(Hatchet::App::FailedDeploy) do
-      Hatchet::GitApp.new("no_lockfile").deploy
-    end
-  end
-end

data/test/hatchet/app_test.rb

@@ -1,96 +0,0 @@
-require 'test_helper'
-
-class AppTest < Minitest::Test
-  def test_app_with_default
-    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
-    assert_match "https://github.com/heroku/heroku-buildpack-ruby", app.buildpacks.first
-  end
-
-  def test_create_app_with_stack
-    stack = "heroku-16"
-    app = Hatchet::App.new("default_ruby", stack: stack)
-    app.create_app
-    assert_equal stack, app.platform_api.app.info(app.name)["build_stack"]["name"]
-  end
-
-  def test_before_deploy
-    @called = false
-    @dir    = false
-
-    app = Hatchet::App.new("default_ruby")
-    def app.push_with_retry!; end # Don't actually deploy
-
-    app.before_deploy do
-      @called = true
-      @dir    = Dir.pwd
-    end
-
-    app.deploy do
-      assert_equal true,    @called
-      assert_equal Dir.pwd, @dir
-    end
-
-    refute_equal Dir.pwd, @dir
-  end
-
-  def test_auto_commits_code
-    string = "foo#{SecureRandom.hex}"
-
-    app = Hatchet::App.new("default_ruby")
-    def app.push_with_retry!; end # Don't actually deploy
-
-    app.before_deploy do |app|
-      assert_equal false, app.send(:needs_commit?)
-      `echo "#{string}" > Gemfile`
-      assert_equal true, app.send(:needs_commit?)
-    end
-    app.deploy do
-      assert_equal string, File.read("Gemfile").chomp
-      assert_equal false, app.send(:needs_commit?)
-    end
-  end
-
-
-  def test_nested_in_directory
-    string = "foo#{SecureRandom.hex}"
-
-    app = Hatchet::App.new("default_ruby")
-    def app.push_with_retry!; end # Don't actually deploy
-
-    app.in_directory do
-      `echo "#{string}" > Gemfile`
-      dir = Dir.pwd
-
-      app.deploy do
-        assert_equal string, File.read("Gemfile").chomp
-        assert_equal Dir.pwd, dir
-      end
-    end
-  end
-
-  def test_run
-    app = Hatchet::GitApp.new("default_ruby")
-    app.deploy do
-      assert_match(/ls: cannot access 'foo bar #baz': No such file or directory\s+Gemfile/, app.run("ls -a Gemfile 'foo bar #baz'"))
-      assert (0 != $?.exitstatus) # $? is from the app.run use of backticks
-      sleep(4) # Dynos don't exit right away and free dynos can't have more than one running at a time, wait before calling `run` again
-
-      app.run("ls erpderp", { :heroku => { "exit-code" => Hatchet::App::SkipDefaultOption } } )
-      assert (0 == $?.exitstatus) # $? is from the app.run use of backticks, but we asked the CLI not to return the program exit status by skipping the default "exit-code" option
-      sleep(4)
-
-      app.run("ls erpderp", { :heroku => { "no-tty" => nil } } )
-      assert (0 != $?.exitstatus) # $? is from the app.run use of backticks
-      sleep(4)
-
-      assert_match(/ohai world/, app.run('echo \$HELLO \$NAME', { raw: true, :heroku => { "env" => "HELLO=ohai;NAME=world" } } ))
-      sleep(4)
-
-      refute_match(/ohai world/, app.run('echo \$HELLO \$NAME', { raw: true, :heroku => { "env" => "" } } ))
-      sleep(4)
-
-      random_name = SecureRandom.hex
-      assert_match(/#{random_name}/, app.run("mkdir foo; touch foo/#{random_name}; ls foo/"))
-    end
-  end
-end