puppet-lint-manifest_whitespace-check 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd465f6f8f5fe07dc5de6b9a9c3eb36e8f99e5c647e3d48a6001cd0f32749cf9
-  data.tar.gz: e0bb7d7f3ee60d7bfed54e28ee24b78dae5a8477b870e41b33902bb86b3a5407
+  metadata.gz: 1a7733009c47320dbae135031b97cd389cd2edab33095ef5a9c64d2b61375d8c
+  data.tar.gz: 5e356c323847a31282c948131d41cd6c9b4f40338818bf42f46b65d3320694b1
 SHA512:
-  metadata.gz: 85069ac6a3e3c7a349eea0e102a35f737204b210d35caf451e71ccd04da54bc241061947be20a93dc2adfc4a0ca91bc429243c27b7d4c50cc2fe072971dfecfd
-  data.tar.gz: a7bde6a55568780469a5576c2353d77108c86e5e6ca84a448992fb9549dd89530f140ca2a1aae1f268145c25321b3acc8467706215a16fd90093043016691459
+  metadata.gz: a8621832c8cf644f7ad467a1215d944ce2427ad97c127f2b60521bd6e6f743f9d37265a030dc11e9491455ab4ce50bab6db6cef1de0417d058c28fa8731fb110
+  data.tar.gz: 7bd64637bf4bde4a1e71c9dd50534a69a63bb698bda7097f68de2759da4bcd8e0b8f7146686c5dc6e38bd539a8e31c1c67708229127e3f4ea448dbbc80bc198e

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

@@ -8,12 +8,12 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
 
       next unless prev_token && prev_code_token
 
+      next if %i[COMMA].include?(prev_code_token.type) && %i[INDENT NEWLINE].include?(prev_token.type)
       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)
@@ -35,10 +35,7 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
     prev_code_token = prev_non_space_token(token)
 
     while prev_code_token != prev_token
-      if !%i[LPAREN LBRACK LBRACE].include?(prev_code_token.type) &&
-         %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/lib/puppet-lint/plugins/check_manifest_whitespace_opening_bracket.rb

@@ -6,13 +6,29 @@ PuppetLint.new_check(:manifest_whitespace_opening_bracket_before) do
       prev_token = bracket_token.prev_token
       prev_code_token = prev_non_space_token(bracket_token)
 
-      next unless prev_token && prev_code_token
-      next if %i[LBRACK LBRACE COMMA SEMIC COMMENT NAME].include?(prev_code_token.type)
-      next unless %i[WHITESPACE NEWLINE INDENT].include?(prev_token.type)
+      next if %i[SEMIC COMMA COLON].include?(prev_code_token.type) && %i[INDENT NEWLINE].include?(prev_token.type)
+      next if %i[COMMENT].include?(prev_code_token.type)
+      next if %i[INDENT NEWLINE].include?(prev_token.type) && %i[NAME RBRACK RBRACE].include?(prev_code_token.type)
+      next if %i[CLASSREF VARIABLE].include?(prev_code_token.type) && (prev_code_token == prev_token)
 
-      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)
+      if %i[RBRACK RBRACE RPAREN LPAREN LBRACK LBRACE TYPE].include?(prev_code_token.type)
+        next if prev_code_token == prev_token
+        next if %i[INDENT NEWLINE].include?(prev_token.type)
+      elsif %i[CLASSREF VARIABLE].include?(prev_code_token.type)
+        # not good
+      elsif tokens.index(prev_code_token) == tokens.index(bracket_token) - 2 &&
+            is_single_space(prev_token)
+        next
+      end
+
+      if prev_code_token.type == :LBRACE
+        ppct = prev_non_space_token(prev_code_token)
+
+        if ppct && ppct.type == :NAME
+          next if %i[INDENT NEWLINE].include?(prev_token.type)
+          next if tokens.index(prev_code_token) == tokens.index(bracket_token) - 2 && is_single_space(prev_token)
+        end
+      end
 
       notify(
         :error,
@@ -36,7 +52,7 @@ PuppetLint.new_check(:manifest_whitespace_opening_bracket_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
 

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

@@ -38,6 +38,18 @@ describe 'manifest_whitespace_opening_bracket_before' do
     end
   end
 
+  context 'with array key in interpolation' do
+    let(:code) do
+      <<~EOF
+        "${my_array['keyname']}"
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to be_empty
+    end
+  end
+
   context 'with multiline iterator' do
     let(:code) do
       <<~EOF
@@ -65,7 +77,8 @@ describe 'manifest_whitespace_opening_bracket_before' do
 
         class example (
           String $content,
-        ){
+          Optional[String] $some_other_content,
+        ) {
           $value = [{ 'key' => 'value' }]
           $value2 = [
             {
@@ -80,11 +93,20 @@ describe 'manifest_whitespace_opening_bracket_before' do
           $value5 = []
           $value6 = {}
 
-          if somecondition{
-            class{ 'example2':
+          if somecondition {
+            class { 'example2':
               param1  => 'value1',
               require => File['somefile'],
             }
+            package { ['pack1', 'pack2']:
+              ensure => present,
+            }
+            package {
+              ['pack3', 'pack4']:
+                ensure => present;
+              ['pack5', 'pack6']:
+                ensure => present;
+            }
           }
         }
       EOF
@@ -97,6 +119,41 @@ describe 'manifest_whitespace_opening_bracket_before' do
     end
   end
 
+  context 'with resource inline' do
+    let(:code) do
+      <<~EOF
+        package { ['pack1', 'pack2']:
+          ensure => present,
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect 0 problems' do
+        expect(problems).to be_empty
+      end
+    end
+  end
+
+  context 'with resource next line' do
+    let(:code) do
+      <<~EOF
+        package {
+          ['pack3', 'pack4']:
+            ensure => present;
+          ['pack5', 'pack6']:
+            ensure => present;
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect 0 problems' do
+        expect(problems).to be_empty
+      end
+    end
+  end
+
   context 'with two spaces' do
     let(:code) do
       <<~EOF

metadata

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