heroku_hatchet 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1896d0a09cfae27ff55b130431dcab677ab7ee5a11851c52d23f32abb1d773db
-  data.tar.gz: 50827926cffb6d14894c4fac985bdaf9ac88645a4640e8d3e203cad6ba405e90
+  metadata.gz: 457db77bc6c69de2ef9179c0b3027ab3c8036b2e639dc924bbb3d4c6903b32b5
+  data.tar.gz: c42cf1ceb1a679f1f0dfdff99c60e6ba1b7cc442d5accd0182ac8b44b2d8add1
 SHA512:
-  metadata.gz: '07895d1b500d6f1d40cd50786440aa4156703ebae3c9eb92af96e1662400f66d493ce413d104e882d338e6b8990136f8a2b967130298c7d154e4b2abd77c6227'
-  data.tar.gz: 82766796bfabe96afed53caec7aa1e78d4a788583a544c2a07130eb66265f598f7c1d15b693bd6b95f79dea15c3c8336bb6bd4d0260c8fd802c067e5fd531331
+  metadata.gz: 4f7d83b39c17fb2700d4b3ddca889df1fd55a884017d09d72b178870d556b1948753d491fbeb02c9a35aee92c3de8d49d4c4aca6c2fd164ddfabe4f3bfe54168
+  data.tar.gz: 78e2a70ce5b00b69e1c98da9a36f691978e043db9e58976947011a3178e8bf6c63520dca01a471c58fdc24e5da7726408704bb0d46f2f0e8ed31ce61fe4ec5c0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 7.1.3
+
+- Important!! Fix branch name detection on CircleCI (https://github.com/heroku/hatchet/pull/124)
+
 ## 7.1.2
 
 - Fix support for Hatchet deploying the 'main' branch (https://github.com/heroku/hatchet/pull/122)

data/lib/hatchet.rb

@@ -30,7 +30,7 @@ module Hatchet
     return ENV['TRAVIS_PULL_REQUEST_BRANCH'] if ENV['TRAVIS_PULL_REQUEST_BRANCH'] && !ENV['TRAVIS_PULL_REQUEST_BRANCH'].empty?
     return ENV['TRAVIS_BRANCH'] if ENV['TRAVIS_BRANCH']
 
-    out = `git describe --contains --all HEAD`.strip
+    out = `git rev-parse --abbrev-ref HEAD`.strip
     raise "Attempting to find current branch name. Error: Cannot describe git: #{out}" unless $?.success?
     out
   end

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "7.1.2"
+  VERSION = "7.1.3"
 end

data/spec/hatchet/git_spec.rb

@@ -6,4 +6,10 @@ describe "GitAppTest" do
       expect(app.output).to match("INTENTIONAL ERROR")
     end
   end
+
+  it "returns the correct branch name on circle CI" do
+    skip("only runs on circle") unless ENV["CIRCLE_BRANCH"]
+
+    expect(Hatchet.git_branch).to eq(ENV["CIRCLE_BRANCH"])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.3
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api