puppet-lint-resource_reference_syntax 1.0.14 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b4d49d1c29ba9ae2d623b28608f0830ed9ad519d
-  data.tar.gz: 05917862e5e238a57adb9ea389f8c5a3e4a15261
+SHA256:
+  metadata.gz: a46a1903b6d2e1c4f769806edb8969fd1aecfaa0be25a0fe8be7831a94fb634f
+  data.tar.gz: 7bd63f489f10957be998878845fb88be834390fe6f9947a040e3fffe78189ab5
 SHA512:
-  metadata.gz: 2d534ade50b6749f69bd0dd3e479e6e267ddae29f825ac22428b8a2767d6d9d9392ac825acd179fa66cfc9f69c8efe1d569b6997f85251a1ce2344cf2a971f92
-  data.tar.gz: c3b6eef005b06ba8c833555b3a8117fabe0dc68a0da9cecbb4f9c330116ff9a078535f83f8e2f51ad5466ac897d23af4ddcec159a1dfad7a46709705b3947661
+  metadata.gz: a5a10f947b16541ee913f1ad16a4ba2ffaa978c01228269c42b7a166b172b85911fd1f30752f41e87d67fea4da44637c5210974cae00def70ccdd6512d532d8f
+  data.tar.gz: 4b555f5fe5fb76d656dbad267d1756d53a19ae8dc07861a094f36c33542c687d2dcfa602ff38bc1d21a12ed44519dbfd16634c2d81d99ef0b986c72743e89f59

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

@@ -0,0 +1,39 @@
+PuppetLint.new_check(:resource_reference_with_unquoted_title) do
+  def check
+    resource_indexes.each do |resource|
+      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
+        check = value_token.next_token
+        until resource[:param_tokens].include? check or not resource[:tokens].include? check or check.nil?
+          case value_token.next_token.type
+          when :CLASSREF
+            begin
+              if value_token.next_token.next_token.type == :LBRACK
+                check_token = value_token.next_token.next_token.next_token
+                if check_token.type == :NAME
+                  notify :error, {
+                    :message => 'unquoted title in resource reference',
+                    :line    => check_token.line,
+                    :column  => check_token.column,
+                    :token   => check_token,
+                  }
+                end
+              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
+  end
+
+  def fix(problem)
+    problem[:token].type = :SSTRING
+  end
+end

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

@@ -18,12 +18,6 @@ PuppetLint.new_check(:resource_reference_without_title_capital) do
                     :line    => check_token.line,
                     :column  => check_token.column
                   }
-                elsif check_token.type == :NAME
-                  notify :error, {
-                    :message => 'resource reference with title with missing quotes',
-                    :line    => check_token.line,
-                    :column  => check_token.column
-                  }
                 end
               end
               value_token = value_token.next_token

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

@@ -0,0 +1,207 @@
+require 'spec_helper'
+
+describe 'resource_reference_with_unquoted_title' do
+  let(:msg) { 'unquoted title in resource reference' }
+
+  context 'with fix disabled' do
+    context 'quoted resource ref on single line resource' do
+      let(:code) { "file { 'foo': require => File['bar'] }" }
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+    context 'unquoted resource ref on single line resource' do
+      let(:code) { "file { 'foo': require => File[bar] }" }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should raise an error' do
+        expect(problems).to contain_error(msg).on_line(1).in_column(31)
+      end
+    end
+
+
+    context 'quoted resource ref on multi line resource' do
+      let(:code) do
+        <<-END
+          file { 'foo':
+            require => File['bar'],
+          }
+        END
+      end
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+    context 'unquoted resource ref on multi line resource' do
+      let(:code) do
+        <<-END
+          file { 'foo':
+            require => File[bar]
+          }
+        END
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should raise an error' do
+        expect(problems).to contain_error(msg).on_line(2).in_column(29)
+      end
+    end
+
+    context 'condensed resources with quoted refs' do
+      let(:code) do
+        <<-END
+          file {
+            'foo':
+              require => File['bar'];
+            'bar':
+              require => File['baz'];
+          }
+        END
+      end
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+    context 'condensed resources with an unquoted ref' do
+      let(:code) do
+        <<-END
+          file {
+            'foo':
+              require => File[bar];
+            'bar':
+              require => File['baz'];
+          }
+        END
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should raise an error' do
+        expect(problems).to contain_error(msg).on_line(3).in_column(31)
+      end
+    end
+
+    context 'resource refs with interpolated variables' do
+      let(:code) do
+        <<-END
+          $file = 'bar'
+
+          file { 'foo':
+            require => File[$file]
+          }
+        END
+      end
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+  end
+
+  context 'with fix enabled' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    context 'unquoted resource ref on single line resource' do
+      let(:code) { "file { 'foo': require => File[bar] }" }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(31)
+      end
+
+      it 'should single quote the resource title' do
+        expect(manifest).to eq("file { 'foo': require => File['bar'] }")
+      end
+    end
+
+    context 'unquoted resource ref on multi line resource' do
+      let(:code) do
+        <<-END
+          file { 'foo':
+            require => File[bar]
+          }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          file { 'foo':
+            require => File['bar']
+          }
+        END
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(2).in_column(29)
+      end
+
+      it 'should single quote the resource ref' do
+        expect(manifest).to eq(fixed)
+      end
+    end
+
+    context 'condensed resources with an unquoted ref' do
+      let(:code) do
+        <<-END
+          file {
+            'foo':
+              require => File[bar];
+            'bar':
+              require => File['baz'];
+          }
+        END
+      end
+
+      let(:fixed) do
+        <<-END
+          file {
+            'foo':
+              require => File['bar'];
+            'bar':
+              require => File['baz'];
+          }
+        END
+      end
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(3).in_column(31)
+      end
+
+      it 'should single quote the resource title' do
+        expect(manifest).to eq(fixed)
+      end
+    end
+  end
+end

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

@@ -99,19 +99,6 @@ describe 'resource_reference_without_title_capital' do
     end
   end
 
-  context 'resource reference with title without quotes' do
-    let(:msg) { 'resource reference with title with missing quotes' }
-    let(:code) { "file { 'foo': ensure => file, notify => Title[one],}" }
-
-    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
-
   context 'stay within the parameter context' do
     let(:code) { "file { 'foo': ensure => file, notify => Title['One'],} $var = [ Exec[runsomething] ]" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-resource_reference_syntax
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - Martin Alfke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -76,32 +76,32 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Extends puppet-lint to ensure that the reference syntax follows Puppet 4 style
+description: "    Extends puppet-lint to ensure that the reference syntax follows
+  Puppet 4 style\n"
 email: ma@example42.com
 executables: []
 extensions: []
@@ -111,9 +111,11 @@ files:
 - LICENSE
 - README.md
 - lib/puppet-lint/plugins/resource_reference_chain_without_whitespace.rb
+- lib/puppet-lint/plugins/resource_reference_with_unquoted_title.rb
 - lib/puppet-lint/plugins/resource_reference_without_title_capital.rb
 - lib/puppet-lint/plugins/resource_reference_without_whitespace.rb
 - spec/puppet-lint/plugins/resource_reference_chain_without_whitespace_spec.rb
+- spec/puppet-lint/plugins/resource_reference_with_unquoted_title_spec.rb
 - spec/puppet-lint/plugins/resource_reference_without_title_capital_spec.rb
 - spec/puppet-lint/plugins/resource_reference_without_whitespace_spec.rb
 - spec/spec_helper.rb
@@ -137,12 +139,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: puppet-lint reference_syntax check
 test_files:
-- spec/puppet-lint/plugins/resource_reference_chain_without_whitespace_spec.rb
-- spec/puppet-lint/plugins/resource_reference_without_title_capital_spec.rb
-- spec/puppet-lint/plugins/resource_reference_without_whitespace_spec.rb
 - spec/spec_helper.rb
+- spec/puppet-lint/plugins/resource_reference_without_whitespace_spec.rb
+- spec/puppet-lint/plugins/resource_reference_without_title_capital_spec.rb
+- spec/puppet-lint/plugins/resource_reference_chain_without_whitespace_spec.rb
+- spec/puppet-lint/plugins/resource_reference_with_unquoted_title_spec.rb