percy-client 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2def872d86cf0afbde064ca9577703edacfb99a7
-  data.tar.gz: 1a92c9b20983c00800a72d201ee88e0dfaa28d74
+  metadata.gz: 8a651ce1bbf67920df1daa189a18a7894da46b1f
+  data.tar.gz: c29f76e3af43125d1863ca2f16f3d2fb3132bdc2
 SHA512:
-  metadata.gz: 57f341a02d1cdadd2c19f191cf8f00b4ab3c354bb2b98ef46fb25fad3a5c412a6af64e296f1f2a4b02b1dc7982c8b57f128415669ce0b0a3d0d53e8f189bd00f
-  data.tar.gz: a082d0bb77e2e77470f2d124fe15e92d0ea333f740191293bd2123a236f82507f6d07fbfeaedec2f0e407846ee6175009071f0cad0bd5dbb4df91175a8cc36e9
+  metadata.gz: 1e6b08f666ae778440a40afa49e4070cb5d18515b3d93e2e2abf9d3386d379738d79c802863b14087d27f7ecefba25198c2e37054935553a93f1f60095aad262
+  data.tar.gz: 696a2ab779b0cb1e9da0e51d67a289c484bf30b2cd894312ade5420252e1b3ae4337d6eb4364e4a177834707bfe958fb658f27479bd1fa6e146e909fd81f4b6b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    percy-client (1.7.0)
+    percy-client (1.8.0)
       faraday (>= 0.9)
       httpclient (>= 2.6)
 
@@ -34,7 +34,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hitimes (1.2.2)
-    httpclient (2.8.2.2)
+    httpclient (2.8.2.4)
     listen (2.10.0)
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)

data/lib/percy/client/environment.rb

@@ -62,7 +62,11 @@ module Percy
           # Pull Request Builder Plugin OR Git Plugin.
           ENV['ghprbActualCommit'] || ENV['GIT_COMMIT']
         when :travis
-          ENV['TRAVIS_COMMIT']
+          if pull_request_number
+            ENV['TRAVIS_PULL_REQUEST_SHA']
+          else
+            ENV['TRAVIS_COMMIT']
+          end
         when :circle
           ENV['CIRCLE_SHA1']
         when :codeship
@@ -90,13 +94,8 @@ module Percy
         when :jenkins
           ENV['ghprbTargetBranch']
         when :travis
-          # Note: this is very unfortunately necessary because Travis does not expose the head
-          # branch, only the targeted 'master' branch in TRAVIS_BRANCH, with no way to get the
-          # actual head branch of the PR. We create a fake branch name so that Percy does not
-          # mistake this PR as a new master build.
-          # https://github.com/travis-ci/travis-ci/issues/1633#issuecomment-194749671
-          if pull_request_number && ENV['TRAVIS_BRANCH'] == 'master'
-            "github-pr-#{pull_request_number}"
+          if pull_request_number
+            ENV['TRAVIS_PULL_REQUEST_BRANCH']
           else
             ENV['TRAVIS_BRANCH']
           end
@@ -212,7 +211,8 @@ module Percy
           var = 'CI_NODE_TOTAL'
           Integer(ENV[var]) if ENV[var] && !ENV[var].empty?
         when :semaphore
-          Integer(ENV['SEMAPHORE_THREAD_COUNT'])
+          var = 'SEMAPHORE_THREAD_COUNT'
+          Integer(ENV[var]) if ENV[var] && !ENV[var].empty?
         end
       end
 

data/lib/percy/client/version.rb

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

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

@@ -20,7 +20,7 @@ RSpec.describe Percy::Client::Builds, :vcr do
               'commit-committer-name' => kind_of(String),
               'commit-committer-email' => kind_of(String),
               'commit-message' => kind_of(String),
-              'pull-request-number' => nil,
+              'pull-request-number' => anything,
               'parallel-nonce' => nil,
               'parallel-total-shards' => nil,
             },

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

@@ -16,6 +16,8 @@ RSpec.describe Percy::Client::Environment do
     ENV['TRAVIS_COMMIT'] = nil
     ENV['TRAVIS_BRANCH'] = nil
     ENV['TRAVIS_PULL_REQUEST'] = nil
+    ENV['TRAVIS_PULL_REQUEST_BRANCH'] = nil
+    ENV['TRAVIS_PULL_REQUEST_SHA'] = nil
     ENV['TRAVIS_REPO_SLUG'] = nil
     ENV['CI_NODE_TOTAL'] = nil
 
@@ -67,6 +69,8 @@ RSpec.describe Percy::Client::Environment do
       'TRAVIS_COMMIT' => ENV['TRAVIS_COMMIT'],
       'TRAVIS_BRANCH' => ENV['TRAVIS_BRANCH'],
       'TRAVIS_PULL_REQUEST' => ENV['TRAVIS_PULL_REQUEST'],
+      'TRAVIS_PULL_REQUEST_BRANCH' => ENV['TRAVIS_PULL_REQUEST_BRANCH'],
+      'TRAVIS_PULL_REQUEST_SHA' => ENV['TRAVIS_PULL_REQUEST_SHA'],
       'TRAVIS_REPO_SLUG' => ENV['TRAVIS_REPO_SLUG'],
     }
     clear_env_vars
@@ -78,6 +82,8 @@ RSpec.describe Percy::Client::Environment do
     ENV['TRAVIS_COMMIT'] = @original_env['TRAVIS_COMMIT']
     ENV['TRAVIS_BRANCH'] = @original_env['TRAVIS_BRANCH']
     ENV['TRAVIS_PULL_REQUEST'] = @original_env['TRAVIS_PULL_REQUEST']
+    ENV['TRAVIS_PULL_REQUEST_BRANCH'] = @original_env['TRAVIS_PULL_REQUEST_BRANCH']
+    ENV['TRAVIS_PULL_REQUEST_SHA'] = @original_env['TRAVIS_PULL_REQUEST_SHA']
     ENV['TRAVIS_REPO_SLUG'] = @original_env['TRAVIS_REPO_SLUG']
   end
 
@@ -200,86 +206,56 @@ RSpec.describe Percy::Client::Environment do
       ENV['ghprbActualCommit'] = 'jenkins-actual-commit'
     end
 
-    describe '#current_ci' do
-      it 'is :jenkins' do
-        expect(Percy::Client::Environment.current_ci).to eq(:jenkins)
-      end
-    end
-    describe '#branch' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.branch).to eq('jenkins-target-branch')
-      end
-    end
-    describe '#_commit_sha' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment._commit_sha).to eq('jenkins-actual-commit')
-      end
-    end
-    describe '#pull_request_number' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.pull_request_number).to eq('123')
-      end
-    end
-    describe '#repo' do
-      it 'returns the current local repo name' do
-        expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
-      end
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:jenkins)
+      expect(Percy::Client::Environment.branch).to eq('jenkins-target-branch')
+      expect(Percy::Client::Environment._commit_sha).to eq('jenkins-actual-commit')
+      expect(Percy::Client::Environment.pull_request_number).to eq('123')
+      expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
     end
   end
   context 'in Travis CI' do
     before(:each) do
       ENV['TRAVIS_BUILD_ID'] = '1234'
       ENV['TRAVIS_BUILD_NUMBER'] = 'build-number'
-      ENV['TRAVIS_PULL_REQUEST'] = '256'
+      ENV['TRAVIS_PULL_REQUEST'] = 'false'
+      ENV['TRAVIS_PULL_REQUEST_BRANCH'] = ''
+      ENV['TRAVIS_PULL_REQUEST_SHA'] = ''
       ENV['TRAVIS_REPO_SLUG'] = 'travis/repo-slug'
       ENV['TRAVIS_COMMIT'] = 'travis-commit-sha'
       ENV['TRAVIS_BRANCH'] = 'travis-branch'
-      ENV['CI_NODE_TOTAL'] = '3'
+      ENV['CI_NODE_TOTAL'] = ''
     end
 
-    describe '#current_ci' do
-      it 'is :travis' do
-        expect(Percy::Client::Environment.current_ci).to eq(:travis)
-      end
-    end
-    describe '#branch' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.branch).to eq('travis-branch')
-      end
-      it 'renames the Percy branch if this is a PR with an unknown head branch' do
-        # Special Travis-only behavior, see note in branch method.
-        ENV['TRAVIS_BRANCH'] = 'master'
-        expect(Percy::Client::Environment.branch).to eq('github-pr-256')
-      end
-    end
-    describe '#_commit_sha' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment._commit_sha).to eq('travis-commit-sha')
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:travis)
+      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
+      expect(Percy::Client::Environment.repo).to eq('travis/repo-slug')
+      expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
+      expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+    end
+    context 'Pull Request build' do
+      before(:each) do
+        ENV['TRAVIS_PULL_REQUEST'] = '256'
+        ENV['TRAVIS_PULL_REQUEST_BRANCH'] = 'travis-pr-branch'
+        ENV['TRAVIS_PULL_REQUEST_SHA'] = 'travis-pr-head-commit-sha'
       end
-    end
-    describe '#pull_request_number' do
-      it 'reads from the CI environment' do
+      it 'has the correct properties' do
+        expect(Percy::Client::Environment.branch).to eq('travis-pr-branch')
+        expect(Percy::Client::Environment._commit_sha).to eq('travis-pr-head-commit-sha')
         expect(Percy::Client::Environment.pull_request_number).to eq('256')
       end
     end
-    describe '#repo' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.repo).to eq('travis/repo-slug')
+    context 'parallel build' do
+      before(:each) do
+        ENV['CI_NODE_TOTAL'] = '3'
       end
-    end
-    describe '#parallel_nonce' do
-      it 'reads from the CI environment (the CI build number)' do
+      it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
-      end
-    end
-    describe '#parallel_total_shards' do
-      it 'reads from the CI environment (the number of nodes)' do
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
-      it 'is nil if empty' do
-        ENV['CI_NODE_TOTAL'] = ''
-        expect(Percy::Client::Environment.parallel_total_shards).to be_nil
-      end
     end
   end
   context 'in Circle CI' do
@@ -290,48 +266,26 @@ RSpec.describe Percy::Client::Environment do
       ENV['CIRCLE_PROJECT_USERNAME'] = 'circle'
       ENV['CIRCLE_PROJECT_REPONAME'] = 'repo-name'
       ENV['CIRCLE_BUILD_NUM'] = 'build-number'
-      ENV['CIRCLE_NODE_TOTAL'] = '2'
+      ENV['CIRCLE_NODE_TOTAL'] = ''
       ENV['CI_PULL_REQUESTS'] = 'https://github.com/owner/repo-name/pull/123'
     end
 
-    describe '#current_ci' do
-      it 'is :circle' do
-        expect(Percy::Client::Environment.current_ci).to eq(:circle)
-      end
-    end
-    describe '#branch' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.branch).to eq('circle-branch')
-      end
-    end
-    describe '#_commit_sha' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment._commit_sha).to eq('circle-commit-sha')
-      end
-    end
-
-    describe '#pull_request_number' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.pull_request_number).to eq('123')
-      end
-    end
-    describe '#repo' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.repo).to eq('circle/repo-name')
-      end
-    end
-    describe '#parallel_nonce' do
-      it 'reads from the CI environment (the CI build number)' do
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:circle)
+      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')
+      expect(Percy::Client::Environment.repo).to eq('circle/repo-name')
+      expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
+      expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+    end
+    context 'parallel build' do
+      before(:each) do
+        ENV['CIRCLE_NODE_TOTAL'] = '3'
+      end
+      it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
-      end
-    end
-    describe '#parallel_total_shards' do
-      it 'reads from the CI environment (the number of nodes)' do
-        expect(Percy::Client::Environment.parallel_total_shards).to eq(2)
-      end
-      it 'is nil if empty' do
-        ENV['CIRCLE_NODE_TOTAL'] = ''
-        expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+        expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end
@@ -342,47 +296,26 @@ RSpec.describe Percy::Client::Environment do
       ENV['CI_BUILD_NUMBER'] = 'codeship-build-number'
       ENV['CI_PULL_REQUEST'] = 'false'  # This is always false on Codeship, unfortunately.
       ENV['CI_COMMIT_ID'] = 'codeship-commit-sha'
-      ENV['CI_NODE_TOTAL'] = '3'
+      ENV['CI_NODE_TOTAL'] = ''
     end
 
-    describe '#current_ci' do
-      it 'is :codeship' do
-        expect(Percy::Client::Environment.current_ci).to eq(:codeship)
-      end
-    end
-    describe '#branch' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.branch).to eq('codeship-branch')
-      end
-    end
-    describe '#_commit_sha' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment._commit_sha).to eq('codeship-commit-sha')
-      end
-    end
-    describe '#pull_request_number' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.pull_request_number).to be_nil
-      end
-    end
-    describe '#repo' do
-      it 'returns the current local repo name' do
-        expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
-      end
-    end
-    describe '#parallel_nonce' do
-      it 'reads from the CI environment (the CI build number)' do
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:codeship)
+      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
+      expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
+      expect(Percy::Client::Environment.parallel_nonce).to eq('codeship-build-number')
+      expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+    end
+    context 'parallel build' do
+      before(:each) do
+        ENV['CI_NODE_TOTAL'] = '3'
+      end
+      it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('codeship-build-number')
-      end
-    end
-    describe '#parallel_total_shards' do
-      it 'reads from the CI environment (the number of nodes)' do
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
-      it 'is nil if empty' do
-        ENV['CI_NODE_TOTAL'] = ''
-        expect(Percy::Client::Environment.parallel_total_shards).to be_nil
-      end
     end
   end
   context 'in Drone' do
@@ -393,30 +326,12 @@ RSpec.describe Percy::Client::Environment do
       ENV['CI_PULL_REQUEST'] = '123'
     end
 
-    describe '#current_ci' do
-      it 'is :drone' do
-        expect(Percy::Client::Environment.current_ci).to eq(:drone)
-      end
-    end
-    describe '#branch' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.branch).to eq('drone-branch')
-      end
-    end
-    describe '#_commit_sha' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment._commit_sha).to eq('drone-commit-sha')
-      end
-    end
-    describe '#pull_request_number' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.pull_request_number).to eq('123')
-      end
-    end
-    describe '#repo' do
-      it 'returns the current local repo name' do
-        expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
-      end
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:drone)
+      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')
+      expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
     end
   end
   context 'in Semaphore CI' do
@@ -426,44 +341,26 @@ RSpec.describe Percy::Client::Environment do
       ENV['REVISION'] = 'semaphore-commit-sha'
       ENV['SEMAPHORE_REPO_SLUG'] = 'repo-owner/repo-name'
       ENV['SEMAPHORE_BUILD_NUMBER'] = 'semaphore-build-number'
-      ENV['SEMAPHORE_THREAD_COUNT'] = '2'
+      ENV['SEMAPHORE_THREAD_COUNT'] = ''
       ENV['PULL_REQUEST_NUMBER'] = '123'
     end
 
-    describe '#current_ci' do
-      it 'is :semaphore' do
-        expect(Percy::Client::Environment.current_ci).to eq(:semaphore)
-      end
-    end
-    describe '#branch' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.branch).to eq('semaphore-branch')
-      end
-    end
-    describe '#_commit_sha' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment._commit_sha).to eq('semaphore-commit-sha')
-      end
-    end
-
-    describe '#pull_request_number' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.pull_request_number).to eq('123')
-      end
-    end
-    describe '#repo' do
-      it 'reads from the CI environment' do
-        expect(Percy::Client::Environment.repo).to eq('repo-owner/repo-name')
-      end
-    end
-    describe '#parallel_nonce' do
-      it 'reads from the CI environment (the CI build number)' do
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:semaphore)
+      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')
+      expect(Percy::Client::Environment.repo).to eq('repo-owner/repo-name')
+      expect(Percy::Client::Environment.parallel_nonce).to eq('semaphore-build-number')
+      expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+    end
+    context 'parallel build' do
+      before(:each) do
+        ENV['SEMAPHORE_THREAD_COUNT'] = '3'
+      end
+      it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('semaphore-build-number')
-      end
-    end
-    describe '#parallel_total_shards' do
-      it 'reads from the CI environment (the number of nodes)' do
-        expect(Percy::Client::Environment.parallel_total_shards).to eq(2)
+        expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday