puppet-lint-manifest_whitespace-check 0.1.0 → 0.1.7

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

@@ -67,242 +67,3 @@ describe 'manifest_whitespace_inherits_name_single_space_before' do
     end
   end
 end
-
-describe 'manifest_whitespace_inherits_name_single_space_after' do
-  let(:single_space_msg) { 'there should be a single space between the class or resource name and the first bracket' }
-
-  context 'with no spaces' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example inherits other::example{
-          class  { 'example2':
-            param1 => 'value1',
-          }
-        }
-      EOF
-    end
-
-    context 'with fix disabled' do
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(38)
-      end
-    end
-
-    context 'with fix enabled' do
-      before do
-        PuppetLint.configuration.fix = true
-      end
-
-      after do
-        PuppetLint.configuration.fix = false
-      end
-
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should fix the manifest' do
-        expect(problems).to contain_fixed(single_space_msg)
-      end
-
-      it 'should fix the newline' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example inherits other::example {
-              class  { 'example2':
-                param1 => 'value1',
-              }
-            }
-          EOF
-        )
-      end
-    end
-  end
-
-  context 'with two spaces' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example inherits other::example  {
-          class  { 'example2':
-            param1 => 'value1',
-          }
-        }
-      EOF
-    end
-
-    context 'with fix disabled' do
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(38)
-      end
-    end
-
-    context 'with fix enabled' do
-      before do
-        PuppetLint.configuration.fix = true
-      end
-
-      after do
-        PuppetLint.configuration.fix = false
-      end
-
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should fix the manifest' do
-        expect(problems).to contain_fixed(single_space_msg)
-      end
-
-      it 'should fix the space' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example inherits other::example {
-              class  { 'example2':
-                param1 => 'value1',
-              }
-            }
-          EOF
-        )
-      end
-    end
-  end
-
-  context 'with newline' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example inherits other::example
-
-
-          {
-          class  { 'example2':
-            param1 => 'value1',
-          }
-        }
-      EOF
-    end
-
-    context 'with fix disabled' do
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(38)
-      end
-    end
-
-    context 'with fix enabled' do
-      before do
-        PuppetLint.configuration.fix = true
-      end
-
-      after do
-        PuppetLint.configuration.fix = false
-      end
-
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should fix the manifest' do
-        expect(problems).to contain_fixed(single_space_msg)
-      end
-
-      it 'should fix the newline' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example inherits other::example {
-              class  { 'example2':
-                param1 => 'value1',
-              }
-            }
-          EOF
-        )
-      end
-    end
-  end
-
-  context 'with comment' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example inherits other::example # the class
-        {
-          class  { 'example2':
-            param1 => 'value1',
-          }
-        }
-      EOF
-    end
-
-    context 'with fix disabled' do
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(38)
-      end
-    end
-
-    context 'with fix enabled' do
-      before do
-        PuppetLint.configuration.fix = true
-      end
-
-      after do
-        PuppetLint.configuration.fix = false
-      end
-
-      it 'should detect a single problem' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should not fix the manifest' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(38)
-      end
-    end
-  end
-end

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

@@ -0,0 +1,460 @@
+# frozen_string_literal: true
+
+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 comment only' do
+    let(:code) do
+      <<~EOF
+        $value7 = {
+          # nothing
+        }
+      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
+        # example
+        #
+        # Main class, includes all other classes.
+        #
+
+        class example (
+          String $content,
+        ) {
+          $value = [{ 'key' => 'value'}]
+          $value2 = [
+            {
+              'key' => 'value1',
+            },
+            {
+              'key' => 'value2',
+            },
+          ]
+          $value3 = myfunc($value1)
+          $value4 = ['somekey']
+          $value5 = []
+          $value6 = {}
+          $value7 = "x${server_facts['environment']}y"
+          $value8 = {
+            # nothing
+          }
+
+          if someothercondition { include ::otherclass}
+          if somecondition {
+            class { 'example2':
+              param1  => 'value1',
+              require => File['somefile'],
+            }
+            class { 'example3':}
+          }
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect 3 problems' do
+        expect(problems).to have(3).problem
+      end
+
+      it 'should create a error' do
+        expect(problems).to contain_error(closing_brace_msg).on_line(9).in_column(31)
+      end
+    end
+
+    context 'with fix enabled' do
+      before do
+        PuppetLint.configuration.fix = true
+      end
+
+      after do
+        PuppetLint.configuration.fix = false
+      end
+
+      it 'should fix a error' do
+        expect(problems).to contain_fixed(closing_brace_msg)
+      end
+
+      it 'should add spaces' do
+        expect(manifest).to eq(
+          <<~EOF,
+            # example
+            #
+            # Main class, includes all other classes.
+            #
+
+            class example (
+              String $content,
+            ) {
+              $value = [{ 'key' => 'value' }]
+              $value2 = [
+                {
+                  'key' => 'value1',
+                },
+                {
+                  'key' => 'value2',
+                },
+              ]
+              $value3 = myfunc($value1)
+              $value4 = ['somekey']
+              $value5 = []
+              $value6 = {}
+              $value7 = "x${server_facts['environment']}y"
+              $value8 = {
+                # nothing
+              }
+
+              if someothercondition { include ::otherclass }
+              if somecondition {
+                class { 'example2':
+                  param1  => 'value1',
+                  require => File['somefile'],
+                }
+                class { 'example3': }
+              }
+            }
+          EOF
+        )
+      end
+    end
+  end
+
+  context 'with too many spaces' do
+    let(:code) do
+      <<~EOF
+        # example
+        #
+        # Main class, includes all other classes.
+        #
+
+        class example (
+          String $content,
+        ) {
+          $value = [{ 'key' => 'value'  }]
+          $value2 = [
+            {
+              'key' => 'value1',
+            },
+            {
+              'key' => 'value2',
+            },
+
+          ]
+          $value3 = myfunc($value1)
+          $value4 = ['somekey'
+          $value5 = []
+          $value6 = { }
+          $value7 = "x${server_facts['environment']}y"
+
+          if someothercondition { include ::otherclass  }
+          if somecondition {
+            class { 'example2':
+              param1  => 'value1',
+              require => File['somefile'],
+            }
+            class { 'example3':  }
+          }
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect 4 problems' do
+        expect(problems).to have(4).problems
+      end
+
+      it 'should create a error' do
+        expect(problems).to contain_error(closing_brace_msg).on_line(9).in_column(31)
+      end
+    end
+
+    context 'with fix enabled' do
+      before do
+        PuppetLint.configuration.fix = true
+      end
+
+      after do
+        PuppetLint.configuration.fix = false
+      end
+
+      it 'should fix a error' do
+        expect(problems).to contain_fixed(closing_brace_msg)
+      end
+
+      it 'should add spaces' do
+        expect(manifest).to eq(
+          <<~EOF,
+            # example
+            #
+            # Main class, includes all other classes.
+            #
+
+            class example (
+              String $content,
+            ) {
+              $value = [{ 'key' => 'value' }]
+              $value2 = [
+                {
+                  'key' => 'value1',
+                },
+                {
+                  'key' => 'value2',
+                },
+
+              ]
+              $value3 = myfunc($value1)
+              $value4 = ['somekey'
+              $value5 = []
+              $value6 = {}
+              $value7 = "x${server_facts['environment']}y"
+
+              if someothercondition { include ::otherclass }
+              if somecondition {
+                class { 'example2':
+                  param1  => 'value1',
+                  require => File['somefile'],
+                }
+                class { 'example3': }
+              }
+            }
+          EOF
+        )
+      end
+    end
+  end
+
+  context 'with too many newlines' do
+    let(:code) do
+      <<~EOF
+        # example
+        #
+        # Main class, includes all other classes.
+        #
+
+        class example (
+          String $content,
+        ) {
+          $value = [{ 'key' => 'value' }]
+          $value2 = [
+            {
+              'key' => 'value1',
+            },
+            {
+              'key' => 'value2',
+
+            },
+          ]
+          $value3 = myfunc($value1)
+          $value4 = ['somekey'
+          $value5 = []
+          $value6 = {
+
+          }
+          $value7 = "x${server_facts['environment']}y"
+
+          if someothercondition { include ::otherclass }
+          if somecondition {
+            class { 'example2':
+              param1  => 'value1',
+              require => File['somefile'],
+
+            }
+
+            class { 'example3': }
+
+          }
+
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect 5 problems' do
+        expect(problems).to have(5).problems
+      end
+
+      it 'should create a error' do
+        expect(problems).to contain_error(closing_brace_msg).on_line(15).in_column(25)
+      end
+    end
+
+    context 'with fix enabled' do
+      before do
+        PuppetLint.configuration.fix = true
+      end
+
+      after do
+        PuppetLint.configuration.fix = false
+      end
+
+      it 'should fix a error' do
+        expect(problems).to contain_fixed(closing_brace_msg)
+      end
+
+      it 'should remove newlines' do
+        expect(manifest).to eq(
+          <<~EOF,
+            # example
+            #
+            # Main class, includes all other classes.
+            #
+
+            class example (
+              String $content,
+            ) {
+              $value = [{ 'key' => 'value' }]
+              $value2 = [
+                {
+                  'key' => 'value1',
+                },
+                {
+                  'key' => 'value2',
+                },
+              ]
+              $value3 = myfunc($value1)
+              $value4 = ['somekey'
+              $value5 = []
+              $value6 = {
+              }
+              $value7 = "x${server_facts['environment']}y"
+
+              if someothercondition { include ::otherclass }
+              if somecondition {
+                class { 'example2':
+                  param1  => 'value1',
+                  require => File['somefile'],
+                }
+
+                class { 'example3': }
+              }
+            }
+          EOF
+        )
+      end
+    end
+  end
+end
+
+describe 'manifest_whitespace_closing_brace_after' do
+  let(:closing_brace_msg) { 'there should be either a bracket, comma, colon, closing quote or a newline after a closing brace, or whitespace and none of the aforementioned' }
+
+  context 'with spaces' do
+    let(:code) do
+      <<~EOF
+        # example
+        #
+        # Main class, includes all other classes.
+        #
+
+        class example (
+          String $content,
+        ) {
+          $value = [{ 'key' => 'value' } ]
+          $value2 = [
+            {
+              'key' => 'value1',
+            },
+            {
+              'key' => 'value2',
+            } ,
+          ]
+
+          $value2bis = {
+            'key' => 'value',
+          } # this comment is fine
+
+          $value3 = myfunc({} )
+          $value4 = ['somekey']
+          $value5 = []
+          $value6 = {}
+          $value7 = "x${server_facts['environment']}y"
+
+          if someothercondition { include ::otherclass }
+          if somecondition {
+            class { 'example2':
+              param1  => 'value1',
+              require => File['somefile'],
+            }
+            class { 'example3': }
+          }
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect 3 problems' do
+        expect(problems).to have(3).problem
+      end
+
+      it 'should create a error' do
+        expect(problems).to contain_error(closing_brace_msg).on_line(9).in_column(33)
+      end
+    end
+
+    context 'with fix enabled' do
+      before do
+        PuppetLint.configuration.fix = true
+      end
+
+      after do
+        PuppetLint.configuration.fix = false
+      end
+
+      it 'should fix a error' do
+        expect(problems).to contain_fixed(closing_brace_msg)
+      end
+
+      it 'should add spaces' do
+        expect(manifest).to eq(
+          <<~EOF,
+            # example
+            #
+            # Main class, includes all other classes.
+            #
+
+            class example (
+              String $content,
+            ) {
+              $value = [{ 'key' => 'value' }]
+              $value2 = [
+                {
+                  'key' => 'value1',
+                },
+                {
+                  'key' => 'value2',
+                },
+              ]
+
+              $value2bis = {
+                'key' => 'value',
+              } # this comment is fine
+
+              $value3 = myfunc({})
+              $value4 = ['somekey']
+              $value5 = []
+              $value6 = {}
+              $value7 = "x${server_facts['environment']}y"
+
+              if someothercondition { include ::otherclass }
+              if somecondition {
+                class { 'example2':
+                  param1  => 'value1',
+                  require => File['somefile'],
+                }
+                class { 'example3': }
+              }
+            }
+          EOF
+        )
+      end
+    end
+  end
+end