puppet-ghostbuster 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fd0578b7418b3a9ec4293c472e1dca897a6418d
-  data.tar.gz: 87358497e0a8e39d82d785f0557515f59465355b
+  metadata.gz: da18d7d720b0464f30e395979feba89136c24299
+  data.tar.gz: 88229a5bd5b2ac831abfacb768d9bcca20406ae7
 SHA512:
-  metadata.gz: 9f97143c1e2252c9abf4a256e0739c823fc25103ef7ab639a6cc3b5065fb65be75d10b0f0b6ea50eed4e146d540f54c78b357d5d873a078d4a0e502b84486012
-  data.tar.gz: a6f023e7d57d327920d4b2a64f0eed8c4a7f3f37b697bc699df0e23aaf001e90cb0da19fafb1360868f060ee6e02f9c94d892c22190b8bfda2c0654f996ba3f5
+  metadata.gz: b64f93ea5cb0909496add62ed2f1b57b62619e5b7bda5713971b37d25190f751daa6ba1c2c4224c601ae7de602c0abf8052bf4be92be8fd6f982688a2d654090
+  data.tar.gz: 8d9fdc6e93bf57aa54bbad62889435a71a2e1fa9c897ddbc84ad159ad95a8d1edec499a88a8acf9814066f3bd30ed26f2d137d3be5f0547cebdfc18c9446029f

data/.travis.yml

@@ -5,7 +5,7 @@ cache: bundler
 script:
   bundle exec rake spec
 rvm:
-- 2.1.5
+- 2.3.1
 matrix:
   fast_finish: true
 deploy:

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [0.9.0](https://rubygems.org/gems/puppet-ghostbuster/versions/0.9.0) (2017-08-18)
+[Full Changelog](https://github.com/camptocamp/puppet-ghostbuster/compare/0.8.0...0.9.0)
+
+**Implemented enhancements:**
+
+- Use PQL queries to filter out deactivated nodes
+- Cache known resources
+- Build on Ruby 2.3.1
+
 ## [0.8.0](https://rubygems.org/gems/puppet-ghostbuster/versions/0.8.0) (2016-09-23)
 [Full Changelog](https://github.com/camptocamp/puppet-ghostbuster/compare/0.7.3...0.8.0)
 

data/lib/puppet-ghostbuster/puppetdb.rb

@@ -4,7 +4,7 @@ class PuppetGhostbuster
   class PuppetDB
     def self.client
       @@client ||= ::PuppetDB::Client.new({
-        :server => "#{ENV['PUPPETDB_URL'] || 'http://puppetdb:8080'}/pdb/query",
+        :server => "#{ENV['PUPPETDB_URL'] || 'http://puppetdb:8080'}",
         :pem    => {
           'key'     => ENV['PUPPETDB_KEY_FILE'],
           'cert'    => ENV['PUPPETDB_CERT_FILE'],
@@ -18,11 +18,19 @@ class PuppetGhostbuster
     end
 
     def self.classes
-      @@classes ||= client.request('resources', [:'=', 'type', 'Class']).data.map { |r| r['title'] }.uniq
+      @@classes ||= client.request('', 'resources[title] { type = "Class" and nodes { deactivated is null } }').data.map { |r| r['title'] }.uniq
     end
 
     def classes
       self.class.classes
     end
+
+    def self.resources
+      @@resources ||= client.request('', 'resources[type] { nodes { deactivated is null } }').data.map { |r| r['type'] }.uniq
+    end
+
+    def resources
+      self.class.resources
+    end
   end
 end

data/lib/puppet-ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class PuppetGhostbuster
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

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

@@ -24,7 +24,7 @@ PuppetLint.new_check(:ghostbuster_defines) do
       title_token = define_idx[:name_token]
       type = title_token.value.split('::').map(&:capitalize).join('::')
 
-      return if puppetdb.client.request('resources', [:'=', 'type', type]).data.size > 0
+      return if puppetdb.resources.include? type
 
       notify :warning, {
         :message => "Define #{type} seems unused",

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

@@ -26,20 +26,17 @@ PuppetLint.new_check(:ghostbuster_files) do
     puppetdb = PuppetGhostbuster::PuppetDB.new
 
     module_name, file_name = m.captures
-    return if puppetdb.client.request('resources', [:'=', ['parameter', 'source'], "puppet:///modules/#{module_name}/#{file_name}"],).data.size > 0
+    query = "resources[title] { parameters.source = 'puppet:///modules/#{module_name}/#{file_name}' and nodes { deactivated is null } }"
+    return if puppetdb.client.request('', query).data.size > 0
 
     dir_name = File.dirname(file_name)
     while dir_name != '.' do
-      return if puppetdb.client.request(
-        'resources',
-        [:'and',
-         [:'or',
-          [:'=', ['parameter', 'source'], "puppet:///modules/#{module_name}/#{dir_name}"],
-          [:'=', ['parameter', 'source'], "puppet:///modules/#{module_name}/#{dir_name}/"],
-      ],
-      [:'=', ['parameter', 'recurse'], true],
-      ],
-      ).data.size > 0
+      query = "resources[title] {
+        (parameters.source = 'puppet:///modules/#{module_name}/#{dir_name}'
+         or parameters.source = 'puppet:///modules/#{module_name}/#{dir_name}/')
+        and parameters.recurse = true
+        and nodes { deactivated is null } }"
+      return if puppetdb.client.request('', query).data.size > 0
       dir_name = File.dirname(dir_name)
     end
 

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

@@ -63,6 +63,8 @@ PuppetLint.new_check(:ghostbuster_hiera_files) do
         end
       end
 
+      query = [:'and', query, [:'=', 'deactivated', nil]]
+
       return if puppetdb.client.request('nodes', query ).data.size > 0
     end
 

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

@@ -26,7 +26,7 @@ PuppetLint.new_check(:ghostbuster_types) do
     type_name = m.captures[0]
 
     puppetdb = PuppetGhostbuster::PuppetDB.new
-    return if puppetdb.client.request('resources', [:'=', 'type', type_name.capitalize]).data.size > 0
+    return if puppetdb.resources.include? type_name.capitalize
 
     notify :warning, {
       :message => "Type #{type_name.capitalize} seems unused",

data/puppet-ghostbuster.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'puppet'
   s.add_dependency         'puppet-lint', '>= 1.0', '< 3.0'
-  s.add_runtime_dependency 'puppetdb-ruby'
+  s.add_runtime_dependency 'puppetdb-ruby', '>= 1.1.1'
 end

data/spec/spec_helper.rb

@@ -12,8 +12,50 @@ class PuppetDB::Client
     end
   end
 
+  def process_pql_kv(q)
+      k, v = q.split(/\s*=\s*/)
+      ".#{k}=#{v}"
+  end
+
+  def pql_to_jgrep(query)
+      endpoint_cols = query.split('{').first
+      endpoint = endpoint_cols.split(/[\s\[]/).first
+      query.sub!(/^#{Regexp.quote(endpoint_cols)}\{\s*/, '')
+      query.sub!(/\s*}\s*/, '')
+      query.sub!(/(and\s+)?nodes\s*\{\s*deactivated\s+is\s+null\s*\}/, '')
+
+      return endpoint, '' if query == ''
+
+      query.gsub!('parameters.', 'parameter.')
+      query.sub!(/\s*=\s*/, '=')
+
+      jgrep_query_and_parts = []
+      query.split(/\s+and\s+/).each do |q|
+          newq = ''
+          if q.start_with?('(')
+              newq << '('
+              newq << q.split(/\s+or\s+/).map do |qq|
+                  process_pql_kv(qq.sub(/^\(/, '').sub(/\)$/, ''))
+              end.join(' or ')
+              newq << ')'
+          else
+              newq << process_pql_kv(q)
+          end
+          jgrep_query_and_parts << newq
+      end
+      jgrep_query = jgrep_query_and_parts.join(" and ")
+      jgrep_query.rstrip!
+
+      return endpoint, jgrep_query
+  end
+
   def request(endpoint, query, opts={})
-    ret = JGrep.jgrep(File.read("spec/fixtures/#{endpoint}.json"), puppetdb_to_jgrep(query))
+    if endpoint == ''
+        endpoint, query = pql_to_jgrep(query)
+    else
+        query = puppetdb_to_jgrep(query)
+    end
+    ret = JGrep.jgrep(File.read("spec/fixtures/#{endpoint}.json"), query)
     PuppetDB::Response.new(ret, ret.size)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-ghostbuster
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Camptocamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 description: Try and find dead code in Puppet receipts
 email: 
 executables: []
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dead code detector for Puppet