puppet-lint-fileserver-check 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645b0edd4d64a696a598dd3253adb1d8cc160f31
-  data.tar.gz: bb3a09d4048b9fae10d55c5da7e7072176e14490
+  metadata.gz: f29951ef181d127ebc193fec7eed34353148bec0
+  data.tar.gz: 617f106be6a01288f8d802c5e394d4eab9eab128
 SHA512:
-  metadata.gz: 8f6063629cb0b4964bbee81779f501381a462c82eb17c08083a0f86bd264a33e982297f8938f637645c11aa6d5edf058f290787e81a9e984adb0c6a95d5cb9b5
-  data.tar.gz: c8467b9f3a604dafe999277c88fb4655577c6576b315e3e4d76269165f38c6ca03acf54481840be0338738b8c71cc43c626e956d260db908e6bbd53999ba6471
+  metadata.gz: 0f532ff5320204e0817e359f62ef1c4a89e27926a8126aa3fc748baf5490a78f60a4cbc5a8846c3f1a2fce27a1a9313d6647dc2e96f73edc0c1e9a0f60fa9d1e
+  data.tar.gz: 1d41a86a47f7fbf9cc480c9a6a36b6ef558fdda66ab0b9a931359c5b1cb6c6c56d881c3cf3926013f7291f1b93c9a0df109d15d17323cf56245f8baf26060345

data/lib/puppet-lint/plugins/check-fileserver.rb

@@ -16,32 +16,36 @@ PuppetLint.new_check(:fileserver) do
   end
 
   def fix(problem)
-    if problem[:resource][:type].value == 'file' && problem[:token].type == :SSTRING
-      problem[:token].prev_code_token.prev_code_token.value = 'content'
-      problem[:token].value.sub!(%r{^puppet:///modules/(.*)}, "file('\\1')")
-      problem[:token].type = :NAME
-    elsif problem[:token].type == :DQPRE
-      problem[:token].prev_code_token.prev_code_token.value = 'content'
-      file = PuppetLint::Lexer::Token.new(
-        :NAME, 'file',
-        problem[:token].line, problem[:token].column+1
-      )
-      lparen = PuppetLint::Lexer::Token.new(
-        :LPAREN, '(',
-        problem[:token].line, problem[:token].column+1
-      )
-      rparen = PuppetLint::Lexer::Token.new(
-        :RPAREN, ')',
-        problem[:token].line, problem[:token].column+1
-      )
-      tokens.insert(tokens.index(problem[:token]), file)
-      tokens.insert(tokens.index(problem[:token]), lparen)
-      problem[:token].value.sub!(%r{^puppet:///modules/}, '')
-      t = problem[:token].next_code_token
-      while t.type != :DQPOST
-        t = t.next_code_token
+    if problem[:resource][:type].value == 'file'
+      if problem[:token].type == :SSTRING
+        problem[:token].prev_code_token.prev_code_token.value = 'content'
+        problem[:token].value.sub!(%r{^puppet:///modules/(.*)}, "file('\\1')")
+        problem[:token].type = :NAME
+      elsif problem[:token].type == :DQPRE
+        problem[:token].prev_code_token.prev_code_token.value = 'content'
+        file = PuppetLint::Lexer::Token.new(
+          :NAME, 'file',
+          problem[:token].line, problem[:token].column+1
+        )
+        lparen = PuppetLint::Lexer::Token.new(
+          :LPAREN, '(',
+          problem[:token].line, problem[:token].column+1
+        )
+        rparen = PuppetLint::Lexer::Token.new(
+          :RPAREN, ')',
+          problem[:token].line, problem[:token].column+1
+        )
+        tokens.insert(tokens.index(problem[:token]), file)
+        tokens.insert(tokens.index(problem[:token]), lparen)
+        problem[:token].value.sub!(%r{^puppet:///modules/}, '')
+        t = problem[:token].next_code_token
+        while t.type != :DQPOST
+          t = t.next_code_token
+        end
+        tokens.insert(tokens.index(t)+1, rparen)
+      else
+        raise PuppetLint::NoFix, "Not fixing"
       end
-      tokens.insert(tokens.index(t)+1, rparen)
     else
       raise PuppetLint::NoFix, "Not fixing"
     end

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

@@ -89,6 +89,24 @@ describe 'fileserver' do
         expect(problems).to contain_warning(msg).on_line(2).in_column(26)
       end
     end
+
+    context 'when using fileserver not in file resource with variables' do
+      let(:code) {
+        <<-EOS
+        foo { 'foo':
+          file_source => "puppet:///${module_name}/foo/bar",
+        }
+        EOS
+      }
+
+      it 'should detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create a warning' do
+        expect(problems).to contain_warning(msg).on_line(2).in_column(26)
+      end
+    end
   end
 
   context 'with fix enabled' do
@@ -279,5 +297,27 @@ describe 'fileserver' do
         expect(manifest).to eq(code)
       end
     end
+
+    context 'when using fileserver not in file resource with variables' do
+      let(:code) {
+        <<-EOS
+        foo { 'foo':
+          file_source => "puppet:///${module_name}/foo/bar",
+        }
+        EOS
+      }
+
+      it 'should detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create a warning' do
+        expect(problems).to contain_warning(msg).on_line(2).in_column(26)
+      end
+
+      it 'should not modify the manifest' do
+        expect(manifest).to eq(code)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-fileserver-check
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mickaël Canévet