percy-cli 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b4abeaf29cbbe7f5a90c445b034795fa4a3978
-  data.tar.gz: d65287197152cbf4d476408895a78b8d62ebcb2f
+  metadata.gz: c733c7f086cb54277cdccea9768c4ea00640bab5
+  data.tar.gz: 71cb84b3d65b2f57ffb82e9f3aa07c924f4373e3
 SHA512:
-  metadata.gz: c6f264c90ad78f351975f261ab98e68e4257e7277a0e9ea1e4637f5d3e2bfc29d8f3c5ee4ac797434b9c9a4f5f2736aa26df68983ef1e9479d7113649abcb4d9
-  data.tar.gz: faeceecd9a612cfeb66a8d88dc1573d4125c322260c54fa9254d809c9d005aa7b20508a5878582b5d72fee1dfd9bd9b88dc35b030f3e74aace1805cd0a74a64b
+  metadata.gz: cf84886f1b1f8fa4cb7ba6151dbd0e57ec223a89868fd9a97ebb7afc0bfaaba5f4b816c2b185578849c60536af95d03baad280241b13f026a4f85e33f40d2780
+  data.tar.gz: ff52d00ba138e5de32e505541dfd260fef882a65b0dc6eae954eee66c655f265fe5789a6accfa02a0e34d397d6d3fb0ee7a9f7341d83e9f27c4d91e23060d32b

data/.rubocop.yml

@@ -1,113 +1,10 @@
-require: rubocop-rspec
-inherit_from: .rubocop_todo.yml
-AllCops:
-  Include:
-    - Rakefile
-    - lib/**/*.rake
-  Exclude:
-    - 'vendor/**/*'
-    - '*.gemspec'
-
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/CaseIndentation:
-  EnforcedStyle: end
-
-Layout/IndentArray:
-  EnforcedStyle: consistent
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Lint/RescueException:
-  Exclude:
-    - 'lib/tasks/*.rake'
-
-Metrics/AbcSize:
-  Max: 100
-
-Metrics/LineLength:
-  Max: 100
-
-Metrics/MethodLength:
-  Max: 80
-
-Style/Documentation:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
+inherit_gem:
+  percy-style:
+    - default.yml
 
-Metrics/BlockLength:
-  Enabled: false
-
-Style/DoubleNegation:
-  Enabled: false
-
-Style/FileName:
-  Exclude: ['Gemfile', 'Guardfile']
-
-Style/FormatStringToken:
-  EnforcedStyle: template
-
-# Disable Style/NumericLiterals so numbers don't need underscores
-Style/NumericLiterals:
-  Enabled: false
-
-Style/NumericPredicate:
-  EnforcedStyle: comparison
-
-Style/RedundantBegin:
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.1
 
-Style/RegexpLiteral:
-  EnforcedStyle: slashes
-  AllowInnerSlashes: true
+Style/GlobalVars:
   Exclude:
-    - 'Guardfile'
-
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: consistent_comma
-
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-
-RSpec/DescribedClass:
-  EnforcedStyle: explicit
-
-RSpec/ExampleLength:
-  Max: 15
-
-RSpec/HookArgument:
-  EnforcedStyle: each
-
-RSpec/ImplicitExpect:
-  EnforcedStyle: should
-
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-RSpec/NotToNot:
-  EnforcedStyle: to_not
-
-RSpec/VerifiedDoubles:
-  Enabled: false
+    - 'lib/percy/cli.rb'

data/Gemfile

@@ -3,11 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in percy-cli.gemspec
 gemspec
 
-group :test do
-  gem 'rubocop'
-  gem 'rubocop-rspec'
-end
-
 group :test, :development do
   gem 'pry'
 end

data/appveyor.yml

@@ -0,0 +1,22 @@
+# Test on Ruby 2.2 and 2.1
+environment:
+  matrix:
+    - RUBY_VERSION: 22
+    - RUBY_VERSION: 21
+
+# Install scripts. (runs after repo cloning)
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+# Post-install test scripts.
+test_script:
+  - bundle exec rspec
+
+build:
+  off

data/lib/percy/cli.rb

@@ -15,7 +15,7 @@ module Percy
     end
 
     def say_error(*args)
-      STDERR.puts *args
+      STDERR.puts(*args)
     end
 
     def run
@@ -46,6 +46,10 @@ module Percy
           '--snapshots_regex REGEX',
           String,
           'Regular expression for matching the files to snapshot. Defaults to: "\.(html|htm)$"'
+        c.option \
+          '--ignore_regex REGEX',
+          String,
+          'Regular expression for matching the files NOT to snapshot. Default is nil.'
         c.option \
           '--widths CSV',
           String,

data/lib/percy/cli/snapshot_runner.rb

@@ -1,6 +1,6 @@
 require 'find'
 require 'digest'
-require 'uri'
+require 'addressable/uri'
 require 'thread/pool'
 
 Thread.abort_on_exception = true
@@ -33,6 +33,7 @@ module Percy
         baseurl = options[:baseurl] || '/'
         enable_javascript = !!options[:enable_javascript]
         include_all = !!options[:include_all]
+        ignore_regex = options[:ignore_regex]
         widths = options[:widths].map { |w| Integer(w) }
         raise ArgumentError, 'baseurl must start with /' if baseurl[0] != '/'
 
@@ -40,7 +41,8 @@ module Percy
 
         # Find all the static files in the given root directory.
         root_paths = _find_root_paths(root_dir, snapshots_regex: options[:snapshots_regex])
-        resource_paths = _find_resource_paths(root_dir, include_all: include_all)
+        opts = {include_all: include_all, ignore_regex: ignore_regex}
+        resource_paths = _find_resource_paths(root_dir, opts)
         root_resources = _list_resources(root_paths, base_resource_options.merge(is_root: true))
         build_resources = _list_resources(resource_paths, base_resource_options)
         all_resources = root_resources + build_resources
@@ -127,7 +129,9 @@ module Percy
       end
 
       def _find_root_paths(dir_path, options = {})
-        _find_files(dir_path).select { |path| _include_root_path?(path, options) }
+        _find_files(dir_path)
+          .select { |path| _include_root_path?(path, options) }
+          .reject { |path| _ignore_resource_path?(path, options) }
       end
 
       def _find_resource_paths(dir_path, options = {})
@@ -145,7 +149,7 @@ module Percy
         paths.each do |path|
           sha = Digest::SHA256.hexdigest(File.read(path))
           next if File.size(path) > MAX_FILESIZE_BYTES
-          resource_url = URI.escape(File.join(baseurl, path.sub(strip_prefix, '')))
+          resource_url = Addressable::URI.escape(File.join(baseurl, path.sub(strip_prefix, '')))
 
           resources << Percy::Client::Resource.new(
             resource_url, sha: sha, is_root: options[:is_root], path: path,
@@ -212,6 +216,16 @@ module Percy
         STATIC_RESOURCE_EXTENSIONS.include?(File.extname(path))
       end
 
+      def _ignore_resource_path?(path, options)
+        return false unless options[:ignore_regex]
+
+        begin
+          path.match(options[:ignore_regex])
+        rescue StandardError
+          false
+        end
+      end
+
       def _include_root_path?(path, options)
         # Skip git files.
         return false if path =~ /\/\.git\//

data/lib/percy/cli/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Cli
-    VERSION = '1.2.9'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/percy-cli.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'commander', '~> 4.3'
   spec.add_dependency 'percy-client', '~> 1.12'
   spec.add_dependency 'thread', '~> 0.2'
+  spec.add_dependency 'addressable', '~> 2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'webmock', '~> 1'
+  spec.add_development_dependency 'percy-style'
 end

data/spec/percy/cli/snapshot_runner_spec.rb

@@ -78,17 +78,47 @@ RSpec.describe Percy::Cli::SnapshotRunner do
     it 'returns only the HTML files in the directory' do
       paths = runner._find_root_paths root_dir
 
-      expect(paths).to match_array(
-        [
-          File.join(root_dir, 'index.html'),
-          File.join(root_dir, 'subdir/test.html'),
-          # Make sure file symlinks are followed.
-          File.join(root_dir, 'subdir/test_symlink.html'),
+      expected_results = [
+        File.join(root_dir, 'index.html'),
+        File.join(root_dir, 'ignore.html'),
+        File.join(root_dir, 'skip.html'),
+        File.join(root_dir, 'subdir/test.html'),
+        # Make sure file symlinks are followed.
+        File.join(root_dir, 'subdir/test_symlink.html'),
+      ]
+
+      # Symlinked folders don't work out-of-the-box upon git clone on windows
+      unless Gem.win_platform?
+        expected_results += [
           # Make sure directory symlinks are followed.
           File.join(root_dir, 'subdir_symlink/test.html'),
           File.join(root_dir, 'subdir_symlink/test_symlink.html'),
-        ],
-      )
+        ]
+      end
+
+      expect(paths).to match_array(expected_results)
+    end
+
+    it 'skips files passed into the ignore_regex option' do
+      paths = runner._find_root_paths root_dir, ignore_regex: 'skip|ignore'
+
+      expected_results = [
+        File.join(root_dir, 'index.html'),
+        File.join(root_dir, 'subdir/test.html'),
+        # Make sure file symlinks are followed.
+        File.join(root_dir, 'subdir/test_symlink.html'),
+      ]
+
+      # Symlinked folders don't work out-of-the-box upon git clone on windows
+      unless Gem.win_platform?
+        expected_results += [
+          # Make sure directory symlinks are followed.
+          File.join(root_dir, 'subdir_symlink/test.html'),
+          File.join(root_dir, 'subdir_symlink/test_symlink.html'),
+        ]
+      end
+
+      expect(paths).to match_array(expected_results)
     end
   end
 
@@ -96,20 +126,26 @@ RSpec.describe Percy::Cli::SnapshotRunner do
     it 'returns only the related static files in the directory' do
       paths = runner._find_resource_paths root_dir
 
-      expect(paths).to match_array(
-        [
-          File.join(root_dir, 'css/base.css'),
-          File.join(root_dir, 'css/test with spaces.css'),
-          File.join(root_dir, 'images/jellybeans.png'),
-          File.join(root_dir, 'images/large-file-skipped.png'),
-          # Make sure file symlinks are followed.
-          File.join(root_dir, 'images/jellybeans-symlink.png'),
+      expected_results = [
+        File.join(root_dir, 'css/base.css'),
+        File.join(root_dir, 'css/test with spaces.css'),
+        File.join(root_dir, 'images/jellybeans.png'),
+        File.join(root_dir, 'images/large-file-skipped.png'),
+        # Make sure file symlinks are followed.
+        File.join(root_dir, 'images/jellybeans-symlink.png'),
+      ]
+
+      # Symlinked folders don't work out-of-the-box upon git clone on windows
+      unless Gem.win_platform?
+        expected_results += [
           # Make sure directory symlinks are followed.
           File.join(root_dir, 'images_symlink/jellybeans.png'),
           File.join(root_dir, 'images_symlink/large-file-skipped.png'),
           File.join(root_dir, 'images_symlink/jellybeans-symlink.png'),
-        ],
-      )
+        ]
+      end
+
+      expect(paths).to match_array(expected_results)
     end
   end
 

data/spec/percy/cli/testdata/ignore.html

@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<html>
+    <h1>Hello World!</h1>
+</html>

data/spec/percy/cli/testdata/images/jellybeans-symlink.png

@@ -0,0 +1 @@
+spec/percy/cli/testdata/images/jellybeans.png

data/spec/percy/cli/testdata/images_symlink

@@ -0,0 +1 @@
+spec/percy/cli/testdata/images/

data/spec/percy/cli/testdata/skip.html

@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<html>
+    <h1>Hello World!</h1>
+</html>

data/spec/percy/cli/testdata/subdir/test_symlink.html

@@ -0,0 +1 @@
+spec/percy/cli/testdata/subdir/test.html

data/spec/percy/cli/testdata/subdir_symlink

@@ -0,0 +1 @@
+spec/percy/cli/testdata/subdir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: percy-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - team@percy.io
@@ -119,13 +147,13 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - RELEASING.md
 - Rakefile
+- appveyor.yml
 - bin/percy
 - lib/percy/cli.rb
 - lib/percy/cli/snapshot_runner.rb
@@ -135,12 +163,16 @@ files:
 - spec/percy/cli/testdata/css/base.css
 - spec/percy/cli/testdata/css/test with spaces.css
 - spec/percy/cli/testdata/css/unrelated-no-extension
+- spec/percy/cli/testdata/ignore.html
 - spec/percy/cli/testdata/images/jellybeans-symlink.png
 - spec/percy/cli/testdata/images/jellybeans.png
 - spec/percy/cli/testdata/images/large-file-skipped.png
+- spec/percy/cli/testdata/images_symlink
 - spec/percy/cli/testdata/index.html
+- spec/percy/cli/testdata/skip.html
 - spec/percy/cli/testdata/subdir/test.html
 - spec/percy/cli/testdata/subdir/test_symlink.html
+- spec/percy/cli/testdata/subdir_symlink
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -162,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Percy command-line interface
@@ -171,10 +203,14 @@ test_files:
 - spec/percy/cli/testdata/css/base.css
 - spec/percy/cli/testdata/css/test with spaces.css
 - spec/percy/cli/testdata/css/unrelated-no-extension
+- spec/percy/cli/testdata/ignore.html
 - spec/percy/cli/testdata/images/jellybeans-symlink.png
 - spec/percy/cli/testdata/images/jellybeans.png
 - spec/percy/cli/testdata/images/large-file-skipped.png
+- spec/percy/cli/testdata/images_symlink
 - spec/percy/cli/testdata/index.html
+- spec/percy/cli/testdata/skip.html
 - spec/percy/cli/testdata/subdir/test.html
 - spec/percy/cli/testdata/subdir/test_symlink.html
+- spec/percy/cli/testdata/subdir_symlink
 - spec/spec_helper.rb

data/.rubocop_todo.yml

@@ -1,63 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-02-09 21:30:53 -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/AmbiguousOperator:
-  Exclude:
-    - 'lib/percy/cli.rb'
-
-# Offense count: 4
-Metrics/AbcSize:
-  Max: 81
-
-# Offense count: 4
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 139
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 12
-
-# Offense count: 5
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 61
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 159
-
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 12
-
-# Offense count: 6
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/percy/cli/snapshot_spec.rb'
-
-# Offense count: 11
-RSpec/MultipleExpectations:
-  Max: 6
-
-# Offense count: 1
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'lib/percy/cli.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/percy/cli/snapshot.rb'

data/spec/percy/cli/testdata/subdir/test_symlink.html

@@ -1 +0,0 @@
-<!DOCTYPE html><html>Hello World!</html>