puppet-lint-manifest_whitespace-check 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80c80c6f7e442284b4e19c5ba0dc556dedaca26bbdb2ab51cca142cea6000b9
-  data.tar.gz: ba85e3831db963d8a5dac5f423377bd1bc8cb780a0e780fc3eb892d854d7419a
+  metadata.gz: 490924a99a241b6362b189a9279316ace251905f99ff547f8c1f3a1801b196c0
+  data.tar.gz: 425fbd3f5b29ea52822bcf76d93c50261b23991e1a37558f3a999f50152feedc
 SHA512:
-  metadata.gz: d6bc3ffe70c55c49dd71149291fae2be47b25fd9f4409026f69330be7c2368a5ea97f259f2e4899844e4bfeeff7311b492a80ad0882340e8398709b06be13887
-  data.tar.gz: d4d4c42cfa65144d4d5ce71edf7d46ce278a1e2a1efcaff866c73f73b3bbe9c573500592b82c0689314c77dd665f4eca0c325f12552b9b5e5b95239d57dfb1c2
+  metadata.gz: 73d1cb558a99dc97ce5e23f7d0ecde9f05016f830832e7ac534675a9a2b0cd0154c552b0df1acd0f77bd143ed90c6e7bbdf3e8ae015e382a4d2de75cf44cd5e0
+  data.tar.gz: 67bf90d141158f7af8ab63f922eff6b98ffdbf36d69d3f489153c6d02c1823843c31e1ee7453a4d488e56c5f624ea766610f27e1760344d135b64970d1933d51

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

@@ -36,13 +36,13 @@ PuppetLint.new_check(:manifest_whitespace_class_name_single_space_after) do
       next unless name_token
 
       next_token = name_token.next_token
-      brace_token = name_token.next_token_of(%i[LPAREN LBRACE])
-      next unless tokens.index(name_token) != tokens.index(brace_token) - 2 ||
+      next_code_token = next_non_space_token(name_token)
+      next unless tokens.index(name_token) != tokens.index(next_code_token) - 2 ||
                   !is_single_space(next_token)
 
       notify(
         :error,
-        message: 'there should be a single space between the class or resource name and the first brace',
+        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,
@@ -52,22 +52,13 @@ PuppetLint.new_check(:manifest_whitespace_class_name_single_space_after) do
 
   def fix(problem)
     token = problem[:token]
-    brace_token = token.prev_token.next_token_of(%i[LPAREN LBRACE])
-
-    if token == brace_token
-      add_token(tokens.index(brace_token), new_single_space)
-      return
-    end
-
-    while token != brace_token
-      unless %i[WHITESPACE INDENT NEWLINE].include?(token.type)
-        raise PuppetLint::NoFix
-      end
+    next_code_token = next_non_space_token(token.prev_token)
 
+    while token != next_code_token
       remove_token(token)
       token = token.next_token
     end
 
-    add_token(tokens.index(brace_token), new_single_space)
+    add_token(tokens.index(next_code_token), new_single_space)
   end
 end

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

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

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 DQPOST]
+  %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_class_header_spec.rb

@@ -66,10 +66,34 @@ describe 'manifest_whitespace_class_name_single_space_before' do
       end
     end
   end
+
+  context 'with inherits' do
+    let(:code) do
+      'class example inherits otherexample {'
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
 end
 
 describe 'manifest_whitespace_class_name_single_space_after' do
-  let(:single_space_msg) { 'there should be a single space between the class or resource name and the first brace' }
+  let(:single_space_msg) { 'there should be a single space between the class or resource name and the next item' }
+
+  context 'with inherits' do
+    let(:code) do
+      <<~EOF
+        class example inherits otherexample {
+          assert_private()
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
 
   context 'with parameters and no spaces' do
     let(:code) do
@@ -405,32 +429,8 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       EOF
     end
 
-    context 'with fix disabled' do
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).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 detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should not fix the manifest' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
-      end
+    it 'should detect no problem' do
+      expect(problems).to have(0).problems
     end
   end
 end

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

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

metadata

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