puppet-lint-improved_arrow_alignment 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c99848491e74f1bd13f483d306162aa7471ded63e223e40f0d4829685f9c2510
-  data.tar.gz: eb43057ff3f2b48773860d15618d2708f55e41fb8296d3ee14d30e4839f9aac9
+  metadata.gz: 85c367296dc00fb0a6246f5e1196a866e7b6b12a7c141d51063dc09ea40ef4dd
+  data.tar.gz: 2fc71152a36b0220ced03b6a3679d7c81986ab85a5707fb0bd9d2df0e3b30d1c
 SHA512:
-  metadata.gz: cce4814a5d75d9a529b0c72240913296a71d7651e693b5492a4c83feec12c81823b10640e9ea7ed0a16ba1e782360b494fa765b456d0745a8b567e160384dba0
-  data.tar.gz: 043d6d59ef125e0c7e67fa0b1c13eb5ea2646672f6b99ebbe98d22f2bbd1e574e74d24b2315ce5c3d080d73b1362616baba1c0270f58c06f870d73b4ed876685
+  metadata.gz: 7c024abbe21847ba053a1a62e8146564b19e62a375c0ebe0b17c40c02775e42fee1e873320f0b00d21e8e569f6fab77bcd745e674f73f2f5cd1a1ecf9b79ef99
+  data.tar.gz: 91584c8ae1b8151a77c884367c9f420534dd42a903d6b5743d5ee529abfe54551ae0e15b2078e6a343c96e08615b5a11fe987277cde884c6a7af378209cffb5a

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

@@ -1,6 +1,6 @@
 PuppetLint.new_check(:improved_arrow_alignment) do
   def check
-    class_indexes.each do |res_idx|
+    (class_indexes + defined_type_indexes).each do |res_idx|
       arrow_column = [0]
       level_idx = 0
       level_tokens = []
@@ -18,6 +18,13 @@ PuppetLint.new_check(:improved_arrow_alignment) do
       next if resource_tokens[first_arrow].line == resource_tokens[last_arrow].line
 
       resource_tokens.each do |token|
+        # don't step on arrow_alignment check from puppet-lint
+        in_resource = false
+        resource_indexes.each do |res|
+          in_resource = res[:tokens].include?(token)
+        end
+        next if in_resource
+
         if token.type == :FARROW
           param_token = token.prev_code_token
 

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

@@ -18,6 +18,41 @@ describe 'improved_arrow_alignment' do
     end
   end
 
+  context 'defined type with correctly alligned' do
+    let(:code) do
+      <<-EOS
+        define imatest::type {
+          File {
+            ensure => present,
+            mode   => '0755'
+          }
+        }
+      EOS
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
+
+  context 'resource misalign let arrow_align check handle' do
+    let(:code) do
+      <<-EOS
+        class imatest {
+          file { '/tmp/test.txt':
+            ensure => present,
+            mode     => '0655',
+          }
+        }
+      EOS
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
+
+
   # and these should cause failiures
 
   context 'resource default with misaligned' do
@@ -45,4 +80,59 @@ describe 'improved_arrow_alignment' do
     end
   end
 
+  context 'resource misalign let arrow_align check handle with resource default' do
+    let(:msg) { 'indentation of => is not properly aligned (expected in column %d, but found it in column %d)' }
+
+    let(:code) do
+      <<-EOS
+        class imatest {
+          File {
+            ensure => present,
+            mode  => '0755',
+            owner    => root,
+          }
+
+          file { '/tmp/test.txt':
+            ensure => present,
+            mode     => '0655',
+          }
+        }
+      EOS
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(2).problems
+    end
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(format(msg, 20, 19)).on_line(4).in_column(19)
+      expect(problems).to contain_warning(format(msg, 20, 22)).on_line(5).in_column(22)
+    end
+  end
+
+  context 'defined type with misaligned' do
+    let(:msg) { 'indentation of => is not properly aligned (expected in column %d, but found it in column %d)' }
+
+    let(:code) do
+      <<-EOS
+        define imatest::type {
+          File {
+            ensure => present,
+            mode  => '0755',
+            owner    => root,
+          }
+        }
+      EOS
+    end
+
+    it 'should detect two problems' do
+      expect(problems).to have(2).problem
+    end
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(format(msg, 20, 19)).on_line(4).in_column(19)
+      expect(problems).to contain_warning(format(msg, 20, 22)).on_line(5).in_column(22)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-improved_arrow_alignment
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Garrett Rowell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint