puppet-ghostbuster 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26896fb8ebecc8062f77819d2bae90f72b858ff3
-  data.tar.gz: 19fe3eb6c7eaa34a3868746426e4159e87d695cb
+  metadata.gz: fe22eeb59f0091363b234940fd33e7a59891d985
+  data.tar.gz: 9926ca96ceda0199032d3e0b5ae5e832eb1488b8
 SHA512:
-  metadata.gz: 0e706f1a1ba18168415218189450b201c5dcb71fad948a13645b305e4e5abfe1fb90e2907e35f98fb31303dbbc1c1cf0d093bd2bb377b70212ce938df7d5da82
-  data.tar.gz: 91103c80cb34bb4a2b8a852157860e258f5be4699f7b19f76ce15c3a045e1f5fdb1ba336f67b974479e83f8d707f2e92040364d5f239a09396dbb032850b42d5
+  metadata.gz: 2ee740dc1a4e7dbd549c1e1d22197916a5365bdbd3df9af45e127805f7cf84b2005f8df3cbdc9f9447381718e30931d751184030147571f52818998e434b3870
+  data.tar.gz: 76cf2ad9801df5220493994e3b2b34cf49096f46eb16869a668a29a4fda4a8cbce560d9c1da390b4f0b45f7b8fb5d89e3d47324b870928f7abb5d7d7496dbc4d

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [0.4.3](https://rubygems.org/gems/puppet-ghostbuster/versions/0.4.3) (2016-05-04)
+[Full Changelog](https://github.com/camptocamp/puppet-ghostbuster/compare/0.4.2...0.4.3)
+
+**Fixed bugs:**
+
+- Less false positive
+
 ## [0.4.2](https://rubygems.org/gems/puppet-ghostbuster/versions/0.4.2) (2016-05-02)
 [Full Changelog](https://github.com/camptocamp/puppet-ghostbuster/compare/0.4.1...0.4.2)
 

data/lib/puppet-ghostbuster/optparser.rb

@@ -43,16 +43,16 @@ class PuppetGhostbuster::OptParser
         PuppetGhostbuster.configuration.puppetdbserverurl = s
       end
 
-      opts.on('--key FILE', 'Load private key from the given file.') do |file|
-        PuppetGhostbuster.configuration.hostprivkey
+      opts.on('--key FILE', 'Load private key from the given file.') do |key|
+        PuppetGhostbuster.configuration.hostprivkey = key
       end
 
-      opts.on('--cert FILE', 'Load cert from the given file.') do |file|
-        PuppetGhostbuster.configuration.hostcert
+      opts.on('--cert FILE', 'Load cert from the given file.') do |cert|
+        PuppetGhostbuster.configuration.hostcert = cert
       end
 
-      opts.on('--ca FILE', 'Load local ca cert from the given file.') do |file|
-        PuppetGhostbuster.configuration.localcacert
+      opts.on('--ca FILE', 'Load local ca cert from the given file.') do |ca|
+        PuppetGhostbuster.configuration.localcacert = ca
       end
 
       opts.load('/etc/puppet-ghostbuster.rc')

data/lib/puppet-ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class PuppetGhostbuster
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/lib/puppet-ghostbuster.rb

@@ -146,21 +146,40 @@ class PuppetGhostbuster
     files.each do |file|
       next unless File.file?(file)
       module_name, file_name = file.match(/.*\/([^\/]+)\/files\/(.+)$/).captures
-      count = 0
+      found = false
+
+      found = true if self.class.client.request('resources', [:'=', ['parameter', 'source'], "^puppet:///modules/#{module_name}/#{file_name}$"],).data.size > 0
+
+      dir_name = File.dirname(file_name)
+      while dir_name != '.' do
+        found = true if self.class.client.request(
+          'resources',
+          [:'and',
+           [:'=', ['parameter', 'source'], "^puppet:///modules/#{module_name}/#{dir_name}/?$"],
+           [:'=', ['parameter', 'recurse'], true],
+        ],
+        ).data.size > 0
+        dir_name = File.dirname(dir_name)
+      end
+
       manifests.each do |manifest|
         if File.symlink?(manifest)
           @@logger.warn "  Skipping symlink #{manifest}"
           next
         end
+
         if match = manifest.match(/.*\/([^\/]+)\/manifests\/.+$/)
           manifest_module_name = match.captures[0]
           if manifest_module_name == module_name
-            count += File.readlines(manifest).grep(/["']\$\{module_name\}\/#{file_name}["']/).size
+            found = true if File.readlines(manifest).grep(/["']\$\{module_name\}\/#{file_name}["']/).size > 0
+            break if found
           end
         end
-        count += File.readlines(manifest).grep(/#{module_name}\/#{file_name}/).size
+        found = true if File.readlines(manifest).grep(/#{module_name}\/#{file_name}/).size > 0
+        break if found
       end
-      @@issues << { :title => "[GhostBuster] File #{module_name}/#{file_name} seems unused", :body => file } if count == 0
+
+      @@issues << { :title => "[GhostBuster] File #{module_name}/#{file_name} seems unused", :body => file } if found
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-ghostbuster
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Camptocamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls