puppet-lint-resource_reference_syntax 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1588999aeae6a48e3b9a1d9ecff0d2078fc68c
-  data.tar.gz: 5328ef32b72821db7ce423b29eb5f0d1f2fb1717
+  metadata.gz: 6444407fc868020ca8c63c1cc06bfeee0735f1e6
+  data.tar.gz: 6559535d01dfde23af4c912e969c3d8bad2421e7
 SHA512:
-  metadata.gz: 14feff85da89a1df849a813393f38f44c90497381adc4d1ac17d604467f14a7476ec16095557fecb5836fdf464fe33e267b859d89b174f79afabb10ccda56595
-  data.tar.gz: e60e57b9da69171a16167df1e4ae371787516f3c19457d31c2cea9f43d7fe081f188742ef293fec0df7a14cd9d4ed4ed648ed0146a642f41dbb78c37670a2ba6
+  metadata.gz: e25f233604d1f3870dcc7dfd3b34369e42e677d03ba153fc3e0ecbde4dff6c13a34481f137fee2a9e4687a315eb7af2e0387fb1a869c6d3af674719964a3ebc3
+  data.tar.gz: 65941825a27dae57fd9275c4dc0015c299a90cba98e01d922de705e512864321cddcd2b93ab0684367bf975ed2c27c68eb01df2b3b783e145fa6beeb5118b330

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

@@ -4,13 +4,26 @@ PuppetLint.new_check(:resource_reference_without_whitespace) do
       resource[:param_tokens].select { |param_token|
         ['require', 'subscribe', 'notify', 'before', 'consume', 'export'].include? param_token.value
       }.each do |param_token|
-        value_token = param_token.next_code_token.next_code_token.next_token
-        if value_token.type != :LBRACK
-          notify :error, {
-            :message => 'whitespce between reference type and title',
-            :line    => param_token.next_code_token.next_code_token.line,
-            :column  => param_token.next_code_token.next_code_token.column
-          }
+        value_token = param_token.next_code_token
+        check = value_token.next_token
+        until check.nil?
+          case value_token.next_token.type
+          when :CLASSREF
+            begin
+              if value_token.next_token.next_token.type == :WHITESPACE
+                notify :error, {
+                  :message => 'whitespce between reference type and title',
+                  :line    => param_token.next_code_token.next_code_token.line,
+                  :column  => param_token.next_code_token.next_code_token.column
+                }
+              end
+              value_token = value_token.next_token
+              check = value_token.next_token
+            end
+          else
+            value_token = value_token.next_token
+            check = value_token.next_token
+          end
         end
       end
     end

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

@@ -35,6 +35,14 @@ describe 'resource_reference_without_title_capital' do
     end
   end
 
+  context 'multiple proper references as array one in quotes, one as variable' do
+    let(:code) { "file { 'foo': ensure => file, notify => [ Title['one'], Title[$foo_var] ],}" }
+
+    it 'should detect no problem' do
+      expect(problems).to have(0).problem
+    end
+  end
+
   context 'a proper reference as variable' do
     let(:code) { "file { 'foo': ensure => file, notify => Title[$foo_var],}" }
 

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

@@ -2,6 +2,24 @@ require 'spec_helper'
 
 describe 'resource_reference_without_whitespace' do
 
+  context 'a proper reference as array' do
+    let(:msg) { 'whitespce between reference type and title' }
+    let(:code) { "file { 'foo': ensure => file, notify => [ Title['one'], Title['two'] ]}" }
+
+    it 'should detect no problem' do
+      expect(problems).to have(0).problem
+    end
+  end
+
+  context 'a proper reference as array one fix, one variable' do
+    let(:msg) { 'whitespce between reference type and title' }
+    let(:code) { "file { 'foo': ensure => file, notify => [ Title['one'], Title[$two] ]}" }
+
+    it 'should detect no problem' do
+      expect(problems).to have(0).problem
+    end
+  end
+
   context 'a proper reference' do
     let(:msg) { 'whitespce between reference type and title' }
     let(:code) { "file { 'foo': ensure => file, notify => Title['one'],}" }
@@ -24,4 +42,17 @@ describe 'resource_reference_without_whitespace' do
     end
   end
 
+  context 'a whitespace between reference and bracket inside an array' do
+    let(:msg) { 'whitespce between reference type and title' }
+    let(:code) { "file { 'foo': ensure => file, consume => [ Title ['one'], Title['two']],}" }
+
+    it 'should only detect a single problem' do
+      expect(problems).to have(1).problem
+    end
+
+    it 'should create an error' do
+      expect(problems).to contain_error(msg).on_line(1)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-resource_reference_syntax
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Martin Alfke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint