percy-client 1.13.7 → 1.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 679ab5cb622bcd8363fbc9145dce6e533cc5d887
-  data.tar.gz: 2847774e6745adc368a9cd5c2519190057290f4f
+  metadata.gz: bf2ad29ea7519dca29107bb4730ce63b01209658
+  data.tar.gz: d0537050170ed7da2ae408d8e587b8e2a8b4de0c
 SHA512:
-  metadata.gz: 1aec137240ec78d0f293fde22542553c312a0d3a4955abd846d9c30d4d585ec77c794b63df2b8e96046187441d249adc879db920bc2937a7b4e71babafe6225b
-  data.tar.gz: ed66d35eb25c182def63139abe20929fcfe541aa5dda061519a09e7c3aec7397f14f5e5e2f1e7f0d8074cc7b137732742db3a0ce3c05c57d55498239659d3a2c
+  metadata.gz: cb995b91309f0289a1e823fa2ce9268a7d25649043085a3e71c6fd8c23fcd78461e73b101d4d1b0bcc465aa31037791f0b9d0d920aada58de6565d6bfe885599
+  data.tar.gz: 61aca7740b14dc0f72a19cd62649e89358e65cc6fce77e4bc3d8b541d25b2d9a15e75cb318c03a1954eb175e9f9afe5be404675168addc339148380659413395

data/lib/percy/client/environment.rb

@@ -29,16 +29,14 @@ module Percy
       # @return [Hash] All commit data from the current commit. Might be empty if commit data could
       # not be found.
       def self.commit
-        output = _raw_commit_output(_commit_sha) if _commit_sha
-        output ||= _raw_commit_output('HEAD')
-        return {branch: branch} unless output && output != ''
-        output = output.force_encoding('UTF-8') if output && output.encoding.to_s == 'US-ASCII'
+        # Try getting data from git itself.
+        # If this has a result, it means git is present in the system.
+        git_data_from_git = _git_commit_output
 
-        # Use the specified SHA or, if not given, the parsed SHA at HEAD.
-        commit_sha = _commit_sha || (output && output.match(/COMMIT_SHA:(.*)/) || [])[1]
+        parse = ->(regex) { (git_data_from_git && git_data_from_git.match(regex) || [])[1] }
+
+        commit_sha = _commit_sha || parse.call(/COMMIT_SHA:(.*)/)
 
-        # If not running in a git repo, allow nils for certain commit attributes.
-        parse = ->(regex) { (output && output.match(regex) || [])[1] }
         {
           # The only required attribute:
           branch: branch,
@@ -46,10 +44,11 @@ module Percy
           sha: commit_sha,
 
           # Optional attributes:
-          message: parse.call(/COMMIT_MESSAGE:(.*)/m),
-          committed_at: parse.call(/COMMITTED_DATE:(.*)/),
-          # These GIT_ environment vars are from the Jenkins Git Plugin, but could be
+          # If we have the git information, read from those rather than env vars.
+          # The GIT_ environment vars are from the Jenkins Git Plugin, but could be
           # used generically. This behavior may change in the future.
+          message: parse.call(/COMMIT_MESSAGE:(.*)/),
+          committed_at: parse.call(/COMMITTED_DATE:(.*)/),
           author_name: parse.call(/AUTHOR_NAME:(.*)/) || ENV['GIT_AUTHOR_NAME'],
           author_email: parse.call(/AUTHOR_EMAIL:(.*)/) || ENV['GIT_AUTHOR_EMAIL'],
           committer_name: parse.call(/COMMITTER_NAME:(.*)/) || ENV['GIT_COMMITTER_NAME'],
@@ -57,6 +56,16 @@ module Percy
         }
       end
 
+      # @private
+      def self._git_commit_output
+        raw_git_output = _raw_commit_output(_commit_sha) if _commit_sha
+        raw_git_output ||= _raw_commit_output('HEAD')
+        if raw_git_output && raw_git_output.encoding.to_s == 'US-ASCII'
+          raw_git_output = raw_git_output.force_encoding('UTF-8')
+        end
+        raw_git_output
+      end
+
       # @private
       def self._commit_sha
         return ENV['PERCY_COMMIT'] if ENV['PERCY_COMMIT']

data/lib/percy/client/version.rb

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

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

@@ -503,25 +503,39 @@ RSpec.describe Percy::Client::Environment do
   describe 'local git repo methods' do
     describe '#commit' do
       it 'returns current local commit data' do
+        raw_git_output = "COMMIT_SHA:sweetsha\n" \
+        "AUTHOR_NAME:LC\n" \
+        "AUTHOR_EMAIL:foobar@gmail.com\n" \
+        "COMMITTER_NAME:LC\n" \
+        "COMMITTER_EMAIL:foobar@gmail.com\n" \
+        "COMMITTED_DATE:444-44-44 44:44:44 -0700\n" \
+        'COMMIT_MESSAGE:wow how cool is this commit'
+        expect(Percy::Client::Environment).to receive(:_git_commit_output).once.and_return(
+          raw_git_output,
+        )
+
         commit = Percy::Client::Environment.commit
+
         expect(commit[:branch]).to_not be_empty
-        expect(commit[:sha]).to_not be_empty
-        expect(commit[:sha].length).to eq(40)
+        expect(commit[:sha]).to eq('sweetsha')
 
-        expect(commit[:author_email]).to match(/.+@.+\..+/)
-        expect(commit[:author_name]).to_not be_empty
-        expect(commit[:committed_at]).to_not be_empty
-        expect(commit[:committer_email]).to_not be_empty
-        expect(commit[:committer_name]).to_not be_empty
-        expect(commit[:message]).to_not be_empty
+        expect(commit[:author_email]).to eq('foobar@gmail.com')
+        expect(commit[:author_name]).to eq('LC')
+        expect(commit[:committed_at]).to eq('444-44-44 44:44:44 -0700')
+        expect(commit[:committer_email]).to eq('foobar@gmail.com')
+        expect(commit[:committer_name]).to eq('LC')
+        expect(commit[:message]).to eq('wow how cool is this commit')
       end
 
-      it 'returns only branch if commit data cannot be found' do
-        expect(Percy::Client::Environment).to receive(:_raw_commit_output).once.and_return(nil)
+      it 'returns data from environment if commit data cannot be found' do
+        ENV['PERCY_BRANCH'] = 'the-coolest-branch'
+        ENV['PERCY_COMMIT'] = 'agreatsha'
+
+        expect(Percy::Client::Environment).to receive(:_git_commit_output).once.and_return(nil)
 
         commit = Percy::Client::Environment.commit
-        expect(commit[:branch]).to be
-        expect(commit[:sha]).to be_nil
+        expect(commit[:branch]).to eq('the-coolest-branch')
+        expect(commit[:sha]).to eq('agreatsha')
 
         expect(commit[:author_email]).to be_nil
         expect(commit[:author_name]).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.13.7
+  version: 1.13.8
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday