percy-client 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 786c3912f514917d00d4800f145b38840a6249428a6643d3d618166698b21962
-  data.tar.gz: 54e3fb3b19fbe27b94cddf6123e6b1718f60974887f30bbf1d315070ba28c2de
+SHA1:
+  metadata.gz: '059d2c2debca0b120960077ae094f60833105028'
+  data.tar.gz: ac1f28ab489a811a14e5557a47d84e951ddf7c75
 SHA512:
-  metadata.gz: 76ec81679f4c59332a2d672f8395f4ad28f20c0d3fb9d5cd2244895f6c08902e02fbd4ee0943c5b6bec80eed4345333bbd5792751b8e4e8a8cbb3543558427a3
-  data.tar.gz: 708df3a6f17796f96430481faf93966af018b08efe621f18393549928037e0589a1cec1634072d29ec46673deca44a6e3e798d6db6c28208deb1798686e78eba
+  metadata.gz: 704386465de40fc8c1dc024fd856022f2200ae4981a9879b39a5d67d59fd07a2ae793cfd03ec96c2b43a1f663f4f41da16b7a541bb1fecf14cff46cf7938febb
+  data.tar.gz: e952bea0d6863372cfdfbe701bf248fdc1ff41310f49119872b711c8ded4a6e399eb259714aae64b0ecd9e041a07208038bd56a5db790c2ae3b95b6df92a8b48

data/RELEASING.md

@@ -11,6 +11,10 @@ bundle exec rake build
 gem push pkg/percy-client-1.XX.XX.gem
 ```
 
+_The gem cli will prompt you for email and password. Find the
+rubygems.org credentials for apps+rubygems@percy.io in the Engineering
+vault._
+
 * Announce the new release,
    making sure to say "thank you" to the contributors
    who helped shape this version!

data/lib/percy/client/connection.rb

@@ -127,7 +127,7 @@ module Percy
           environment = [
             environment_info,
             "ruby/#{_ruby_version}",
-            Percy::Client::Environment.current_ci,
+            Percy::Client::Environment.ci_info,
           ].compact.join('; ')
 
           "#{client} (#{environment})"

data/lib/percy/client/environment.rb

@@ -23,7 +23,16 @@ module Percy
         return :drone if ENV['DRONE'] == 'true'
         return :semaphore if ENV['SEMAPHORE'] == 'true'
         return :buildkite if ENV['BUILDKITE'] == 'true'
-        return :gitlab if ENV['GITLAB_CI']
+        return :gitlab if ENV['GITLAB_CI'] == 'true'
+      end
+
+      def self.ci_version
+        return unless current_ci == :gitlab
+        ENV['CI_SERVER_VERSION']
+      end
+
+      def self.ci_info
+        [current_ci, ci_version].compact.join('/')
       end
 
       # @return [Hash] All commit data from the current commit. Might be empty if commit data could
@@ -89,7 +98,7 @@ module Percy
           return if ENV['BUILDKITE_COMMIT'] == 'HEAD'
           ENV['BUILDKITE_COMMIT']
         when :gitlab
-          ENV['CI_BUILD_REF']
+          ENV['CI_COMMIT_SHA']
         end
       end
 
@@ -133,7 +142,7 @@ module Percy
         when :buildkite
           ENV['BUILDKITE_BRANCH']
         when :gitlab
-          ENV['CI_BUILD_REF_NAME']
+          ENV['CI_COMMIT_REF_NAME']
         else
           _raw_branch_output
         end
@@ -233,7 +242,7 @@ module Percy
         when :buildkite
           ENV['BUILDKITE_BUILD_ID']
         when :gitlab
-          ENV['CI_BUILD_ID']
+          ENV['CI_JOB_ID']
         end
       end
 

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '1.14.1'.freeze
+    VERSION = '1.15.0'.freeze
   end
 end

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

@@ -1,14 +1,15 @@
 RSpec.describe Percy::Client::Connection do
   let(:user_agent) do
     "Percy/#{api_version} #{client_info} percy-client/#{Percy::Client::VERSION} "\
-    "(#{environment_info}; ruby/#{ruby_version}; #{ci_name})"
+    "(#{environment_info}; ruby/#{ruby_version}; #{ci_name}/#{ci_version})"
   end
   let(:content_type) { 'application/vnd.api+json' }
   let(:api_version) { 'v1' }
   let(:ruby_version) { '2.2.6p396' }
   let(:client_info) { 'percy-capybara/3.1.0' }
   let(:environment_info) { 'Rails/4.2.1' }
-  let(:ci_name) { 'buildkite' }
+  let(:ci_name) { :gitlab }
+  let(:ci_version) { '8.14.3-ee' }
   let(:uri) { "#{Percy.config.api_url}/test" }
 
   shared_examples_for 'a connection that sets headers with HTTP method' do |http_method|
@@ -24,6 +25,7 @@ RSpec.describe Percy::Client::Connection do
       expect(Percy.client).to receive(:environment_info).and_return(environment_info)
 
       expect(Percy::Client::Environment).to receive(:current_ci).and_return(ci_name)
+      expect(Percy::Client::Environment).to receive(:ci_version).and_return(ci_version)
 
       expect(response).to eq('foo' => true)
     end

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

@@ -72,9 +72,9 @@ RSpec.describe Percy::Client::Environment do
 
     # Unset Gitlab CI vars.
     ENV['GITLAB_CI'] = nil
-    ENV['CI_BUILD_REF'] = nil
-    ENV['CI_BUILD_REF_NAME'] = nil
-    ENV['CI_BUILD_ID'] = nil
+    ENV['CI_COMMIT_REF'] = nil
+    ENV['CI_COMMIT_REF_NAME'] = nil
+    ENV['CI_JOB_ID'] = nil
   end
 
   before(:each) do
@@ -263,6 +263,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:jenkins)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       expect(Percy::Client::Environment.branch).to eq('jenkins-source-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('jenkins-actual-commit')
       expect(Percy::Client::Environment.pull_request_number).to eq('256')
@@ -286,6 +287,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:travis)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       expect(Percy::Client::Environment.branch).to eq('travis-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('travis-commit-sha')
       expect(Percy::Client::Environment.pull_request_number).to be_nil
@@ -333,6 +335,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:circle)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       expect(Percy::Client::Environment.branch).to eq('circle-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('circle-commit-sha')
       expect(Percy::Client::Environment.pull_request_number).to eq('123')
@@ -365,6 +368,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:codeship)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       expect(Percy::Client::Environment.branch).to eq('codeship-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('codeship-commit-sha')
       expect(Percy::Client::Environment.pull_request_number).to be_nil
@@ -395,6 +399,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:drone)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       expect(Percy::Client::Environment.branch).to eq('drone-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('drone-commit-sha')
       expect(Percy::Client::Environment.pull_request_number).to eq('123')
@@ -416,6 +421,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:semaphore)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       expect(Percy::Client::Environment.branch).to eq('semaphore-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('semaphore-commit-sha')
       expect(Percy::Client::Environment.pull_request_number).to eq('123')
@@ -450,6 +456,7 @@ RSpec.describe Percy::Client::Environment do
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:buildkite)
+      expect(Percy::Client::Environment.ci_version).to eq(nil)
       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
@@ -489,14 +496,16 @@ RSpec.describe Percy::Client::Environment do
 
   context 'when in Gitlab CI' do
     before(:each) do
-      ENV['GITLAB_CI'] = 'yes'
-      ENV['CI_BUILD_REF'] = 'gitlab-commit-sha'
-      ENV['CI_BUILD_REF_NAME'] = 'gitlab-branch'
-      ENV['CI_BUILD_ID'] = 'gitlab-build-id'
+      ENV['GITLAB_CI'] = 'true'
+      ENV['CI_COMMIT_SHA'] = 'gitlab-commit-sha'
+      ENV['CI_COMMIT_REF_NAME'] = 'gitlab-branch'
+      ENV['CI_JOB_ID'] = 'gitlab-build-id'
+      ENV['CI_SERVER_VERSION'] = '8.14.3-ee'
     end
 
     it 'has the correct properties' do
       expect(Percy::Client::Environment.current_ci).to eq(:gitlab)
+      expect(Percy::Client::Environment.ci_version).to eq('8.14.3-ee')
       expect(Percy::Client::Environment.branch).to eq('gitlab-branch')
       expect(Percy::Client::Environment._commit_sha).to eq('gitlab-commit-sha')
       expect(Percy::Client::Environment.pull_request_number).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Percy::Client