heroku_hatchet 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ab96e76acbc9193b2bda5f8ac7ada60364008f2
-  data.tar.gz: 794c94bfde39543b8ac96e69321cca5fa9122680
+  metadata.gz: 27c6dcf4b94d7ffa2ff13c22681fb82ce164743f
+  data.tar.gz: a5184d0c3128783bb2b3eb8dbd7ba86e0197d57b
 SHA512:
-  metadata.gz: f0be209eafbe2220d4685d373c34b96922e1b427312713e42deba1006954c95031adf3c4f91f72bf1b5cb776503128b05a6c4ad3bef0ef179b80e793507ea4eb
-  data.tar.gz: 9844f35fe14d22d00bc2448b209fe8f4754e8df48959b18a6efcaf4ad632d9d21b1b4db7e2b77c0bd4c30265c709521d7b99dc37cd147099e88a8ca1f849fa1d
+  metadata.gz: 12b6562ee9a6b76be96cba750285c8d7674452ff50ba6f07beeef0898ba941ec1a0124b0ec47235cdeb41b41bab44c4c5c08f7ea50030d8bf8cf1d714b7b6ab5
+  data.tar.gz: 9f5efa38ed5b0d8a03e161ebab5acf0758b24f8c14cc2348b911eae83db68d4572d304e7014660b7860f2a36eaaa2e1759a4d18a911124221fd948b161ae473a

data/.travis.yml

@@ -0,0 +1,14 @@
+---
+language: ruby
+rvm:
+- 2.0.0
+before_script: bundle exec rake hatchet:setup_travis
+script: bundle exec parallel_test test/hatchet -n 6
+
+
+env:
+  global:
+  - secure: |-
+      SfUgPagZILPjm4rjkYlEck76PUE47dimpNZgUtUf7wTAbe6EE83QmnRl6uDT
+      eSdxuY9uNFoTwNLC0J+mRiDAJtAQxBsst8wFoc3diK2o8Ojnor5yd3cxddBv
+      uvJK6optVPzDveg7rjC7zsELzWYvzWW9enZ6gr8BY/cIPIWTXMw=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0
+
+- Failed deploys now raise an exception
+
 ## 0.0.2
 
 - Added ability to run inline commands with no block (such as `app.run('ruby -v')`)

data/README.md

@@ -2,9 +2,9 @@
 
 ![](http://f.cl.ly/items/2M2O2Q2I2x0e1M1P2936/Screen%20Shot%202013-01-06%20at%209.59.38%20PM.png)
 
-## What
+Hatchet is a an integration testing library for developing Heroku buildpacks.
 
-The 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)
 
 ## Install
 

data/Rakefile

@@ -5,3 +5,9 @@ require 'hatchet/tasks'
 
 task :default => [:test]
 
+test_task = Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/hatchet/**/*_test.rb'
+  t.verbose = false
+end

data/hatchet.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "heroku-api"
   gem.add_dependency "activesupport"
-  gem.add_development_dependency "rake"
   gem.add_dependency "anvil-cli"
   gem.add_dependency "excon"
   gem.add_dependency "thor"
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "parallel_tests"
 end
 

data/hatchet.json

@@ -1,5 +1,6 @@
 {
   "hatchet": {"directory": "test/fixtures"},
-  "rails3": ["sharpstone/rails3_mri_193"],
-  "rails2": ["sharpstone/rails2blog"]
+  "rails3":  ["sharpstone/rails3_mri_193"],
+  "rails2":  ["sharpstone/rails2blog"],
+  "bundler": ["sharpstone/no_lockfile"]
 }

data/lib/hatchet.rb

@@ -5,6 +5,8 @@ require 'active_support/core_ext/object/blank'
 require 'json'
 require 'stringio'
 require 'fileutils'
+require 'stringio'
+
 
 module Hatchet
   class App

data/lib/hatchet/anvil_app.rb

@@ -5,38 +5,48 @@ module Hatchet
   class AnvilApp < App
 
     def initialize(directory, options = {})
-      @buildpack   = options[:buildpack]
+      @buildpack = options[:buildpack]
       @buildpack ||= File.expand_path('.')
       super
     end
 
     def push!
