puppet-lint-class_alignment-check 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472da99d1199ebc852ca972b0df75171b5421ec006e03fa02af41a1eefcbbff7
-  data.tar.gz: eb86074f1126e1f27749f33f6d4572892efe8dfd490208e35cd1a5ea359f9357
+  metadata.gz: fe4a55df13a00eb32e3dab657bc0d1dc1e2982851d3992ec1329210b2642ccc5
+  data.tar.gz: 0d227e2da3f0dfa710ee46a11c3a9bd0e6e4fbf05728e96b553ae28a018c305e
 SHA512:
-  metadata.gz: b21647377367ee30cd6eaae3280e4baf6359ffb9b1b62ed27791d5ff84649b0b47f4e209d6bd6e45bd5468f719877690892c79835f12be1641a515e7abd929fa
-  data.tar.gz: 9175489f85c7e46de2c76d29a9ec3d0d36d9287892a88f2add6df9c5f9fc7ca6841c8b0e0d2601ee7f78d2192d218999bca97e064a9fcae99c9852a1abe2241f
+  metadata.gz: 4c33eb7910db84735f6baa86e020b604cdc272c18d726c7c53bb34b3995b6ca874fc5da985756df1f34f985cc80385f2477fe571756ff0c8da374ca0e1001de8
+  data.tar.gz: 9d3122d562637f655b4fdb251e59256c3a29a42b6affecf78d26d9618cacacd81d3ae698541d5fda6b0e1aa1350d71807bfbd87b5f55213d671bb7ba0f010a41

data/README.md

@@ -11,13 +11,26 @@ A puppet-lint plugin to check and fix class params/equals alignment.
 
 ## Usage
 
-This plugin provides 2 checks for puppet-lint:
+This plugin provides 3 checks for puppet-lint:
 
+- `class_params_newline`
 - `class_params_alignment`
 - `class_equals_alignment`
 
 It supports `--fix` flag.
 
+To properly reformat the code, run `puppet-lint --fix` like this:
+
+```bash
+$ puppet-lint --only-checks class_params_newline --fix .
+$ puppet-lint --only-checks class_params_alignment --fix .
+$ puppet-lint --only-checks class_equals_alignment --fix .
+
+# It's best to combine the above checks with `strict_indent` to fix all remaining issues
+$ puppet-lint --only-checks strict_indent --fix .
+
+```
+
 > Parameters to classes or defined types must be uniformly indented in two
 > spaces from the title. The equals sign should be aligned.
 >

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

@@ -4,16 +4,16 @@
 # https://puppet.com/docs/puppet/7/style_guide.html#style_guide_classes-param-indentation-alignment
 
 def a_param?(token)
-  if token.prev_code_token.type == :EQUALS
+  if token&.prev_code_token&.type == :EQUALS
     false
-  elsif token.prev_code_token.type == :FARROW
+  elsif token&.prev_code_token&.type == :FARROW
     false
-  elsif token.type == :VARIABLE && !%i[DQPRE DQMID].include?(token.prev_code_token.type)
+  elsif token&.type == :VARIABLE && !%i[DQPRE DQMID].include?(token.prev_code_token.type)
     true
   end
 end
 
-def first_param_on_the_line?(token)
+def first_on_the_line?(token, type)
   origin = token
   while token&.prev_token
     token = token.prev_token
@@ -24,7 +24,7 @@ def first_param_on_the_line?(token)
   while token&.next_token
     token = token.next_token
 
-    break if token.type == :VARIABLE
+    break if token.type == type
   end
 
   origin == token
@@ -33,9 +33,9 @@ end
 def the_one?(token, character)
   case character
   when '='
-    true if token.type == :EQUALS
+    true if token.type == :EQUALS && first_on_the_line?(token, :EQUALS)
   when '$'
-    true if token.type == :VARIABLE && a_param?(token) && first_param_on_the_line?(token)
+    true if a_param?(token) && first_on_the_line?(token, :VARIABLE)
   end
 end
 
@@ -113,12 +113,12 @@ def check_for(character)
         arrow_column[level_idx] = this_arrow_column if arrow_column[level_idx] < this_arrow_column
 
         (level_tokens[level_idx] ||= []) << token
-      elsif token.prev_token.type == :LPAREN
+      elsif token == resource_tokens[0]
         level_idx += 1
         arrow_column << 0
         level_tokens[level_idx] ||= []
         param_column << nil
-      elsif token.next_token.type == :RPAREN
+      elsif token == resource_tokens[-1]
         if (level_tokens[level_idx] ||= []).map(&:line).uniq.length > 1
           level_tokens[level_idx].each do |arrow_tok|
             next if arrow_tok.column == arrow_column[level_idx] || level_tokens[level_idx].size == 1
@@ -148,30 +148,14 @@ end
 # This function is copied & modified from puppet-lint arrow_alignment fix
 # https://github.com/puppetlabs/puppet-lint/blob/020143b705b023946739eb44e7c7d99fcd087527/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb#L94
 def fix_for(problem)
-  if problem[:newline]
-    index = tokens.index(problem[:token].prev_code_token.prev_token)
-
-    # insert newline
-    tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
-
-    # indent the parameter to the correct depth
-    problem[:token].prev_code_token.prev_token.type = :INDENT
-    problem[:token].prev_code_token.prev_token.value = ' ' * problem[:newline_indent]
-
-    end_param_idx = tokens.index(problem[:token].prev_code_token)
-    start_param_idx = tokens.index(problem[:token].prev_token_of(%i[INDENT NEWLINE]))
-    param_length = tokens[start_param_idx..end_param_idx].map do |r|
-                     r.to_manifest.length
-                   end.reduce(0) { |sum, x| sum + x } + 1
-    new_ws_len = problem[:arrow_column] - param_length
-  else
-    new_ws_len = if problem[:token].prev_token.type == :WHITESPACE
-                   problem[:token].prev_token.to_manifest.length
-                 else
-                   0
-                 end
-    new_ws_len += (problem[:arrow_column] - problem[:token].column)
-  end
+  raise PuppetLint::NoFix if problem[:newline]
+
+  new_ws_len = if problem[:token].prev_token.type == :WHITESPACE
+                 problem[:token].prev_token.to_manifest.length
+               else
+                 0
+               end
+  new_ws_len += (problem[:arrow_column] - problem[:token].column)
 
   if new_ws_len.negative?
     raise PuppetLint::NoFix if problem[:token].prev_token.type != :INDENT

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

@@ -0,0 +1,70 @@
+def prev_param_token(token)
+  while token&.prev_code_token
+    token = token.prev_code_token
+    break if a_param?(token)
+  end
+  token
+end
+
+PuppetLint.new_check(:class_params_newline) do
+  def check
+    (class_indexes + defined_type_indexes).each do |item|
+      tokens = item[:param_tokens]
+
+      first_param = tokens.index { |token| a_param?(token) }
+      last_param = tokens.rindex { |token| a_param?(token) }
+      next if first_param.nil?
+      next if last_param.nil?
+
+      # Skip if there's only 1 param
+      next if tokens[first_param] == tokens[last_param]
+
+      tokens.each do |token|
+        next unless a_param?(token)
+
+        if token.prev_code_token == :LPAREN
+          next if token.line != token.prev_code_token.line
+        elsif token.line != prev_param_token(token).line
+          next
+        end
+
+        notify(
+          :warning,
+          message: "Parameter #{token.to_manifest} should have its own line (expected in line #{token.line + 1}, but found it in line #{token.line})",
+          line: token.line,
+          column: token.column,
+          token: token,
+          newline: true,
+          newline_indent: item[:tokens][0].column + 1
+        )
+      end
+    end
+  end
+
+  def fix(problem)
+    token = problem[:token]
+    case token&.prev_code_token&.type
+    when :TYPE
+      token = token.prev_code_token
+    when :RBRACK
+      count = 0
+      while token&.prev_code_token
+        token = token.prev_code_token
+        case token.type
+        when :RBRACK
+          count += 1
+        when :LBRACK
+          count -= 1
+        end
+
+        break if count.zero?
+      end
+      token = token.prev_code_token
+    end
+
+    index = tokens.index(token.prev_code_token.next_token)
+    tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
+
+    token.prev_token.value = ' ' * problem[:newline_indent] if %i[WHITESPACE INDENT].include?(token.prev_token.type)
+  end
+end

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

@@ -241,13 +241,12 @@ describe 'class_equals_alignment' do
         END
       end
 
-      it 'should detect 2 problems' do
-        expect(problems).to have(2).problems
+      it 'should detect 1 problem' do
+        expect(problems).to have(1).problems
       end
 
-      it 'should create 2 warnings' do
+      it 'should create 1 warning' do
         expect(problems).to contain_warning(format(msg, 18, 16)).on_line(2).in_column(16)
-        expect(problems).to contain_warning(format(msg, 18, 29)).on_line(2).in_column(29)
       end
     end
   end
@@ -424,23 +423,21 @@ describe 'class_equals_alignment' do
       let(:fixed) do
         <<-END
           class test (
-            $a   = 'foo',
-            $bb  = 'bar',
+            $a   = 'foo', $bb = 'bar',
             $ccc = 'baz',
           ) {}
         END
       end
 
-      it 'should detect 2 problems' do
-        expect(problems).to have(2).problems
+      it 'should detect 1 problem' do
+        expect(problems).to have(1).problems
       end
 
-      it 'should fix 2 problems' do
+      it 'should fix 1 problem' do
         expect(problems).to contain_fixed(format(msg, 18, 16)).on_line(2).in_column(16)
-        expect(problems).to contain_fixed(format(msg, 18, 29)).on_line(2).in_column(29)
       end
 
-      it 'should move the extra param onto its own line and realign' do
+      it 'should not move the extra param onto its own line and realign' do
         expect(manifest).to eq(fixed)
       end
     end
@@ -458,24 +455,21 @@ describe 'class_equals_alignment' do
       let(:fixed) do
         <<-END
           class test (
-            $a     = 'foo',
-            $bbccc = 'bar',
-            $ccc   = 'baz',
+            $a   = 'foo', $bbccc = 'bar',
+            $ccc = 'baz',
           ) {}
         END
       end
 
-      it 'should detect 2 problems' do
-        expect(problems).to have(3).problems
+      it 'should detect 1 problem' do
+        expect(problems).to have(1).problems
       end
 
-      it 'should fix 2 problems' do
-        expect(problems).to contain_fixed(format(msg, 20, 16)).on_line(2).in_column(16)
-        expect(problems).to contain_fixed(format(msg, 20, 32)).on_line(2).in_column(32)
-        expect(problems).to contain_fixed(format(msg, 20, 18)).on_line(3).in_column(18)
+      it 'should fix 1 problem' do
+        expect(problems).to contain_fixed(format(msg, 18, 16)).on_line(2).in_column(16)
       end
 
-      it 'should move the extra param onto its own line and realign' do
+      it 'should not move the extra param onto its own line and realign' do
         expect(manifest).to eq(fixed)
       end
     end

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

@@ -280,7 +280,7 @@ describe 'class_params_alignment' do
         <<-END
           class name (
             $aaa = function('foo', 'bar'),
-            $bbb = function('foo', 'bar'),
+              $bbb = function('foo', 'bar'),
             Boolean $key1 = false,
             Enum['never', 'allow', 'try', 'demand'] $key2,
           $materializer_version = $foo ? {
@@ -308,7 +308,7 @@ describe 'class_params_alignment' do
 
       it 'should fix 4 problems' do
         expect(problems).to contain_fixed(format(msg, 53, 13)).on_line(2).in_column(13)
-        expect(problems).to contain_fixed(format(msg, 53, 13)).on_line(3).in_column(13)
+        expect(problems).to contain_fixed(format(msg, 53, 15)).on_line(3).in_column(15)
         expect(problems).to contain_fixed(format(msg, 53, 21)).on_line(4).in_column(21)
         expect(problems).to contain_fixed(format(msg, 53, 11)).on_line(6).in_column(11)
       end

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

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe 'class_params_newline' do
+  let(:msg) { 'Parameter %s should have its own line (expected in line %d, but found it in line %d)' }
+
+  context 'with fix disabled' do
+    context 'tidy code' do
+      let(:code) do
+        <<-END
+          class bar(
+                                                        $someparam = 'somevalue',
+                                                        $another,
+            String                                      $nope,
+                                                        $foo,
+            Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port,
+            # $aaa,
+            String                                      $third     = 'meh',
+            Array[Int, Int]                             $asdf      = 'asdf',
+          ) { }
+        END
+      end
+
+      it 'should detect 0 problems' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+    context 'messy code' do
+      let(:code) do
+        <<-END
+          class bar(                                                        $someparam = 'somevalue',
+            $another, String $nope, $foo,
+            Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port,
+            # $aaa,
+            String                                              $third     = 'meh', Array[Int, Int] $asdf = 'asdf',
+          ) { }
+        END
+      end
+
+      it 'should detect 4 problems' do
+        expect(problems).to have(4).problems
+      end
+
+      it 'should create four warnings' do
+        expect(problems).to contain_warning(format(msg, '$someparam', 2, 1)).on_line(1).in_column(77)
+        expect(problems).to contain_warning(format(msg, '$nope', 3, 2)).on_line(2).in_column(30)
+        expect(problems).to contain_warning(format(msg, '$foo', 3, 2)).on_line(2).in_column(37)
+        expect(problems).to contain_warning(format(msg, '$asdf', 6, 5)).on_line(5).in_column(101)
+      end
+    end
+  end
+
+  context 'with fix enabled' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    context 'messy code' do
+      let(:code) do
+        <<-END
+          class bar(                                                        $someparam = 'somevalue',
+            $another, String $nope, $foo,
+            Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port,
+            # $aaa,
+            String                                              $third     = 'meh', Array[Int, Int] $asdf = 'asdf',
+          ) { }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          class bar(
+            $someparam = 'somevalue',
+            $another,
+            String $nope,
+            $foo,
+            Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port,
+            # $aaa,
+            String                                              $third     = 'meh',
+            Array[Int, Int] $asdf = 'asdf',
+          ) { }
+        END
+      end
+
+      it 'should fix the problems' do
+        expect(manifest).to eq(fixed)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-class_alignment-check
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Anh Pham
@@ -123,8 +123,10 @@ files:
 - LICENSE
 - README.md
 - lib/puppet-lint/plugins/check_class_alignment.rb
+- lib/puppet-lint/plugins/check_class_params_newline.rb
 - spec/puppet-lint/plugins/check_class_equals_alignment_spec.rb
 - spec/puppet-lint/plugins/check_class_params_alignment_spec.rb
+- spec/puppet-lint/plugins/check_class_params_newline_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/anhpt379/puppet-lint-class_alignment-check
 licenses:
@@ -152,4 +154,5 @@ summary: A puppet-lint plugin to check & fix class params/equals alignment.
 test_files:
 - spec/puppet-lint/plugins/check_class_equals_alignment_spec.rb
 - spec/puppet-lint/plugins/check_class_params_alignment_spec.rb
+- spec/puppet-lint/plugins/check_class_params_newline_spec.rb
 - spec/spec_helper.rb