puppet-lint-manifest_whitespace-check 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a88d7225a7ea73adc00bc91018d5b78e220ad0a8056c221690e7373ed5f26ab
-  data.tar.gz: 01a9be5a5bbecf5c4c3c668d2afd5e41f41dabcd6e4369134ce23695f725c2fc
+  metadata.gz: e7a82b75562b3f216e849bb8b6600982ccfd262bb0eb7fe97a1669510187c061
+  data.tar.gz: 1b00868a696b0dfeee05148f58d413244c579e50d35fcb47f05f3d68b5c18117
 SHA512:
-  metadata.gz: 9682a9aa02a6110d8204ec9035f92e958be68d55489ae7a46548bb133fd0d2f002130e9150f1de31e885d3dcb044e64e6068f9f934e2ac5b1dd704edf46ed26c
-  data.tar.gz: e22271195239f6e9c25d631853734379c8f911899379e1f2c805cf7e195cf4679d5d73e4da01b6f8563f20fb07ff023559b1009d0989c9be368230bb02cb8fc5
+  metadata.gz: b2c308c27fb7b90390fddd309c125cd72036af8d24ae43ae871a8de1f0d97bfc9126099c0a30fdf052bc8fedb6da4c5800dbd6ca35d418d59e826578d7a540d6
+  data.tar.gz: 7fda90bd22b2c51a73f6782874ba8ff2009532a54a233424537a6a5fe2cc234edc4e05ffc9038148ed225d3e0232f47ee69793bdad4ce5a3216ee755d30213c4

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

@@ -9,9 +9,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
       next unless prev_token && prev_code_token
       next if %i[LBRACE].include?(prev_token.type)
 
-      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
+      next if !%i[LBRACE].include?(prev_code_token.type) && (is_single_space(prev_token) && tokens.index(prev_code_token) == tokens.index(brace_token) - 2)
 
       next if prev_token.type == :INDENT && (tokens.index(prev_code_token) == tokens.index(brace_token) - 3)
 
@@ -41,9 +39,7 @@ PuppetLint.new_check(:manifest_whitespace_closing_brace_before) do
       next_token = next_token.next_token
     end
 
-    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
+    add_token(tokens.index(next_token), new_single_space) if next_token.type == :RBRACE && !%i[LBRACE NEWLINE INDENT].include?(next_token.prev_token.type)
   end
 end
 

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

@@ -25,8 +25,9 @@ PuppetLint.new_check(:manifest_whitespace_opening_bracket_before) do
 
       if prev_code_token.type == :LBRACE
         ppct = prev_non_space_token(prev_code_token)
+        next unless ppct
 
-        if ppct && ppct.type == :NAME
+        if %i[NAME PIPE].include?(ppct.type)
           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

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

@@ -7,19 +7,19 @@ describe 'manifest_whitespace_arrows_single_space_after' do
 
   context 'with two spaces' do
     let(:code) do
-      <<~EOF
+      <<~CODE
         class { 'example2':
           param1 =>  'value1',
         }
-      EOF
+      CODE
     end
 
     context 'with fix disabled' do
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a error' do
+      it 'creates a error' do
         expect(problems).to contain_error(single_space_msg).on_line(2).in_column(12)
       end
     end
@@ -33,21 +33,21 @@ describe 'manifest_whitespace_arrows_single_space_after' do
         PuppetLint.configuration.fix = false
       end
 
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(single_space_msg)
       end
 
-      it 'should fix the space' do
+      it 'fixes the space' do
         expect(manifest).to eq(
-          <<~EOF,
+          <<~CODE,
             class { 'example2':
               param1 => 'value1',
             }
-          EOF
+          CODE
         )
       end
     end
@@ -55,19 +55,19 @@ describe 'manifest_whitespace_arrows_single_space_after' do
 
   context 'with no spaces' do
     let(:code) do
-      <<~EOF
+      <<~CODE
         class { 'example2':
           param1 =>'value1',
         }
-      EOF
+      CODE
     end
 
     context 'with fix disabled' do
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a error' do
+      it 'creates a error' do
         expect(problems).to contain_error(single_space_msg).on_line(2).in_column(12)
       end
     end
@@ -81,21 +81,21 @@ describe 'manifest_whitespace_arrows_single_space_after' do
         PuppetLint.configuration.fix = false
       end
 
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(single_space_msg)
       end
 
-      it 'should fix the space' do
+      it 'fixes the space' do
         expect(manifest).to eq(
-          <<~EOF,
+          <<~CODE,
             class { 'example2':
               param1 => 'value1',
             }
-          EOF
+          CODE
         )
       end
     end
@@ -103,19 +103,19 @@ describe 'manifest_whitespace_arrows_single_space_after' do
 
   context 'with string as space' do
     let(:code) do
-      <<~EOF
+      <<~CODE
         class { 'example2':
           param1 =>' ',
         }
-      EOF
+      CODE
     end
 
     context 'with fix disabled' do
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a error' do
+      it 'creates a error' do
         expect(problems).to contain_error(single_space_msg).on_line(2).in_column(12)
       end
     end
@@ -129,21 +129,21 @@ describe 'manifest_whitespace_arrows_single_space_after' do
         PuppetLint.configuration.fix = false
       end
 
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(single_space_msg)
       end
 
-      it 'should fix the space' do
+      it 'fixes the space' do
         expect(manifest).to eq(
-          <<~EOF,
+          <<~CODE,
             class { 'example2':
               param1 => ' ',
             }
-          EOF
+          CODE
         )
       end
     end
@@ -151,22 +151,22 @@ describe 'manifest_whitespace_arrows_single_space_after' do
 
   context 'many resources' do
     let(:code) do
-      <<~EOF
+      <<~CODE
         class { 'example2':
           param1 =>'value1',
           param2 => 'value2',
           param3 =>   'value3',
           param4 =>  'value4',
         }
-      EOF
+      CODE
     end
 
     context 'with fix disabled' do
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(3).problems
       end
 
-      it 'should create a error' do
+      it 'creates a error' do
         expect(problems).to contain_error(single_space_msg).on_line(2).in_column(12)
         expect(problems).to contain_error(single_space_msg).on_line(4).in_column(12)
         expect(problems).to contain_error(single_space_msg).on_line(5).in_column(12)
@@ -182,24 +182,24 @@ describe 'manifest_whitespace_arrows_single_space_after' do
         PuppetLint.configuration.fix = false
       end
 
-      it 'should detect a single problem' do
+      it 'detects a single problem' do
         expect(problems).to have(3).problem
       end
 
-      it 'should fix the manifest' do
+      it 'fixes the manifest' do
         expect(problems).to contain_fixed(single_space_msg)
       end
 
-      it 'should fix the space' do
+      it 'fixes the space' do
         expect(manifest).to eq(
-          <<~EOF,
+          <<~CODE,
             class { 'example2':
               param1 => 'value1',
               param2 => 'value2',
               param3 => 'value3',
               param4 => 'value4',
             }
-          EOF
+          CODE
         )
       end
     end
@@ -208,40 +208,40 @@ describe 'manifest_whitespace_arrows_single_space_after' do
   context 'valid cases' do
     context 'correct arrow' do
       let(:code) do
-        <<~EOF
+        <<~CODE
           class { 'example2':
             param1 => 'value1',
           }
-        EOF
+        CODE
       end
 
-      it 'should detect a no problem' do
+      it 'detects a no problem' do
         expect(problems).to be_empty
       end
     end
 
     context 'in a string' do
       let(:code) do
-        <<~EOF
+        <<~CODE
           "param1 =>    'value1'",
-        EOF
+        CODE
       end
 
-      it 'should detect a no problem' do
+      it 'detects a no problem' do
         expect(problems).to be_empty
       end
     end
 
     context 'in a heredoc' do
       let(:code) do
-        <<~EOF
+        <<~CODE
           $data = @("DATA"/L)
             param1 =>    'value1',
             | DATA
-        EOF
+        CODE
       end
 
-      it 'should detect a no problem' do
+      it 'detects a no problem' do
         expect(problems).to be_empty
       end
     end