percy-cli 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f9a5af6f5270d20cad236336bf754647d3d8dbb
-  data.tar.gz: f1b1223a3109b2b9421ac13e0a95dbc634696d5c
+  metadata.gz: 9850a1af689e2c117bbe0b183546e92e591b968b
+  data.tar.gz: c10b07dab5709b16be0222f7225a5f73e7a03275
 SHA512:
-  metadata.gz: 7b88784abd1f790f1fd70f9ed01b40eae74113b9c5906224b7a0f1d0e84f8a7c8b8923439ede0475ecdf944d7c6724107ead97c07d193c6a9b2483f0d98588be
-  data.tar.gz: 3255e8ce4dc9586c848ec13591a017bdcd1ea7fb3342b6c4d9058ac4436a3f9a043cd11c001ed3454c21d39d984aaad4ae746bd9eed507036b0bab12eca1b1a0
+  metadata.gz: 2222e6b6414985a6ed54370d39b564e0dc06f550c08113524ed04da580a0aee029f7e594df436339f82fcad1493cfe0b1940b0b7b8fa773f3bb6fcf4cbe2269e
+  data.tar.gz: 1ac69b7e3e58585558a9b6addcf73b2fe8a191148cf370fd658228a3513e4d21a16dc59b05d3cb8cd1ebdbad8aafb16e08427552ffa25111dcfb848f32672741

data/lib/percy/cli/snapshot.rb

@@ -16,48 +16,9 @@ module Percy
 
       DEFAULT_SNAPSHOTS_REGEX = /\.(html|htm)$/
 
-      # Modified version of Diego Perini's URL regex. https://gist.github.com/dperini/729294
-      REMOTE_URL_REGEX_STRING = (
-        # protocol identifier
-        "(?:(?:https?:)?//)" +
-        "(?:" +
-          # IP address exclusion
-          # private & local networks
-          "(?!(?:10|127)(?:\\.\\d{1,3}){3})" +
-          "(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})" +
-          "(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})" +
-          # IP address dotted notation octets
-          # excludes loopback network 0.0.0.0
-          # excludes reserved space >= 224.0.0.0
-          # excludes network & broacast addresses
-          # (first & last IP address of each class)
-          "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
-          "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
-          "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
-        "|" +
-          # host name
-          "(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)" +
-          # domain name
-          "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*" +
-          # TLD identifier
-          "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" +
-        ")" +
-        # port number
-        "(?::\\d{2,5})?" +
-        # resource path
-        "(?:/[^\\s\"']*)?"
-      )
-      HTML_REMOTE_URL_REGEX = Regexp.new("(<link.*?href=['\"](" + REMOTE_URL_REGEX_STRING + ")[^>]+)")
-
-      # Match all url("https://...") styles, with whitespace and quote variatinos.
-      CSS_REMOTE_URL_REGEX = Regexp.new(
-        "url\\s*\\([\"'\s]*(" + REMOTE_URL_REGEX_STRING + ")[\"'\s]*\\)"
-      )
-
       def run_snapshot(root_dir, options = {})
         repo = options[:repo] || Percy.config.repo
         strip_prefix = File.absolute_path(options[:strip_prefix] || root_dir)
-        autoload_remote_resources = options[:autoload_remote_resources] || false
         num_threads = options[:threads] || 10
         snapshot_limit = options[:snapshot_limit]
 
@@ -66,12 +27,6 @@ module Percy
         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)
-
-        if autoload_remote_resources
-          remote_urls = find_remote_urls(root_paths + resource_paths)
-          related_resources += build_remote_resources(remote_urls)
-        end
-
         all_resources = root_resources + related_resources
 
         if root_resources.empty?
@@ -144,25 +99,6 @@ module Percy
         file_paths
       end
 
-      def find_remote_urls(file_paths)
-        urls = []
-        file_paths.each do |path|
-          extension = File.extname(path)
-          case extension
-          when '.html'
-            content = File.read(path)
-            urls += content.scan(HTML_REMOTE_URL_REGEX).map do |match|
-              next if !match[0].include?('stylesheet')  # Only include links with rel="stylesheet".
-              maybe_add_protocol(match[1])
-            end
-          when '.css'
-            content = File.read(path)
-            urls += content.scan(CSS_REMOTE_URL_REGEX).map { |match| maybe_add_protocol(match[0]) }
-          end
-        end
-        urls.compact.uniq
-      end
-
       def maybe_add_protocol(url)
         url[0..1] == '//' ? "http:#{url}" : url
       end
@@ -182,36 +118,6 @@ module Percy
         resources
       end
 
-      def build_remote_resources(remote_urls)
-        resources = []
-
-        bar = Commander::UI::ProgressBar.new(
-          remote_urls.length,
-          title: 'Fetching remote resources...',
-          format: ':title |:progress_bar| :percent_complete% complete - :url',
-          width: 20,
-          complete_message: "Fetched #{remote_urls.length} remote resources.",
-        )
-
-        remote_urls.each do |url|
-          bar.increment url: url
-          begin
-            response = Faraday.get(url)
-          rescue Faraday::Error::ConnectionFailed, Faraday::SSLError => e
-            say_error e
-            next
-          end
-          if response.status != 200
-            say_error "Remote resource failed, skipping (#{response.status}): #{url}"
-            next
-          end
-
-          sha = Digest::SHA256.hexdigest(response.body)
-          resources << Percy::Client::Resource.new(url, sha: sha, content: response.body)
-        end
-        resources
-      end
-
       # Uploads missing resources either for a build or snapshot.
       def upload_missing_resources(build, obj, potential_resources, options = {})
         # Upload the content for any missing resources.

data/lib/percy/cli/version.rb

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

data/lib/percy/cli.rb

@@ -45,10 +45,6 @@ module Percy
           '--snapshot_limit NUM',
           Integer,
           "Max number of snapshots to upload, useful for testing. Default is unlimited."
-        c.option \
-          '--autoload_remote_resources',
-          'Attempts to parse HTML and CSS for remote resources, fetch them, and include in ' +
-          'snapshots. This can be very useful if your static website relies on remote resources.'
         c.option \
           '--threads NUM',
           Integer,
@@ -56,7 +52,6 @@ module Percy
           "Defaults to #{DEFAULT_NUM_THREADS}, max #{MAX_NUM_THREADS}."
 
         c.action do |args, options|
-          options.default autoload_remote_resources: false
           options.default threads: DEFAULT_NUM_THREADS
           options.threads = MAX_NUM_THREADS if options.threads > MAX_NUM_THREADS
 

data/spec/percy/cli/snapshot_spec.rb

@@ -27,26 +27,6 @@ RSpec.describe Percy::Cli::Snapshot do
       ])
     end
   end
-  describe '#find_remote_urls' do
-    it 'returns remote resources referenced throughout the static website' do
-      root_paths = Percy::Cli.new.send(:find_root_paths, root_dir)
-      resource_paths = Percy::Cli.new.send(:find_resource_paths, root_dir)
-
-      remote_urls = Percy::Cli.new.send(:find_remote_urls, root_paths + resource_paths)
-      expect(remote_urls).to match_array([
-        # In index.html:
-        'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css',
-        'http://example.com:12345/test-no-protocol.css',
-        'http://example.com:12345/test-duplicate.css',
-        'http://example.com:12345/test-query-param.css?v=1',
-        'http://example.com:12345/test-single-quotes.css',
-        'http://example.com:12345/test-diff-tag-order.css',
-
-        # In base.css:
-        'http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css',
-      ])
-    end
-  end
   describe '#build_resources' do
     it 'returns resource objects' do
       paths = [File.join(root_dir, 'css/base.css')]
@@ -81,24 +61,6 @@ RSpec.describe Percy::Cli::Snapshot do
       expect(resources.first.path).to eq(paths.first)
     end
   end
-  describe '#build_remote_resources' do
-    it 'fetches the remote URLs and creates resource objects' do
-      urls = [
-        'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css',
-        'http://example.com:12345/test-failure.css',
-      ]
-      stub_request(:get, 'http://example.com:12345/test-failure.css').to_return(status: 400)
-
-      resources = Percy::Cli.new.send(:build_remote_resources, urls)
-
-      expect(resources.length).to eq(1)
-      expect(resources[0].resource_url).to eq(urls[0])
-      expect(resources[0].sha).to be
-      expect(resources[0].is_root).to be_nil
-      expect(resources[0].content).to be
-      expect(resources[0].path).to be_nil
-    end
-  end
   describe '#upload_snapshot' do
     xit 'uploads the given resources to the build' do
       # TODO(fotinakis): tests for this.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Percy command-line interface