percy-client 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6e5d6a5fc015d71a6d33b4e8d17586d6e549f9
-  data.tar.gz: de697f9395a54014fca4dfdfef708f70e9ddf327
+  metadata.gz: faeea13f560dc02b0e342b7ff1b150f1cb328992
+  data.tar.gz: 66c65cadf25bf1f38c43d8408235aa383dd0649a
 SHA512:
-  metadata.gz: 339be04f0286083660610c13c94993c60cc10e42f28867881bd59039562de5caba17365dc495ac330ab04277ee4941a747d04c00789cbbeb370310264f5d768c
-  data.tar.gz: 7726037097b659e98f2e9d4cc8c62df8cc073d452a3b3f2dce271ed9621ae0981408fc960405bb738e1206952d1d198083567ba9e508977c392732f870e68b0f
+  metadata.gz: c8cdecfd7259f45698e015f57b09c2f7c6800daacaea64c88ba36cf5b905220bedc98a3b5c9141743d15e651ea838f23df1742d5d76dc6884dfbe8c98b4c1c88
+  data.tar.gz: f6c3d6f4f5fa2870c6cde224e954c297ff49b88700cbdd0417a43eadcbada8cd053d2a3aa265a6aa575e5afe019d4b7daeb826fd0eb3c6dc0bc5f5f3012e4198

data/.rubocop.yml

@@ -0,0 +1,67 @@
+require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
+AllCops:
+  Include:
+    - Rakefile
+    - lib/**/*.rake
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Metrics/LineLength:
+  Max: 101
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/CaseIndentation:
+  EnforcedStyle: end
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+# Disable Style/NumericLiterals so numbers don't need underscores
+Style/NumericLiterals:
+  Enabled: false
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+Style/RedundantBegin:
+  Enabled: false
+
+Style/RegexpLiteral:
+  EnforcedStyle: slashes
+  AllowInnerSlashes: true
+
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+
+
+
+
+# Will be able to do this in >= v1.11
+# RSpec/DescribedClass:
+#   EnforcedStyle: explicit

data/.rubocop_todo.yml

@@ -0,0 +1,101 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-02-11 20:36:15 -0800 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/EmptyWhen:
+  Exclude:
+    - 'lib/percy/client/environment.rb'
+
+# Offense count: 13
+Metrics/AbcSize:
+  Max: 65
+
+# Offense count: 24
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 450
+
+# Offense count: 10
+Metrics/CyclomaticComplexity:
+  Max: 14
+
+# Offense count: 1
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 101
+
+# Offense count: 14
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 57
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 220
+
+# Offense count: 6
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 4
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/lib/percy/client/builds_spec.rb'
+    - 'spec/lib/percy/client/snapshots_spec.rb'
+
+# Offense count: 113
+# Configuration parameters: SkipBlocks.
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/lib/percy/client/environment_spec.rb'
+    - 'spec/lib/percy/client_spec.rb'
+    - 'spec/lib/percy_spec.rb'
+
+# Offense count: 22
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/lib/percy/client/builds_spec.rb'
+    - 'spec/lib/percy/client/connection_spec.rb'
+    - 'spec/lib/percy/client/environment_spec.rb'
+    - 'spec/lib/percy/client/resources_spec.rb'
+    - 'spec/lib/percy/client/snapshots_spec.rb'
+    - 'spec/lib/percy/config_spec.rb'
+    - 'spec/lib/percy_spec.rb'
+
+# Offense count: 20
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: implicit, each, example
+RSpec/HookArgument:
+  EnforcedStyle: each
+
+# Offense count: 8
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/lib/percy/client/environment_spec.rb'
+
+# Offense count: 27
+RSpec/MultipleExpectations:
+  Max: 10
+
+# Offense count: 12
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: not_to, to_not
+RSpec/NotToNot:
+  Exclude:
+    - 'spec/lib/percy/client/builds_spec.rb'
+    - 'spec/lib/percy/client/environment_spec.rb'
+    - 'spec/lib/percy_spec.rb'
+
+# Offense count: 1
+Style/MethodMissing:
+  Exclude:
+    - 'lib/percy.rb'

data/.travis.yml

@@ -8,10 +8,13 @@ addons:
     - libgmp-dev
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.1.1
-  - 2.2.2
+  - ruby-2.2.6
+  - ruby-2.3.3
+  - ruby-2.4.0
   - ruby-head
 before_install:
+  - gem update --system
   - gem update bundler
-script: bundle exec rspec
+script:
+  - bundle exec rspec
+  - bundle exec rubocop -D

data/Gemfile

@@ -3,4 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in percy-client.gemspec
 gemspec
 
-gem 'guard-rspec', require: false
+gem 'guard-rspec', require: false
+
+group :test do
+  gem 'rubocop'
+  gem 'rubocop-rspec'
+end

data/Rakefile

@@ -1,2 +1 @@
 require 'bundler/gem_tasks'
-

data/lib/percy.rb

@@ -25,25 +25,29 @@ module Percy
     @logger if defined?(@logger)
     @logger ||= Logger.new(STDOUT)
     @logger.level = config.debug ? Logger::DEBUG : Logger::INFO
-    @logger.formatter = proc do |severity, datetime, progname, msg|
-       "[percy][#{severity}] #{msg}\n"
+    @logger.formatter = proc do |severity, _datetime, _progname, msg|
+      "[percy][#{severity}] #{msg}\n"
     end
     @logger
   end
 
   # @private
-  def self.respond_to_missing?(method_name, include_private = false)
-    client.respond_to?(method_name, include_private)
-  end if RUBY_VERSION >= '1.9'
+  if RUBY_VERSION >= '1.9'
+    def self.respond_to_missing?(method_name, include_private = false)
+      client.respond_to?(method_name, include_private)
+    end
+  end
 
   # @private
-  def self.respond_to?(method_name, include_private = false)
-    client.respond_to?(method_name, include_private) || super
-  end if RUBY_VERSION < '1.9'
+  if RUBY_VERSION < '1.9'
+    def self.respond_to?(method_name, include_private = false)
+      client.respond_to?(method_name, include_private) || super
+    end
+  end
 
   # @private
   def self.method_missing(method_name, *args, &block)
-    return super if !client.respond_to?(method_name)
+    return super unless client.respond_to?(method_name)
     client.send(method_name, *args, &block)
   end
   private :method_missing

data/lib/percy/client.rb

@@ -14,7 +14,7 @@ module Percy
     include Percy::Client::Snapshots
     include Percy::Client::Resources
 
-    class Error < Exception; end
+    class Error < RuntimeError; end
     class TimeoutError < Error; end
     class ConnectionFailed < Error; end
     class HttpError < Error
@@ -32,18 +32,18 @@ module Percy
       end
     end
 
-    class ClientError < HttpError; end  # 4xx;
-    class BadRequestError < ClientError; end  # 400.
-    class UnauthorizedError < ClientError; end  # 401.
-    class PaymentRequiredError < ClientError; end  # 402.
-    class ForbiddenError < ClientError; end  # 403.
+    class ClientError < HttpError; end # 4xx;
+    class BadRequestError < ClientError; end # 400.
+    class UnauthorizedError < ClientError; end # 401.
+    class PaymentRequiredError < ClientError; end # 402.
+    class ForbiddenError < ClientError; end # 403.
     class NotFoundError < ClientError; end  # 404.
     class ConflictError < ClientError; end  # 409.
 
-    class ServerError < HttpError; end  # 5xx.
-    class InternalServerError < ServerError; end  # 500.
-    class BadGatewayError < ServerError; end  # 502.
-    class ServiceUnavailableError < ServerError; end  # 503.
+    class ServerError < HttpError; end # 5xx.
+    class InternalServerError < ServerError; end # 500.
+    class BadGatewayError < ServerError; end # 502.
+    class ServiceUnavailableError < ServerError; end # 503.
 
     attr_reader :config
 

data/lib/percy/client/builds.rb

@@ -14,7 +14,7 @@ module Percy
         # Only pass parallelism data if it all exists and there is more than 1 shard.
         in_parallel_environment = parallel_nonce && \
           parallel_total_shards && parallel_total_shards > 1
-        if !in_parallel_environment
+        unless in_parallel_environment
           parallel_nonce = nil
           parallel_total_shards = nil
         end
@@ -36,18 +36,18 @@ module Percy
               'parallel-nonce' => parallel_nonce,
               'parallel-total-shards' => parallel_total_shards,
             },
-          }
+          },
         }
 
         if resources
-          if !resources.respond_to?(:each)
-            raise ArgumentError.new(
-              'resources argument must be an iterable of Percy::Client::Resource objects')
+          unless resources.respond_to?(:each)
+            raise ArgumentError,
+              'resources argument must be an iterable of Percy::Client::Resource objects'
           end
           relationships_data = {
             'relationships' => {
               'resources' => {
-                'data' => resources.map { |r| r.serialize },
+                'data' => resources.map(&:serialize),
               },
             },
           }
@@ -71,5 +71,3 @@ module Percy
     end
   end
 end
-
-

data/lib/percy/client/connection.rb

@@ -39,12 +39,14 @@ module Percy
             error_class = Percy::Client::BadGatewayError
           when 503
             error_class = Percy::Client::ServiceUnavailableError
-          when CLIENT_ERROR_STATUS_RANGE  # Catchall.
+          when CLIENT_ERROR_STATUS_RANGE # Catchall.
             error_class = Percy::Client::HttpError
           end
+          return unless error_class
           raise error_class.new(
-              env.status, env.method.upcase, env.url, env.body,
-              "Got #{env.status} (#{env.method.upcase} #{env.url}):\n#{env.body}") if error_class
+            env.status, env.method.upcase, env.url, env.body,
+            "Got #{env.status} (#{env.method.upcase} #{env.url}):\n#{env.body}",
+          )
         end
       end
 

data/lib/percy/client/environment.rb

@@ -9,34 +9,35 @@ module Percy
         'COMMITTER_EMAIL:%ae',
         'COMMITTED_DATE:%ai',
         # Note: order is important, this must come last because the regex is a multiline match.
-        'COMMIT_MESSAGE:%B'
+        'COMMIT_MESSAGE:%B',
       ].freeze
 
-      class Error < Exception; end
-      class RepoNotFoundError < Exception; end
+      class Error < RuntimeError; end
+      class RepoNotFoundError < RuntimeError; end
 
       def self.current_ci
         return :travis if ENV['TRAVIS_BUILD_ID']
-        return :jenkins if ENV['JENKINS_URL'] && ENV['ghprbPullId']  # Pull Request Builder plugin.
+        return :jenkins if ENV['JENKINS_URL'] && ENV['ghprbPullId'] # Pull Request Builder plugin.
         return :circle if ENV['CIRCLECI']
         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'
+        return :gitlab if ENV['GITLAB_CI']
       end
 
       # @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') if !output
+        output = _raw_commit_output('HEAD') unless output
 
         # Use the specified SHA or, if not given, the parsed SHA at HEAD.
         commit_sha = _commit_sha || output && output.match(/COMMIT_SHA:(.*)/)[1]
 
         # If not running in a git repo, allow nils for certain commit attributes.
-        extract_or_nil = lambda { |regex| (output && output.match(regex) || [])[1] }
-        return {
+        extract_or_nil = ->(regex) { (output && output.match(regex) || [])[1] }
+        {
           # The only required attribute:
           branch: branch,
           # An optional but important attribute:
@@ -48,7 +49,7 @@ module Percy
           # These GIT_ environment vars are from the Jenkins Git Plugin, but could be
           # used generically. This behavior may change in the future.
           author_name: extract_or_nil.call(/AUTHOR_NAME:(.*)/) || ENV['GIT_AUTHOR_NAME'],
-          author_email: extract_or_nil.call(/AUTHOR_EMAIL:(.*)/)  || ENV['GIT_AUTHOR_EMAIL'],
+          author_email: extract_or_nil.call(/AUTHOR_EMAIL:(.*)/) || ENV['GIT_AUTHOR_EMAIL'],
           committer_name: extract_or_nil.call(/COMMITTER_NAME:(.*)/) || ENV['GIT_COMMITTER_NAME'],
           committer_email: extract_or_nil.call(/COMMITTER_EMAIL:(.*)/) || ENV['GIT_COMMITTER_EMAIL'],
         }
@@ -80,14 +81,16 @@ module Percy
           # 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']
+        when :gitlab
+          ENV['CI_BUILD_REF']
         end
       end
 
       # @private
       def self._raw_commit_output(commit_sha)
-        format = GIT_FORMAT_LINES.join('%n')  # "git show" format uses %n for newlines.
+        format = GIT_FORMAT_LINES.join('%n') # "git show" format uses %n for newlines.
         output = `git show --quiet #{commit_sha} --format="#{format}" 2> /dev/null`.strip
-        return if $?.to_i != 0
+        return if $CHILD_STATUS.to_i != 0
         output
       end
 
@@ -114,9 +117,12 @@ module Percy
           ENV['BRANCH_NAME']
         when :buildkite
           ENV['BUILDKITE_BRANCH']
+        when :gitlab
+          ENV['CI_BUILD_REF_NAME']
         else
           _raw_branch_output
         end
+
         if result == ''
           STDERR.puts '[percy] Warning: not in a git repo, setting PERCY_BRANCH to "master".'
           result = 'master'
@@ -138,7 +144,7 @@ module Percy
 
       def self.repo
         return ENV['PERCY_PROJECT'] if ENV['PERCY_PROJECT']
-        return ENV['PERCY_REPO_SLUG'] if ENV['PERCY_REPO_SLUG']  # Deprecated.
+        return ENV['PERCY_REPO_SLUG'] if ENV['PERCY_REPO_SLUG'] # Deprecated.
 
         case current_ci
         when :travis
@@ -150,15 +156,15 @@ module Percy
         else
           origin_url = _get_origin_url.strip
           if origin_url == ''
-            raise Percy::Client::Environment::RepoNotFoundError.new(
-              'No local git repository found. ' +
-              'You can manually set PERCY_PROJECT to fix this. See https://percy.io/docs')
+            raise Percy::Client::Environment::RepoNotFoundError,
+              'No local git repository found. ' \
+              'You can manually set PERCY_PROJECT to fix this. See https://percy.io/docs'
           end
           match = origin_url.match(Regexp.new('[:/]([^/]+\/[^/]+?)(\.git)?\Z'))
-          if !match
-            raise Percy::Client::Environment::RepoNotFoundError.new(
-              "Could not determine repository name from URL: #{origin_url.inspect}\n" +
-              "You can manually set PERCY_PROJECT to fix this. See https://percy.io/docs")
+          unless match
+            raise Percy::Client::Environment::RepoNotFoundError,
+              "Could not determine repository name from URL: #{origin_url.inspect}\n" \
+              'You can manually set PERCY_PROJECT to fix this. See https://percy.io/docs'
           end
           match[1]
         end
@@ -204,6 +210,8 @@ module Percy
           ENV['SEMAPHORE_BUILD_NUMBER']
         when :buildkite
           ENV['BUILDKITE_BUILD_ID']
+        when :gitlab
+          ENV['CI_BUILD_ID']
         end
       end
 

data/lib/percy/client/resources.rb

@@ -4,7 +4,6 @@ require 'addressable/uri'
 
 module Percy
   class Client
-
     # A simple data container object used to pass data to create_snapshot.
     class Resource
       attr_accessor :sha
@@ -48,7 +47,7 @@ module Percy
         content_msg = content.nil? ? '' : "content.length: #{content.length}"
         "<Resource #{sha} #{resource_url} is_root:#{!!is_root} #{mimetype} #{content_msg}>"
       end
-      alias_method :to_s, :inspect
+      alias to_s inspect
     end
 
     module Resources

data/lib/percy/client/snapshots.rb

@@ -2,9 +2,9 @@ module Percy
   class Client
     module Snapshots
       def create_snapshot(build_id, resources, options = {})
-        if !resources.respond_to?(:each)
-          raise ArgumentError.new(
-            'resources argument must be an iterable of Percy::Client::Resource objects')
+        unless resources.respond_to?(:each)
+          raise ArgumentError,
+            'resources argument must be an iterable of Percy::Client::Resource objects'
         end
 
         widths = options[:widths] || config.default_widths
@@ -18,7 +18,7 @@ module Percy
             },
             'relationships' => {
               'resources' => {
-                'data' => resources.map { |r| r.serialize },
+                'data' => resources.map(&:serialize),
               },
             },
           },

data/lib/percy/client/version.rb

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

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

@@ -7,7 +7,8 @@ RSpec.describe Percy::Client::Builds, :vcr do
       # Whitebox test to check POST data.
       expect_any_instance_of(Percy::Client).to \
         receive(:post)
-        .with(/\/api\/v1\/repos\/fotinakis\/percy-examples\/builds\//, {
+        .with(
+          /\/api\/v1\/repos\/fotinakis\/percy-examples\/builds\//,
           'data' => {
             'type' => 'builds',
             'attributes' => {
@@ -25,7 +26,7 @@ RSpec.describe Percy::Client::Builds, :vcr do
               'parallel-total-shards' => nil,
             },
           },
-        }).and_call_original
+        ).and_call_original
 
       build = Percy.create_build('fotinakis/percy-examples')
       expect(build).to be
@@ -73,7 +74,8 @@ RSpec.describe Percy::Client::Builds, :vcr do
         # Whitebox test to check POST data.
         expect_any_instance_of(Percy::Client).to \
           receive(:post)
-          .with(/\/api\/v1\/repos\/fotinakis\/percy-examples\/builds\//, {
+          .with(
+            /\/api\/v1\/repos\/fotinakis\/percy-examples\/builds\//,
             'data' => {
               'type' => 'builds',
               'attributes' => {
@@ -91,7 +93,7 @@ RSpec.describe Percy::Client::Builds, :vcr do
                 'parallel-total-shards' => 4,
               },
             },
-          })
+          )
 
         Percy.create_build('fotinakis/percy-examples')
       end
@@ -112,7 +114,7 @@ RSpec.describe Percy::Client::Builds, :vcr do
     it 'finalizes a build' do
       build = Percy.create_build('fotinakis/percy-examples')
       result = Percy.finalize_build(build['data']['id'])
-      expect(result).to eq({'success' => true})
+      expect(result).to eq('success' => true)
     end
   end
 end

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

@@ -8,7 +8,7 @@ RSpec.describe Percy::Client::Connection do
     it 'performs a GET request to the api_url and parses response' do
       stub_request(:get, "#{Percy.config.api_url}/test").to_return(body: {foo: true}.to_json)
       data = Percy.client.get("#{Percy.config.api_url}/test")
-      expect(data).to eq({'foo' => true})
+      expect(data).to eq('foo' => true)
     end
     it 'raises customized timeout errors' do
       stub_request(:get, "#{Percy.config.api_url}/test").to_raise(Faraday::TimeoutError)
@@ -28,7 +28,7 @@ RSpec.describe Percy::Client::Connection do
         .then.to_return(body: {foo: true}.to_json, status: 200)
 
       data = Percy.client.get("#{Percy.config.api_url}/test")
-      expect(data).to eq({'foo' => true})
+      expect(data).to eq('foo' => true)
     end
     it 'raises error after 3 retries' do
       stub_request(:get, "#{Percy.config.api_url}/test")
@@ -42,7 +42,7 @@ RSpec.describe Percy::Client::Connection do
     it 'performs a POST request to the api_url and parses response' do
       stub_request(:post, "#{Percy.config.api_url}/test").to_return(body: {foo: true}.to_json)
       data = Percy.client.post("#{Percy.config.api_url}/test", {})
-      expect(data).to eq({'foo' => true})
+      expect(data).to eq('foo' => true)
     end
     it 'raises customized timeout errors' do
       stub_request(:post, "#{Percy.config.api_url}/test").to_raise(Faraday::TimeoutError)
@@ -101,7 +101,7 @@ RSpec.describe Percy::Client::Connection do
         .then.to_return(body: {foo: true}.to_json, status: 200)
 
       data = Percy.client.post("#{Percy.config.api_url}/test", {})
-      expect(data).to eq({'foo' => true})
+      expect(data).to eq('foo' => true)
     end
     it 'raises error after 3 retries' do
       stub_request(:post, "#{Percy.config.api_url}/test")

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

@@ -6,7 +6,7 @@ RSpec.describe Percy::Client::Environment do
     ENV['PERCY_TARGET_BRANCH'] = nil
     ENV['PERCY_PULL_REQUEST'] = nil
     ENV['PERCY_PROJECT'] = nil
-    ENV['PERCY_REPO_SLUG'] = nil  # Deprecated.
+    ENV['PERCY_REPO_SLUG'] = nil # Deprecated.
     ENV['PERCY_PARALLEL_NONCE'] = nil
     ENV['PERCY_PARALLEL_TOTAL'] = nil
 
@@ -51,7 +51,7 @@ RSpec.describe Percy::Client::Environment do
     ENV['DRONE_BRANCH'] = nil
     ENV['CI_PULL_REQUEST'] = nil
 
-    # Unset Semaphore CI vars
+    # Unset Semaphore CI vars.
     ENV['CI'] = nil
     ENV['SEMAPHORE'] = nil
     ENV['REVISION'] = nil
@@ -61,12 +61,18 @@ RSpec.describe Percy::Client::Environment do
     ENV['SEMAPHORE_CURRENT_THREAD'] = nil
     ENV['PULL_REQUEST_NUMBER'] = nil
 
-    # Unset Buildkite CI vars
+    # 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
+
+    # Unset Gitlab CI vars.
+    ENV['GITLAB_CI'] = nil
+    ENV['CI_BUILD_REF'] = nil
+    ENV['CI_BUILD_REF_NAME'] = nil
+    ENV['CI_BUILD_ID'] = nil
   end
 
   before(:each) do
@@ -183,7 +189,8 @@ RSpec.describe Percy::Client::Environment do
       it 'errors if unable to parse local repo name' do
         expect(Percy::Client::Environment).to receive(:_get_origin_url).once.and_return('foo')
         expect { Percy::Client::Environment.repo }.to raise_error(
-          Percy::Client::Environment::RepoNotFoundError)
+          Percy::Client::Environment::RepoNotFoundError,
+        )
       end
     end
     describe '#parallel_nonce' do
@@ -301,7 +308,7 @@ RSpec.describe Percy::Client::Environment do
       ENV['CI_NAME'] = 'codeship'
       ENV['CI_BRANCH'] = 'codeship-branch'
       ENV['CI_BUILD_NUMBER'] = 'codeship-build-number'
-      ENV['CI_PULL_REQUEST'] = 'false'  # This is always false on Codeship, unfortunately.
+      ENV['CI_PULL_REQUEST'] = 'false' # This is always false on Codeship, unfortunately.
       ENV['CI_COMMIT_ID'] = 'codeship-commit-sha'
       ENV['CI_NODE_TOTAL'] = ''
     end
@@ -385,7 +392,7 @@ RSpec.describe Percy::Client::Environment do
       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.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
@@ -406,6 +413,25 @@ RSpec.describe Percy::Client::Environment do
       end
     end
   end
+  context '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'
+    end
+
+    it 'has the correct properties' do
+      expect(Percy::Client::Environment.current_ci).to eq(:gitlab)
+      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
+      expect(Percy::Client::Environment.parallel_nonce).to eq('gitlab-build-id')
+      expect(Percy::Client::Environment.parallel_total_shards).to be_nil
+      # TODO: repo is deprecated, remove this:
+      expect(Percy::Client::Environment.repo).to eq('percy/percy-client') # From git, not env.
+    end
+  end
   describe 'local git repo methods' do
     describe '#commit' do
       it 'returns current local commit data' do

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

@@ -7,7 +7,7 @@ RSpec.describe Percy::Client::Resources, :vcr do
   describe 'Percy::Client::Resource' do
     it 'can be initialized with minimal data' do
       resource = Percy::Client::Resource.new('/foo.html', sha: sha)
-      expect(resource.serialize).to eq({
+      expect(resource.serialize).to eq(
         'type' => 'resources',
         'id' => sha,
         'attributes' => {
@@ -15,7 +15,7 @@ RSpec.describe Percy::Client::Resources, :vcr do
           'mimetype' => nil,
           'is-root' => nil,
         },
-      })
+      )
     end
     it 'can be initialized with all data' do
       resource = Percy::Client::Resource.new(
@@ -25,7 +25,7 @@ RSpec.describe Percy::Client::Resources, :vcr do
         mimetype: 'text/html',
         content: content,
       )
-      expect(resource.serialize).to eq({
+      expect(resource.serialize).to eq(
         'type' => 'resources',
         'id' => sha,
         'attributes' => {
@@ -33,7 +33,7 @@ RSpec.describe Percy::Client::Resources, :vcr do
           'mimetype' => 'text/html',
           'is-root' => true,
         },
-      })
+      )
     end
     it 'errors if not given sha or content' do
       expect { Percy::Client::Resource.new('/foo.html') }.to raise_error(ArgumentError)

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

@@ -12,7 +12,8 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
       # Whitebox test to catch POST data that is sent but is not returned in the API response.
       expect_any_instance_of(Percy::Client).to \
         receive(:post)
-        .with(/snapshots\/$/, {
+        .with(
+          /snapshots\/$/,
           'data' => {
             'type' => 'snapshots',
             'attributes' => {
@@ -45,7 +46,7 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
               },
             },
           },
-        })
+        )
         .and_call_original
 
       snapshot = Percy.create_snapshot(
@@ -70,7 +71,8 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
       # Whitebox test to catch POST data that is sent but is not returned in the API response.
       expect_any_instance_of(Percy::Client).to \
         receive(:post)
-        .with(/snapshots\/$/, {
+        .with(
+          /snapshots\/$/,
           'data' => {
             'type' => 'snapshots',
             'attributes' => {
@@ -103,7 +105,7 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
               },
             },
           },
-        })
+        )
         .and_call_original
 
       snapshot = Percy.create_snapshot(
@@ -135,7 +137,7 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
       snapshot = Percy.create_snapshot(build['data']['id'], resources, name: 'homepage')
 
       result = Percy.finalize_snapshot(snapshot['data']['id'])
-      expect(result).to eq({'success' => true})
+      expect(result).to eq('success' => true)
     end
   end
 end

data/spec/lib/percy/client_spec.rb

@@ -6,4 +6,4 @@ RSpec.describe Percy::Client do
       expect(client.config).to eq(config)
     end
   end
-end
+end

data/spec/lib/percy/config_spec.rb

@@ -2,17 +2,19 @@ RSpec.describe Percy::Config do
   let(:config) { described_class.new }
 
   it 'returns the correct defaults' do
-    expect(config.keys).to eq([
-      :access_token,
-      :api_url,
-      :debug,
-      :repo,
-      :default_widths,
-    ])
+    expect(config.keys).to eq(
+      [
+        :access_token,
+        :api_url,
+        :debug,
+        :repo,
+        :default_widths,
+      ],
+    )
     expect(config.access_token).to be_nil
     expect(config.api_url).to eq(ENV['PERCY_API'])
     expect(config.debug).to eq(false)
     expect(config.repo).to eq('percy/percy-client')
     expect(config.default_widths).to eq([])
   end
-end
+end

data/spec/lib/percy_spec.rb

@@ -34,4 +34,4 @@ RSpec.describe Percy do
       expect(old_logger).to_not eq(Percy.logger)
     end
   end
-end
+end

data/spec/support/vcr_setup.rb

@@ -6,7 +6,7 @@ VCR.configure do |c|
   c.hook_into :webmock
 
   c.default_cassette_options = {
-    record: ENV['RECORD'] ? :new_episodes : :none
+    record: ENV['RECORD'] ? :new_episodes : :none,
   }
 
   c.filter_sensitive_data('<FILTERED_PERCY_TOKEN>') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -131,9 +131,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Percy::Client