puppet-lint-manifest_whitespace-check 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deec283a984c69934edd2522701fd6e840fb15e5ebbaf5d836366e59a6f7d894
-  data.tar.gz: e4b9559d3d6f82ef25f362b1bcbf8d7e8268e2f54089398dfb22519f6529b289
+  metadata.gz: 490924a99a241b6362b189a9279316ace251905f99ff547f8c1f3a1801b196c0
+  data.tar.gz: 425fbd3f5b29ea52822bcf76d93c50261b23991e1a37558f3a999f50152feedc
 SHA512:
-  metadata.gz: 4a49d305962a6ea8168b6deb0f3ec7baf47276d7c6aa56c3869f16f73ed3ade68c3ff63acea7a5ebdef71cab5388b67b5d5cfc898d2f2f2daaa3bb9d7867a4a2
-  data.tar.gz: 10217466afcdf5fcd832eb08a54d1031c1f88d417783bc77da4a035ee3dfa5cfacc020ee87bac0b030abe59d80f080f596ffa0c803cddaf73aa0f312a3ac7d1d
+  metadata.gz: 73d1cb558a99dc97ce5e23f7d0ecde9f05016f830832e7ac534675a9a2b0cd0154c552b0df1acd0f77bd143ed90c6e7bbdf3e8ae015e382a4d2de75cf44cd5e0
+  data.tar.gz: 67bf90d141158f7af8ab63f922eff6b98ffdbf36d69d3f489153c6d02c1823843c31e1ee7453a4d488e56c5f624ea766610f27e1760344d135b64970d1933d51

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

@@ -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

@@ -55,6 +55,8 @@ PuppetLint.new_check(:manifest_whitespace_closing_bracket_after) do
       next unless next_token
       next if after_bracket_tokens.include?(next_token.type)
 
+      warn next_token.inspect
+
       if next_token.type == :WHITESPACE
         next_code_token = next_non_space_token(bracket_token)
         next unless next_code_token
@@ -63,7 +65,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/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[RBRACE 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

@@ -17,6 +17,22 @@ describe 'manifest_whitespace_closing_brace_before' do
     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
@@ -356,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,23 @@ 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 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

metadata

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