Bug fixes, lint, rubocop, spec tests etc.

.fixtures.yml

@@ -0,0 +1,7 @@
+fixtures:
+  repositories:
+    stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+    inifile: 'https://github.com/puppetlabs/puppetlabs-inifile.git'
+    staging: 'https://github.com/voxpupuli/puppet-staging.git'
+  symlinks:
+    splunk: "#{source_dir}"

lib/puppet/provider/ini_setting/splunk.rb

@@ -1,19 +1,19 @@
 Puppet::Type.type(:ini_setting).provide(
   :splunk,
-  :parent => Puppet::Type.type(:ini_setting).provider(:ruby)
+  parent: Puppet::Type.type(:ini_setting).provider(:ruby)
 ) do
 
-  confine :true => false # Never automatically select this provider
+  confine true: false # Never automatically select this provider
 
   @file_path = nil
 
-  def self.file_path
-    raise Puppet::Error, "file_path must be set with splunk_config type before provider can be used" if @file_path.nil?
-    raise Puppet::Error, "Child provider class does not support a file_name method" unless self.respond_to?(:file_name)
-    File.join(@file_path, file_name)
+  class << self
+    attr_writer :file_path
   end
 
-  def self.set_file_path(path)
-    @file_path=path
+  def self.file_path
+    raise Puppet::Error, 'file_path must be set with splunk_config type before provider can be used' if @file_path.nil?
+    raise Puppet::Error, 'Child provider class does not support a file_name method' unless respond_to?(:file_name)
+    File.join(@file_path, file_name)
   end
 end

lib/puppet/provider/splunk_authentication/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_authentication).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/authentication.conf'

lib/puppet/provider/splunk_authorize/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_authorize).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/authorize.conf'

lib/puppet/provider/splunk_distsearch/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_distsearch).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/distsearch.conf'

lib/puppet/provider/splunk_indexes/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_indexes).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/indexes.conf'

lib/puppet/provider/splunk_input/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_input).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/inputs.conf'

lib/puppet/provider/splunk_limits/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_limits).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/limits.conf'

lib/puppet/provider/splunk_output/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_output).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/outputs.conf'

lib/puppet/provider/splunk_props/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_props).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/props.conf'

lib/puppet/provider/splunk_server/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_server).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/server.conf'

lib/puppet/provider/splunk_transforms/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_transforms).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/transforms.conf'

lib/puppet/provider/splunk_web/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunk_web).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/web.conf'

lib/puppet/provider/splunkforwarder_input/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunkforwarder_input).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/inputs.conf'

lib/puppet/provider/splunkforwarder_output/ini_setting.rb

@@ -1,9 +1,8 @@
 Puppet::Type.type(:splunkforwarder_output).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
-    "system/local/outputs.conf"
+    'system/local/outputs.conf'
   end
 end
-

lib/puppet/provider/splunkforwarder_props/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunkforwarder_props).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/props.conf'

lib/puppet/provider/splunkforwarder_transforms/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunkforwarder_transforms).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/transforms.conf'

lib/puppet/provider/splunkforwarder_web/ini_setting.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:splunkforwarder_web).provide(
   :ini_setting,
-  :parent => Puppet::Type.type(:ini_setting).provider(:splunk)
+  parent: Puppet::Type.type(:ini_setting).provider(:splunk)
 ) do
   def self.file_name
     'system/local/web.conf'

lib/puppet/type/splunk_authentication.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_authentication) do
-  @doc = "Manage splunk authentication settings in authentication.conf"
+  @doc = 'Manage splunk authentication settings in authentication.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end
-

lib/puppet/type/splunk_authorize.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_authorize) do
-  @doc = "Manage splunk authorize settings in authorize.conf"
+  @doc = 'Manage splunk authorize settings in authorize.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end

lib/puppet/type/splunk_config.rb

@@ -1,12 +1,10 @@
 # Require all of our types so the class names are resolvable for purging
-Dir[File.dirname(__FILE__) + '/*.rb'].each do |file| 
-    unless file == __FILE__
-      require file
-    end
+Dir[File.dirname(__FILE__) + '/*.rb'].each do |file|
+  require file unless file == __FILE__
 end
 
 Puppet::Type.newtype(:splunk_config) do
-  newparam(:name, :namevar => true) do
+  newparam(:name, namevar: true) do
     desc 'splunk config'
   end
 
@@ -23,26 +21,26 @@
   end
 
   ## Generate purge parameters for the splunk_config type
-  [ 
-      :purge_inputs,
-      :purge_outputs,
-      :purge_authentication,
-      :purge_authorize,
-      :purge_distsearch,
-      :purge_indexes,
-      :purge_limits,
-      :purge_props,
-      :purge_server,
-      :purge_transforms,
-      :purge_web,
-      :purge_forwarder_inputs,
-      :purge_forwarder_outputs,
-      :purge_forwarder_props,
-      :purge_forwarder_transforms,
-      :purge_forwarder_web
+  [
+    :purge_inputs,
+    :purge_outputs,
+    :purge_authentication,
+    :purge_authorize,
+    :purge_distsearch,
+    :purge_indexes,
+    :purge_limits,
+    :purge_props,
+    :purge_server,
+    :purge_transforms,
+    :purge_web,
+    :purge_forwarder_inputs,
+    :purge_forwarder_outputs,
+    :purge_forwarder_props,
+    :purge_forwarder_transforms,
+    :purge_forwarder_web
   ].each do |p|
     newparam(p) do
-      newvalues(:true,:false)
+      newvalues(:true, :false)
       defaultto :false
     end
   end
@@ -53,7 +51,7 @@
   def generate
     set_provider_paths
 
-    resources = Array.new
+    resources = []
 
     {
       Puppet::Type::Splunk_output               => self[:purge_outputs],
@@ -71,14 +69,13 @@ def generate
       Puppet::Type::Splunkforwarder_props       => self[:purge_forwarder_props],
       Puppet::Type::Splunkforwarder_transforms  => self[:purge_forwarder_transforms],
       Puppet::Type::Splunkforwarder_web         => self[:purge_forwarder_web]
-    }.each do |k,purge|
+    }.each do |k, purge|
       resources.concat(purge_splunk_resources(k)) if purge == :true
     end
 
-    return resources
+    resources
   end
 
-
   def set_provider_paths
     [
       :splunk_authentication,
@@ -92,7 +89,7 @@ def set_provider_paths
       :splunk_transforms,
       :splunk_web
     ].each do |res_type|
-      Puppet::Type.type(res_type).provider(:ini_setting).set_file_path(self[:server_confdir])
+      Puppet::Type.type(res_type).provider(:ini_setting).file_path = self[:server_confdir]
     end
     [
       :splunkforwarder_input,
@@ -101,40 +98,37 @@ def set_provider_paths
       :splunkforwarder_transforms,
       :splunkforwarder_web
     ].each do |res_type|
-      Puppet::Type.type(res_type).provider(:ini_setting).set_file_path(self[:forwarder_confdir])
+      Puppet::Type.type(res_type).provider(:ini_setting).file_path = self[:forwarder_confdir]
     end
   end
-    
+
   def purge_splunk_resources(klass)
     type_name = klass.name
-    purge_resources = Array.new
-    puppet_resources = Array.new
+    purge_resources = []
+    puppet_resources = []
 
     # Search the catalog for resource types matching the provided class
     # type and build an array of puppet resources matching the namevar
     # as section/setting
     #
     catalog_resources = catalog.resources.select { |r| r.is_a?(klass) }
     catalog_resources.each do |res|
-      puppet_resources << res[:section] + "/" + res[:setting]
+      puppet_resources << res[:section] + '/' + res[:setting]
     end
 
-
     # Search the configured instances of the class type and purge them if
     # the instance name (setion/setting) isn't found in puppet_resources
     #
     Puppet::Type.type(type_name).instances.each do |instance|
-      unless puppet_resources.include?(instance.name)
-        purge_resources << Puppet::Type.type(type_name).new(
-          :name    => instance.name,
-          :section => instance[:section],
-          :setting => instance[:setting],
-          :ensure => :absent
-        )
-      end
+      next if puppet_resources.include?(instance.name)
+      purge_resources << Puppet::Type.type(type_name).new(
+        name: instance.name,
+        section: instance[:section],
+        setting: instance[:setting],
+        ensure: :absent
+      )
     end
 
-    return purge_resources
+    purge_resources
   end
-
 end

lib/puppet/type/splunk_distsearch.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_distsearch) do
-  @doc= "Manage distsearch entries in distsearch.conf"
+  @doc = 'Manage distsearch entries in distsearch.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end
-

lib/puppet/type/splunk_indexes.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_indexes) do
-  @doc = "Manage splunk index settings in indexes.conf"
+  @doc = 'Manage splunk index settings in indexes.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end
-

lib/puppet/type/splunk_input.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_input) do
-  @doc = "Manage splunk input settings in inputs.conf"
+  @doc = 'Manage splunk input settings in inputs.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end

lib/puppet/type/splunk_limits.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_limits) do
-  @doc = "Manage splunk limits settings in limits.conf"
+  @doc = 'Manage splunk limits settings in limits.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end

lib/puppet/type/splunk_output.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_output) do
-  @doc = "Manage splunk output settings in outputs.conf"
+  @doc = 'Manage splunk output settings in outputs.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end

lib/puppet/type/splunk_props.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_props) do
-  @doc = "Manage splunk prop settings in props.conf"
+  @doc = 'Manage splunk prop settings in props.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end

lib/puppet/type/splunk_server.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')
 
 Puppet::Type.newtype(:splunk_server) do
-  @doc = "Manage splunk server settings in server.conf"
+  @doc = 'Manage splunk server settings in server.conf'
   PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
 end