puppet-lint-manifest_whitespace-check 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d348cb4f0a000a02c631f97562527a401f7e61f2954e31e8841c9095b32a8f
-  data.tar.gz: 7fbdd7c452078510f2ae545a93f492f3effd982775cfce706ed7d41219eaa282
+  metadata.gz: bd465f6f8f5fe07dc5de6b9a9c3eb36e8f99e5c647e3d48a6001cd0f32749cf9
+  data.tar.gz: e0bb7d7f3ee60d7bfed54e28ee24b78dae5a8477b870e41b33902bb86b3a5407
 SHA512:
-  metadata.gz: 1e5df8707c5cbbe5a05bac3b1f16542e1df5c02cc41f4ca5a4d2e97eda2508bb5aa25601bbce7e04a3f06c6803a96dbd69752cd43be33d6f7dd69f23ff1c54dc
-  data.tar.gz: c0c670b007c1456d68a59635e3e29da5ffbc9bdc0e3ff3c0cc1623766180665ef2180b3fff0b584b7ae9bee29243e618b92a7b9030880c3d965b090ac802a790
+  metadata.gz: 85069ac6a3e3c7a349eea0e102a35f737204b210d35caf451e71ccd04da54bc241061947be20a93dc2adfc4a0ca91bc429243c27b7d4c50cc2fe072971dfecfd
+  data.tar.gz: a7bde6a55568780469a5576c2353d77108c86e5e6ca84a448992fb9549dd89530f140ca2a1aae1f268145c25321b3acc8467706215a16fd90093043016691459

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

@@ -9,19 +9,13 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
       next unless prev_token && prev_code_token
       next if %i[LBRACE].include?(prev_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
+      if !%i[LBRACE].include?(prev_code_token.type) && (is_single_space(prev_token) && tokens.index(prev_code_token) == tokens.index(brace_token) - 2)
+        next
       end
 
-      if prev_token.type == :INDENT
-        next if tokens.index(prev_code_token) == tokens.index(brace_token) - 3
-      end
+      next if prev_token.type == :INDENT && (tokens.index(prev_code_token) == tokens.index(brace_token) - 3)
 
-      if prev_token.type == :NEWLINE
-        next if tokens.index(prev_code_token) == tokens.index(brace_token) - 2
-      end
+      next if prev_token.type == :NEWLINE && (tokens.index(prev_code_token) == tokens.index(brace_token) - 2)
 
       notify(
         :error,
@@ -39,13 +33,9 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
     next_token = token
 
     until next_token.type == :RBRACE
-      if tokens[tokens.index(next_token)..-1].first(2).collect(&:type) == %i[NEWLINE RBRACE]
-        break
-      end
+      break if tokens[tokens.index(next_token)..-1].first(2).collect(&:type) == %i[NEWLINE RBRACE]
 
-      if tokens[tokens.index(next_token)..-1].first(3).collect(&:type) == %i[NEWLINE INDENT RBRACE]
-        break
-      end
+      break if tokens[tokens.index(next_token)..-1].first(3).collect(&:type) == %i[NEWLINE INDENT RBRACE]
 
       remove_token(next_token)
       next_token = next_token.next_token

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

@@ -11,12 +11,8 @@ PuppetLint.new_check(:manifest_whitespace_closing_bracket_before) do
 
       next unless %i[NEWLINE INDENT WHITESPACE].include?(prev_token.type)
 
-      if prev_token.type == :INDENT
-        next if tokens.index(prev_code_token) == tokens.index(bracket_token) - 3
-      end
-      if prev_token.type == :NEWLINE
-        next if tokens.index(prev_code_token) == tokens.index(bracket_token) - 2
-      end
+      next if prev_token.type == :INDENT && (tokens.index(prev_code_token) == tokens.index(bracket_token) - 3)
+      next if prev_token.type == :NEWLINE && (tokens.index(prev_code_token) == tokens.index(bracket_token) - 2)
 
       notify(
         :error,
@@ -37,9 +33,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_bracket_before) do
 
     next_token = token.next_token
     until next_token.type == :RBRACK
-      if next_token.type == :INDENT && next_token.next_token.type == :RBRACK
-        break
-      end
+      break if next_token.type == :INDENT && next_token.next_token.type == :RBRACK
 
       remove_token(next_token)
       next_token = next_token.next_token

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

@@ -7,11 +7,17 @@ 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
-      if %i[LPAREN LBRACK LBRACE COLON COMMA COMMENT].include?(prev_code_token.type)
-        next
+
+      next if %i[COMMENT COLON].include?(prev_code_token.type)
+
+      if %i[LPAREN LBRACK LBRACE].include?(prev_code_token.type)
+        next if tokens.index(prev_code_token) == tokens.index(brace_token) - 1
+        next if tokens[tokens.index(prev_code_token)..tokens.index(brace_token)].collect(&:type).include?(:NEWLINE)
+
+      else
+        next unless tokens.index(prev_code_token) != tokens.index(brace_token) - 2 ||
+                    !is_single_space(prev_token)
       end
-      next unless tokens.index(prev_code_token) != tokens.index(brace_token) - 2 ||
-                  !is_single_space(prev_token)
 
       notify(
         :error,
@@ -29,7 +35,8 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
     prev_code_token = prev_non_space_token(token)
 
     while prev_code_token != prev_token
-      unless %i[WHITESPACE INDENT NEWLINE].include?(prev_token.type)
+      if !%i[LPAREN LBRACK LBRACE].include?(prev_code_token.type) &&
+         %i[WHITESPACE INDENT NEWLINE].include?(prev_token.type)
         raise PuppetLint::NoFix
       end
 
@@ -37,7 +44,7 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
       prev_token = prev_token.prev_token
     end
 
-    add_token(tokens.index(token), new_single_space)
+    add_token(tokens.index(token), new_single_space) unless %i[LPAREN LBRACK LBRACE].include?(prev_code_token.type)
   end
 end
 
@@ -47,7 +54,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[RBRACE].include?(next_token.type)
+      next if %i[RBRACE LBRACK LBRACE].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,14 +7,10 @@ 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
-      if %i[LBRACK LBRACE COMMA SEMIC COMMENT].include?(prev_code_token.type)
-        next
-      end
+      next if %i[LBRACK LBRACE COMMA SEMIC COMMENT NAME].include?(prev_code_token.type)
       next unless %i[WHITESPACE NEWLINE INDENT].include?(prev_token.type)
 
-      if %i[INDENT NEWLINE].include?(prev_token.type) && %i[RBRACK RBRACE].include?(prev_code_token.type)
-        next
-      end
+      next if %i[INDENT NEWLINE].include?(prev_token.type) && %i[RBRACK RBRACE].include?(prev_code_token.type)
       next unless tokens.index(prev_code_token) != tokens.index(bracket_token) - 2 ||
                   !is_single_space(prev_token)
 
@@ -34,9 +30,7 @@ PuppetLint.new_check(:manifest_whitespace_opening_bracket_before) do
     prev_code_token = prev_non_space_token(token)
 
     while prev_code_token != prev_token
-      unless %i[WHITESPACE INDENT NEWLINE].include?(prev_token.type)
-        raise PuppetLint::NoFix
-      end
+      raise PuppetLint::NoFix unless %i[WHITESPACE INDENT NEWLINE].include?(prev_token.type)
 
       remove_token(prev_token)
       prev_token = prev_token.prev_token

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

@@ -3,7 +3,9 @@
 require 'spec_helper'
 
 describe 'manifest_whitespace_class_name_single_space_before' do
-  let(:single_space_msg) { 'there should be a single space between the class or defined resource statement and the name' }
+  let(:single_space_msg) {
+    'there should be a single space between the class or defined resource statement and the name'
+  }
 
   context 'with two spaces' do
     let(:code) do

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

@@ -402,7 +402,9 @@ 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, punctuation mark, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned' }
+  let(:closing_brace_msg) do
+    'there should be either a bracket, punctuation mark, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned'
+  end
 
   context 'with iterator' do
     let(:code) do
@@ -417,6 +419,18 @@ describe 'manifest_whitespace_closing_brace_after' do
     end
   end
 
+  context 'inline with a function after' do
+    let(:code) do
+      <<~EOF
+        Hash({ $key => $return_value } )
+      EOF
+    end
+
+    it 'should detect 1 problem' do
+      expect(problems).to have(1).problem
+    end
+  end
+
   context 'with spaces' do
     let(:code) do
       <<~EOF

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

@@ -153,7 +153,9 @@ 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, punctuation mark, 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

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

@@ -28,8 +28,8 @@ describe 'manifest_whitespace_double_newline_end_of_file' do
     context 'with 1 empty line at the end of a manifest' do
       let(:code) do
         <<~EOF
-        class example {
-        }
+          class example {
+          }
 
         EOF
       end
@@ -46,8 +46,8 @@ describe 'manifest_whitespace_double_newline_end_of_file' do
     context 'with 3 empty lines at the end of a manifest' do
       let(:code) do
         <<~EOF
-        class example {
-        }
+          class example {
+          }
 
 
 
@@ -78,8 +78,8 @@ describe 'manifest_whitespace_double_newline_end_of_file' do
     context 'with 1 empty line at the end of a manifest' do
       let(:code) do
         <<~EOF
-        class example {
-        }
+          class example {
+          }
 
         EOF
       end
@@ -95,8 +95,8 @@ describe 'manifest_whitespace_double_newline_end_of_file' do
       it 'should add the final newline' do
         expect(manifest).to eq(
           <<~EOF
-          class example {
-          }
+            class example {
+            }
           EOF
         )
       end
@@ -105,8 +105,8 @@ describe 'manifest_whitespace_double_newline_end_of_file' do
     context 'with 3 empty lines at the end of a manifest' do
       let(:code) do
         <<~EOF
-        class example {
-        }
+          class example {
+          }
 
 
 
@@ -126,8 +126,8 @@ describe 'manifest_whitespace_double_newline_end_of_file' do
       it 'should add the final newline' do
         expect(manifest).to eq(
           <<~EOF
-          class example {
-          }
+            class example {
+            }
           EOF
         )
       end

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

@@ -19,6 +19,59 @@ describe 'manifest_whitespace_opening_brace_before' do
     end
   end
 
+  context 'inside, inline with function' do
+    let(:code) do
+      <<~EOF
+        $sssd_config = {
+        ▏ 'sssd' => merge($config, {
+        ▏ ▏ ▏ 'domains'  => $domains,
+        ▏ ▏ ▏ 'services' => 'nss,pam',
+        ▏ }),
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to be_empty
+    end
+  end
+
+  context 'inside interpolation' do
+    let(:code) do
+      <<~EOF
+        my_define { "foo-${myvar}": }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to be_empty
+    end
+  end
+
+  context 'inline with a function before' do
+    let(:code) do
+      <<~EOF
+        Hash( { $key => $return_value })
+      EOF
+    end
+
+    it 'should detect 1 problem' do
+      expect(problems).to have(1).problem
+    end
+  end
+
+  context 'inline with a function' do
+    let(:code) do
+      <<~EOF
+        Hash({ $key => $return_value })
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to be_empty
+    end
+  end
+
   context 'inside a function' do
     let(:code) do
       <<~EOF

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

@@ -51,7 +51,6 @@ describe 'manifest_whitespace_opening_bracket_before' do
     end
 
     it 'should detect no problems' do
-      pending 'Fix the linter'
       expect(problems).to be_empty
     end
   end

metadata

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