heroku_hatchet 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eff388a9b8a640e00f9a7d71dca8c63c044eb68133a3fab77c948e52d5b8e10
-  data.tar.gz: 005704cca536d304d4c59100aa70ac92da1230fb6a5f8d2deaab5acd68670407
+  metadata.gz: aaba14f0335f61010579c2a28cebb4ddc3745673cd2bf9e60a79b9b77772fba1
+  data.tar.gz: 46d867946f075054f67d2a5a1262ef203cfe20e19f6f025b2761f76a65b5b886
 SHA512:
-  metadata.gz: ddedca5de3df3a7e677a6689eb06b4d7cda13a5593b6f46bd8f621b1ae954bc3ea4cd22c6f7872822f12424dcd2884192823ff458b9e2155d4f7e8236d73c746
-  data.tar.gz: 961a6edc1894a16668b001f692fca7976eba92123e16fc110f5275f38d4d780e097762642ad833a888fa4acaa7289c4beccb695c6e75f44f037e20633e84c097
+  metadata.gz: c241f9a5422e4fba52afa9bb86c2e593452ab021bf111707deea9f6a132d7b4ea3afcba69b95575b82628838e5433e502ba9f64cf1cda8beaa8c764eb56dbd29
+  data.tar.gz: b65f318865923df9da5aeb17e86bb39a1633b787b0497a5d991361650d816925accb986a2c0b015d6b67c949fc0cf67408a83373810a46328c9c353e0203af8e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 5.0.3
+
+- Allow repos to be "locked" to master instead of a specific commit (https://github.com/heroku/hatchet/pull/80)
+
 ## 5.0.2
 
 - Fix `before_deploy` use with ci test runs (https://github.com/heroku/hatchet/pull/78)

data/README.md

@@ -92,6 +92,32 @@ Be careful when including repos inside of your test directory. If you're using a
 
 When basing tests on external repos, do not change the tests or they may spontaneously fail. We may create a hatchet.lockfile or something to declare the commit in the future.
 
+When you run `hatchet install` it will lock all the Repos to a specific commit. This is done so that if a repo changes upstream that introduces an error the test suite won't automatically pick it up. For example in https://github.com/sharpstone/lock_fail/commit/e61ba47043fbae131abb74fd74added7e6e504df an error is added, but this will only cause a failure if your project intentionally locks to commit `e61ba47043fbae131abb74fd74added7e6e504df` or later.
+
+You can re-lock your projects by running `hatchet lock`. This modifies the `hatchet.lock` file. For example:
+
+```
+---
+- - test/fixtures/repos/bundler/no_lockfile
+  - 1947ce9a9c276d5df1c323b2ad78d1d85c7ab4c0
+- - test/fixtures/repos/ci/rails5_ci_fails_no_database
+  - 3044f05febdfbbe656f0f5113cf5968ca07e34fd
+- - test/fixtures/repos/ci/rails5_ruby_schema_format
+  - 3e63c3e13f435cf4ab11265e9abd161cc28cc552
+- - test/fixtures/repos/default/default_ruby
+  - 6e642963acec0ff64af51bd6fba8db3c4176ed6e
+- - test/fixtures/repos/lock/lock_fail
+  - da748a59340be8b950e7bbbfb32077eb67d70c3c
+- - test/fixtures/repos/lock/lock_fail_master
+  - master
+- - test/fixtures/repos/rails2/rails2blog
+  - b37357a498ae5e8429f5601c5ab9524021dc2aaa
+- - test/fixtures/repos/rails3/rails3_mri_193
+  - 88c5d0d067cfd11e4452633994a85b04627ae8c7
+```
+
+If you don't want to lock a specific commit, you can instead specify `master` and it will always grab the latest commits.
+
 
 ## Deploying apps
 

data/bin/hatchet

@@ -67,6 +67,7 @@ class HatchetCLI < Thor
   desc "locks to specific git commits", "updates hatchet.lock"
   def lock
     lock_hash = {}
+    lockfile_hash = load_lockfile
     dirs.map do |directory, git_repo|
       Threaded.later do
         puts "== locking #{directory}"
@@ -75,8 +76,12 @@ class HatchetCLI < Thor
           clone(directory, git_repo, quiet: false)
         end
 
-        commit = commit_at_directory(directory)
-        lock_hash[directory] = commit
+        if lockfile_hash[directory] == "master"
+          lock_hash[directory] = "master"
+        else
+          commit = commit_at_directory(directory)
+          lock_hash[directory] = commit
+        end
       end
     end.map(&:join)
 

data/hatchet.json

@@ -10,5 +10,8 @@
               "sharpstone/rails5_ruby_schema_format",
               "sharpstone/rails5_ci_fails_no_database"
  ],
- "lock": ["sharpstone/lock_fail"]
+ "lock": [
+   "sharpstone/lock_fail",
+   "sharpstone/lock_fail_master"
+ ]
 }

data/hatchet.lock

@@ -9,6 +9,8 @@
   - 6e642963acec0ff64af51bd6fba8db3c4176ed6e
 - - test/fixtures/repos/lock/lock_fail
   - da748a59340be8b950e7bbbfb32077eb67d70c3c
+- - test/fixtures/repos/lock/lock_fail_master
+  - master
 - - test/fixtures/repos/rails2/rails2blog
   - b37357a498ae5e8429f5601c5ab9524021dc2aaa
 - - test/fixtures/repos/rails3/rails3_mri_193

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 end

data/test/hatchet/lock_test.rb

@@ -6,4 +6,13 @@ class LockTest < Minitest::Test
       assert app.deployed?
     end
   end
+
+  def test_app_with_failure_can_be_locked_to_master
+    puts `bundle exec hatchet lock`
+
+    lock = YAML.load_file("hatchet.lock")
+    name, branch = lock.select {|k,v| k.end_with?("lock_fail_master") }.first
+    assert_equal "test/fixtures/repos/lock/lock_fail_master", name
+    assert_equal "master", branch
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -203,7 +203,6 @@ files:
 - ".circleci/config.yml"
 - ".github/workflows/check_changelog.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-- 2.3.1
-before_script:
-  - bundle exec hatchet ci:setup
-script: bundle exec parallel_test test/hatchet -n 11
-after_script: bundle exec rake hatchet:teardown_travis
-env:
-  global:
-  - HATCHET_BUILDPACK_BRANCH=master
-  - HATCHET_RETRIES=3
-  - HATCHET_APP_LIMIT=80
-  - secure: KvuEChRTZYrWd1Q4PKt3YM5FkfuCAOtsKgjC4HDGjCYVNee3793XGwAr0e5LiQqrvHDmbJS7ZPelV3ptor2QJTdmZjPhu/tZKPMLQg7wm8vTcrJflkJDqJl6ECxd40zbUgmo+wSPSvx+K3ZGKqLF4D43vvFJaqBUoAVOGdt66c8=
-  - secure: XuJ4XUraWzNlfY9a+6Mh9lVlLuRY988YAaA8LKQOe2KAT5MRqcZzqlKOwDeTWK0tas68bzK7T8RT/L+6/nck0u5VrPHMhkc8QDBSqcle8kFcBxf/64EnCzB40lZoxvcdQ3wm8E41DRwsI7hAHLdVVNXC8f1/wQOAm77nOEvPdvM=
-sudo: true
-dist: trusty