puppet-lint-manifest_whitespace-check 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282678f99caeebc548db24014520b89900f3d22430a4c906403958da93701a48
-  data.tar.gz: d37219ad94c7775cdff3eb830c984e71393d0a65369a1262ddf1a284755906d1
+  metadata.gz: c6eb78b1b0aa97896074ac01224d0d9ec8d62fd113308cd715c0bb60ff26707c
+  data.tar.gz: f9c4c73d8a5698e6b3b44732f400a7f3506e9a784622ab8e741332c03f67d2d4
 SHA512:
-  metadata.gz: 1e563b17a5038ec4e352a504c63ef36674c15cb686a889674ab2b988aeade047ad400bf5e769dd280ab757d3bf1dfa85b07cb46f2323b306fc9ad63755507ae9
-  data.tar.gz: e9ebb4a5ebacb1a69fdff632dde3cf6d91a9abd8d38bdc667aa41c3e2c47dda181de02385d03dc408a56bcec9f6f5a60743541aec37eecf1061bbe695d5cc591
+  metadata.gz: 82aeade9ab4d7c4106411ba01250e21c983f78e5d5aa5f53ac8e518f9344be7e219b8182ad6801330e721147d313458bdcbba97882f30170340d9ab5d4250715
+  data.tar.gz: fbe9b003c323b27e7361f8548e9d234558255fbd7a6229bd863c9f9c2482ef886f787d75455ebad9476127e1d9e08834f73e1467d57468e1af4f28211a68f9cb

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

@@ -7,9 +7,9 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
       prev_code_token = prev_non_space_token(brace_token)
 
       next unless prev_token && prev_code_token
-      next if %i[LBRACE RBRACK RBRACE].include?(prev_token.type)
+      next if %i[LBRACE].include?(prev_token.type)
 
-      unless %i[LBRACE RBRACK RBRACE].include?(prev_code_token.type)
+      unless %i[LBRACE].include?(prev_code_token.type)
         if is_single_space(prev_token) && tokens.index(prev_code_token) == tokens.index(brace_token) - 2
           next
         end
@@ -73,7 +73,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_after) do
 
       notify(
         :error,
-        message: 'there should be either a bracket, comma, colon, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned',
+        message: 'there should be either a bracket, punctuation mark, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned',
         line: next_token.line,
         column: next_token.column,
         token: next_token,

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

@@ -63,7 +63,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_bracket_after) do
 
       notify(
         :error,
-        message: 'there should be either a bracket, comma, colon, closing quote or a newline after a closing bracket, or whitespace and none of the aforementioned',
+        message: 'there should be either a bracket, punctuation mark, closing quote or a newline after a closing bracket, or whitespace and none of the aforementioned',
         line: next_token.line,
         column: next_token.column,
         token: next_token,

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

@@ -7,7 +7,9 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
       prev_code_token = prev_non_space_token(brace_token)
 
       next unless prev_token && prev_code_token
-      next if %i[LBRACK LBRACE COMMA COMMENT].include?(prev_code_token.type)
+      if %i[LBRACK LBRACE COLON COMMA COMMENT].include?(prev_code_token.type)
+        next
+      end
       next unless tokens.index(prev_code_token) != tokens.index(brace_token) - 2 ||
                   !is_single_space(prev_token)
 
@@ -45,7 +47,7 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_after) do
       next_token = brace_token.next_token
 
       next unless next_token && !is_single_space(next_token)
-      next if %i[LBRACK LBRACE RBRACE].include?(next_token.type)
+      next if %i[RBRACE].include?(next_token.type)
 
       if next_token.type == :NEWLINE
         next_token = next_token.next_token

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

@@ -9,6 +9,9 @@ PuppetLint.new_check(:manifest_whitespace_opening_bracket_before) do
       next unless prev_token && prev_code_token
       next if %i[LBRACK LBRACE COMMA SEMIC].include?(prev_code_token.type)
       next unless %i[WHITESPACE NEWLINE INDENT].include?(prev_token.type)
+      if prev_token.type == :NEWLINE && %i[RBRACK RBRACE].include?(prev_code_token.type)
+        next
+      end
       next unless tokens.index(prev_code_token) != tokens.index(bracket_token) - 2 ||
                   !is_single_space(prev_token)
 

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

@@ -9,7 +9,7 @@ def new_single_space
 end
 
 def after_bracket_tokens
-  %i[RBRACE RBRACK RPAREN SEMIC COMMA COLON NEWLINE DQMID DQPOST LBRACK]
+  %i[RBRACK RPAREN SEMIC COMMA COLON DOT NEWLINE DQMID DQPOST LBRACK]
 end
 
 def prev_non_space_token(token)

data/spec/puppet-lint/plugins/manifest_whitespace_closing_brace_spec.rb

@@ -5,6 +5,34 @@ require 'spec_helper'
 describe 'manifest_whitespace_closing_brace_before' do
   let(:closing_brace_msg) { 'there should be a bracket or a single newline before a closing brace' }
 
+  context 'with nested hash' do
+    let(:code) do
+      <<~EOF
+        Hash $instances  = { 'localhost' => { 'url' => 'http://localhost/mod_status?auto' } },
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
+  context 'with iterator' do
+    let(:code) do
+      <<~EOF
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
   context 'with comment only' do
     let(:code) do
       <<~EOF
@@ -344,7 +372,20 @@ describe 'manifest_whitespace_closing_brace_before' do
 end
 
 describe 'manifest_whitespace_closing_brace_after' do
-  let(:closing_brace_msg) { 'there should be either a bracket, comma, colon, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned' }
+  let(:closing_brace_msg) { 'there should be either a bracket, punctuation mark, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned' }
+
+  context 'with iterator' do
+    let(:code) do
+      <<~EOF
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
 
   context 'with spaces' do
     let(:code) do

data/spec/puppet-lint/plugins/manifest_whitespace_closing_bracket_spec.rb

@@ -153,7 +153,35 @@ describe 'manifest_whitespace_closing_bracket_before' do
 end
 
 describe 'manifest_whitespace_closing_bracket_after' do
-  let(:closing_bracket_msg) { 'there should be either a bracket, comma, colon, closing quote or a newline after a closing bracket, or whitespace and none of the aforementioned' }
+  let(:closing_bracket_msg) { 'there should be either a bracket, punctuation mark, closing quote or a newline after a closing bracket, or whitespace and none of the aforementioned' }
+
+  context 'with many brackets' do
+    let(:code) do
+      <<~EOF
+        ensure_packages($spaceweather::packages, { require => Class['Mongodb::Globals'] })
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
+  context 'with iterator' do
+    let(:code) do
+      <<~EOF
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
 
   context 'with spaces' do
     let(:code) do
@@ -203,12 +231,12 @@ describe 'manifest_whitespace_closing_bracket_after' do
     end
 
     context 'with fix disabled' do
-      it 'should detect 3 problems' do
-        expect(problems).to have(3).problem
+      it 'should detect 2 problems' do
+        expect(problems).to have(2).problem
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(closing_bracket_msg).on_line(9).in_column(32)
+        expect(problems).to contain_error(closing_bracket_msg).on_line(23).in_column(22)
       end
     end
 
@@ -236,7 +264,7 @@ describe 'manifest_whitespace_closing_bracket_after' do
             class example (
               String $content,
             ) {
-              $value = { 'key' => ['value']}
+              $value = { 'key' => ['value'] }
               $value2 = [
                 {
                   'key' => 'value1',

data/spec/puppet-lint/plugins/manifest_whitespace_opening_brace_spec.rb

@@ -19,6 +19,21 @@ describe 'manifest_whitespace_opening_brace_before' do
     end
   end
 
+  context 'with cases' do
+    let(:code) do
+      <<~EOF
+        case $facts['kernel'] {
+          'OpenBSD': { $has_wordexp = false }
+          default:   { $has_wordexp = true }
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
   context 'with no spaces' do
     let(:code) do
       <<~EOF

data/spec/puppet-lint/plugins/manifest_whitespace_opening_bracket_spec.rb

@@ -5,6 +5,22 @@ require 'spec_helper'
 describe 'manifest_whitespace_opening_bracket_before' do
   let(:opening_bracket_msg) { 'there should be a single space before an opening bracket' }
 
+  context 'with iterator' do
+    let(:code) do
+      <<~EOF
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
   context 'with no spaces' do
     let(:code) do
       <<~EOF
@@ -228,6 +244,22 @@ end
 describe 'manifest_whitespace_opening_bracket_after' do
   let(:opening_bracket_msg) { 'there should be no whitespace or a single newline after an opening bracket' }
 
+  context 'with iterator' do
+    let(:code) do
+      <<~EOF
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+
+        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
   context 'with a single space' do
     let(:code) do
       <<~EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-manifest_whitespace-check
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - Jo Vandeginste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint