puppet-lint-unquoted_string-check 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1234067b3fd6b2651cc7a2be8c632b70c0a2094d
-  data.tar.gz: 840a3bd085a8ed87c71fc537980e0201a135daab
+  metadata.gz: d0da62169a6718196034aff4f7ab841c9220fb93
+  data.tar.gz: 3c32f8a9a476915f75eba6df3b042d20cbc68891
 SHA512:
-  metadata.gz: 1b7e03d5414177c65f9751085e901274ef2c64286515e52cc0abf9b845d034302bae035981f2103b5b3a5f4099a3ad287b718ee7f55e43cf552d7d8d89942182
-  data.tar.gz: 597c0695a7f642d647f5766a4003f12618f3cc1b8ac6c1fbaff1deb6d2ec7bf32e6947a5c31a59eb60a05bb929394da8fa46ee263b689a444d6bca8c6adf8197
+  metadata.gz: 53561bea1d4e76646a010c4d2a1318f87b243658aa029b4bbd86e4dfca4477862560f3f6c6d980167516913d6c35d00c4b355332e2931380bec0dec49a8eb2f6
+  data.tar.gz: ccd89bbf93c121df5ac76816a8f45192ac38c6bfaa5b0dd69840fcea34c4dc76353b344c43098acb518d9b1b3eb6db919d5fba100976424fa594675ca41fbc7d

data/lib/puppet-lint/plugins/check_unquoted_string_in_case.rb

@@ -22,66 +22,44 @@ def type_indexes(type)
   type_indexes
 end
 
-def tokens_to_fix(type_tokens, sep_type)
-  tokens_to_fix = []
-  type_tokens.index do |r|
-    if r.type == sep_type
-      s = r.prev_token
-      while s.type != :NEWLINE and s.type != :LBRACE
-        if s.type == :NAME || s.type == :CLASSREF
-          tokens_to_fix << s
+def notify_tokens(type, sep_type, message)
+  type_indexes(type).each do |kase|
+    type_tokens = tokens[kase[:start]..kase[:end]]
+    type_tokens.index do |r|
+      if r.type == sep_type
+        s = r.prev_token
+        while s.type != :NEWLINE and s.type != :LBRACE
+          if s.type == :NAME || s.type == :CLASSREF
+            notify :warning, {
+              :message => message,
+              :line    => s.line,
+              :column  => s.column,
+              :token   => s,
+            }
+          end
+          s = s.prev_token
         end
-        s = s.prev_token
       end
     end
   end
-  tokens_to_fix
-end
-
-def act_on_tokens(type, sep_type, &block)
-  type_indexes(type).each do |kase|
-    case_tokens = tokens[kase[:start]..kase[:end]]
-
-    tokens_to_fix(case_tokens, sep_type).each do |r|
-      block.call(r)
-    end
-  end
 end
 
 PuppetLint.new_check(:unquoted_string_in_case) do
-
   def check
-    act_on_tokens(:CASE, :COLON) do |r|
-      notify :warning, {
-        :message => 'unquoted string in case',
-        :line    => r.line,
-        :column  => r.column,
-      }
-    end
+    notify_tokens(:CASE, :COLON, 'unquoted string in case')
   end 
 
   def fix(problem)
-    act_on_tokens(:CASE, :COLON) do |r|
-      r.type = :SSTRING
-    end
+    problem[:token].type = :SSTRING
   end
 end
 
 PuppetLint.new_check(:unquoted_string_in_selector) do
-
   def check
-    act_on_tokens(:QMARK, :FARROW) do |r|
-      notify :warning, {
-        :message => 'unquoted string in selector',
-        :line    => r.line,
-        :column  => r.column,
-      }
-    end
+    notify_tokens(:QMARK, :FARROW, 'unquoted string in selector')
   end 
 
   def fix(problem)
-    act_on_tokens(:QMARK, :FARROW) do |r|
-      r.type = :SSTRING
-    end
+    problem[:token].type = :SSTRING
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-unquoted_string-check
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Camptocamp
@@ -120,5 +120,5 @@ summary: A puppet-lint plugin to check that selectors and case statements cases
   quoted.
 test_files:
 - spec/spec_helper.rb
-- spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_case_spec.rb
 - spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_selector_spec.rb
+- spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_case_spec.rb