-      slug_url = nil
-
-      begin
-        stderr_orig = $stderr
-        stdout_orig = $stdout
-        string_io   = StringIO.new
-        $stderr     = string_io
-        slug_url    = Anvil::Engine.build(".", :buildpack => @buildpack, :pipeline => true)
+      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"
         response = release(@name, slug_url)
         while response.status == 202
           response = Excon.get("#{release_host}#{response.headers["Location"]}")
         end
-      rescue Anvil::Builder::BuildError => e
-        output = $stderr.dup
-        stdout_orig.puts output.string # print the errors to the test output
-        return [false, output.string]
-      ensure
-        $stderr = stderr_orig
-        $stdout = stdout_orig
       end
 
-      [true, string_io.string]
+      err.string
     end
 
-    def teardown!
+    def wrap_stdout_and_rescue(error, &block)
+      wrap_stdout do |orig_out, orig_err|
+        begin
+          yield orig_out, orig_err
+        rescue error => e
+          return [$stdout.dup, $stderr.dup] if @allow_failure
+          orig_out.puts $stderr.dup.string # print the errors to the test output
+          raise e
+        end
+      end
+    end
+
+    def wrap_stdout(orig_out = $stdout, orig_err = $stderr, &block)
+      $stderr  = StringIO.new
+      $stdout  = StringIO.new
+      yield orig_out, orig_err
+      puts [$stdout.dup, $stderr.dup].inspect
+      return $stdout.dup, $stderr.dup
+    ensure
+      $stdout = orig_out
+      $stderr = orig_err
+    end
+
+   def teardown!
       super
       FileUtils.rm_rf("#{directory}/.anvil")
     end

data/lib/hatchet/app.rb

@@ -2,10 +2,20 @@ module Hatchet
   class App
     attr_reader :name, :directory
 
+    class FailedDeploy < StandardError
+      def initialize(app, output)
+        msg = "could not deploy #{app.name} using #{app.class} if this was expected " <<
+              "add `allow_failure: true` to your deploy hash\n\n" <<
+              "output : #{output.inspect}"
+        super(msg)
+      end
+    end
+
     def initialize(repo_name, options = {})
-      @directory = config.path_for_name(repo_name)
-      @name      = options[:name]  || "test-app-#{Time.now.to_f}".gsub('.', '-')
-      @debug     = options[:debug] || options[:debugging]
+      @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
     end
 
     # config is read only, should be threadsafe
@@ -65,13 +75,17 @@ module Hatchet
     def deploy(&block)
       Dir.chdir(directory) do
         self.setup!
-        result, output = self.push!
-        block.call(self, heroku, output)
+        @output = self.push!
+        block.call(self, heroku, output) if block.present?
       end
     ensure
       self.teardown!
     end
 
+    def output
+      @output
+    end
+
     private
       def api_key
         @api_key ||= ENV['HEROKU_API_KEY'] || `heroku auth:token`.chomp

data/lib/hatchet/git_app.rb

@@ -18,8 +18,11 @@ module Hatchet
     end
 
     def push!
-      output = `git push #{git_repo} master`
-      [$?.success?, output]
+      output = `git push #{git_repo} master 2>&1`
+      if !$?.success?
+        raise FailedDeploy.new(self, output) unless @allow_failure
+      end
+      return output
     end
   end
 end

data/lib/hatchet/tasks.rb

@@ -1,10 +1,20 @@
 require 'rake'
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/hatchet/**/*_test.rb'
-  t.verbose = false
-end
-
+namespace :hatchet do
+  task :setup_travis do
+    puts "== Setting Up Travis =="
+    ['bundle exec hatchet install',
+     %Q{echo "\nHost heroku.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config},
+     %Q{echo "\nHost github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config},
+     'wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh',
+     'ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa',
+     'heroku keys:add',
+     'heroku login'
+    ].each do |command|
+      puts "== Running: #{command}"
+      `#{command}`
+    end
+    puts "== Done =="
+  end
+end

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/test/fixtures/buildpacks/heroku-buildpack-ruby/.gitignore

@@ -0,0 +1,4 @@
+repos/*
+.DS_Store
+vendor/bundler/*
+vendor/bundle/*

data/test/fixtures/buildpacks/heroku-buildpack-ruby/CHANGELOG.md

@@ -0,0 +1,378 @@
+## v61 (4/18/2013)
+
+Features:
+
+* Start caching the rubygems version used.
+
+Bugfixes:
+
+* Rebuild bundler cache if rubygems 2 is detected. Bugfixes in later rubygems.
+
+## v60 (4/17/2013)
+
+Security:
+
+* Disable Java RMI Remote Classloading for CVE-2013-1537, <https://bugzilla.redhat.com/show_bug.cgi?id=952387>
+
+## v59 (4/4/2013)
+
+Bugfixes:
+
+* Change JVM S3 bucket
+
+## v58 (3/19/2013)
+
+Bugfixes:
+
+* Fix ruby 1.8.7 not being able to compile native extensions
+
+## v57 (3/18/2013)
+
+Bugfixes:
+
+* Fix git gemspec bug in bundler
+
+## v56 (3/11/2013)
+
+Bugfixes:
+
+* Upgrade bundler to 1.3.2 to fix --dry-clean/Would have removed bug in bundle clean, part 2.
+
+## v55 (3/7/2013)
+
+Bugfixes:
+
+* Revert back to Bundler 1.3.0.pre.5, see https://gist.github.com/mattonrails/e063caf86962995e7ba0
+
+## v54 (3/7/2013)
+
+Bugfixes:
+
+* Upgrade bundler to 1.3.2 to fix --dry-clean/Would have removed bug in bundle clean
+
+## v53 (3/6/2013)
+
+Bugfixes:
+
+* bin/detect for Rails 3 and 4 will use railties for detection vs the rails gem
+* bin/detect does not error out when Gemfile + Gemfile.lock are missing
+
+## v52 (2/25/2013)
+
+Bugfixes:
+
+* Revert back to 1.3.0.pre.5 due to bundler warnings
+
+## v51 (2/25/2013)
+
+Features:
+
+* Initial Rails 4 beta support
+* Upgrade bundler to 1.3.0
+
+Bugfixes:
+
+* Better buildpack detection through Gemfile.lock gems
+
+## v50 (1/31/2013)
+
+Features:
+
+* Restore ruby deploys back to normal
+
+## v49 (1/30/2013)
+
+Features:
+
+* Re-enable ruby deploys for apps just using the heroku cache
+* Display ruby version change when busting the cache
+
+## v48 (1/30/2013)
+
+Features:
+
+* Update deploy error message copy to link to status incident.
+
+## v47 (1/30/2013)
+
+Features:
+
+* Disable ruby deploys due to rubygems.org compromise
+
+## v46 (1/10/2013)
+
+Features:
+
+* Upgrade Bundler to 1.3.0.pre.5
+* bundler binstubs now go in vendor/bundle/bin
+
+## v45 (12/14/2012)
+
+Features:
+
+* Stop setting env vars in bin/release now that login-shell is released
+* Enable Invoke Dynamic on JRuby by default
+* GEM_PATH is now updated on each push
+
+## v44 (12/14/2012)
+
+Faulty Release
+
+## v43 (12/13/2012)
+
+Features:
+
+* Upgrade Bundler to 1.3.0.pre.2
+
+## v42 (11/26/2012)
+
+Features:
+
+* Upgrade Bundler to 1.2.2 to fix Ruby 2.0.0/YAML issues
+
+## v41 (11/1/2012)
+
+Features:
+
+* Enable ruby 2.0.0 support for testing
+
+## v40 (10/14/2012)
+
+Features:
+
+* Cache version of the buildpack we used to deploy
+* Purge cache when v38 is detected
+
+## v39 (10/14/2012)
+
+Bugfixes:
+
+* Don't display cache clearing message for new apps
+* Actually clear bundler cache on ruby version change
+
+## v38 (10/14/2012)
+
+Bugfixes:
+
+* Stop bundle cache from continually growing
+
+## v37 (10/12/2012)
+
+Bugfixes:
+
+* Remove temporary workaround from v36.
+* Clear bundler cache upon Ruby version change
+
+## v36 (10/12/2012)
+
+Bugfixes:
+
+* Always clear the cache for ruby 1.9.3 as a temporary workaround due to the security upgrade
+
+## v35 (9/19/2012)
+
+Features:
+
+* Upgrade to Bundler 1.2.1
+* Display bundle clean output
+* More resilent to rubygems.org API outages
+
+Bugfixes:
+
+* `bundle clean` works again
+
+## v34 (8/30/2012)
+
+Features:
+
+* Upgrade to Bundler 1.2.0
+
+## v33 (8/9/2012)
+
+Features:
+
+* Upgrade to Bundler 1.2.0.rc.2
+* vendor JDK7 for JRuby, but disable invoke dynamic
+
+## v29 (7/19/2012)
+
+Features:
+
+* support .profile.d/ruby.sh
+* sync stdout so that the buildpack streams even in non-interactive shells
+* Upgrade to Bundler 1.2.0.rc
+
+## v28 (7/16/2012)
+
+Features:
+
+* Vendor OpenJDK6 into slug when using JRuby
+* ruby version support for ruby 1.8.7 via bundler's ruby DSL
+
+Bugfixes:
+
+* sqlite3 error gets displayed again
+
+## v27 (6/14/2012)
+
+Bugfixes:
+
+* Remove `vendor/bundle` message only appears when dir actually exists
+
+## v26 (6/14/2012)
+
+Features:
+
+* print message when assets:precompile finishes successfully
+* Remove `vendor/bundle` if user commits it to their git repo.
+
+## v25 (6/12/2012)
+
+Features:
+
+* support "ruby-xxx-jruby-yyy" for jruby detection packages
+
+## v24 (6/7/2012)
+
+Features:
+
+* removes bundler cache in the slug, to minimize slug size (@stevenh512, #16)
+* optimize push time with caching
+
+## v23 (5/8/2012)
+
+Bugfixes:
+
+* fix ruby version bug with "fatal:-Not-a-git-repository"
+
+## v22 (5/7/2012)
+
+Features:
+
+* bundler 1.2.0.pre
+* ruby version support for ruby 1.9.2/1.9.3 via bundler's ruby DSL
+
+Deprecation:
+
+* ENV['RUBY_VERSION'] in favor of bundler's ruby DSL
+
+## v21 (3/21/2012)
+
+Features:
+
+* bundler 1.1.2
+
+## v20 (3/12/2012)
+
+Features:
+
+* bundler 1.1.0 \o/
+
+## v19 (1/25/2012)
+
+Bugfixes:
+
+* fix native extension building for rbx 2.0.0dev
+
+## v18 (1/18/2012)
+
+Features:
+
+* JRuby support
+* rbx 2.0.0dev support
+
+Bugfixes:
+
+* force db password to be a string in the yaml file
+
+## v17 (12/29/2011)
+
+Features:
+
+* bundler 1.1.rc.7
+
+## v16 (12/29/2011)
+
+Features:
+
+* pass DATABASE_URL to rails 3.1 assets:precompile rake task detection
+
+## v15 (12/27/2011)
+
+Features:
+
+* bundler 1.1.rc.6
+
+## v14 (12/22/2011)
+
+Bugfixes:
+
+* stop freedom patching syck in ruby 1.9.3+
+
+## v13 (12/15/2011)
+
+Features:
+
+* bundler 1.1.rc.5
+
+## v12 (12/13/2011)
+
+Bugfixes:
+
+* syck workaround for yaml/psych issues
+
+## v11 (12/12/2011)
+
+Features:
+
+* bundler 1.1.rc.3
+
+## v10 (11/23/2011)
+
+Features:
+
+* bundler binstubs
+* dynamic slug_vendor_base detection
+
+Bugfixes:
+
+* don't show sqlite3 error if it's in a bundle without group on failed bundle install
+
+## v9 (11/14/2011)
+
+Features:
+
+* rbx 1.2.4 support
+* print out RUBY_VERSION being used
+
+Bugfixes:
+
+* don't leave behind ruby_versions.yml
+
+## v8 (11/8/2011)
+
+Features:
+
+* use vm as part of RUBY_VERSION
+
+## v7 (11/8/2011)
+
+Features:
+
+* ruby 1.9.3 support
+* specify ruby versions using RUBY_VERSION build var
+
+Bugfixes:
+
+* move "bin/" to the front of the PATH, so apps can override existing bins
+
+## v6 (11/2/2011)
+
+Features:
+
+* add sqlite3 warning when detected on bundle install error
+
+Bugfixes:
+
+* Change gem detection to use lockfile parser
+* use `$RACK_ENV` when thin is detected for rack apps