puppet-lint-manifest_whitespace-check 0.1.2 → 0.1.8

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

@@ -7,3 +7,19 @@ end
 def new_single_space
   PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', 0, 0)
 end
+
+def after_bracket_tokens
+  %i[RBRACE RBRACK RPAREN SEMIC COMMA COLON NEWLINE DQMID DQPOST LBRACK]
+end
+
+def prev_non_space_token(token)
+  while token = token.prev_token
+    return token unless %i[WHITESPACE INDENT NEWLINE].include?(token.type)
+  end
+end
+
+def next_non_space_token(token)
+  while token = token.next_token
+    return token unless %i[WHITESPACE INDENT NEWLINE].include?(token.type)
+  end
+end

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

@@ -66,10 +66,34 @@ describe 'manifest_whitespace_class_name_single_space_before' do
       end
     end
   end
+
+  context 'with inherits' do
+    let(:code) do
+      'class example inherits otherexample {'
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
 end
 
 describe 'manifest_whitespace_class_name_single_space_after' do
-  let(:single_space_msg) { 'there should be a single space between the class or resource name and the first brace' }
+  let(:single_space_msg) { 'there should be a single space between the class or resource name and the next item' }
+
+  context 'with inherits' do
+    let(:code) do
+      <<~EOF
+        class example inherits otherexample {
+          assert_private()
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to have(0).problem
+    end
+  end
 
   context 'with parameters and no spaces' do
     let(:code) do
@@ -405,370 +429,8 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       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(14)
-      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(14)
-      end
-    end
-  end
-end
-
-describe 'manifest_whitespace_class_opening_curly_brace' do
-  let(:opening_curly_brace_same_line_msg) { 'there should be a single space before the opening curly brace of a class body' }
-
-  context 'with no spaces' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example (
-          String $content,
-        ){
-          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(opening_curly_brace_same_line_msg).on_line(8).in_column(2)
-      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 create a error' do
-        expect(problems).to contain_fixed(opening_curly_brace_same_line_msg)
-      end
-
-      it 'should add a space' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example (
-              String $content,
-            ) {
-              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 (
-          String $content,
-        )  {
-          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(opening_curly_brace_same_line_msg).on_line(8).in_column(4)
-      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 create a error' do
-        expect(problems).to contain_fixed(opening_curly_brace_same_line_msg)
-      end
-
-      it 'should remove a space' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example (
-              String $content,
-            ) {
-              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 (
-          String $content,
-        )
-        {
-          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(opening_curly_brace_same_line_msg).on_line(9).in_column(1)
-      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 create a error' do
-        expect(problems).to contain_fixed(opening_curly_brace_same_line_msg)
-      end
-
-      it 'should fix the newline' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example (
-              String $content,
-            ) {
-              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 (
-          String $content,
-        ) # 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(opening_curly_brace_same_line_msg).on_line(9).in_column(1)
-      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(opening_curly_brace_same_line_msg).on_line(9).in_column(1)
-      end
-    end
-  end
-
-  context 'with good inherits' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example (
-          String $content,
-        ) inherits other::example {
-          class { 'example2':
-            param1 => 'value1',
-          }
-        }
-      EOF
-    end
-
-    context 'with fix disabled' do
-      it 'should detect no problem' do
-        expect(problems).to have(0).problems
-      end
-    end
-  end
-
-  context 'with bad inherits' do
-    let(:code) do
-      <<~EOF
-        # example
-        #
-        # Main class, includes all other classes.
-        #
-
-        class example (
-          String $content,
-        ) 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(opening_curly_brace_same_line_msg).on_line(8).in_column(26)
-      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 missing space' do
-        expect(problems).to have(1).problem
-      end
-
-      it 'should add the space' do
-        expect(manifest).to eq(
-          <<~EOF,
-            # example
-            #
-            # Main class, includes all other classes.
-            #
-
-            class example (
-              String $content,
-            ) inherits other::example {
-              class { 'example2':
-                param1 => 'value1',
-              }
-            }
-          EOF
-        )
-      end
+    it 'should detect no problem' do
+      expect(problems).to have(0).problems
     end
   end
 end

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 brace' }
-
-  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