puppet-lint-manifest_whitespace-check 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282678f99caeebc548db24014520b89900f3d22430a4c906403958da93701a48
-  data.tar.gz: d37219ad94c7775cdff3eb830c984e71393d0a65369a1262ddf1a284755906d1
+  metadata.gz: deec283a984c69934edd2522701fd6e840fb15e5ebbaf5d836366e59a6f7d894
+  data.tar.gz: e4b9559d3d6f82ef25f362b1bcbf8d7e8268e2f54089398dfb22519f6529b289
 SHA512:
-  metadata.gz: 1e563b17a5038ec4e352a504c63ef36674c15cb686a889674ab2b988aeade047ad400bf5e769dd280ab757d3bf1dfa85b07cb46f2323b306fc9ad63755507ae9
-  data.tar.gz: e9ebb4a5ebacb1a69fdff632dde3cf6d91a9abd8d38bdc667aa41c3e2c47dda181de02385d03dc408a56bcec9f6f5a60743541aec37eecf1061bbe695d5cc591
+  metadata.gz: 4a49d305962a6ea8168b6deb0f3ec7baf47276d7c6aa56c3869f16f73ed3ade68c3ff63acea7a5ebdef71cab5388b67b5d5cfc898d2f2f2daaa3bb9d7867a4a2
+  data.tar.gz: 10217466afcdf5fcd832eb08a54d1031c1f88d417783bc77da4a035ee3dfa5cfacc020ee87bac0b030abe59d80f080f596ffa0c803cddaf73aa0f312a3ac7d1d

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

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/spec/puppet-lint/plugins/manifest_whitespace_closing_brace_spec.rb

@@ -5,6 +5,18 @@ 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 comment only' do
     let(:code) do
       <<~EOF

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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jo Vandeginste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint