puppet-lint-manifest_whitespace-check 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490924a99a241b6362b189a9279316ace251905f99ff547f8c1f3a1801b196c0
-  data.tar.gz: 425fbd3f5b29ea52822bcf76d93c50261b23991e1a37558f3a999f50152feedc
+  metadata.gz: 7dd5e8776e914e8e269dba2e5fc7b10b344cdd8f2f0bb9e7b41b88ac0eb5b782
+  data.tar.gz: 69807b0aa0325654cabc75395b93494eb5375c7d53319c1163536da82f320466
 SHA512:
-  metadata.gz: 73d1cb558a99dc97ce5e23f7d0ecde9f05016f830832e7ac534675a9a2b0cd0154c552b0df1acd0f77bd143ed90c6e7bbdf3e8ae015e382a4d2de75cf44cd5e0
-  data.tar.gz: 67bf90d141158f7af8ab63f922eff6b98ffdbf36d69d3f489153c6d02c1823843c31e1ee7453a4d488e56c5f624ea766610f27e1760344d135b64970d1933d51
+  metadata.gz: ff95eac15ab930d9dfeabcfdfbb126288c7ef4d2b98a9ef6547e11202970190a0e3e2a0eb5d9595cb8228613446792c4547c8a68527e5c1ae087755547f45dcc
+  data.tar.gz: 11c9f07ca69106a3212813b0228d3215b41614cdc9c0526e1c141ed0399e156a2e0800b544b4f9886c4ff4bd7af22286417073b56142b235e3901a66bf9d8843

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

@@ -55,8 +55,6 @@ 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

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

@@ -9,6 +9,9 @@ PuppetLint.new_check(:manifest_whitespace_opening_bracket_before) do
       next unless prev_token && prev_code_token
       next if %i[LBRACK LBRACE COMMA SEMIC].include?(prev_code_token.type)
       next unless %i[WHITESPACE NEWLINE INDENT].include?(prev_token.type)
+      if prev_token.type == :NEWLINE && %i[RBRACK RBRACE].include?(prev_code_token.type)
+        next
+      end
       next unless tokens.index(prev_code_token) != tokens.index(bracket_token) - 2 ||
                   !is_single_space(prev_token)
 

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

@@ -5,6 +5,22 @@ require 'spec_helper'
 describe 'manifest_whitespace_opening_bracket_before' do
   let(:opening_bracket_msg) { 'there should be a single space before an opening bracket' }
 
+  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 no spaces' do
     let(:code) do
       <<~EOF
@@ -228,6 +244,22 @@ end
 describe 'manifest_whitespace_opening_bracket_after' do
   let(:opening_bracket_msg) { 'there should be no whitespace or a single newline after an opening bracket' }
 
+  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 a single space' 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.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Jo Vandeginste