percy-client 1.13.6 → 1.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd84cf9ac38282cc0057f714197b65e0e75a8122
-  data.tar.gz: 01f640d98197a7e4a34b0f09b33d31e8e05e7900
+  metadata.gz: 679ab5cb622bcd8363fbc9145dce6e533cc5d887
+  data.tar.gz: 2847774e6745adc368a9cd5c2519190057290f4f
 SHA512:
-  metadata.gz: 015eec97ba845a645d0a9e3f309bc4542746bc101970ae5506a6c40df5444d7948393166361a4206e33683584cc0b57d97c9a50cb5e323dc408f5b3a781e14c3
-  data.tar.gz: 5513c0a98c57e71cb980f33373d2f0aa447bd4bbdd680cebc6af1ead78c01b9af58415429d3a6f3658a006a187a7a0d4d2263a8eac1a56179671bda28a432da3
+  metadata.gz: 1aec137240ec78d0f293fde22542553c312a0d3a4955abd846d9c30d4d585ec77c794b63df2b8e96046187441d249adc879db920bc2937a7b4e71babafe6225b
+  data.tar.gz: ed66d35eb25c182def63139abe20929fcfe541aa5dda061519a09e7c3aec7397f14f5e5e2f1e7f0d8074cc7b137732742db3a0ce3c05c57d55498239659d3a2c

data/.rubocop.yml

@@ -4,4 +4,7 @@ inherit_gem:
 
 RSpec/InstanceVariable:
   Exclude:
-    - spec/lib/percy/client/environment_spec.rb
+    - spec/lib/percy/client/environment_spec.rb
+
+AllCops:
+  TargetRubyVersion: 2.1

data/.travis.yml

@@ -11,7 +11,9 @@ rvm:
   - ruby-2.2.6
   - ruby-2.3.3
   - ruby-2.4.0
-  - ruby-head
+  - ruby-2.5.0
+  # ruby-head is now 2.6dev. Installation fails.
+  # - ruby-head
 before_install:
   - gem update --system
   - gem update bundler

data/appveyor.yml

@@ -1,5 +1,8 @@
 environment:
   matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 23
     - RUBY_VERSION: 22
     - RUBY_VERSION: 21
 

data/lib/percy/client/environment.rb

@@ -31,10 +31,11 @@ module Percy
       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'
 
         # Use the specified SHA or, if not given, the parsed SHA at HEAD.
-        commit_sha = _commit_sha || output && output.match(/COMMIT_SHA:(.*)/)[1]
+        commit_sha = _commit_sha || (output && output.match(/COMMIT_SHA:(.*)/) || [])[1]
 
         # If not running in a git repo, allow nils for certain commit attributes.
         parse = ->(regex) { (output && output.match(regex) || [])[1] }
@@ -129,8 +130,8 @@ module Percy
         end
 
         if result == ''
-          STDERR.puts '[percy] Warning: not in a git repo, setting PERCY_BRANCH to "master".'
-          result = 'master'
+          STDERR.puts '[percy] Warning: not in a git repo, no branch detected.'
+          result = nil
         end
         result
       end
@@ -143,7 +144,11 @@ module Percy
       # @private
       def self._raw_branch_output
         # Discover from local git repo branch name.
-        `git rev-parse --abbrev-ref HEAD 2> /dev/null`.strip
+        if Gem.win_platform?
+          `git rev-parse --abbrev-ref HEAD 2> NUL`.strip
+        else
+          `git rev-parse --abbrev-ref HEAD 2> /dev/null`.strip
+        end
       end
       class << self; private :_raw_branch_output; end
 

data/lib/percy/client/version.rb

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

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

@@ -111,9 +111,9 @@ RSpec.describe Percy::Client::Environment do
     end
 
     describe '#branch' do
-      it 'returns master if not in a git repo' do
+      it 'returns nil if not in a git repo' do
         expect(Percy::Client::Environment).to receive(:_raw_branch_output).and_return('')
-        expect(Percy::Client::Environment.branch).to eq('master')
+        expect(Percy::Client::Environment.branch).to be_nil
       end
 
       it 'reads from the current local repo' do

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

@@ -105,3 +105,4 @@ RSpec.describe Percy::Client::Resource do
     end
   end
 end
+# rubocop:enable RSpec/MultipleDescribes

metadata

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