rubocop-cask 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d2072108140f809e919c9f1bfe3c9a7fbf095c5d16b2db1a5eb1c1ac2f5db5
-  data.tar.gz: db42b732f5139900a29cc9d461f7c405ae861fd515b280a6b517d772985cf313
+  metadata.gz: 0416ad989e2e206697e6e3a255f6ca37c4455134453cb8d79225dd275743728d
+  data.tar.gz: bd884af3ba5b89ac48b69070c7d6d53a2176ab381ee64d5996d042c125a0cd85
 SHA512:
-  metadata.gz: 7cedcd755c015b5cdcd97245f8c7c4feef9e51d24cdacc0a033376facea45a83b8f83b0be53cfb23a851b6183f5fcabbc7a87c9d952a6d9cb37ed186b312dfb3
-  data.tar.gz: b99489754639d326f3d3fcc3323301a26d75e55b76e07d83ab88f6f8d9aaa5b6a44bc6073cea2c2f933681d9c4241b2fecb9e99cba6a6ac226608d6ce397a1c3
+  metadata.gz: 607c4f15c81aa2592ac0812b6472c5ee62f95439eb972bbfc6636664e8ba586c62f38e53a2e362444e5acfd3ced5206f642bdc638038ff179bfc39ea1bd932e6
+  data.tar.gz: b453fc2ca3ffd8f6680094890acb691d992095dd7bfa7fc14ba8a9f1e99141c8b13ecc4381d7b4b88d3eee93f0cdac413c20f721f392866c084c6e83332b08c0

data/lib/rubocop/cask/ast/cask_header.rb

@@ -14,10 +14,6 @@ module RuboCop
           hash_node
         end
 
-        def test_cask?
-          header_method_name == :test_cask || dsl_version.to_s.include?('test')
-        end
-
         def header_str
           @header_str ||= source_range.source
         end
@@ -27,19 +23,7 @@ module RuboCop
         end
 
         def preferred_header_str
-          "#{preferred_header_method_name} '#{cask_token}'"
-        end
-
-        def preferred_header_method_name
-          test_cask? ? :test_cask : :cask
-        end
-
-        def header_method_name
-          @header_method_name ||= method_node.method_name
-        end
-
-        def dsl_version
-          @dsl_version ||= pair_node.key_node.children.first
+          "cask '#{cask_token}'"
         end
 
         def cask_token

data/lib/rubocop/cask/constants.rb

@@ -2,14 +2,11 @@ module RuboCop
   module Cask
     # Constants available globally for use in all Cask cops.
     module Constants
-      CASK_METHOD_NAMES = [:cask, :test_cask].freeze
-
       STANZA_GROUPS = [
         [:version, :sha256],
         [:url, :appcast, :name, :homepage],
         [
           :auto_updates,
-          :accessibility_access,
           :conflicts_with,
           :depends_on,
           :container

data/lib/rubocop/cask/extend/node.rb

@@ -11,13 +11,7 @@ module RuboCop
       def_node_matcher :key_node,    '{(pair $_ _) (hash (pair $_ _) ...)}'
       def_node_matcher :val_node,    '{(pair _ $_) (hash (pair _ $_) ...)}'
 
-      def cask_block?
-        block_type? && method_node.cask_header?
-      end
-
-      def cask_header?
-        send_type? && CASK_METHOD_NAMES.include?(method_name)
-      end
+      def_node_matcher :cask_block?, '(block (send nil? :cask _) args ...)'
 
       def stanza?
         (send_type? || block_type?) && STANZA_ORDER.include?(method_name)

data/lib/rubocop/cask/version.rb

@@ -3,6 +3,6 @@ require 'rubygems'
 module RuboCop
   module Cask
     # Version information for the Cask RuboCop plugin.
-    VERSION = '0.22.0'.freeze
+    VERSION = '0.23.0'.freeze
   end
 end

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

@@ -14,7 +14,7 @@ module RuboCop
 
         REFERENCE_URL = 'https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#when-url-and-homepage-hostnames-differ-add-a-comment'.freeze
 
-        COMMENT_FORMAT = /# [^ ]+ was verified as official when first introduced to the cask/
+        COMMENT_FORMAT = /# [^ ]+ was verified as official when first introduced to the cask/.freeze
 
         MSG_NO_MATCH = '`%<url>s` does not match `%<full_url>s`'.freeze
 
@@ -24,8 +24,8 @@ module RuboCop
         MSG_WRONG_FORMAT = '`%<comment>s` does not match the expected comment format. ' \
                            'For details, see ' + REFERENCE_URL
 
-        MSG_UNNECESSARY = '`%<domain>s` matches `%<homepage>s`, the comment above the `url` ' \
-                          'stanza is unnecessary'.freeze
+        MSG_UNNECESSARY = 'The URL\'s domain `%<domain>s` matches the homepage `%<homepage>s`, ' \
+                          'the comment above the `url` stanza is unnecessary'.freeze
 
         def on_cask(cask_block)
           @cask_block = cask_block
@@ -52,6 +52,7 @@ module RuboCop
         def add_offense_unnecessary_comment(stanza)
           return unless comment?(stanza)
           return unless url_match_homepage?(stanza)
+          return unless comment_matches_format?(stanza)
           return unless comment_matches_url?(stanza)
 
           comment = comment(stanza).loc.expression

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

@@ -75,8 +75,9 @@ describe RuboCop::Cop::Cask::HomepageMatchesUrl do
     end
     let(:expected_offenses) do
       [{
-        message: '`foo.example.com` matches `example.com`, ' \
-                 'the comment above the `url` stanza is unnecessary',
+        message: 'The URL\'s domain `foo.example.com` matches the homepage ' \
+                 '`example.com`, the comment above the `url` stanza is ' \
+                 'unnecessary',
         severity: :convention,
         line: 2,
         column: 2,

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

@@ -29,50 +29,5 @@ describe RuboCop::Cop::Cask::NoDslVersion do
 
       include_examples 'autocorrects source'
     end
-
-    context 'with dsl version containing "test"' do
-      let(:source) { "cask :v1test => 'foo' do; end" }
-      let(:correct_source) { "test_cask 'foo' do; end" }
-      let(:expected_offenses) do
-        [{
-          message: "Use `test_cask 'foo'` instead of `cask :v1test => 'foo'`",
-          severity: :convention,
-          line: 1,
-          column: 0,
-          source: "cask :v1test => 'foo'"
-        }]
-      end
-
-      include_examples 'reports offenses'
-
-      include_examples 'autocorrects source'
-    end
-  end
-
-  context 'with header method `test_cask`' do
-    context 'with no dsl version' do
-      let(:source) { "test_cask 'foo' do; end" }
-
-      include_examples 'does not report any offenses'
-    end
-
-    context 'with dsl version' do
-      let(:source) { "test_cask :v1 => 'foo' do; end" }
-      let(:correct_source) { "test_cask 'foo' do; end" }
-      let(:expected_offenses) do
-        [{
-          message: "Use `test_cask 'foo'` instead of "\
-                   "`test_cask :v1 => 'foo'`",
-          severity: :convention,
-          line: 1,
-          column: 0,
-          source: "test_cask :v1 => 'foo'"
-        }]
-      end
-
-      include_examples 'reports offenses'
-
-      include_examples 'autocorrects source'
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Joshua Hagins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.1
+        version: 0.60.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.1
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Code style checking for Homebrew-Cask files