percy-cli 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c733c7f086cb54277cdccea9768c4ea00640bab5
-  data.tar.gz: 71cb84b3d65b2f57ffb82e9f3aa07c924f4373e3
+  metadata.gz: 312ef525da9b6c70354812c688f833e5f7262171
+  data.tar.gz: b5d596076601b60ac23df1bcac6af67b95d6a36d
 SHA512:
-  metadata.gz: cf84886f1b1f8fa4cb7ba6151dbd0e57ec223a89868fd9a97ebb7afc0bfaaba5f4b816c2b185578849c60536af95d03baad280241b13f026a4f85e33f40d2780
-  data.tar.gz: ff52d00ba138e5de32e505541dfd260fef882a65b0dc6eae954eee66c655f265fe5789a6accfa02a0e34d397d6d3fb0ee7a9f7341d83e9f27c4d91e23060d32b
+  metadata.gz: fd0f40f09e449bb77a497e5722621e801f46d7a68a4c1bd185948867040b665907ce93bef1768f9be5caf9328367c96fede88cf8eaca34621bb665235fafc1b7
+  data.tar.gz: 74be05cae89ec9546103e2b9b65bff5bacf731e5b3a90cc1b08f7a61a2cbf6dccd04724ea8aaf26b439bd4584d3e6cb604fc9e7e88fc6491d72979f0f30faec7

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
     - default.yml
 
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.2
 
 Style/GlobalVars:
   Exclude:

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.1
   - 2.2
   - ruby-head
 before_install:

data/appveyor.yml

@@ -1,8 +1,7 @@
-# Test on Ruby 2.2 and 2.1
+# Test on Ruby 2.2
 environment:
   matrix:
     - RUBY_VERSION: 22
-    - RUBY_VERSION: 21
 
 # Install scripts. (runs after repo cloning)
 install:

data/lib/percy/cli/snapshot_runner.rb

@@ -25,23 +25,30 @@ module Percy
       end
 
       def run(root_dir, options = {})
-        repo = options[:repo] || Percy.config.repo
         root_dir = File.expand_path(File.absolute_path(root_dir))
         strip_prefix = File.expand_path(File.absolute_path(options[:strip_prefix] || root_dir))
-        num_threads = options[:threads] || 10
-        snapshot_limit = options[:snapshot_limit]
-        baseurl = options[:baseurl] || '/'
+
+        # CLI Options
         enable_javascript = !!options[:enable_javascript]
         include_all = !!options[:include_all]
+        snapshot_limit = options[:snapshot_limit]
+        snapshots_regex = options[:snapshots_regex]
         ignore_regex = options[:ignore_regex]
         widths = options[:widths].map { |w| Integer(w) }
+        num_threads = options[:threads] || 10
+        repo = options[:repo] || Percy.config.repo
+        baseurl = options[:baseurl] || '/'
         raise ArgumentError, 'baseurl must start with /' if baseurl[0] != '/'
 
         base_resource_options = {strip_prefix: strip_prefix, baseurl: baseurl}
 
         # Find all the static files in the given root directory.
-        root_paths = _find_root_paths(root_dir, snapshots_regex: options[:snapshots_regex])
-        opts = {include_all: include_all, ignore_regex: ignore_regex}
+        opts = {
+          include_all: include_all,
+          ignore_regex: ignore_regex,
+          snapshots_regex: snapshots_regex,
+        }
+        root_paths = _find_root_paths(root_dir, opts)
         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)

data/lib/percy/cli/version.rb

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

data/spec/percy/cli/snapshot_runner_spec.rb

@@ -99,8 +99,29 @@ RSpec.describe Percy::Cli::SnapshotRunner do
       expect(paths).to match_array(expected_results)
     end
 
+    it 'returns only the files matching the snapshots_regex' do
+      opts = {snapshots_regex: 'xml'}
+      paths = runner._find_root_paths(root_dir, opts)
+
+      expected_results = [
+        File.join(root_dir, 'index.xml'),
+        File.join(root_dir, 'subdir/test.xml'),
+      ]
+
+      # 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.xml'),
+        ]
+      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'
+      opts = {ignore_regex: 'skip|ignore'}
+      paths = runner._find_root_paths(root_dir, opts)
 
       expected_results = [
         File.join(root_dir, 'index.html'),

data/spec/percy/cli/testdata/README.md

@@ -0,0 +1 @@
+### This is a readme

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

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

data/spec/percy/cli/testdata/images_symlink

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

data/spec/percy/cli/testdata/index.xml

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <title>Test Percy CLI</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet" type="text/css">
+  <link href="//example.com:12345/test-no-protocol.css" rel="stylesheet" type="text/css">
+  <link href='http://example.com:12345/test-single-quotes.css' rel="stylesheet" type="text/css">
+  <link href="http://example.com:12345/test-query-param.css?v=1" rel="stylesheet" type="text/css">
+
+  <link href="http://example.com:12345/test-duplicate.css" rel="stylesheet" type="text/css">
+  <link href="http://example.com:12345/test-duplicate.css" rel="stylesheet" type="text/css">
+
+  <link rel="stylesheet" type="text/css" href="http://example.com:12345/test-diff-tag-order.css">
+
+  <link rel="author" href="https://example.com/should-not-be-included"/>
+
+  <h1>Hello World!</h1>
+
+  Just some text, should not be included:
+  http://example.com/should-not-be-included.css
+</html>

data/spec/percy/cli/testdata/subdir/test.xml

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

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

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

data/spec/percy/cli/testdata/subdir_symlink

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -160,6 +160,7 @@ files:
 - lib/percy/cli/version.rb
 - percy-cli.gemspec
 - spec/percy/cli/snapshot_runner_spec.rb
+- spec/percy/cli/testdata/README.md
 - spec/percy/cli/testdata/css/base.css
 - spec/percy/cli/testdata/css/test with spaces.css
 - spec/percy/cli/testdata/css/unrelated-no-extension
@@ -169,8 +170,10 @@ files:
 - 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/index.xml
 - spec/percy/cli/testdata/skip.html
 - spec/percy/cli/testdata/subdir/test.html
+- spec/percy/cli/testdata/subdir/test.xml
 - spec/percy/cli/testdata/subdir/test_symlink.html
 - spec/percy/cli/testdata/subdir_symlink
 - spec/spec_helper.rb
@@ -194,12 +197,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Percy command-line interface
 test_files:
 - spec/percy/cli/snapshot_runner_spec.rb
+- spec/percy/cli/testdata/README.md
 - spec/percy/cli/testdata/css/base.css
 - spec/percy/cli/testdata/css/test with spaces.css
 - spec/percy/cli/testdata/css/unrelated-no-extension
@@ -209,8 +213,10 @@ test_files:
 - 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/index.xml
 - spec/percy/cli/testdata/skip.html
 - spec/percy/cli/testdata/subdir/test.html
+- spec/percy/cli/testdata/subdir/test.xml
 - spec/percy/cli/testdata/subdir/test_symlink.html
 - spec/percy/cli/testdata/subdir_symlink
 - spec/spec_helper.rb