percy-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9850a1af689e2c117bbe0b183546e92e591b968b
-  data.tar.gz: c10b07dab5709b16be0222f7225a5f73e7a03275
+  metadata.gz: caa2b62dccd292c0e266963747b0a97d6d847422
+  data.tar.gz: 25c5d6de30979ea5aee24e2123255f072515bc29
 SHA512:
-  metadata.gz: 2222e6b6414985a6ed54370d39b564e0dc06f550c08113524ed04da580a0aee029f7e594df436339f82fcad1493cfe0b1940b0b7b8fa773f3bb6fcf4cbe2269e
-  data.tar.gz: 1ac69b7e3e58585558a9b6addcf73b2fe8a191148cf370fd658228a3513e4d21a16dc59b05d3cb8cd1ebdbad8aafb16e08427552ffa25111dcfb848f32672741
+  metadata.gz: 50dfa8bfd63712646e7194f850bca142c48e21c0e038b3a969b0d0d61aa993868e7b6befccca972959ddf779b395eaec58fa4a4a250262fd6b92ec045fe43c98
+  data.tar.gz: a7c9084be4c0dea839901c0894361467a586c09148c2bc81f45748bf5530d849aab7ec38d19335a58e6f088101f3976aa8b5d858070a14fc5f657cf082bf2e5f

data/lib/percy/cli/snapshot.rb

@@ -21,12 +21,16 @@ module Percy
         strip_prefix = File.absolute_path(options[:strip_prefix] || root_dir)
         num_threads = options[:threads] || 10
         snapshot_limit = options[:snapshot_limit]
+        baseurl = options[:baseurl] || '/'
+        raise ArgumentError.new('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])
         resource_paths = find_resource_paths(root_dir)
-        root_resources = build_resources(root_paths, strip_prefix, is_root: true)
-        related_resources = build_resources(resource_paths, strip_prefix)
+        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
 
         if root_resources.empty?
@@ -103,7 +107,9 @@ module Percy
         url[0..1] == '//' ? "http:#{url}" : url
       end
 
-      def build_resources(paths, strip_prefix, options = {})
+      def build_resources(paths, options = {})
+        strip_prefix = options[:strip_prefix]
+        baseurl = options[:baseurl]
         resources = []
 
         # Strip trailing slash from strip_prefix.
@@ -111,7 +117,8 @@ module Percy
 
         paths.each do |path|
           sha = Digest::SHA256.hexdigest(File.read(path))
-          resource_url = URI.escape(path.sub(strip_prefix, ''))
+          resource_url = 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)
         end

data/lib/percy/cli/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Cli
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/percy/cli.rb

@@ -29,6 +29,12 @@ module Percy
       command :snapshot do |c|
         c.syntax = 'snapshot <root_dir>'
         c.description = 'Snapshot a folder of static files.'
+        c.option \
+          '--baseurl PATH',
+          String,
+          'The live URL base path. Defaults to "/". Set this if your site is hosted in ' +
+          'a subdirectory in production that does not exist locally. If using Jekyll, this ' +
+          'should be the same as your "baseurl" config.'
         c.option \
           '--strip_prefix PATH',
           String,

data/spec/percy/cli/snapshot_spec.rb

@@ -30,7 +30,8 @@ RSpec.describe Percy::Cli::Snapshot do
   describe '#build_resources' do
     it 'returns resource objects' do
       paths = [File.join(root_dir, 'css/base.css')]
-      resources = Percy::Cli.new.send(:build_resources, paths, root_dir)
+      options = {baseurl: '/', strip_prefix: root_dir}
+      resources = Percy::Cli.new.send(:build_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.sha).to eq(Digest::SHA256.hexdigest(File.read(paths.first)))
@@ -40,7 +41,8 @@ RSpec.describe Percy::Cli::Snapshot do
     end
     it 'returns resource objects with is_root set if given' do
       paths = [File.join(root_dir, 'index.html')]
-      resources = Percy::Cli.new.send(:build_resources, paths, root_dir, is_root: true)
+      options = {baseurl: '/', strip_prefix: root_dir, is_root: true}
+      resources = Percy::Cli.new.send(:build_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.resource_url).to eq('/index.html')
@@ -51,7 +53,8 @@ RSpec.describe Percy::Cli::Snapshot do
     end
     it 'encodes the resource_url' do
       paths = [File.join(root_dir, 'css/test with spaces.css')]
-      resources = Percy::Cli.new.send(:build_resources, paths, root_dir)
+      options = {baseurl: '/', strip_prefix: root_dir}
+      resources = Percy::Cli.new.send(:build_resources, paths, options)
 
       expect(resources.length).to eq(1)
       expect(resources.first.resource_url).to eq('/css/test%20with%20spaces.css')
@@ -60,6 +63,18 @@ RSpec.describe Percy::Cli::Snapshot do
       expect(resources.first.content).to be_nil
       expect(resources.first.path).to eq(paths.first)
     end
+    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)
+
+      expect(resources.length).to eq(1)
+      expect(resources.first.resource_url).to eq('/test%20baseurl/index.html')
+      expect(resources.first.sha).to eq(Digest::SHA256.hexdigest(File.read(paths.first)))
+      expect(resources.first.is_root).to be_truthy
+      expect(resources.first.content).to be_nil
+      expect(resources.first.path).to eq(paths.first)
+    end
   end
   describe '#upload_snapshot' do
     xit 'uploads the given resources to the build' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander