puppet-lint-manifest_whitespace-check 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 941d8699643b2ed44f68db5fb1abf74a6ec306d83097885f18b263c46c66cea5
-  data.tar.gz: b63a2f088279f55fbeba0fd69ced4f4112629844584ab70d06e777fc40213513
+  metadata.gz: 282678f99caeebc548db24014520b89900f3d22430a4c906403958da93701a48
+  data.tar.gz: d37219ad94c7775cdff3eb830c984e71393d0a65369a1262ddf1a284755906d1
 SHA512:
-  metadata.gz: c07c96370ad7811c654dc14251aa54899382a0e831bdd0556da915892a98e308cb61db27018f33873ac0d634635a4913f43f864d6feaca222e338d32f36fdd2c
-  data.tar.gz: 66698c346495d1b3f578c25d83db1774cbdc08ec486745ee1defcb1ae2502d21c7a8e80bd6e52ecef5181f01347b43561bdf72df9a04617cc6213de7be02c58e
+  metadata.gz: 1e563b17a5038ec4e352a504c63ef36674c15cb686a889674ab2b988aeade047ad400bf5e769dd280ab757d3bf1dfa85b07cb46f2323b306fc9ad63755507ae9
+  data.tar.gz: e9ebb4a5ebacb1a69fdff632dde3cf6d91a9abd8d38bdc667aa41c3e2c47dda181de02385d03dc408a56bcec9f6f5a60743541aec37eecf1061bbe695d5cc591

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

@@ -36,13 +36,13 @@ PuppetLint.new_check(:manifest_whitespace_class_name_single_space_after) do
       next unless name_token
 
       next_token = name_token.next_token
-      brace_token = name_token.next_token_of(%i[LPAREN LBRACE])
-      next unless tokens.index(name_token) != tokens.index(brace_token) - 2 ||
+      next_code_token = next_non_space_token(name_token)
+      next unless tokens.index(name_token) != tokens.index(next_code_token) - 2 ||
                   !is_single_space(next_token)
 
       notify(
         :error,
-        message: 'there should be a single space between the class or resource name and the first brace',
+        message: 'there should be a single space between the class or resource name and the next item',
         line: next_token.line,
         column: next_token.column,
         token: next_token,
@@ -52,22 +52,13 @@ PuppetLint.new_check(:manifest_whitespace_class_name_single_space_after) do
 
   def fix(problem)
     token = problem[:token]
-    brace_token = token.prev_token.next_token_of(%i[LPAREN LBRACE])
-
-    if token == brace_token
-      add_token(tokens.index(brace_token), new_single_space)
-      return
-    end
-
-    while token != brace_token
-      unless %i[WHITESPACE INDENT NEWLINE].include?(token.type)
-        raise PuppetLint::NoFix
-      end
+    next_code_token = next_non_space_token(token.prev_token)
 
+    while token != next_code_token
       remove_token(token)
       token = token.next_token
     end
 
-    add_token(tokens.index(brace_token), new_single_space)
+    add_token(tokens.index(next_code_token), new_single_space)
   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,32 +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
+    it 'should detect no problem' do
+      expect(problems).to have(0).problems
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-manifest_whitespace-check
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jo Vandeginste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint