heroku_hatchet 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879f4df69cef6001a414901541ac22e24ab72d4011c2c51f8e3af60bf32e6a1c
-  data.tar.gz: a70a7755b68c22722e77467dfbffcbae34fe37e7252ee8e252f096f1ef8f00e5
+  metadata.gz: 2b30075b5028dc2c364c35d338ad0d48e7a9318c088c9f433936664d60262318
+  data.tar.gz: 4cc696dadc3e206ff256d252b756c950d4ca0a36e541f554d1c8d416005418f3
 SHA512:
-  metadata.gz: eccbe2d8e66399f5a8cb0e619299ee27200fd74ff1c2de6a71dfdb8059891a4d7a21e0c95edae43218184fa816af23ec326da70f67da9828755d17e4a8274f56
-  data.tar.gz: aece0edf868b9737db650eb2815b7cb2929c4b7b5fc5847d3016289e3d0db55a63f8985cfb0bccefd90c7e1b7a1b0db56d4dd795a155223d72f7ec6d5d7ba24c
+  metadata.gz: b19500cd4df7b71b00d9930f47aa732db1535108895cd23c04eddc34aaad9f35550a19ff6a596c5b3b52fa01afe2cc48e7243cb4223c1c9fe5419197095db6d6
+  data.tar.gz: 283b420ef99004247dc2ef190771a43fe401052aec131dc55531c5ebebd1f4f0ca0d3d3976d9fe4f49e8a026193975bfce7e9d7485efdfa6fbbea0167dee9bf7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 4.1.2
+
+- Hatchet::App.default_buildpack is aliased to `:default` symbol while passing in buildpacks as an array to Hatchet::App (https://github.com/heroku/hatchet/pull/73)
+
 ## 4.1.1
 
 - Fix branch resolution on Travis when a pull-request is tested (https://github.com/heroku/hatchet/pull/70)

data/README.md

@@ -187,12 +187,16 @@ def test_deploy
   # ...
 ```
 
-You can specify multiple buildpacks by passing in an array.
+You can specify multiple buildpacks by passing in an array. When you do that you also need to tell hatchet where to place your buildpack. Since hatchet needs to build your buildpack from a branch you should not hardcode a path like `heroku/ruby` instead Hatchet has a replacement mechanism. Use the `:default` symbol where you want your buildpack to execute. For example:
 
-You can use `Hatchet::App.default_buildpack` to get the buildpack URL and branch specified by environment variables:
+```
+Hatchet::Runner.new("default_ruby", buildpacks: [:default, "https://github.com/pgbouncer/pgbouncer"])
+```
+
+That will expand your buildpack and branch. For example if you're on the `update_readme` branch of the `heroku-buildpack-ruby` buildpack it would expand to:
 
 ```
-Hatchet::Runner.new("default_ruby", buildpacks: [Hatchet::App.default_buildpack, "https://github.com/pgbouncer/pgbouncer"])
+Hatchet::Runner.new("default_ruby", buildpacks: ["https://github.com/heroku/heroku-buildpack-ruby#update_readme", "https://github.com/pgbouncer/pgbouncer"])
 ```
 
 You can also specify a stack:

data/lib/hatchet/app.rb

@@ -9,7 +9,7 @@ module Hatchet
     HATCHET_BUILDPACK_BRANCH = -> { ENV['HATCHET_BUILDPACK_BRANCH'] || ENV['HEROKU_TEST_RUN_BRANCH'] || Hatchet.git_branch }
     BUILDPACK_URL = "https://github.com/heroku/heroku-buildpack-ruby.git"
 
-    attr_reader :name, :stack, :directory, :repo_name, :app_config
+    attr_reader :name, :stack, :directory, :repo_name, :app_config, :buildpacks
 
     class FailedDeploy < StandardError
       def initialize(app, output)
@@ -45,6 +45,8 @@ module Hatchet
       @labs          = ([] << labs).flatten.compact
       @buildpacks    = buildpack || buildpacks || buildpack_url || self.class.default_buildpack
       @buildpacks    = Array(@buildpacks)
+      @buildpacks.map! {|b| b == :default ? self.class.default_buildpack : b}
+
       @before_deploy = before_deploy
       @app_config    = config
       @reaper        = Reaper.new(api_rate_limit: api_rate_limit)

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

data/test/hatchet/app_test.rb

@@ -1,6 +1,11 @@
 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)
@@ -62,7 +67,7 @@ class AppTest < Minitest::Test
       end
     end
   end
-  
+
   def test_run
     app = Hatchet::GitApp.new("default_ruby")
     app.deploy do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api