puppet-lint-manifest_whitespace-check 0.1.11 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd5e8776e914e8e269dba2e5fc7b10b344cdd8f2f0bb9e7b41b88ac0eb5b782
-  data.tar.gz: 69807b0aa0325654cabc75395b93494eb5375c7d53319c1163536da82f320466
+  metadata.gz: af72a48c82a227107871c1e7b83a3bec2a101aab3cef89bbd3d6ce426122334d
+  data.tar.gz: c7bc25b60155836000ec44971dd88832fafd413cac0e89107c49be5e86e804c1
 SHA512:
-  metadata.gz: ff95eac15ab930d9dfeabcfdfbb126288c7ef4d2b98a9ef6547e11202970190a0e3e2a0eb5d9595cb8228613446792c4547c8a68527e5c1ae087755547f45dcc
-  data.tar.gz: 11c9f07ca69106a3212813b0228d3215b41614cdc9c0526e1c141ed0399e156a2e0800b544b4f9886c4ff4bd7af22286417073b56142b235e3901a66bf9d8843
+  metadata.gz: 24961bb90cab1231db45ad634bf31444a276645d371401168956a436dd977e23166b19d5b1880e96d8ebfc64c3c53da68c4a65e92643a421094fae5a693ec2f0
+  data.tar.gz: c57d69810e67d335b597cb8257d627a07ac6c31fde14e37f64b8c05e4bb83fc750ca9e87699689211f299268ca287e89d76835259667d6b0876c3ed94f40b04e

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

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

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

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

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

@@ -155,6 +155,18 @@ end
 describe 'manifest_whitespace_closing_bracket_after' do
   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
@@ -219,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
 
@@ -252,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

@@ -8,10 +8,27 @@ describe 'manifest_whitespace_opening_bracket_before' do
   context 'with iterator' do
     let(:code) do
       <<~EOF
-        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+        {
+          # some generic comment
+          ['some', 'values']
         }
+      EOF
+    end
 
-        ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
+
+  context 'with iterator' do
+    let(:code) do
+      <<~EOF
+        {
+          if condition {
+          }
+
+          ['ib0', 'ib1', 'ib2', 'ib3', 'pub', 'oob', '0', '184'].each |String $name| {
+          }
         }
       EOF
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-manifest_whitespace-check
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.16
 platform: ruby
 authors:
 - Jo Vandeginste