heroku_hatchet 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5858aba476c6665c554f78f1e59ff86620441b05
-  data.tar.gz: b720257ac9ec4fef2df697eb48c36f519cdec43d
+  metadata.gz: 4be516b833e976ab64fc5c3701d265ed57ee7420
+  data.tar.gz: bf652d701b3d9fa2b7c8f8fa8cbbb164706d1531
 SHA512:
-  metadata.gz: dc750c15ad6d24155300b83d7015b6b4c906ce5222ac730e9bd4d9ec3fac3cfb2ee2c7108becf53658e823e66491feed7c99fa08eb29146ae658fc41a1ecad01
-  data.tar.gz: 4b67d67bc28e56613d9495f448a69447cff1fd58569b3ec1be4869eba55abc0f18513ea1bce3ad5db8a21679774bbcd114fb8e663913ae751d2c8c53f6b2bf3f
+  metadata.gz: ff12c2b9fab0095fc6ba59efba4d4872d63b6ce10e2a705cba23f5815a8fe4056149288fd25d3ecdd4fb96f02eaacbfd4790af605e4508aca68e9d166109334e
+  data.tar.gz: 794eacb79ff25a3066a3dde082f66e451402d91f7a80996cdaf5ba1ab99ff9062907f5aab4e97c22eca42f8ee156af3595999c77c59f57b2b002b0e4de205ce2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 1.1.7
+
+- Add labs methods `App#set_labs!` and `App.new(labs: "websockets")`
+
 ## 1.1.6
 - `App#setup!` is now idempotent
 - Added `App#get_config`

data/lib/hatchet/app.rb

@@ -4,18 +4,20 @@ module Hatchet
 
     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}"
+        msg = "Could not deploy '#{app.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}"
         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]
+      @name          = options[:name]          || "test-app-#{Time.now.to_f}".gsub('.', '-')
+      @debug         = options[:debug]         || options[:debugging]
       @allow_failure = options[:allow_failure] || false
+      @labs          = ([] << options[:labs]).flatten.compact
     end
 
     # config is read only, should be threadsafe
@@ -37,6 +39,22 @@ module Hatchet
       heroku.get_config_vars(name).body
     end
 
+    def lab_is_installed?(lab)
+      get_labs.any? {|hash| hash["name"] == lab }
+    end
+
+    def get_labs
+      heroku.get_features(name).body
+    end
+
+    def set_labs!
+      @labs.each {|lab| set_lab(lab) }
+    end
+
+    def set_lab(lab)
+      heroku.post_feature(lab, name)
+    end
+
     def add_database(db_name = 'heroku-postgresql:dev', match_val = "HEROKU_POSTGRESQL_[A-Z]+_URL")
       Hatchet::RETRIES.times.retry do
         heroku.post_addon(name, db_name)
@@ -79,6 +97,7 @@ module Hatchet
     def setup!
       return self if @app_is_setup
       heroku.post_app(name: name)
+      set_labs!
       @app_is_setup = true
       self
     end

data/lib/hatchet/git_app.rb

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

data/lib/hatchet/tasks.rb

@@ -1,4 +1,5 @@
 config_ssh = <<-RUBY
+
 Host heroku.com
     StrictHostKeyChecking no
     CheckHostIP no
@@ -10,14 +11,16 @@ RUBY
 namespace :hatchet do
   task :setup_travis do
     puts "== Setting Up Travis =="
-    ['bundle exec hatchet install',
+    [
+     "bundle exec hatchet install",
      "echo '#{config_ssh}' >> ~/.ssh/config",
-     'wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh',
-     'yes | heroku keys:add'
+     "curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://toolbelt.heroku.com/install-ubuntu.sh | sh",
+     "yes | heroku keys:add"
     ].each do |command|
       puts "== Running: #{command}"
       Bundler.with_clean_env do
         `#{command}`
+        raise "Command failed: #{command.inspect}" unless $?.success?
       end
     end
     puts "== Done =="

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/lib/hatchet.rb

@@ -17,7 +17,9 @@ module Hatchet
   end
 
   def self.git_branch
-    `git describe --contains --all HEAD`.strip
+    out = `git describe --contains --all HEAD`.strip
+    raise "Cannot describe git: #{out}" unless $?.success?
+    out
   end
 
   def self.set_deploy_strategy!

data/test/hatchet/git_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class GitAppTest < Test::Unit::TestCase
   def test_can_deploy_git_app
-    Hatchet::GitApp.new("rails3_mri_193").deploy do |app|
+    Hatchet::GitApp.new("rails3_mri_193", buildpack: "https://github.com/heroku/heroku-buildpack-ruby.git").deploy do |app|
       assert true
       assert_match '1.9.3', app.run("ruby -v")
 

data/test/hatchet/heroku_api_test.rb

@@ -10,6 +10,6 @@ class HerokuApiTest < Test::Unit::TestCase
     expected = {"foo" => "bar"}
     assert_equal expected, runner.get_config
   ensure
-    runner.teardown!
+    runner.teardown! if runner
   end
-end
+end

data/test/hatchet/labs_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class LabsTest < Test::Unit::TestCase
+  def setup
+    @buildpack_path = File.expand_path 'test/fixtures/buildpacks/heroku-buildpack-ruby'
+  end
+
+  def test_can_deploy_git_app
+    lab_name = "websockets"
+    app = Hatchet::App.new("rails3_mri_193", labs: lab_name, buildpack: @buildpack_path)
+    app.setup!
+    assert(app.lab_is_installed?(lab_name), "Expected #{app.get_labs.inspect} to include {'name' => '#{lab_name}' } but it did not")
+  ensure
+    app.teardown! if app
+  end
+end
+

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rrrretry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: anvil-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: repl_runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hatchet is a an integration testing library for developing Heroku buildpacks.
@@ -158,8 +158,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -217,6 +217,7 @@ files:
 - test/hatchet/config_test.rb
 - test/hatchet/git_test.rb
 - test/hatchet/heroku_api_test.rb
+- test/hatchet/labs_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
 - test/hatchet/runner_test.rb
 - test/test_helper.rb
@@ -230,17 +231,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.
@@ -287,6 +288,8 @@ test_files:
 - test/hatchet/config_test.rb
 - test/hatchet/git_test.rb
 - test/hatchet/heroku_api_test.rb
+- test/hatchet/labs_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
 - test/hatchet/runner_test.rb
 - test/test_helper.rb
+has_rdoc: