percy-cli 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a959d330004f2968d18a568f537c181d357c9647
-  data.tar.gz: 06797a482a138ed5e8ef7794a13a89d3c8a9962d
+  metadata.gz: 0bacd3f31c9a5045f5f9696e03a55b150d68bbc7
+  data.tar.gz: 363609d9f91e061966b7b88252b58682ee82ded1
 SHA512:
-  metadata.gz: 0be0b08394cd24de759f916880666b5d0dc6d90b3d4c028ceb19d53a44b29990703b11dae19de7c0f8849d9bd68fda33274042e947c283be453047481ff55b45
-  data.tar.gz: d357287bf1c592ee8fe7a521c59f811c13e404d9e77f7fc673823026ad3032971585a1222c94e112e4f12450b98eb3b65792a493e11e827845e536e01d0f7c39
+  metadata.gz: dfac04fe59707361fe44d12198747a67537397f7e8cfd7440dd301ba7b86a23a403b4586050ac604a72ec43e76468c311bfc05fdeca327d07dbbf352f3a5f9de
+  data.tar.gz: 3bf6624f8fbc4929c59b6756b69fcfb951c94cf3bacd00404c40d24d7131e974071bd58e74d9cde208c3e965c70bf86dc98d989c3d63a04c6fc48fd1fa8b4575

data/lib/percy/cli/snapshot.rb

@@ -19,7 +19,8 @@ module Percy
 
       def run_snapshot(root_dir, options = {})
         repo = options[:repo] || Percy.config.repo
-        strip_prefix = File.absolute_path(options[:strip_prefix] || root_dir)
+        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] || '/'
@@ -32,22 +33,22 @@ 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)
-        root_resources = build_resources(root_paths, base_resource_options.merge(is_root: true))
-        related_resources = build_resources(resource_paths, base_resource_options)
-        all_resources = root_resources + related_resources
+        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
 
         if root_resources.empty?
           say "No root resource files found. Are there HTML files in the given directory?"
           exit(-1)
         end
 
-        related_resources.each do |resource|
+        build_resources.each do |resource|
           Percy.logger.debug { "Found build resource: #{resource.resource_url}" }
         end
 
         build = rescue_connection_failures do
           say 'Creating build...'
-          build = Percy.create_build(repo, resources: related_resources)
+          build = Percy.create_build(repo, resources: build_resources)
 
           say 'Uploading build resources...'
           upload_missing_resources(build, build, all_resources, {num_threads: num_threads})
@@ -56,7 +57,7 @@ module Percy
         end
         return if failed?
 
-        # Upload a snapshot for every root resource, and associate the related_resources.
+        # Upload a snapshot for every root resource, and associate the build_resources.
         output_lock = Mutex.new
         snapshot_thread_pool = Thread.pool(num_threads)
         total = snapshot_limit ? [root_resources.length, snapshot_limit].min : root_resources.length
@@ -113,10 +114,7 @@ module Percy
         snapshots_regex = options[:snapshots_regex] || DEFAULT_SNAPSHOTS_REGEX
 
         file_paths = []
-        Find.find(dir_path).each do |relative_path|
-          path = File.absolute_path(relative_path)
-          # Skip directories.
-          next if !FileTest.file?(path)
+        _find_files(dir_path).each do |path|
           # Skip files that don't match the snapshots_regex.
           next if !path.match(snapshots_regex)
           file_paths << path
@@ -126,11 +124,7 @@ module Percy
 
       def find_resource_paths(dir_path)
         file_paths = []
-        Find.find(dir_path).each do |relative_path|
-          path = File.absolute_path(relative_path)
-
-          # Skip directories.
-          next if !FileTest.file?(path)
+        _find_files(dir_path).each do |path|
           # Skip dot files.
           next if path.match(/\/\./)
           # Only include files with the above static extensions.
@@ -145,8 +139,8 @@ module Percy
         url[0..1] == '//' ? "http:#{url}" : url
       end
 
-      def build_resources(paths, options = {})
-        strip_prefix = options[:strip_prefix]
+      def list_resources(paths, options = {})
+        strip_prefix = File.expand_path(options[:strip_prefix])
         baseurl = options[:baseurl]
         resources = []
 
@@ -194,6 +188,18 @@ module Percy
         uploader_thread_pool.wait
         uploader_thread_pool.shutdown
       end
+
+      # A file find method that follows directory and file symlinks.
+      def _find_files(*paths)
+        paths.flatten!
+        paths.map! { |p| Pathname.new(p) }
+        files = paths.select { |p| p.file? }
+        (paths - files).each do |dir|
+          files << _find_files(dir.children)
+        end
+        files.flatten.map { |path| path.to_s }
+      end
+      private :_find_files
     end
   end
 end

data/lib/percy/cli/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Cli
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

data/spec/percy/cli/snapshot_spec.rb

@@ -3,6 +3,9 @@ require 'digest'
 RSpec.describe Percy::Cli::Snapshot do
   let(:root_dir) { File.expand_path('../testdata/', __FILE__) }
 
+  # Used for testing that paths are collapsed before use.r
+  let(:root_dir_relative) { root_dir + '/../testdata' }
+
   describe '#run_snapshot' do
     xit 'snapshots a root directory of static files' do
       # TODO(fotinakis): tests for the full flow.
@@ -55,6 +58,11 @@ RSpec.describe Percy::Cli::Snapshot do
       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'),
+        # Make sure directory symlinks are followed.
+        File.join(root_dir, 'subdir_symlink/test.html'),
+        File.join(root_dir, 'subdir_symlink/test_symlink.html'),
       ])
     end
   end
@@ -65,14 +73,19 @@ RSpec.describe Percy::Cli::Snapshot do
         File.join(root_dir, 'css/base.css'),
         File.join(root_dir, 'css/test with spaces.css'),
         File.join(root_dir, 'images/jellybeans.png'),
+        # Make sure file symlinks are followed.
+        File.join(root_dir, 'images/jellybeans-symlink.png'),
+        # Make sure directory symlinks are followed.
+        File.join(root_dir, 'images_symlink/jellybeans.png'),
+        File.join(root_dir, 'images_symlink/jellybeans-symlink.png'),
       ])
     end
   end
-  describe '#build_resources' do
+  describe '#list_resources' do
     it 'returns resource objects' do
       paths = [File.join(root_dir, 'css/base.css')]
       options = {baseurl: '/', strip_prefix: root_dir}
-      resources = Percy::Cli.new.send(:build_resources, paths, options)
+      resources = Percy::Cli.new.send(:list_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.sha).to eq(Digest::SHA256.hexdigest(File.read(paths.first)))
@@ -80,10 +93,18 @@ RSpec.describe Percy::Cli::Snapshot do
       expect(resources.first.content).to be_nil
       expect(resources.first.path).to eq(paths.first)
     end
+    it 'correctly strips the prefix from resource_url' do
+      paths = [File.join(root_dir, 'index.html')]
+      options = {baseurl: '/', strip_prefix: root_dir_relative, is_root: true}
+      resources = Percy::Cli.new.send(:list_resources, paths, options)
+
+      expect(resources.length).to eq(1)
+      expect(resources.first.resource_url).to eq('/index.html')
+    end
     it 'returns resource objects with is_root set if given' do
       paths = [File.join(root_dir, 'index.html')]
       options = {baseurl: '/', strip_prefix: root_dir, is_root: true}
-      resources = Percy::Cli.new.send(:build_resources, paths, options)
+      resources = Percy::Cli.new.send(:list_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.resource_url).to eq('/index.html')
@@ -95,7 +116,7 @@ RSpec.describe Percy::Cli::Snapshot do
     it 'encodes the resource_url' do
       paths = [File.join(root_dir, 'css/test with spaces.css')]
       options = {baseurl: '/', strip_prefix: root_dir}
-      resources = Percy::Cli.new.send(:build_resources, paths, options)
+      resources = Percy::Cli.new.send(:list_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.resource_url).to eq('/css/test%20with%20spaces.css')
@@ -107,7 +128,7 @@ RSpec.describe Percy::Cli::Snapshot do
     it 'prepends the baseurl if given' do
       paths = [File.join(root_dir, 'index.html')]
       options = {strip_prefix: root_dir, is_root: true, baseurl: '/test baseurl/'}
-      resources = Percy::Cli.new.send(:build_resources, paths, options)
+      resources = Percy::Cli.new.send(:list_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.resource_url).to eq('/test%20baseurl/index.html')

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -132,9 +132,11 @@ 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/images/jellybeans-symlink.png
 - spec/percy/cli/testdata/images/jellybeans.png
 - spec/percy/cli/testdata/index.html
 - spec/percy/cli/testdata/subdir/test.html
+- spec/percy/cli/testdata/subdir/test_symlink.html
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -165,7 +167,9 @@ 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/images/jellybeans-symlink.png
 - spec/percy/cli/testdata/images/jellybeans.png
 - spec/percy/cli/testdata/index.html
 - spec/percy/cli/testdata/subdir/test.html
+- spec/percy/cli/testdata/subdir/test_symlink.html
 - spec/spec_helper.rb