percy-client 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a651ce1bbf67920df1daa189a18a7894da46b1f
-  data.tar.gz: c29f76e3af43125d1863ca2f16f3d2fb3132bdc2
+  metadata.gz: dd70d6513c8a2d45939367a3b48f040b38994554
+  data.tar.gz: 690049af75d386c2d3bafcdb3256e09a30e3a485
 SHA512:
-  metadata.gz: 1e6b08f666ae778440a40afa49e4070cb5d18515b3d93e2e2abf9d3386d379738d79c802863b14087d27f7ecefba25198c2e37054935553a93f1f60095aad262
-  data.tar.gz: 696a2ab779b0cb1e9da0e51d67a289c484bf30b2cd894312ade5420252e1b3ae4337d6eb4364e4a177834707bfe958fb658f27479bd1fa6e146e909fd81f4b6b
+  metadata.gz: 6817e9f394b45bd4edfaaca95191cece4a89fb3871f31577d68c6b1844df4f7eafc12eec830e78e9389c8b9c06abc6e8fca7b8cdcaedbc18b5dff93f53efbdca
+  data.tar.gz: a8137680c8a45fbf3751a1766cdbb21413bf6ed2acbadbb80ac28747f72620f56d4d15bd62f2fc61a4028f873099a7c348d5144347bb68aadbdade2bbede5948

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    percy-client (1.8.0)
+    percy-client (1.9.0)
       faraday (>= 0.9)
       httpclient (>= 2.6)
 

data/lib/percy/client/environment.rb

@@ -22,6 +22,7 @@ module Percy
         return :codeship if ENV['CI_NAME'] && ENV['CI_NAME'] == 'codeship'
         return :drone if ENV['DRONE'] == 'true'
         return :semaphore if ENV['SEMAPHORE'] == 'true'
+        return :buildkite if ENV['BUILDKITE'] == 'true'
       end
 
       # @return [Hash] All commit data from the current commit. Might be empty if commit data could
@@ -75,6 +76,10 @@ module Percy
           ENV['DRONE_COMMIT']
         when :semaphore
           ENV['REVISION']
+        when :buildkite
+          # Buildkite mixes SHAs and non-SHAs in BUILDKITE_COMMIT, so we return null if non-SHA.
+          return if ENV['BUILDKITE_COMMIT'] == 'HEAD'
+          ENV['BUILDKITE_COMMIT']
         end
       end
 
@@ -107,6 +112,8 @@ module Percy
           ENV['DRONE_BRANCH']
         when :semaphore
           ENV['BRANCH_NAME']
+        when :buildkite
+          ENV['BUILDKITE_BRANCH']
         else
           _raw_branch_output
         end
@@ -176,6 +183,8 @@ module Percy
           ENV['CI_PULL_REQUEST']
         when :semaphore
           ENV['PULL_REQUEST_NUMBER']
+        when :buildkite
+          ENV['BUILDKITE_PULL_REQUEST'] if ENV['BUILDKITE_PULL_REQUEST'] != 'false'
         end
       end
 
@@ -193,6 +202,8 @@ module Percy
           ENV['CI_BUILD_NUMBER']
         when :semaphore
           ENV['SEMAPHORE_BUILD_NUMBER']
+        when :buildkite
+          ENV['BUILDKITE_BUILD_ID']
         end
       end
 

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '1.8.0'
+    VERSION = '1.9.0'
   end
 end

data/spec/lib/percy/client/environment_spec.rb

@@ -60,6 +60,13 @@ RSpec.describe Percy::Client::Environment do
     ENV['SEMAPHORE_BUILD_NUMBER'] = nil
     ENV['SEMAPHORE_CURRENT_THREAD'] = nil
     ENV['PULL_REQUEST_NUMBER'] = nil
+
+    # Unset Buildkite CI vars
+    ENV['BUILDKITE'] = nil
+    ENV['BUILDKITE_COMMIT'] = nil
+    ENV['BUILDKITE_BRANCH'] = nil
+    ENV['BUILDKITE_PULL_REQUEST'] = nil
+    ENV['BUILDKITE_BUILD_ID'] = nil
   end
 
   before(:each) do
@@ -364,6 +371,41 @@ RSpec.describe Percy::Client::Environment do
       end
     end
   end
+  context 'in Buildkite' do
+    before(:each) do
+      ENV['BUILDKITE'] = 'true'
+      ENV['BUILDKITE_COMMIT'] = 'buildkite-commit-sha'
+      ENV['BUILDKITE_BRANCH'] = 'buildkite-branch'
+      ENV['BUILDKITE_PULL_REQUEST'] = 'false'
+      ENV['BUILDKITE_BUILD_ID'] = 'buildkite-build-id'
+    end
+
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:buildkite)
+      expect(Percy::Client::Environment.branch).to eq('buildkite-branch')
+      expect(Percy::Client::Environment._commit_sha).to eq('buildkite-commit-sha')
+      expect(Percy::Client::Environment.pull_request_number).to be_nil
+      expect(Percy::Client::Environment.repo).to eq('percy/percy-client')  # From git, not env.
+      expect(Percy::Client::Environment.parallel_nonce).to eq('buildkite-build-id')
+      expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+    end
+    context 'Pull Request build' do
+      before(:each) do
+        ENV['BUILDKITE_PULL_REQUEST'] = '123'
+      end
+      it 'has the correct properties' do
+        expect(Percy::Client::Environment.pull_request_number).to eq('123')
+      end
+    end
+    context 'UI-triggered HEAD build' do
+      before(:each) do
+        ENV['BUILDKITE_COMMIT'] = 'HEAD'
+      end
+      it 'has the correct properties' do
+        expect(Percy::Client::Environment._commit_sha).to be_nil
+      end
+    end
+  end
   describe 'local git repo methods' do
     describe '#commit' do
       it 'returns current local commit data' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Perceptual Inc.