heroku_hatchet 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa556ab6fdabb69a56ba6ce5569cee34f4cc63edeb7fc457b6e688b13327c195
-  data.tar.gz: e5c85e1b3e78e20c048878807e1263813cceb175a3e824471163c112adcb3b04
+  metadata.gz: 1369acdf78065d7a2a8679e428f3fff5505a9ab4b0ee42165269e775eaceb1b9
+  data.tar.gz: e6c777f04fae2dcf40c54431680372ae7e8ccc105d3144f19b09b81eb29d5dd4
 SHA512:
-  metadata.gz: 3a64cc18c16afc07f97de99b76d5a8a5b2232a4fce4e0c287b0326a5536722fb210a5a0fd3153606900f6a9784356741c80794844e51b774351cd664d4fa0d86
-  data.tar.gz: 1f1dbec3966889e0504f02fb6d66ec8059970868dedffa92b72dfa5a69710c692a3210941e8fe10d52260767b7cd65718f29346e62191fd70772538fef594bbf
+  metadata.gz: 704504fbb115cb2b06fb02ca46edd790fb58c94e6e3e6008cd5b414c3b29424835a19b56a4d1e5c8d050f5a81c6b6013a1f2c66ca054ab30ef6bc258874d1354
+  data.tar.gz: 11e646721d3e75cda5c9af6636ee27240944c84b681db85aad963a5b93b3d02dd41cf45253b8e54768ab6ae550854a93cc70f72e20a2d5bbe3053810fd5e980d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## HEAD
 
+## 4.0.3
+
+- Introduce explicit `before_deploy` block that is called, well...before deploy happens. If any changes are made to disk at this time then contents are committed to disk (https://github.com/heroku/hatchet/pull/51)
+- Allow running `deploy` block inside of an `in_directory` block (https://github.com/heroku/hatchet/pull/51)
+- Introduce Hatchet::App#commit! that will commit any files to a repo in the current directory. (https://github.com/heroku/hatchet/pull/51)
+
 ## 4.0.2
 
 - Support for running Hatchet tests on Heroku CI by defaulting to `ENV['HEROKU_TEST_RUN_BRANCH']` (#48)

data/lib/hatchet.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'stringio'
 require 'fileutils'
 require 'stringio'
+require 'date'
 
 module Hatchet
 end

data/lib/hatchet/app.rb

@@ -21,16 +21,28 @@ module Hatchet
       end
     end
 
-    def initialize(repo_name, options = {})
+    def initialize(repo_name,
+                   stack: "",
+                   name: default_name,
+                   debug: nil,
+                   debugging: nil,
+                   allow_failure: false,
+                   labs: [],
+                   buildpack: nil,
+                   buildpacks: nil,
+                   buildpack_url: nil,
+                   before_deploy: nil
+                  )
       @repo_name     = repo_name
       @directory     = config.path_for_name(@repo_name)
-      @name          = options[:name]          || "hatchet-t-#{SecureRandom.hex(10)}"
-      @stack         = options[:stack]
-      @debug         = options[:debug]         || options[:debugging]
-      @allow_failure = options[:allow_failure] || false
-      @labs          = ([] << options[:labs]).flatten.compact
-      @buildpacks    = options[:buildpack] || options[:buildpacks] || options[:buildpack_url] || self.class.default_buildpack
+      @name          = name
+      @stack         = stack
+      @debug         = debug || debugging
+      @allow_failure = allow_failure
+      @labs          = ([] << labs).flatten.compact
+      @buildpacks    = buildpack || buildpacks || buildpack_url || self.class.default_buildpack
       @buildpacks    = Array(@buildpacks)
+      @before_deploy = before_deploy
       @reaper        = Reaper.new(api_rate_limit: api_rate_limit)
     end
 
@@ -148,14 +160,27 @@ module Hatchet
       puts "Hatchet setup: #{name.inspect} for #{repo_name.inspect}"
       create_app
       set_labs!
-      # heroku.put_config_vars(name, 'BUILDPACK_URL' => @buildpack)
-      buildpack_list = @buildpacks.map {|pack| { buildpack: pack }}
+      buildpack_list = @buildpacks.map { |pack| { buildpack: pack } }
       api_rate_limit.call.buildpack_installation.update(name, updates: buildpack_list)
+
+      call_before_deploy
       @app_is_setup = true
       self
     end
     alias :setup :setup!
 
+    def before_deploy(&block)
+      raise "block required" unless block
+      @before_deploy = block
+
+      self
+    end
+
+
+    def commit!
+      local_cmd_exec!('git add .; git commit -m next')
+    end
+
     def push_without_retry!
       raise NotImplementedError
     end
@@ -170,10 +195,14 @@ module Hatchet
     end
 
     def in_directory(directory = self.directory)
+      yield directory and return if @already_in_dir
+
       Dir.mktmpdir do |tmpdir|
         FileUtils.cp_r("#{directory}/.", "#{tmpdir}/.")
         Dir.chdir(tmpdir) do
+          @already_in_dir = true
           yield directory
+          @already_in_dir = false
         end
       end
     end
@@ -192,7 +221,6 @@ module Hatchet
       self.teardown!
     end
 
-
     def push
       max_retries = @allow_failure ? 1 : RETRIES
       max_retries.times.retry do |attempt|
@@ -208,7 +236,6 @@ module Hatchet
     alias :push_with_retry  :push
     alias :push_with_retry! :push_with_retry
 
-
     def retry_error_message(error, attempt, max_retries)
       attempt += 1
       return "" if attempt == max_retries
@@ -290,9 +317,38 @@ module Hatchet
       @api_rate_limit ||= ApiRateLimit.new(@platform_api)
     end
 
-    private
-    # if someone uses bundle exec
-    def bundle_exec
+    private def needs_commit?
+      out = local_cmd_exec!('git status --porcelain').chomp
+
+      return false if out.empty?
+      true
+    end
+
+    private def local_cmd_exec!(cmd)
+      out = `#{cmd}`
+      raise "Command: #{cmd} failed: #{out}" unless $?.success?
+      out
+    end
+
+    private def default_name
+      "hatchet-t-#{SecureRandom.hex(10)}"
+    end
+
+    private def call_before_deploy
+      return unless @before_deploy
+      raise "before_deploy: #{@before_deploy.inspect} must respond to :call"  unless @before_deploy.respond_to?(:call)
+      raise "before_deploy: #{@before_deploy.inspect} must respond to :arity" unless @before_deploy.respond_to?(:arity)
+
+      if @before_deploy.arity == 1
+        @before_deploy.call(self)
+      else
+        @before_deploy.call
+      end
+
+      commit! if needs_commit?
+    end
+
+    private def bundle_exec
       if defined?(Bundler)
         Bundler.with_clean_env do
           yield

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

data/test/hatchet/app_test.rb

@@ -7,4 +7,59 @@ class AppTest < Minitest::Test
     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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api