heroku_hatchet 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72a81e640b88d888b06df31b59bea074b8c90ce5
-  data.tar.gz: a9cb4cb76d6f3accbc497128711f01dfb1f80ca9
+  metadata.gz: d675d2785c4891e158609756788aefc993eb2951
+  data.tar.gz: 79d6dbb02bbd78dbe01e702c8133740e83512f46
 SHA512:
-  metadata.gz: f5f245824acff4b87a55faaf4a96cbc8148747e65fc3e6806371f45e2cbcf4dd5b6066b55beb40d5843c07f45eadcf700bba4ad87886be7b8cfefe2763079081
-  data.tar.gz: 60fe67a113b9f2b5eb8e009f8fd18b8267b5198180d7f1d48cfa3a507330d30d32ecd6584a825eca91816acd04dda9da568ecc89beee9bbbaa8b883716a4a963
+  metadata.gz: a3e15797cf063d2396adf07b95f58b49efa8a95a780be8c86b7afe2b7ec396b2ae621c30f50305929c018fa7be1d20ac30c54d38c7dd5f2f59ff621be2c00aa6
+  data.tar.gz: cbb5d2103970d491d63b9c2f5e9a0c090b9256040ae2e37dccc5560f5cb126bae491965a5166e161f7a6e137059a022c0559256758cd71fd9c855a8b0b01dcc3

data/README.md

@@ -4,7 +4,7 @@
 
 Hatchet is a an integration testing library for developing Heroku buildpacks.
 
-[![Build Status](https://travis-ci.org/heroku/hatchet.png?branch=master)](https://travis-ci.org/heroku/hatchet)
+[![Build Status](https://travis-ci.org/heroku/hatchet.svg?branch=master)](https://travis-ci.org/heroku/hatchet)
 
 ## Install
 

data/hatchet.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "threaded",      "~> 0"
 
 
+  gem.add_development_dependency "minitest",       "~> 4.0"
   gem.add_development_dependency "rake",           "~> 10"
   gem.add_development_dependency "mocha",          "~> 1"
   gem.add_development_dependency "parallel_tests", "~> 0"

data/lib/hatchet/app.rb

@@ -15,10 +15,11 @@ module Hatchet
     def initialize(repo_name, options = {})
       @repo_name     = repo_name
       @directory     = config.path_for_name(@repo_name)
-      @name          = options[:name]          || "test-app-#{Time.now.to_f}".gsub('.', '-')
+      @name          = options[:name]          || "hatchet-t-#{SecureRandom.hex(10)}"
       @debug         = options[:debug]         || options[:debugging]
       @allow_failure = options[:allow_failure] || false
       @labs          = ([] << options[:labs]).flatten.compact
+      @reaper        = Reaper.new(heroku)
     end
 
     # config is read only, should be threadsafe
@@ -95,9 +96,21 @@ module Hatchet
       !heroku.get_ps(name).body.detect {|ps| ps["process"].include?("web") }.nil?
     end
 
+    def create_app
+      3.times.retry do
+        begin
+          heroku.post_app(name: name)
+        rescue Heroku::API::Errors::RequestFailed => e
+          @reaper.cycle if e.message.match(/app limit/)
+          raise e
+        end
+      end
+    end
+
     # creates a new heroku app via the API
     def setup!
       return self if @app_is_setup
+      puts "Hatchet setup: #{name.inspect} for #{repo_name.inspect}"
       heroku.post_app(name: name)
       set_labs!
       @app_is_setup = true
@@ -114,7 +127,7 @@ module Hatchet
         puts "Debugging App:#{name}"
         return false
       end
-      heroku.delete_app(name)
+      @reaper.cycle
     end
 
     def in_directory(directory = self.directory)

data/lib/hatchet/reaper.rb

@@ -0,0 +1,48 @@
+module Hatchet
+  # Hatchet apps are useful after the tests run for debugging purposes
+  # the reaper is designed to allow the most recent apps to stay alive
+  # while keeping the total number of apps under the global Heroku limit.
+  # Any time you're worried about hitting the limit call @reaper.cycle
+  #
+  class Reaper
+    HEROKU_APP_LIMIT = Integer(ENV["HEROKU_APP_LIMIT"]  || 100) # the number of apps heroku allows you to keep
+    HATCHET_APP_LIMT = Integer(ENV["HATCHET_APP_LIMIT"] || 20)  # the number of apps hatchet keeps around
+    DEFAULT_REGEX = /^hatchet-t-/
+    attr_accessor :apps
+
+
+    def initialize(heroku, regex = DEFAULT_REGEX)
+      @heroku = heroku
+      @regex  = regex
+    end
+
+    # Ascending order, oldest is last
+    def get_apps
+      @apps         = @heroku.get_apps.body.sort_by {|app| DateTime.parse(app["created_at"]) }.reverse
+      @hatchet_apps = @apps.select {|app| app["name"].match(@regex) }
+      @apps
+    end
+
+    def cycle(apps = get_apps)
+      if over_limit?
+        destroy_oldest
+        cycle
+      else
+        # do nothing
+      end
+    end
+
+    def destroy_oldest
+      oldest_name  = @hatchet_apps.pop["name"]
+      puts "Destroying #{oldest_name.inspect}. Hatchet app limit: #{HATCHET_APP_LIMT}"
+      @heroku.delete_app(oldest_name)
+    end
+
+    private
+
+    def over_limit?
+      @apps.count > HEROKU_APP_LIMIT || @hatchet_apps.count > HATCHET_APP_LIMT
+    end
+  end
+end
+

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/lib/hatchet.rb

@@ -11,7 +11,7 @@ require 'stringio'
 
 
 module Hatchet
-  RETRIES = Integer(ENV['HATCHET_RETRIES'] || 1)
+  RETRIES   = Integer(ENV['HATCHET_RETRIES']   || 1)
 
   class App
   end
@@ -37,6 +37,7 @@ module Hatchet
 end
 
 require 'hatchet/version'
+require 'hatchet/reaper'
 require 'hatchet/app'
 require 'hatchet/anvil_app'
 require 'hatchet/git_app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +201,7 @@ files:
 - lib/hatchet/app.rb
 - lib/hatchet/config.rb
 - lib/hatchet/git_app.rb
+- lib/hatchet/reaper.rb
 - lib/hatchet/tasks.rb
 - lib/hatchet/version.rb
 - test/fixtures/buildpacks/heroku-buildpack-ruby/.gitignore
@@ -256,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.
@@ -308,4 +323,3 @@ test_files:
 - test/hatchet/multi_cmd_runner_test.rb
 - test/hatchet/runner_test.rb
 - test/test_helper.rb
-has_rdoc: