rubocop-cask 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28972420dc9ce7f5af5f9acd84d29315618b81b6
-  data.tar.gz: 7805e7dc619fd148d982a7397a7cf49c0eb7aa17
+  metadata.gz: a7bfd4f036ef39c44b9eb7b4674f42f9b01914c8
+  data.tar.gz: 22211aefd4d93daeb700fcdbb2b1749b539cbc5f
 SHA512:
-  metadata.gz: 898b80daadf2ab178beae041529bb41e580d6fb59c031b46c03411132d9ec0a829099204024efa22e5940f02e46d412ed723a30797ee4c4c9f0a58d1c4250a6a
-  data.tar.gz: 950eaf10f6c9cf303b10d0d38b89355ddb6ac3652b19788e63f71cef51a01d7c0ae043a5c855b2479e20d60473b2c21f22cc940d193dc09ec5ae6521f68e7c7e
+  metadata.gz: 7ff1dfab7f15095c227549f4dc54d44c1cab1c398b64767c070c01e38d60b46f65f4c5233ae1a101111428a1e1bcfc436f8c18f1a2f43c9aa60c976a73134689
+  data.tar.gz: 5807adcf506a9da06929422184d3d831665abf94d5f532d0c11d801f86718812b78f54cb7023af5d7f8ccdae348ff452ddd65892def4bfa64ee3f703a824266a

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.0.0'
+      STRING = '0.0.1'
 
       def self.gem_version
         Gem::Version.new(STRING)

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

@@ -14,7 +14,7 @@ module RuboCop
       #     ...
       #   end
       class NoDslVersion < Cop
-        MESSAGE = "Use `%s '%s'` instead of `%s %s => '%s'`"
+        MESSAGE = 'Use `%s` instead of `%s`'
 
         CASK_METHOD_NAMES = [:cask, :test_cask]
 
@@ -22,19 +22,26 @@ module RuboCop
           method, _args, _body = node.children
           _receiver, method_name, object = method.children
           return unless CASK_METHOD_NAMES.include?(method_name)
-          return unless object.type == :hash
           check(method_name, object)
         end
 
         private
 
         def check(method_name, object)
+          return unless object.type == :hash
+          message = build_message(method_name, object)
+          add_offense(object, :expression, message)
+        end
+
+        def build_message(method_name, object)
           left, right = *object.children.first
-          dsl_version_sym = left.children.first
           cask_token = right.children.first
-          message = format(MESSAGE, method_name, cask_token, method_name,
-                           dsl_version_sym.inspect, cask_token)
-          add_offense(object, :expression, message)
+          dsl_version_str = left.children.first.to_s
+          new_method_name =
+            dsl_version_str.include?('test') ? :test_cask : method_name
+          preferred_header = "#{new_method_name} '#{cask_token}'"
+          actual_header = "#{method_name} #{object.loc.expression.source}"
+          format(MESSAGE, preferred_header, actual_header)
         end
       end
     end

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

@@ -14,6 +14,19 @@ describe RuboCop::Cop::Cask::NoDslVersion do
       .to eq([":v1 => 'foo'"])
   end
 
+  it 'checks for dsl version with test in cask header' do
+    inspect_source(cop, [
+      "cask :v1test => 'foo' do",
+      'end'
+    ])
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.first.line).to eq(1)
+    expect(cop.messages)
+      .to eq(["Use `test_cask 'foo'` instead of `cask :v1test => 'foo'`"])
+    expect(cop.highlights)
+      .to eq([":v1test => 'foo'"])
+  end
+
   it 'ignores cask header with no dsl version' do
     inspect_source(cop, [
       "cask 'foo' do",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Joshua Hagins