puppet-lint-manifest_whitespace-check 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e03f64681e0f77650a16f9cb6fdc2da2f02cdfcd7480070bab2c847de55088a
-  data.tar.gz: 3a92cd24d10fbd164d6f08d3e8c5ef2777ddc9575658c4d49cba1e2719fcfcbf
+  metadata.gz: 242cfac889870bbdd8d1346f1adafb8348b868945e9cfbe9adebebf6c4468c59
+  data.tar.gz: 0fd2197f54e3f911e077d3315458a0e2c44e69230570757cf26a7fc26db0d89e
 SHA512:
-  metadata.gz: ef768ef36782696c60b1e03ee44cf43916df55100415c84e0c636e9ea6eddadfe2536ab7e4c35bf514aba32e7861b8868f654a0b14b444cdafa507a71bad3d70
-  data.tar.gz: 642d9a4ff1e10f056cd938b7206ffc0835ee479cdf7423beb7eb8c6d6cc8f923ae3478adb597c88903b9eb721d778275b33fc56a3d9563c91ad3af1d54a78fb8
+  metadata.gz: fc1eea7da122458e2cda3cad1820548774a57149ec6ae6061fd75e20388a82af98e4d93e740f15bfdb623e6f4ee5cd647d189e6c30285238712040eddbcc8f0f
+  data.tar.gz: 80b25a77380531e248bb146af17a010818e4782698fe85972cf97245a27ab2383fb8b2a3cc69875c56afd6a3ef3e3fe769d05a770bd858a45e5de4e55af5aecd

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

@@ -43,20 +43,22 @@ PuppetLint.new_check(:manifest_whitespace_class_name_single_space_after) do
       notify(
         :error,
         message: 'there should be a single space between the class or resource name and the next item',
-        line: next_token.line,
-        column: next_token.column,
-        token: next_token,
+        line: name_token.line,
+        column: name_token.column,
+        token: name_token,
       )
     end
   end
 
   def fix(problem)
     token = problem[:token]
-    next_code_token = next_non_space_token(token.prev_token)
 
-    while token != next_code_token
-      remove_token(token)
-      token = token.next_token
+    next_token = token.next_token
+    next_code_token = next_non_space_token(token)
+
+    while next_token != next_code_token
+      remove_token(next_token)
+      next_token = next_token.next_token
     end
 
     add_token(tokens.index(next_code_token), new_single_space)

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_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_class_header_spec.rb

@@ -119,7 +119,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -183,7 +183,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(24)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -245,7 +245,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -307,7 +307,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -372,7 +372,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 

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_brace_spec.rb

@@ -34,6 +34,46 @@ describe 'manifest_whitespace_opening_brace_before' do
     end
   end
 
+  context 'with class no spaces' do
+    let(:code) do
+      <<~EOF
+        class example{
+          # some generic comment
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect a problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create a error' do
+        expect(problems).to contain_error(opening_brace_msg).on_line(1).in_column(14)
+      end
+    end
+
+    context 'with fix enabled' do
+      before do
+        PuppetLint.configuration.fix = true
+      end
+
+      after do
+        PuppetLint.configuration.fix = false
+      end
+
+      it 'should add a space' do
+        expect(manifest).to eq(
+          <<~EOF,
+            class example {
+              # some generic comment
+            }
+          EOF
+        )
+      end
+    end
+  end
+
   context 'with no spaces' do
     let(:code) do
       <<~EOF

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-manifest_whitespace-check
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Jo Vandeginste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint