puppet-lint-fileserver-check 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 722b51fc3ed0c18a55430a47c7fde2e6fa629517
-  data.tar.gz: c40f988cb66cda5c83c829b2ccb175abf30c0954
+  metadata.gz: 645b0edd4d64a696a598dd3253adb1d8cc160f31
+  data.tar.gz: bb3a09d4048b9fae10d55c5da7e7072176e14490
 SHA512:
-  metadata.gz: 62e4400749b9f814c77242c525fdc92a5c2be7179dffdfd73583193582dc320d04b74f2a50bacb3d368c6c4a05e8c5011ae64b2183287df117e670f77992956b
-  data.tar.gz: ff5e9562e3e317b255ee8c8541f0cfed458baeb16f1cc0d75ec7ed99e9d978a33b58357d210bd2f543eaa8e31b599c9b51699e94490b7ac23720d2ec93ffea71
+  metadata.gz: 8f6063629cb0b4964bbee81779f501381a462c82eb17c08083a0f86bd264a33e982297f8938f637645c11aa6d5edf058f290787e81a9e984adb0c6a95d5cb9b5
+  data.tar.gz: c8467b9f3a604dafe999277c88fb4655577c6576b315e3e4d76269165f38c6ca03acf54481840be0338738b8c71cc43c626e956d260db908e6bbd53999ba6471

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

@@ -20,6 +20,28 @@ PuppetLint.new_check(:fileserver) do
       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

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

@@ -182,12 +182,79 @@ describe 'fileserver' do
         expect(problems).to have(1).problem
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning(msg).on_line(3).in_column(21)
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(3).in_column(21)
       end
 
-      it 'should not modify the manifest' do
-        expect(manifest).to eq(code)
+      it 'should add a newline to the end of the manifest' do
+        expect(manifest).to eq(
+          <<-EOS
+        file { 'foo':
+          ensure => file,
+          content => file("${module_name}/bar"),
+        }
+        EOS
+        )
+      end
+    end
+
+    context 'code using a variable' do
+      let(:code) {
+        <<-EOS
+        file { 'foo':
+          ensure => file,
+          source => "puppet:///modules/foo/${bar}",
+        }
+        EOS
+      }
+
+      it 'should detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(3).in_column(21)
+      end
+
+      it 'should add a newline to the end of the manifest' do
+        expect(manifest).to eq(
+          <<-EOS
+        file { 'foo':
+          ensure => file,
+          content => file("foo/${bar}"),
+        }
+        EOS
+        )
+      end
+    end
+
+    context 'code using two variables' do
+      let(:code) {
+        <<-EOS
+        file { 'foo':
+          ensure => file,
+          source => "puppet:///modules/${module_name}/${bar}",
+        }
+        EOS
+      }
+
+      it 'should detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(3).in_column(21)
+      end
+
+      it 'should add a newline to the end of the manifest' do
+        expect(manifest).to eq(
+          <<-EOS
+        file { 'foo':
+          ensure => file,
+          content => file("${module_name}/${bar}"),
+        }
+        EOS
+        )
       end
     end
 

metadata

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