puppet-lint-trailing_comma-check 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe5aee738e1475cc878f16a346cd865a65816d5
-  data.tar.gz: c28c215aa8395c695d3a2110a3d80fb1094d5aec
+  metadata.gz: fa2a36ca4307710331baaa180b0791ee63dcd591
+  data.tar.gz: d3444472a003019d87de2945c84c9f96f5eb1769
 SHA512:
-  metadata.gz: 90b31b52f716941fb3febcc736b8bc87b0f507d4355cd2bbe1205db5f843cf968b96b38b46b5c2e48b22bafb7a60edeca75bcdd5f2b168bbc259b6d924366c98
-  data.tar.gz: 4b983edc4f6f5f6ddbb6f4943af3accd9754b1bf0119835772c588f49809d00cd83c82683531a96eb7a905a87be6b673c91e5f6ce0cc3e3a44612a9ec3a70e06
+  metadata.gz: d235a2f71f944e22639ff157ddd7faada07d2ec6c92de801cf6de610ee576e9f09112d113aabecf3bc5fbb3495fb61ba3ff47386a30ab425fcb630a20c7d2c49
+  data.tar.gz: 066b977847270a699e830fe1b0f656415cfcd6997c15c9f76f4ba8185c8fd1c59797ec835413b8b5c3ee1214fa8a927ba4f4494b662f168c87fd27b60bf28b74

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

@@ -1,44 +1,76 @@
 PuppetLint.new_check(:trailing_comma) do
   def array_indexes
-    results = []
-    tokens.each_with_index do |token, token_idx|
-      if token.type == :LBRACK
-        real_idx = 0
-        tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
-          real_idx = token_idx + 1 + cur_token_idx
-          break if cur_token.type == :RBRACK
+    @array_indexes ||= Proc.new do
+      arrays = []
+      tokens.each_with_index do |token, token_idx|
+        if token.type == :LBRACK
+          real_idx = 0
+          tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
+            real_idx = token_idx + 1 + cur_token_idx
+            break if cur_token.type == :RBRACK
+          end
+
+          arrays << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
         end
+      end
+      arrays
+    end.call
+  end
 
-        results << {
-          :start  => token_idx,
-          :end    => real_idx,
-          :tokens => tokens[token_idx..real_idx],
-        }
+  def hash_indexes
+    @hash_indexes ||= Proc.new do
+      hashes = []
+      tokens.each_with_index do |token, token_idx|
+        next unless token.prev_code_token
+        next unless [:EQUALS, :ISEQUAL, :FARROW, :LPAREN].include? token.prev_code_token.type
+        if token.type == :LBRACE
+          level = 0
+          real_idx = 0
+          tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
+            real_idx = token_idx + 1 + cur_token_idx
+
+            level += 1 if cur_token.type == :LBRACE
+            level -= 1 if cur_token.type == :RBRACE
+            break if level < 0
+          end
+
+          hashes << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
+        end
       end
-    end
-    results
+      hashes
+    end.call
   end
 
   def defaults_indexes
-    results = []
-    tokens.each_with_index do |token, token_idx|
-      if token.type == :CLASSREF && token.next_code_token && \
-         token.next_code_token.type == :LBRACE
-        real_idx = 0
+    @defaults_indexes ||= Proc.new do
+      defaults = []
+      tokens.each_with_index do |token, token_idx|
+        if token.type == :CLASSREF && token.next_code_token && \
+          token.next_code_token.type == :LBRACE
+          real_idx = 0
 
-        tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
-          real_idx = token_idx + 1 + cur_token_idx
-          break if cur_token.type == :RBRACE
-        end
+          tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
+            real_idx = token_idx + 1 + cur_token_idx
+            break if cur_token.type == :RBRACE
+          end
 
-        results << {
-          :start  => token_idx,
-          :end    => real_idx,
-          :tokens => tokens[token_idx..real_idx],
-        }
+          defaults << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
+        end
       end
-    end
-    results
+      defaults
+    end.call
   end
 
   def check_elem(elem, except_type)
@@ -67,6 +99,11 @@ PuppetLint.new_check(:trailing_comma) do
       check_elem(array, :LBRACK)
     end
 
+    # Hashes
+    hash_indexes.each do |hash|
+      check_elem(hash, :LBRACE)
+    end
+
     # Defaults
     defaults_indexes.each do |defaults|
       check_elem(defaults, :LBRACE)

data/spec/puppet-lint/plugins/check_trailing_comma/check_trailing_comma_spec.rb

@@ -41,6 +41,14 @@ describe 'trailing_comma' do
           owner => root,
           group => '0',
         }
+
+        $foo = {
+          'bar' => {
+            baz  => 'abc',
+            bazz => 'def',
+          },
+          'qux' => 'ghi',
+        }
         EOS
       }
 
@@ -86,11 +94,19 @@ describe 'trailing_comma' do
           owner => root,
           group => '0'
         }
+
+        $foo = {
+          'bar' => {
+            baz  => 'abc',
+            bazz => 'def'
+          },
+          'qux' => 'ghi'
+        }
         EOS
       }
 
-      it 'should detect 4 problems' do
-        expect(problems).to have(4).problems
+      it 'should detect 6 problems' do
+        expect(problems).to have(6).problems
       end
 
       it 'should create warnings' do
@@ -98,6 +114,8 @@ describe 'trailing_comma' do
         expect(problems).to contain_warning(msg).on_line(10).in_column(27)
         expect(problems).to contain_warning(msg).on_line(24).in_column(18)
         expect(problems).to contain_warning(msg).on_line(33).in_column(23)
+        expect(problems).to contain_warning(msg).on_line(39).in_column(26)
+        expect(problems).to contain_warning(msg).on_line(41).in_column(25)
       end
     end
   end
@@ -148,6 +166,14 @@ describe 'trailing_comma' do
           owner => root,
           group => '0',
         }
+
+        $foo = {
+          'bar' => {
+            baz  => 'abc',
+            bazz => 'def',
+          },
+          'qux' => 'ghi',
+        }
         EOS
       }
 
@@ -197,11 +223,19 @@ describe 'trailing_comma' do
           owner => root,
           group => '0'
         }
+
+        $foo = {
+          'bar' => {
+            baz  => 'abc',
+            bazz => 'def'
+          },
+          'qux' => 'ghi'
+        }
         EOS
       }
 
-      it 'should detect 4 problems' do
-        expect(problems).to have(4).problems
+      it 'should detect 6 problems' do
+        expect(problems).to have(6).problems
       end
 
       it 'should create a warning' do
@@ -209,6 +243,8 @@ describe 'trailing_comma' do
         expect(problems).to contain_fixed(msg).on_line(10).in_column(27)
         expect(problems).to contain_fixed(msg).on_line(24).in_column(18)
         expect(problems).to contain_fixed(msg).on_line(33).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(39).in_column(26)
+        expect(problems).to contain_fixed(msg).on_line(41).in_column(25)
       end
 
       it 'should add trailing commas' do
@@ -248,6 +284,14 @@ describe 'trailing_comma' do
           owner => root,
           group => '0',
         }
+
+        $foo = {
+          'bar' => {
+            baz  => 'abc',
+            bazz => 'def',
+          },
+          'qux' => 'ghi',
+        }
           EOS
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-trailing_comma-check
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Camptocamp