heroku_hatchet 3.0.6 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13cac9a330ace0d1cf9f4cc3994b32d56f35e91ba5aa5fd0a6262bd1f49fe38
-  data.tar.gz: b1b8809b146182aca8173146ab7bcf703aaf929311d69ef0b45219d6088da078
+  metadata.gz: 7705d38debbab89dedc8a49709edc3622dd8e3c24c019a11b1709c7bd9224977
+  data.tar.gz: c2cc84b1898f3c6401f3549339f25c44a985ef71bd870faea736f9d0e5155d1b
 SHA512:
-  metadata.gz: 20a9d41e88f5bdab3e41671cce20cc14947e8e3dc13fb1997c3dd5dda5d7cb55ab224543257dbcf5205696bedfa2d0f2d47fc162f1c1d408d2696121d8cf172d
-  data.tar.gz: 9e138c6c8cdce9b773560540153777d6e8c12cc3c13b7969a0b6261e99a02e542865a9f4945d175998dbd09885c018ed9474ffd9219d57febe775ea51bde31c9
+  metadata.gz: bfb9317a73bce407d199e2f87b210bd014b86e102d5de04a3f0a95e1aad4871a6b789ebe0e3e322e2eb140797a42ed9b5b81d0b3e109850bb056110b99f3129c
+  data.tar.gz: e7c68939dfff5a7d28754a16a6934cc1a2a5821424df408487632dfa62fcab1e38a5eb23527fdceadf63d64c72ff3a3455c72568504211c3ebfaec2b59175d81

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 3.1.0
+
+- Introduce a lockfile #42
+
 ## 3.0.6
 
 - Fix double delete error #41

data/bin/hatchet

@@ -14,14 +14,17 @@ require 'hatchet'
 require 'thor'
 require 'threaded'
 require 'date'
+require 'yaml'
 
 class HatchetCLI < Thor
   desc "install", "installs repos defined in 'hatchet.json'"
   def install
     warn_dot_ignore!
+    lock_hash = YAML.safe_load(File.read('hatchet.lock')).to_h
     puts "Installing repos for hatchet"
     dirs.map do |directory, git_repo|
       Threaded.later do
+        commit = lock_hash.fetch(directory) { raise "expected #{directory} to be locked but it is not, please run `hatchet lock` and commit the results"}
         directory = File.expand_path(directory)
         if Dir[directory].present?
           puts "== pulling '#{git_repo}' into '#{directory}'\n"
@@ -30,10 +33,33 @@ class HatchetCLI < Thor
           puts "== cloning '#{git_repo}' into '#{directory}'\n"
           clone(directory, git_repo)
         end
+        checkout_commit(directory, commit)
       end
     end.map(&:join)
   end
 
+  desc "locks to specific git commits", "updates hatchet.lock"
+  def lock
+    lock_hash = {}
+    dirs.map do |directory, git_repo|
+      Threaded.later do
+        puts "== locking #{directory}"
+        unless Dir.exist?(directory)
+          raise "Bad git repo #{git_repo.inspect}" if bad_repo?(git_repo)
+          clone(directory, git_repo, quiet: false)
+        end
+
+        commit = commit_at_directory(directory)
+        lock_hash[directory] = commit
+      end
+    end.map(&:join)
+
+    lock_hash = lock_hash.sort
+    File.open('hatchet.lock', 'w') {|f| f << lock_hash.to_yaml }
+
+    puts "Done!"
+  end
+
   desc "list", "lists all repos and their destination listed in hatchet.json"
   def list
     repos.each do |repo, directory|
@@ -59,6 +85,11 @@ class HatchetCLI < Thor
 
   private
 
+  def bad_repo?(url)
+    `git ls-remote --exit-code -h "#{url}"`
+    $? != 0
+  end
+
   def warn_dot_ignore!
     return false unless File.exist?('.gitignore')
 
@@ -80,14 +111,22 @@ class HatchetCLI < Thor
     config.dirs
   end
 
-  def pull(path, git_repo)
-    puts `cd #{path} && git pull --rebase #{git_repo} master --quiet`
+  def checkout_commit(directory, commit)
+    cmd("cd #{directory} && git reset --hard #{commit}")
+  end
+
+  def commit_at_directory(directory)
+    cmd("cd #{directory} && git log -n1  --pretty=format:%H").strip
   end
 
-  def clone(path, git_repo)
+  def pull(path, git_repo, commit: false)
+    cmd("cd #{path} && git pull --rebase #{git_repo} master --quiet")
+  end
+
+  def clone(path, git_repo, quiet: true)
     path = File.join(path, '..') # up one dir to prevent repos/codetriage/codetriage/#...
     FileUtils.mkdir_p(path)
-    puts `cd #{path} && git clone #{git_repo} --quiet`
+    cmd("cd #{path} && git clone #{git_repo} --quiet", quiet: quiet)
   end
 
   def bundle_exec
@@ -99,6 +138,15 @@ class HatchetCLI < Thor
       yield
     end
   end
+
+  def cmd(command, let_fail: false, stdin: nil, quiet: true)
+    command = "printf '#{stdin}' | #{command}" if stdin
+    puts "Running: #{command}" unless quiet
+    result = `#{command}`
+    return result if let_fail
+    raise "Command #{command} failed:\n#{result}" unless $?.success?
+    return result
+  end
 end
 
 HatchetCLI.start(ARGV)

data/hatchet.json

@@ -1,5 +1,7 @@
 {
-  "hatchet": {"directory": "test/fixtures"},
+  "hatchet": {
+    "directory": "test/fixtures"
+  },
   "rails3":  ["sharpstone/rails3_mri_193"],
   "rails2":  ["sharpstone/rails2blog"],
   "bundler": ["sharpstone/no_lockfile"],
@@ -7,5 +9,6 @@
   "ci":      [
               "sharpstone/rails5_ruby_schema_format",
               "sharpstone/rails5_ci_fails_no_database"
-              ]
+ ],
+ "lock": ["sharpstone/lock_fail"]
 }

data/hatchet.lock

@@ -0,0 +1,15 @@
+---
+- - 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
+  - da748a59340be8b950e7bbbfb32077eb67d70c3c
+- - test/fixtures/repos/lock/lock_fail
+  - da748a59340be8b950e7bbbfb32077eb67d70c3c
+- - test/fixtures/repos/rails2/rails2blog
+  - b37357a498ae5e8429f5601c5ab9524021dc2aaa
+- - test/fixtures/repos/rails3/rails3_mri_193
+  - 88c5d0d067cfd11e4452633994a85b04627ae8c7

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "3.0.6"
+  VERSION = "3.1.0"
 end

data/test/hatchet/lock_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class LockTest < Minitest::Test
+  def test_app_with_failure_can_be_locked_to_prior_commit
+    Hatchet::GitApp.new("lock_fail").deploy do |app|
+      assert app.deployed?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -196,6 +196,7 @@ files:
 - bin/hatchet
 - hatchet.gemspec
 - hatchet.json
+- hatchet.lock
 - lib/hatchet.rb
 - lib/hatchet/anvil_app.rb
 - lib/hatchet/app.rb
@@ -218,6 +219,7 @@ files:
 - test/hatchet/git_test.rb
 - test/hatchet/heroku_api_test.rb
 - test/hatchet/labs_test.rb
+- test/hatchet/lock_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
 - test/test_helper.rb
 homepage: https://github.com/heroku/hatchet
@@ -258,5 +260,6 @@ test_files:
 - test/hatchet/git_test.rb
 - test/hatchet/heroku_api_test.rb
 - test/hatchet/labs_test.rb
+- test/hatchet/lock_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
 - test/test_helper.rb