puppet-lint-manifest_whitespace-check 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af72a48c82a227107871c1e7b83a3bec2a101aab3cef89bbd3d6ce426122334d
-  data.tar.gz: c7bc25b60155836000ec44971dd88832fafd413cac0e89107c49be5e86e804c1
+  metadata.gz: 242cfac889870bbdd8d1346f1adafb8348b868945e9cfbe9adebebf6c4468c59
+  data.tar.gz: 0fd2197f54e3f911e077d3315458a0e2c44e69230570757cf26a7fc26db0d89e
 SHA512:
-  metadata.gz: 24961bb90cab1231db45ad634bf31444a276645d371401168956a436dd977e23166b19d5b1880e96d8ebfc64c3c53da68c4a65e92643a421094fae5a693ec2f0
-  data.tar.gz: c57d69810e67d335b597cb8257d627a07ac6c31fde14e37f64b8c05e4bb83fc750ca9e87699689211f299268ca287e89d76835259667d6b0876c3ed94f40b04e
+  metadata.gz: fc1eea7da122458e2cda3cad1820548774a57149ec6ae6061fd75e20388a82af98e4d93e740f15bfdb623e6f4ee5cd647d189e6c30285238712040eddbcc8f0f
+  data.tar.gz: 80b25a77380531e248bb146af17a010818e4782698fe85972cf97245a27ab2383fb8b2a3cc69875c56afd6a3ef3e3fe769d05a770bd858a45e5de4e55af5aecd

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

@@ -43,20 +43,22 @@ PuppetLint.new_check(:manifest_whitespace_class_name_single_space_after) do
       notify(
         :error,
         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,
+        line: name_token.line,
+        column: name_token.column,
+        token: name_token,
       )
     end
   end
 
   def fix(problem)
     token = problem[:token]
-    next_code_token = next_non_space_token(token.prev_token)
 
-    while token != next_code_token
-      remove_token(token)
-      token = token.next_token
+    next_token = token.next_token
+    next_code_token = next_non_space_token(token)
+
+    while next_token != next_code_token
+      remove_token(next_token)
+      next_token = next_token.next_token
     end
 
     add_token(tokens.index(next_code_token), new_single_space)

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

@@ -119,7 +119,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -183,7 +183,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(24)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -245,7 +245,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -307,7 +307,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 
@@ -372,7 +372,7 @@ describe 'manifest_whitespace_class_name_single_space_after' do
       end
 
       it 'should create a error' do
-        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(14)
+        expect(problems).to contain_error(single_space_msg).on_line(6).in_column(7)
       end
     end
 

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

@@ -34,6 +34,46 @@ describe 'manifest_whitespace_opening_brace_before' do
     end
   end
 
+  context 'with class no spaces' do
+    let(:code) do
+      <<~EOF
+        class example{
+          # some generic comment
+        }
+      EOF
+    end
+
+    context 'with fix disabled' do
+      it 'should detect a problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create a error' do
+        expect(problems).to contain_error(opening_brace_msg).on_line(1).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 add a space' do
+        expect(manifest).to eq(
+          <<~EOF,
+            class example {
+              # some generic comment
+            }
+          EOF
+        )
+      end
+    end
+  end
+
   context 'with no spaces' do
     let(:code) do
       <<~EOF

metadata

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