rubocop-cask 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b59dbdf77871dfb415f6c6b82a839adf420ef2
-  data.tar.gz: 6272d48c52239336dfb184841a762def030aa4ed
+  metadata.gz: 2ac6a5d268b98862401e58b0085e4efa060c0583
+  data.tar.gz: 566a249832eabe03dd177f584915918a076c87d3
 SHA512:
-  metadata.gz: d1613b3809074f0ac320b6dc6ae492d4d0a876111bc5bc4dbb342d531114fe66fcf4e813c1917e1bb17583afd26f689496d0bc429efc796aea9ffb73db648de4
-  data.tar.gz: 267fb175ad3f454167720ffa8b9ea9ca71d84f14e8ddeb36433e6d60122557e3613be67a5275a52760b22e7af93bdd09ecc610bb762d3ffc4ad1a109c76a600d
+  metadata.gz: d2e4d8eacaf06880cd78e9889b2f62936a69145d9cb1a3ced0b1712ee54bf31904f20c82a737179132a8ff865fe7fc5cd285bdadc61ce76f92515f9b0606ee2f
+  data.tar.gz: e81e01ee41c0ac1dbb3e76fa6aa45cecd2d6fb25634dc351e93ed32de67b80e572b0305816dde37ea92f8c09e3264e2f1bb48cb3a58e33a1163e5421c6164973

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

@@ -54,7 +54,7 @@ module RuboCop
         alias eql? ==
 
         Constants::STANZA_ORDER.each do |stanza_name|
-          class_eval <<-RUBY, __FILE__, __LINE__
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{stanza_name}?
               stanza_name == :#{stanza_name}
             end

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.15.1'.freeze
+    VERSION = '0.16.0'.freeze
   end
 end

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

@@ -16,15 +16,15 @@ module RuboCop
 
         COMMENT_FORMAT = /# [^ ]+ was verified as official when first introduced to the cask/
 
-        MSG_NO_MATCH = '`%s` does not match `%s`'.freeze
+        MSG_NO_MATCH = '`%<url>s` does not match `%<full_url>s`'.freeze
 
-        MSG_MISSING = '`%s` does not match `%s`, a comment has to be added ' \
+        MSG_MISSING = '`%<domain>s` does not match `%<homepage>s`, a comment has to be added ' \
                       'above the `url` stanza. For details, see ' + REFERENCE_URL
 
-        MSG_WRONG_FORMAT = '`%s` does not match the expected comment format. ' \
+        MSG_WRONG_FORMAT = '`%<comment>s` does not match the expected comment format. ' \
                            'For details, see ' + REFERENCE_URL
 
-        MSG_UNNECESSARY = '`%s` matches `%s`, the comment above the `url` ' \
+        MSG_UNNECESSARY = '`%<domain>s` matches `%<homepage>s`, the comment above the `url` ' \
                           'stanza is unnecessary'.freeze
 
         def on_cask(cask_block)
@@ -56,7 +56,7 @@ module RuboCop
           comment = comment(stanza).loc.expression
           add_offense(comment,
                       location: comment,
-                      message: format(MSG_UNNECESSARY, domain(stanza), homepage))
+                      message: format(MSG_UNNECESSARY, domain: domain(stanza), homepage: homepage))
         end
 
         def add_offense_missing_comment(stanza)
@@ -65,7 +65,7 @@ module RuboCop
 
           range = stanza.source_range
           url_domain = domain(stanza)
-          add_offense(range, location: range, message: format(MSG_MISSING, url_domain, homepage, url_domain))
+          add_offense(range, location: range, message: format(MSG_MISSING, domain: url_domain, homepage: homepage))
         end
 
         def add_offense_no_match(stanza)
@@ -76,7 +76,7 @@ module RuboCop
           comment = comment(stanza).loc.expression
           add_offense(comment,
                       location: comment,
-                      message: format(MSG_NO_MATCH, url_from_comment(stanza), full_url(stanza)))
+                      message: format(MSG_NO_MATCH, url: url_from_comment(stanza), full_url: full_url(stanza)))
         end
 
         def add_offense_wrong_format(stanza)
@@ -87,7 +87,7 @@ module RuboCop
           comment = comment(stanza).loc.expression
           add_offense(comment,
                       location: comment,
-                      message: format(MSG_WRONG_FORMAT, comment(stanza).text))
+                      message: format(MSG_WRONG_FORMAT, comment: comment(stanza).text))
         end
 
         def comment?(stanza)

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

@@ -9,7 +9,7 @@ module RuboCop
       class HomepageUrlTrailingSlash < Cop
         include OnHomepageStanza
 
-        MSG_NO_SLASH = "'%s' must have a slash after the domain.".freeze
+        MSG_NO_SLASH = "'%<url>s' must have a slash after the domain.".freeze
 
         def on_homepage_stanza(stanza)
           url_node = stanza.stanza_node.first_argument
@@ -17,7 +17,7 @@ module RuboCop
 
           return if url !~ %r{^.+://[^/]+$}
           add_offense(url_node, location: :expression,
-                                message: format(MSG_NO_SLASH, url))
+                                message: format(MSG_NO_SLASH, url: url))
         end
 
         def autocorrect(node)

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

@@ -19,7 +19,7 @@ module RuboCop
         extend Forwardable
         include CaskHelp
 
-        MESSAGE = 'Use `%s` instead of `%s`'.freeze
+        MESSAGE = 'Use `%<preferred>s` instead of `%<current>s`'.freeze
 
         def on_cask(cask_block)
           @cask_header = cask_block.header
@@ -53,7 +53,7 @@ module RuboCop
         end
 
         def error_msg
-          format(MESSAGE, preferred_header_str, header_str)
+          format(MESSAGE, preferred: preferred_header_str, current: header_str)
         end
       end
     end

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

@@ -10,7 +10,7 @@ module RuboCop
         extend Forwardable
         include CaskHelp
 
-        MESSAGE = '`%s` stanza out of order'.freeze
+        MESSAGE = '`%<stanza>s` stanza out of order'.freeze
 
         def on_cask(cask_block)
           @cask_block = cask_block
@@ -34,7 +34,7 @@ module RuboCop
 
         def add_offenses
           offending_stanzas.each do |stanza|
-            message = format(MESSAGE, stanza.stanza_name)
+            message = format(MESSAGE, stanza: stanza.stanza_name)
             add_offense(stanza, location: stanza.source_range_with_comments,
                                 message: message)
           end

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

@@ -137,19 +137,19 @@ describe RuboCop::Cop::Cask::StanzaGrouping do
 
   context 'when caveats stanza is incorrectly grouped' do
     let(:source) do
-      format(<<-CASK.undent, caveats.strip)
+      format(<<-CASK.undent, caveats: caveats.strip)
         cask 'foo' do
           version :latest
           sha256 :no_check
           url 'https://foo.example.com/foo.zip'
           name 'Foo'
           app 'Foo.app'
-          %s
+          %<caveats>s
         end
       CASK
     end
     let(:correct_source) do
-      format(<<-CASK.undent, caveats.strip)
+      format(<<-CASK.undent, caveats: caveats.strip)
         cask 'foo' do
           version :latest
           sha256 :no_check
@@ -159,7 +159,7 @@ describe RuboCop::Cop::Cask::StanzaGrouping do
 
           app 'Foo.app'
 
-          %s
+          %<caveats>s
         end
       CASK
     end

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

@@ -193,11 +193,11 @@ describe RuboCop::Cop::Cask::StanzaOrder do
 
   context 'when the caveats stanza is out of order' do
     let(:source) do
-      format(<<-CASK.undent, caveats.strip)
+      format(<<-CASK.undent, caveats: caveats.strip)
         cask 'foo' do
           name 'Foo'
           url 'https://foo.example.com/foo.zip'
-          %s
+          %<caveats>s
           version :latest
           app 'Foo.app'
           sha256 :no_check
@@ -205,14 +205,14 @@ describe RuboCop::Cop::Cask::StanzaOrder do
       CASK
     end
     let(:correct_source) do
-      format(<<-CASK.undent, caveats.strip)
+      format(<<-CASK.undent, caveats: caveats.strip)
         cask 'foo' do
           version :latest
           sha256 :no_check
           url 'https://foo.example.com/foo.zip'
           name 'Foo'
           app 'Foo.app'
-          %s
+          %<caveats>s
         end
       CASK
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Joshua Hagins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement