puppet-lint-fileserver-check 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2385520863deb2af2d03950b89a4bf0bbad4b7b
-  data.tar.gz: 07a8c1a4be44ac43e7a8ef42b3ae2e4ccdc6a5b4
+  metadata.gz: 02c2f3a43158b08805bb51ac2afad8728c514fa6
+  data.tar.gz: de15da23deee73db54567cbabbb4ce76b57c5b93
 SHA512:
-  metadata.gz: d9027849b1313dcfe8cd84fdffa0bf4e8848f4dbc5f9759b2c2b69d0710357fe0ec11018c4a79c6d7ae53bfff46ae7d75f142bb48ed444e5775b96ced62b5c11
-  data.tar.gz: 93895b28f5e155e1448ec564f26754c79e0af066e5684b590600eb01ab6ce83d1210657628c667b03e09cbc32ef48e128d76d36596119c96b76bc3d18e9d6d2f
+  metadata.gz: 9ba84f2511002241d34edace57d29f617020bca497741d69f0e6b5c0ddcd453c04ce96eee5010484ee9fcf0e1c558b019159ec8cc4fe078d92ddb130372a2c1e
+  data.tar.gz: 84f99b95f27cf4e47d3cd7d6d16cb6c6a29c72d7842b6817a395ce2af4ae00596275e867a0db0a0baf6d3687ab78cc834a1f3a7fdbd9454a1cfc804712dac21c

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

@@ -1,10 +1,18 @@
 PuppetLint.new_check(:fileserver) do
+  def token_attr(resource, name)
+    resource[:tokens].select do |t|
+      t.type == :NAME && t.value == name && \
+        t.next_code_token && t.next_code_token.type == :FARROW
+    end
+  end
+
   def check
     resource_indexes.each do |resource|
       attr = resource[:tokens].select do |t|
         t.prev_code_token && t.prev_code_token.type == :FARROW && t.value =~ %r{^puppet:///}
       end
       next if attr.empty?
+      next if resource[:type].value == 'file' and !token_attr(resource, 'recurse').empty? and token_attr(resource, 'recurse')[0].next_code_token.next_code_token.type == :TRUE
       notify :warning, {
         :message  => 'expected file() instead of fileserver',
         :line     => attr[0].line,

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

@@ -29,7 +29,23 @@ describe 'fileserver' do
         EOS
       }
 
-      it 'should detect a single problem' do
+      it 'should not detect any problem' do
+        expect(problems).to have(0).problem
+      end
+    end
+
+    context 'code using fileserver with puppet:/// and recurse=true' do
+      let(:code) {
+        <<-EOS
+        file { 'foo':
+          ensure  => file,
+          recurse => true,
+          source  => 'puppet:///modules/foo/bar',
+        }
+        EOS
+      }
+
+      it 'should not detect any problem' do
         expect(problems).to have(0).problem
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-fileserver-check
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint