heroku_hatchet 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cac48b3f78e361924cf97f575634fed07bb6474
-  data.tar.gz: 177886238aa528b57365d9cf8b47bc4f3d4f96f2
+  metadata.gz: 41fe3c7326911d5c112ba7ef95ef7f25397fb59e
+  data.tar.gz: eba86db8f7652204a308b910e5d2e01c160b15f4
 SHA512:
-  metadata.gz: d77a4f52a1506d979f31c5518114a14e43efeb2b773834dabf1a4941f06e68555d0357df1f760b43c3ffacc0138e53c09952c27a565dee340d1c4254376ed3ce
-  data.tar.gz: 8bbbb34ad178c195e4a0106e865b0ebd842ca0e8c254270cffb75fee3befb18f86de9c3a53a78d7bd7d72450e3455dfe480ce1aee0be6e164ab88588b337c6e7
+  metadata.gz: 82f41b5be9b220f58b504829044a7da3e38f690af0862a59692ac28cf61e0fc70808a99d6fb7878aaa69007108771dc55362349fdffeec2f1333bf8dbfefa7a2
+  data.tar.gz: 0f4a2b231c42870ffebbe886c0eaab1f4dd158a824321b7209846302a3a75389a71ed397d16cd7e3e1aa3d58fb46a9059fe2ebcbd5d3b50645d3b067b991b6cf

data/.gitignore

@@ -4,4 +4,5 @@ test/fixtures/repos/*
 
 
 Gemfile.lock
-debug.rb
+debug.rb
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## HEAD
 
+## 1.2.0
+
+- Change `App#push` default behavior to be `App#push_with_retry!`
+- `App#in_directory` now copies source repo to tmpdir so it can be modified if needed
+- Repo name now shows up in error outputs.
+
 ## 1.1.9
 
 - Use TRAVIS_BRANCH if present

data/lib/hatchet/anvil_app.rb

@@ -10,7 +10,7 @@ module Hatchet
       super
     end
 
-    def push!
+    def push_without_retry!
       out, err = wrap_stdout_and_rescue(Anvil::Builder::BuildError) do
         slug_url  = Anvil::Engine.build(".", :buildpack => @buildpack, :pipeline => true)
         puts "Releasing to http://#{@name}.herokuapp.com"

data/lib/hatchet/app.rb

@@ -1,10 +1,10 @@
 module Hatchet
   class App
-    attr_reader :name, :directory
+    attr_reader :name, :directory, :repo_name
 
     class FailedDeploy < StandardError
       def initialize(app, output)
-        msg = "Could not deploy '#{app.name}' using '#{app.class}' at path: '#{app.directory}'\n" <<
+        msg = "Could not deploy '#{app.name}' (#{app.repo_name}) using '#{app.class}' at path: '#{app.directory}'\n" <<
               " if this was expected add `allow_failure: true` to your deploy hash.\n" <<
               "output:\n" <<
               "#{output}"
@@ -13,7 +13,8 @@ module Hatchet
     end
 
     def initialize(repo_name, options = {})
-      @directory     = config.path_for_name(repo_name)
+      @repo_name     = repo_name
+      @directory     = config.path_for_name(@repo_name)
       @name          = options[:name]          || "test-app-#{Time.now.to_f}".gsub('.', '-')
       @debug         = options[:debug]         || options[:debugging]
       @allow_failure = options[:allow_failure] || false
@@ -102,7 +103,7 @@ module Hatchet
       self
     end
 
-    def push!
+    def push_without_retry!
       raise NotImplementedError
     end
 
@@ -116,8 +117,11 @@ module Hatchet
     end
 
     def in_directory(directory = self.directory)
-      Dir.chdir(directory) do
-        yield directory
+      Dir.mktmpdir do |tmpdir|
+        FileUtils.cp_r("#{directory}/.", "#{tmpdir}/.")
+        Dir.chdir(tmpdir) do
+          yield directory
+        end
       end
     end
 
@@ -136,21 +140,26 @@ module Hatchet
     end
 
 
-    def push_with_retry!
-      RETRIES.times.retry do |attempt|
+    def push
+      max_retries = @allow_failure ? 1 : RETRIES
+      max_retries.times.retry do |attempt|
         begin
-          @output = self.push!
+          @output = self.push_without_retry!
         rescue StandardError => error
-          puts retry_error_message(error, attempt)
+          puts retry_error_message(error, attempt, max_retries)
           raise error
         end
       end
     end
+    alias :push! :push
+    alias :push_with_retry  :push
+    alias :push_with_retry! :push_with_retry
+
 
-    def retry_error_message(error, attempt)
+    def retry_error_message(error, attempt, max_retries)
       attempt += 1
-      return "" if attempt == RETRIES
-      msg = "\nRetrying failed Attempt ##{attempt}/#{RETRIES} to push for '#{name}' due to error: \n"<<
+      return "" if attempt == max_retries
+      msg = "\nRetrying failed Attempt ##{attempt}/#{max_retries} to push for '#{name}' due to error: \n"<<
             "#{error.class} #{error.message}\n  #{error.backtrace.join("\n  ")}"
     end
 

data/lib/hatchet/git_app.rb

@@ -19,7 +19,9 @@ module Hatchet
       "git@heroku.com:#{name}.git"
     end
 
-    def push!
+    def push_without_retry!
+      puts `pwd`
+      puts `ls`
       output = `git push #{git_repo} master 2>&1`
       if !$?.success?
         raise FailedDeploy.new(self, "Buildpack: #{@buildpack.inspect}\nRepo: #{git_repo}\n#{output}") unless @allow_failure

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "1.1.9"
+  VERSION = "1.2.0"
 end

data/test/hatchet/allow_failure_anvil_test.rb

@@ -20,13 +20,14 @@ class AllowFailureAnvilTest < Test::Unit::TestCase
   end
 
   def test_retries
+    orig_retries = Hatchet::RETRIES
     Hatchet.const_set(:RETRIES, 2)
     assert_raise(Anvil::Builder::BuildError) do
       app = Hatchet::AnvilApp.new("no_lockfile", buildpack: @buildpack_path)
-      app.expects(:push!).twice.raises(Anvil::Builder::BuildError)
+      app.expects(:push_without_retry!).twice.raises(Anvil::Builder::BuildError)
       app.deploy
     end
   ensure
-    Hatchet.const_set(:RETRIES, 1)
+    Hatchet.const_set(:RETRIES, orig_retries)
   end
 end

data/test/hatchet/multi_cmd_runner_test.rb

@@ -30,7 +30,6 @@ class MultiCmdRunnerTest < Test::Unit::TestCase
           bash.run("ls") { |r| assert_match "Gemfile", r }
         end
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api