rubocop-cask 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20c70b535a7f7a0aade9f2fb33eec5a52c6ed63c
-  data.tar.gz: 67f22d2efeaa1e20df95f9737c50234d7c929501
+  metadata.gz: 02c2b2529f1fade3ca9a1cb469bd93a3045691a6
+  data.tar.gz: d917f20d41ec9a706310409cff6c845e0931b94c
 SHA512:
-  metadata.gz: 34d53b4881babc3d66f6cabc6da513f9cf04fa46651ff6ef0e2e9ac3221abaec1145c1dbfa2c5820c46da891db63b1bb1a35be3a7629c8d3855034517671b412
-  data.tar.gz: d65f6a09b2ed8aaa99755a8f5a8bed5e117fa85ac0af9be6e494b13e77bca39add26b21b74e36dc6b89d8264a0aeb87d10708ed014a47aec502011385c81b540
+  metadata.gz: eb0f81dcea7c2f56ffa6817fa4dac7f5ae698391f7dadbd465f4c3ba9bb9621017bebe43f2f60287727b424bfc95c6373e97eccd287a1a410d1934b238da7f6c
+  data.tar.gz: 603af6daa35201369ac47f03f8a89ca32dd24fe6576bd5e3738c75a4e701bf6c741e5f10471a8b85a2becc16d59183a027431d2228f7317bfd0f6f32a64730a0

data/lib/rubocop/cask/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cask
     # Version information for the Cask RuboCop plugin.
     module Version
-      STRING = '0.8.0'.freeze
+      STRING = '0.8.1'.freeze
 
       def self.gem_version
         Gem::Version.new(STRING)

data/lib/rubocop/cop/cask/homepage_matches_url.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'public_suffix'
 
 module RuboCop
   module Cop
@@ -14,7 +15,7 @@ module RuboCop
         MSG_NO_MATCH = '`%s` does not match `%s`'.freeze
 
         MSG_MISSING = '`%s` does not match `%s`, a comment in the form of ' \
-                      '`# example.com was verified as official when first ' \
+                      '`# %s was verified as official when first ' \
                       'introduced to the cask` has to be added above the ' \
                       '`url` stanza'.freeze
 
@@ -35,7 +36,7 @@ module RuboCop
         def add_offenses
           toplevel_stanzas.select(&:url?).each do |url|
             if url_match_homepage?(url)
-              next unless comment?(url)
+              next unless comment?(url) && comment_matches_url?(url)
               add_offense_unnecessary_comment(url)
             elsif !comment?(url)
               add_offense_missing_comment(url)
@@ -47,21 +48,22 @@ module RuboCop
 
         def add_offense_missing_comment(stanza)
           range = stanza.source_range
-          add_offense(range, range, format(MSG_MISSING, url(stanza), homepage))
+          url_domain = domain(stanza)
+          add_offense(range, range, format(MSG_MISSING, url_domain, homepage, url_domain))
         end
 
         def add_offense_unnecessary_comment(stanza)
           comment = comment(stanza).loc.expression
           add_offense(comment,
                       comment,
-                      format(MSG_UNNECESSARY, url(stanza), homepage))
+                      format(MSG_UNNECESSARY, domain(stanza), homepage))
         end
 
         def add_offense_no_match(stanza)
           comment = comment(stanza).loc.expression
           add_offense(comment,
                       comment,
-                      format(MSG_NO_MATCH, url_from_comment(stanza), url(stanza)))
+                      format(MSG_NO_MATCH, url_from_comment(stanza), full_url(stanza)))
         end
 
         def comment?(stanza)
@@ -78,33 +80,33 @@ module RuboCop
         end
 
         def comment_matches_url?(stanza)
-          url(stanza).include?(url_from_comment(stanza))
+          full_url(stanza).include?(url_from_comment(stanza))
         end
 
-        def strip_http(url)
-          url.sub(%r{^.*://(?=www\.)?}, '')
+        def strip_url_scheme(url)
+          url.sub(%r{^.*://(www\.)?}, '')
         end
 
-        def extract_stanza(stanza)
-          stanza.source
-            .sub(/#{stanza.stanza_name} \'(.*)\'/, '\1')
-            .sub(/#{stanza.stanza_name} \"(.*)\"/, '\1')
+        def domain(stanza)
+          strip_url_scheme(extract_url(stanza)).gsub(%r{^([^/]+).*}, '\1')
         end
 
-        def domain(url)
-          strip_http(url).gsub(%r{^([^/]+).*}, '\1')
+        def extract_url(stanza)
+          string = stanza.stanza_node.children[2]
+          return string.str_content if string.str_type?
+          string.to_s.gsub(%r{.*"([a-z0-9]+\:\/\/[^"]+)".*}m, '\1')
         end
 
-        def url_match_homepage?(url)
-          url(url).include?(homepage)
+        def url_match_homepage?(stanza)
+          PublicSuffix.domain(domain(stanza)) == homepage
         end
 
-        def url(stanza)
-          domain(extract_stanza(stanza))
+        def full_url(stanza)
+          strip_url_scheme(extract_url(stanza))
         end
 
         def homepage
-          url(toplevel_stanzas.find(&:homepage?))
+          PublicSuffix.domain(domain(toplevel_stanzas.find(&:homepage?)))
         end
       end
     end

data/spec/rubocop/cop/cask/homepage_matches_url_spec.rb

@@ -23,41 +23,45 @@ describe RuboCop::Cop::Cask::HomepageMatchesUrl do
       include_examples 'does not report any offenses'
     end
 
-    context 'but there is a comment' do
-      let(:source) do
-        <<-CASK.undent
-          cask 'foo' do
-            # foo.example.com was verified as official when first introduced to the cask
-            url 'https://foo.example.com/foo.zip'
-            homepage 'https://foo.example.com'
-          end
-        CASK
-      end
-      let(:expected_offenses) do
-        [{
-          message: '`foo.example.com` matches `foo.example.com`, ' \
-                   'the comment above the `url` stanza is unnecessary',
-          severity: :convention,
-          line: 2,
-          column: 2,
-          source: '# foo.example.com was verified as official when ' \
-                  'first introduced to the cask'
-        }]
+    context 'and the url stanza has a referrer' do
+      context 'and no interpolation' do
+        let(:source) do
+          <<-CASK.undent
+            cask 'foo' do
+              url 'https://foo.example.com/foo.zip',
+                  referrer: 'https://example.com/foo/'
+              homepage 'https://foo.example.com'
+            end
+          CASK
+        end
+
+        include_examples 'does not report any offenses'
       end
 
-      include_examples 'reports offenses'
+      context 'and interpolation' do
+        let(:source) do
+          <<-CASK.undent
+            cask 'foo' do
+              version '1.8.0_72,8.13.0.5'
+              url "https://foo.example.com/foo-\#{version.after_comma}-\#{version.minor}.\#{version.patch}.\#{version.before_comma.sub(\%r{.*_}, '')}.zip",
+                  referrer: 'https://example.com/foo/'
+              homepage 'https://foo.example.com'
+            end
+          CASK
+        end
+
+        include_examples 'does not report any offenses'
+      end
     end
-  end
 
-  context 'when the url does not match the homepage' do
-    context 'and there is a comment' do
-      context 'which matches the url' do
+    context 'but there is a comment' do
+      context 'which does not match the url' do
         let(:source) do
           <<-CASK.undent
             cask 'foo' do
-              # example.com was verified as official when first introduced to the cask
+              # this is just a comment with information
               url 'https://example.com/foo.zip'
-              homepage 'https://foo.example.com'
+              homepage 'https://example.com'
             end
           CASK
         end
@@ -65,23 +69,82 @@ describe RuboCop::Cop::Cask::HomepageMatchesUrl do
         include_examples 'does not report any offenses'
       end
 
+      context 'which matches the url' do
+        let(:source) do
+          <<-CASK.undent
+            cask 'foo' do
+              # foo.example.com was verified as official when first introduced to the cask
+              url 'https://foo.example.com/foo.zip'
+              homepage 'https://foo.example.com'
+            end
+          CASK
+        end
+        let(:expected_offenses) do
+          [{
+            message: '`foo.example.com` matches `example.com`, ' \
+                     'the comment above the `url` stanza is unnecessary',
+            severity: :convention,
+            line: 2,
+            column: 2,
+            source: '# foo.example.com was verified as official when ' \
+                    'first introduced to the cask'
+          }]
+        end
+
+        include_examples 'reports offenses'
+      end
+    end
+  end
+
+  context 'when the url does not match the homepage' do
+    context 'and there is a comment' do
+      context 'which matches the url' do
+        context 'and does not have slashes' do
+          let(:source) do
+            <<-CASK.undent
+              cask 'foo' do
+                # example.com was verified as official when first introduced to the cask
+                url 'https://example.com/foo.zip'
+                homepage 'https://foo.example.org'
+              end
+            CASK
+          end
+
+          include_examples 'does not report any offenses'
+        end
+
+        context 'and has slashes' do
+          let(:source) do
+            <<-CASK.undent
+              cask 'foo' do
+                # example.com/vendor/app was verified as official when first introduced to the cask
+                url 'https://downloads.example.com/vendor/app/foo.zip'
+                homepage 'https://vendor.example.org/app/'
+              end
+            CASK
+          end
+
+          include_examples 'does not report any offenses'
+        end
+      end
+
       context 'which does not match the url' do
         let(:source) do
           <<-CASK.undent
             cask 'foo' do
-              # example.org was verified as official when first introduced to the cask
-              url 'https://example.com/foo.zip'
+              # example.com was verified as official when first introduced to the cask
+              url 'https://example.org/foo.zip'
               homepage 'https://foo.example.com'
             end
           CASK
         end
         let(:expected_offenses) do
           [{
-            message: '`example.org` does not match `example.com`',
+            message: '`example.com` does not match `example.org/foo.zip`',
             severity: :convention,
             line: 2,
             column: 2,
-            source: '# example.org was verified as official when ' \
+            source: '# example.com was verified as official when ' \
                     'first introduced to the cask'
           }]
         end
@@ -95,13 +158,13 @@ describe RuboCop::Cop::Cask::HomepageMatchesUrl do
         <<-CASK.undent
           cask 'foo' do
             url 'https://example.com/foo.zip'
-            homepage 'https://foo.example.com'
+            homepage 'https://example.org'
           end
         CASK
       end
       let(:expected_offenses) do
         [{
-          message: '`example.com` does not match `foo.example.com`, a ' \
+          message: '`example.com` does not match `example.org`, a ' \
                    'comment in the form of `# example.com was verified as ' \
                    'official when first introduced to the cask` has to be ' \
                    'added above the `url` stanza',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Joshua Hagins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop