heroku_hatchet 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4be516b833e976ab64fc5c3701d265ed57ee7420
-  data.tar.gz: bf652d701b3d9fa2b7c8f8fa8cbbb164706d1531
+  metadata.gz: 1e408aa0585f0a1514510df94f2dce61e8295db2
+  data.tar.gz: 5bc54517f98cb23cdfbdab8b8983ea81d2563952
 SHA512:
-  metadata.gz: ff12c2b9fab0095fc6ba59efba4d4872d63b6ce10e2a705cba23f5815a8fe4056149288fd25d3ecdd4fb96f02eaacbfd4790af605e4508aca68e9d166109334e
-  data.tar.gz: 794eacb79ff25a3066a3dde082f66e451402d91f7a80996cdaf5ba1ab99ff9062907f5aab4e97c22eca42f8ee156af3595999c77c59f57b2b002b0e4de205ce2
+  metadata.gz: 69b2baceef96a7736aa2c532a4c4ff59dc686439b4ca58439ac83658cbd9e9c59280ed8438e90c24a902aa40d7a1b268d6a071466811a2773ec2a95546846a59
+  data.tar.gz: 01bc16bdf88d52e5764fd5b5e251bab61662738ebc4e6b1417ac6bc051babadbefa48db3bd266857a7187acbd964fadd0425700a863e1e064f6421b923092ee3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 1.1.8
+
+- Do not check git branch unless using GitApp
+
 ## 1.1.7
 
 - Add labs methods `App#set_labs!` and `App.new(labs: "websockets")`

data/lib/hatchet.rb

@@ -18,7 +18,7 @@ module Hatchet
 
   def self.git_branch
     out = `git describe --contains --all HEAD`.strip
-    raise "Cannot describe git: #{out}" unless $?.success?
+    raise "Attempting to find current branch name. Error: Cannot describe git: #{out}" unless $?.success?
     out
   end
 

data/lib/hatchet/git_app.rb

@@ -2,11 +2,11 @@ module Hatchet
   # used for deploying a test app to heroku via git
   class GitApp < App
     HATCHET_BUILDPACK_BASE   = (ENV['HATCHET_BUILDPACK_BASE'] || "https://github.com/heroku/heroku-buildpack-ruby.git")
-    HATCHET_BUILDPACK_BRANCH = (ENV['HATCHET_BUILDPACK_BRANCH'] || Hatchet.git_branch)
+    HATCHET_BUILDPACK_BRANCH = -> { ENV['HATCHET_BUILDPACK_BRANCH'] || Hatchet.git_branch }
     BUILDPACK_URL = "https://github.com/heroku/heroku-buildpack-ruby.git"
 
     def initialize(directory, options = {})
-      @buildpack = options[:buildpack] || options[:buildpack_url] || [HATCHET_BUILDPACK_BASE, HATCHET_BUILDPACK_BRANCH].join("#")
+      @buildpack = options[:buildpack] || options[:buildpack_url] || [HATCHET_BUILDPACK_BASE, HATCHET_BUILDPACK_BRANCH.call].join("#")
       super
     end
 

data/lib/hatchet/version.rb

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

metadata

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