puppet-lint-manifest_whitespace-check 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deec283a984c69934edd2522701fd6e840fb15e5ebbaf5d836366e59a6f7d894
-  data.tar.gz: e4b9559d3d6f82ef25f362b1bcbf8d7e8268e2f54089398dfb22519f6529b289
+  metadata.gz: 5f942c3097eac960a4830626b7950525074c9c39ab1ff401d04e1256ebda861e
+  data.tar.gz: 9aa3c04aa40c1c0f5349044208b717c3c387de7321286c23b53bc3b31169d8c0
 SHA512:
-  metadata.gz: 4a49d305962a6ea8168b6deb0f3ec7baf47276d7c6aa56c3869f16f73ed3ade68c3ff63acea7a5ebdef71cab5388b67b5d5cfc898d2f2f2daaa3bb9d7867a4a2
-  data.tar.gz: 10217466afcdf5fcd832eb08a54d1031c1f88d417783bc77da4a035ee3dfa5cfacc020ee87bac0b030abe59d80f080f596ffa0c803cddaf73aa0f312a3ac7d1d
+  metadata.gz: adb52463b3cc9dee9f8291cf1ef24eb2ecb4e804ac381f7151d7d633bfe2d7c223d385da5ea21b0ceb75921d3d2241ce28a83672554edc74cfdb0b8ff11b1cb1
+  data.tar.gz: 3770c9176be5522c65f47d833a34e9430529b327980f0f237d2fa01dc2ddc3dbec0bb8f130110c1711d013e9db50d392c281bed38f351c53aec47e8a3e059977

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

@@ -25,7 +25,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
 
       notify(
         :error,
-        message: 'there should be a bracket or a single newline before a closing brace',
+        message: 'there should be a single space or newline before a closing brace',
         line: prev_code_token.next_token.line,
         column: prev_code_token.next_token.column,
         token: prev_code_token.next_token,
@@ -51,7 +51,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
       next_token = next_token.next_token
     end
 
-    if next_token.type == :RBRACE && !%i[LBRACE RBRACE RBRACK NEWLINE INDENT].include?(next_token.prev_token.type)
+    if next_token.type == :RBRACE && !%i[LBRACE NEWLINE INDENT].include?(next_token.prev_token.type)
       add_token(tokens.index(next_token), new_single_space)
     end
   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

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

@@ -3,7 +3,37 @@
 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' }
+  let(:closing_brace_msg) { 'there should be a single space or newline before a closing brace' }
+
+  context 'with plus' do
+    let(:code) do
+      <<~EOF
+        $my_images = { 'default' => {}}
+      EOF
+    end
+
+    context 'with fix enabled' do
+      before do
+        PuppetLint.configuration.fix = true
+      end
+
+      after do
+        PuppetLint.configuration.fix = false
+      end
+
+      it 'should fix a error' do
+        expect(problems).to contain_fixed(closing_brace_msg)
+      end
+
+      it 'should add spaces' do
+        expect(manifest).to eq(
+          <<~EOF,
+            $my_images = { 'default' => {} }
+          EOF
+        )
+      end
+    end
+  end
 
   context 'with nested hash' do
     let(:code) do
@@ -17,6 +47,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 +402,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_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.9
+  version: 0.1.14
 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