puppet-ghostbuster 0.9.0 → 1.2.0

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

@@ -1,28 +1,28 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ghostbuster_defines' do
-
   context 'with fix disabled' do
-
     context 'when define is not used' do
-      let(:code) { "define foo::foo {}" }
-      let(:path) { "./modules/foo/manifests/foo.pp" }
+      let(:code) { 'define foo::foo {}' }
+      let(:path) { './modules/foo/manifests/foo.pp' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning('Define Foo::Foo seems unused')
       end
     end
 
     context 'when define is used' do
-      let(:code) { "define bar::foo {}" }
-      let(:path) { "./modules/bar/manifests/foo.pp" }
+      let(:code) { 'define bar::foo {}' }
+      let(:path) { './modules/bar/manifests/foo.pp' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
   end

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

@@ -1,55 +1,68 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ghostbuster_facts' do
   let(:code) { "Facter.add('foo')" }
 
   context 'with fix disabled' do
-
     context 'when fact is not used' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/facter/multi.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/facter/multi.rb' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(2).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(2)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Fact multi1 seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('Fact multi1 seems unused')
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Fact multi2 seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('Fact multi2 seems unused')
       end
     end
 
     context 'when fact is used in a string' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/facter/foo.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/facter/foo.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when fact is used in manifest' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/facter/bar.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/facter/bar.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when fact is used in a template' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/facter/baz.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/facter/baz.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when fact is used in an inline_template' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/facter/quux.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/facter/quux.rb' }
+
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
+      end
+    end
+
+    context 'when added fact is a symbol and unused' do
+      let(:path) { './spec/fixtures/modules/foo/lib/facter/asym.rb' }
+
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
+      end
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'creates a warning' do
+        expect(problems).to contain_warning('Fact asym seems unused')
       end
     end
   end

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

@@ -1,64 +1,64 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ghostbuster_files' do
-
-  let(:code) { "" }
+  let(:code) { '' }
 
   context 'with fix disabled' do
-
     context 'when file usage is found in puppetdb' do
-      let(:path) { "./modules/foo/files/bar" }
+      let(:path) { './modules/foo/files/bar' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when parent directory with recurse => true usage is found in puppetdb' do
-      let(:path) { "./modules/foo/files/baz/baz" }
+      let(:path) { './modules/foo/files/baz/baz' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when using full module name syntax' do
-      let(:path) { "./modules/foo/files/used_with_file" }
+      let(:path) { './modules/foo/files/used_with_file' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when using $module_name syntax' do
-      let(:path) { "./modules/foo/files/used_with_file_and_module_name" }
+      let(:path) { './modules/foo/files/used_with_file_and_module_name' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when file in ROOT is not used' do
-      let(:path) { "./modules/bar/files/foo" }
+      let(:path) { './modules/bar/files/foo' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("File bar/foo seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('File bar/foo seems unused')
       end
     end
 
     context 'when file in subdir is not used' do
-      let(:path) { "./modules/bar/files/foo/bar" }
+      let(:path) { './modules/bar/files/foo/bar' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("File bar/foo/bar seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('File bar/foo/bar seems unused')
       end
     end
   end

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

@@ -1,43 +1,44 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ghostbuster_functions' do
   let(:code) { '' }
 
   context 'with fix disabled' do
-
     context 'when function is not used' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/puppet/parser/functions/foo.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/puppet/parser/functions/foo.rb' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Function foo seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('Function foo seems unused')
       end
     end
 
     context 'when function is used in a manifest' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/puppet/parser/functions/bar.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/puppet/parser/functions/bar.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when function is used in a template using scope.function_baz()' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/puppet/parser/functions/baz.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/puppet/parser/functions/baz.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when function is used in a template using Puppet::Parser::Functions.function(:quux)' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/puppet/parser/functions/quux.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/puppet/parser/functions/quux.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
   end

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

@@ -1,78 +1,102 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 ENV['HIERA_YAML_PATH'] = './spec/fixtures/hiera.yaml'
 
 describe 'ghostbuster_hiera_files' do
-
-  let(:code) { "" }
+  let(:code) { '' }
 
   context 'with fix disabled' do
-    
     context 'when a certname file is NOT used' do
-      let(:path) { "./hieradata/nodes/foo.example.com.yaml" }
+      let(:path) { './data/nodes/foo.example.com.yaml' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Hiera File nodes/foo.example.com.yaml seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning("Hiera File #{path} seems unused")
       end
     end
 
     context 'when a certname file is used' do
-      let(:path) { "./hieradata/nodes/bar.example.com.yaml" }
+      let(:path) { './data/nodes/bar.example.com.yaml' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when an environment file is NOT used' do
-      let(:path) { "./hieradata/environment/foo.yaml" }
+      let(:path) { './data/environment/foo.yaml' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Hiera File environment/foo.yaml seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning("Hiera File #{path} seems unused")
       end
     end
 
     context 'when an environment file is used' do
-      let(:path) { "./hieradata/environment/production.yaml" }
+      let(:path) { './data/environment/production.yaml' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when an fact is NOT used' do
-      let(:path) { "./hieradata/virtual/false.yaml" }
+      let(:path) { './data/virtual/false.yaml' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Hiera File virtual/false.yaml seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning("Hiera File #{path} seems unused")
       end
     end
 
     context 'when an fact file is used' do
-      let(:path) { "./hieradata/virtual/true.yaml" }
+      let(:path) { './data/virtual/true.yaml' }
+
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
+      end
+    end
+
+    context 'when an fact file is used with wrong extension' do
+      let(:path) { './data/virtual/true.eyaml' }
+
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
+      end
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'creates a warning' do
+        expect(problems).to contain_warning("Hiera File #{path} seems unused")
       end
     end
 
     context 'when using a variable in hierarchy' do
-      let(:path) { "./hieradata/domain/example.com.yaml" }
+      let(:path) { './data/domain/example.com.yaml' }
+
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
+      end
+    end
+
+    context 'when hierarchy datadir is NOT default and NOT used' do
+      let(:path) { './private/nodes/privates.example.com.eyaml' }
+
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
+      end
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'creates a warning' do
+        expect(problems).to contain_warning("Hiera File #{path} seems unused")
       end
     end
   end

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

@@ -1,43 +1,44 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ghostbuster_templates' do
-  let(:code) { "" }
+  let(:code) { '' }
 
   context 'with fix disabled' do
-
     context 'when using full module name syntax' do
-      let(:path) { "./modules/foo/templates/used_with_template" }
+      let(:path) { './modules/foo/templates/used_with_template' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when using $module_name syntax' do
-      let(:path) { "./modules/foo/templates/used_with_template_and_module_name" }
+      let(:path) { './modules/foo/templates/used_with_template_and_module_name' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when using template in template' do
-      let(:path) { "./modules/foo/templates/used_in_template.erb" }
+      let(:path) { './modules/foo/templates/used_in_template.erb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
 
     context 'when template usage is not found in manifests' do
-      let(:path) { "./modules/foo/templates/unused" }
+      let(:path) { './modules/foo/templates/unused' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Template foo/unused seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('Template foo/unused seems unused')
       end
     end
   end

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

@@ -1,27 +1,28 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ghostbuster_types' do
   let(:code) { '' }
 
   context 'with fix disabled' do
-
     context 'when type is not used' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/puppet/type/foo.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/puppet/type/foo.rb' }
 
-      it 'should detect one problem' do
-        expect(problems).to have(1).problems
+      it 'detects one problem' do
+        expect(problems.size).to eq(1)
       end
 
-      it 'should create a warning' do
-        expect(problems).to contain_warning("Type Foo seems unused")
+      it 'creates a warning' do
+        expect(problems).to contain_warning('Type Foo seems unused')
       end
     end
 
     context 'when type is used in a manifest' do
-      let(:path) { "./spec/fixtures/modules/foo/lib/puppet/type/bar.rb" }
+      let(:path) { './spec/fixtures/modules/foo/lib/puppet/type/bar.rb' }
 
-      it 'should not detect any problem' do
-        expect(problems).to have(0).problems
+      it 'does not detect any problem' do
+        expect(problems.size).to eq(0)
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ PuppetLint::Plugins.load_spec_helper
 
 class PuppetDB::Client
   def puppetdb_to_jgrep(query)
-    if query[0] == :'and' || query[0] == :'or'
+    if query[0] == :and || query[0] == :or
       "(#{puppetdb_to_jgrep(query[1])} #{query[0]} #{puppetdb_to_jgrep(query[2])})"
     else
       "#{[query[1]].flatten.join('.')}#{query[0]}#{query[2]}"
@@ -13,50 +13,50 @@ class PuppetDB::Client
   end
 
   def process_pql_kv(q)
-      k, v = q.split(/\s*=\s*/)
-      ".#{k}=#{v}"
+    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
+    endpoint_cols = query.split('{').first
+    endpoint = endpoint_cols.split(/[\s\[]/).first
+    query.sub!(/^#{Regexp.quote(endpoint_cols)}\{\s*/, '')
+    query.sub!(/(group\s+by\s+(type|title))/, '')
+    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 = jgrep_query_and_parts.join(" and ")
-      jgrep_query.rstrip!
+      jgrep_query_and_parts << newq
+    end
+    jgrep_query = jgrep_query_and_parts.join(' and ')
+    jgrep_query.rstrip!
 
-      return endpoint, jgrep_query
+    [endpoint, jgrep_query]
   end
 
-  def request(endpoint, query, opts={})
+  def request(endpoint, query, _opts = {})
     if endpoint == ''
-        endpoint, query = pql_to_jgrep(query)
+      endpoint, query = pql_to_jgrep(query)
     else
-        query = puppetdb_to_jgrep(query)
+      query = puppetdb_to_jgrep(query)
     end
     ret = JGrep.jgrep(File.read("spec/fixtures/#{endpoint}.json"), query)
     PuppetDB::Response.new(ret, ret.size)
   end
 end
-