openvox 7.37.1 → 8.19.0

data/lib/puppet/provider/package/yum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/util/package/version/rpm'
 require_relative '../../../puppet/util/rpm_compare'
@@ -22,6 +24,9 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
   commands :cmd => "yum", :rpm => "rpm"
 
+  # Mixing confine statements, control expressions, and exception handling
+  # confuses Rubocop's Layout cops, so we disable them entirely.
+  # rubocop:disable Layout
   if command('rpm')
     confine :true => begin
       rpm('--version')
@@ -31,9 +36,10 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         true
       end
   end
+  # rubocop:enable Layout
 
-defaultfor :operatingsystem => :amazon
-defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
+  defaultfor 'os.name' => :amazon
+  defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
 
   def insync?(is)
     return false if [:purged, :absent].include?(is)
@@ -53,12 +59,10 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
       end
 
       is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
-        begin
-          is_version = RPM_VERSION.parse(version)
-          should_version.include?(is_version)
-        rescue RPM_VERSION::ValidationFailure
-          Puppet.debug("Cannot parse #{is} as a RPM version")
-        end
+        is_version = RPM_VERSION.parse(version)
+        should_version.include?(is_version)
+      rescue RPM_VERSION::ValidationFailure
+        Puppet.debug("Cannot parse #{is} as a RPM version")
       end
     end
   end
@@ -67,6 +71,7 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
 
   def self.prefetch(packages)
     raise Puppet::Error, _("The yum provider can only be used as root") if Process.euid != 0
+
     super
   end
 
@@ -84,7 +89,6 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
   # @param disableexcludes [Array<String>] A list of repository excludes to disable for this query
   # @return [Hash<Symbol, String>]
   def self.latest_package_version(package, disablerepo, enablerepo, disableexcludes)
-
     key = [disablerepo, enablerepo, disableexcludes]
 
     @latest_versions ||= {}
@@ -115,12 +119,13 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
     output = Puppet::Util::Execution.execute(args, :failonfail => false, :combine => false)
 
     updates = {}
-    if output.exitstatus == 100
+    case output.exitstatus
+    when 100
       updates = parse_updates(output)
-    elsif output.exitstatus == 0
-      self.debug "#{command(:cmd)} check-update exited with 0; no package updates available."
+    when 0
+      debug "#{command(:cmd)} check-update exited with 0; no package updates available."
     else
-      self.warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
+      warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
     end
     updates
   end
@@ -148,7 +153,6 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
   end
 
   def self.update_to_hash(pkgname, pkgversion)
-
     # The pkgname string has two parts: name, and architecture. Architecture
     # is the portion of the string following the last "." character. All
     # characters preceding the final dot are the package name. Parse out
@@ -168,7 +172,7 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
       :epoch => epoch,
       :version => version,
       :release => release,
-      :arch    => arch,
+      :arch => arch,
     }
   end
 
@@ -205,15 +209,13 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
       end
       versions = []
       available_versions(@resource[:name], disablerepo, enablerepo, disableexcludes).each do |version|
-        begin
-          rpm_version = RPM_VERSION.parse(version)
-          versions << rpm_version if should_range.include?(rpm_version)
-        rescue RPM_VERSION::ValidationFailure
-          Puppet.debug("Cannot parse #{version} as a RPM version")
-        end
+        rpm_version = RPM_VERSION.parse(version)
+        versions << rpm_version if should_range.include?(rpm_version)
+      rescue RPM_VERSION::ValidationFailure
+        Puppet.debug("Cannot parse #{version} as a RPM version")
       end
 
-      version = versions.sort.last if versions.any?
+      version = versions.max if versions.any?
 
       if version
         version = version.to_s.sub(/^\d+:/, '')
@@ -237,25 +239,24 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
 
   def install
     wanted = @resource[:name]
-    error_level = self.class.error_level
     update_command = self.class.update_command
     # If not allowing virtual packages, do a query to ensure a real package exists
     unless @resource.allow_virtual?
-      execute([command(:cmd), '-d', '0', '-e', error_level, '-y', install_options, :list, wanted].compact)
+      execute([command(:cmd), '-y', install_options, :list, wanted].compact)
     end
 
     should = @resource.should(:ensure)
-    self.debug "Ensuring => #{should}"
+    debug "Ensuring => #{should}"
     operation = :install
 
     case should
     when :latest
-      current_package = self.query
+      current_package = query
       if current_package && !current_package[:ensure].to_s.empty?
         operation = update_command
-        self.debug "Ensuring latest, so using #{operation}"
+        debug "Ensuring latest, so using #{operation}"
       else
-        self.debug "Ensuring latest, but package is absent, so using install"
+        debug "Ensuring latest, but package is absent, so using install"
         operation = :install
       end
       should = nil
@@ -264,10 +265,10 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
       # version feed it to yum directly
       if @resource[:source]
         wanted = @resource[:source]
-        self.debug "Installing directly from #{wanted}"
+        debug "Installing directly from #{wanted}"
       end
       should = nil
-    when false,:absent
+    when false, :absent
       # pass
       should = nil
     else
@@ -276,35 +277,32 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
         # version, and also supplying the path to a package that supplies that
         # version.
         wanted = @resource[:source]
-        self.debug "Installing directly from #{wanted}"
+        debug "Installing directly from #{wanted}"
       else
         # No explicit source was specified, so add the package version
         should = best_version(should)
         wanted += "-#{should}"
         if wanted.scan(self.class::ARCH_REGEX)
-          self.debug "Detected Arch argument in package! - Moving arch to end of version string"
-          wanted.gsub!(/(.+)(#{self.class::ARCH_REGEX})(.+)/,'\1\3\2')
+          debug "Detected Arch argument in package! - Moving arch to end of version string"
+          wanted.gsub!(/(.+)(#{self.class::ARCH_REGEX})(.+)/, '\1\3\2')
         end
       end
-      current_package = self.query
+      current_package = query
       if current_package
         if @resource[:install_only]
-          self.debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
+          debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
           operation = update_command
-        elsif rpm_compareEVR(should, current_package[:ensure]) < 0
-          self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
+        elsif rpm_compare_evr(should, current_package[:ensure]) < 0
+          debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = :downgrade
-        elsif rpm_compareEVR(should, current_package[:ensure]) > 0
-          self.debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
+        elsif rpm_compare_evr(should, current_package[:ensure]) > 0
+          debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = update_command
         end
       end
     end
 
-    # Yum on el-4 and el-5 returns exit status 0 when trying to install a package it doesn't recognize;
-    # ensure we capture output to check for errors.
-    no_debug = if Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i > 5 then ["-d", "0"] else [] end
-    command = [command(:cmd)] + no_debug + ["-e", error_level, "-y", install_options, operation, wanted].compact
+    command = [command(:cmd)] + ["-y", install_options, operation, wanted].compact
     output = execute(command)
 
     if output.to_s =~ /^No package #{wanted} available\.$/
@@ -313,8 +311,8 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
 
     # If a version was specified, query again to see if it is a matching version
     if should
-      is = self.query
-      raise Puppet::Error, _("Could not find package %{name}") % { name: self.name } unless is
+      is = query
+      raise Puppet::Error, _("Could not find package %{name}") % { name: name } unless is
 
       version = is[:ensure]
       # FIXME: Should we raise an exception even if should == :latest
@@ -327,26 +325,27 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
   # What's the latest package version available?
   def latest
     upd = self.class.latest_package_version(@resource[:name], disablerepo, enablerepo, disableexcludes)
-    unless upd.nil?
-      # FIXME: there could be more than one update for a package
-      # because of multiarch
-      return "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
-    else
+    if upd.nil?
       # Yum didn't find updates, pretend the current version is the latest
-      self.debug "Yum didn't find updates, current version (#{properties[:ensure]}) is the latest"
+      debug "Yum didn't find updates, current version (#{properties[:ensure]}) is the latest"
       version = properties[:ensure]
       raise Puppet::DevError, _("Tried to get latest on a missing package") if version == :absent || version == :purged
-      return version
+
+      version
+    else
+      # FIXME: there could be more than one update for a package
+      # because of multiarch
+      "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
     end
   end
 
   def update
     # Install in yum can be used for update, too
-    self.install
+    install
   end
 
   def purge
-    execute([command(:cmd), "-y", :erase, @resource[:name]])
+    execute([command(:cmd), "-y", :remove, @resource[:name]])
   end
 
   private
@@ -373,15 +372,19 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
   # @return [Array<String>] All hash values with the given key.
   def scan_options(options, key)
     return [] unless options.is_a?(Enumerable)
-    values = options.map do | repo |
-      value = if repo.is_a?(String)
-        next unless repo.include?('=')
-        Hash[*repo.strip.split('=')] # make it a hash
-      else
-        repo
+
+    values =
+      options.map do |repo|
+        value =
+          if repo.is_a?(String)
+            next unless repo.include?('=')
+
+            Hash[*repo.strip.split('=')] # make it a hash
+          else
+            repo
+          end
+        value[key]
       end
-      value[key]
-    end
     values.compact.uniq
   end
 end

data/lib/puppet/provider/package/zypper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11.
 
@@ -9,8 +11,8 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
 
   commands :zypper => "/usr/bin/zypper"
 
-  defaultfor :operatingsystem => [:suse, :sles, :sled, :opensuse]
-  confine    :operatingsystem => [:suse, :sles, :sled, :opensuse]
+  defaultfor 'os.name' => [:suse, :sles, :sled, :opensuse]
+  confine    'os.name' => [:suse, :sles, :sled, :opensuse]
 
   # @api private
   # Reset the latest version hash to nil
@@ -37,17 +39,18 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       pkg_ver = line.split(/\s*\|\s*/)
       # ignore zypper headers
       next unless pkg_ver[0] == 'v'
+
       avail_updates[pkg_ver[2]] = pkg_ver[4]
     end
 
     avail_updates
   end
 
-  #on zypper versions <1.0, the version option returns 1
-  #some versions of zypper output on stderr
+  # on zypper versions <1.0, the version option returns 1
+  # some versions of zypper output on stderr
   def zypper_version
-    cmd = [self.class.command(:zypper),"--version"]
-    execute(cmd, { :failonfail => false, :combine => true})
+    cmd = [self.class.command(:zypper), "--version"]
+    execute(cmd, { :failonfail => false, :combine => true })
   end
 
   def best_version(should)
@@ -69,6 +72,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       output.lines.each do |line|
         pkg_ver = line.split(/\s*\|\s*/)
         next unless pkg_ver[1] == @resource[:name]
+
         begin
           rpm_version = Puppet::Util::Package::Version::Rpm.parse(pkg_ver[3])
 
@@ -78,7 +82,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
         end
       end
 
-      return versions.sort.last if versions.any?
+      return versions.max if versions.any?
 
       Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
       should
@@ -88,7 +92,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   # Install a package using 'zypper'.
   def install
     should = @resource.should(:ensure)
-    self.debug "Ensuring => #{should}"
+    debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
@@ -101,17 +105,17 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       wanted = "#{wanted}-#{should}"
     end
 
-    #This has been tested with following zypper versions
-    #SLE 10.4: 0.6.201
-    #SLE 11.3: 1.6.307
-    #SLE 12.0: 1.11.14
-    #Assume that this will work on newer zypper versions
+    # This has been tested with following zypper versions
+    # SLE 10.4: 0.6.201
+    # SLE 11.3: 1.6.307
+    # SLE 12.0: 1.11.14
+    # Assume that this will work on newer zypper versions
 
-    #extract version numbers and convert to integers
-    major, minor, patch = zypper_version.scan(/\d+/).map{ |x| x.to_i }
-    self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
+    # extract version numbers and convert to integers
+    major, minor, patch = zypper_version.scan(/\d+/).map(&:to_i)
+    debug "Detected zypper version #{major}.#{minor}.#{patch}"
 
-    #zypper version < 1.0 does not support --quiet flag
+    # zypper version < 1.0 does not support --quiet flag
     if major < 1
       quiet = '--terse'
     else
@@ -121,14 +125,13 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
     inst_opts = []
     inst_opts = install_options if resource[:install_options]
 
-
     options = []
     options << quiet
     options << '--no-gpg-check' unless inst_opts.delete('--no-gpg-check').nil?
     options << '--no-gpg-checks' unless inst_opts.delete('--no-gpg-checks').nil?
     options << :install
 
-    #zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
+    # zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
     options << '--auto-agree-with-licenses' unless major < 1 and minor <= 6 and patch <= 13
     options << '--no-confirm'
     options += inst_opts unless inst_opts.empty?
@@ -141,16 +144,14 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
 
     zypper(*options)
 
-    unless self.query
-      raise Puppet::ExecutionFailure.new(
-        _("Could not find package %{name}") % { name: self.name }
-      )
+    unless query
+      raise Puppet::ExecutionFailure, _("Could not find package %{name}") % { name: name }
     end
   end
 
   # What's the latest package version available?
   def latest
-    return self.class.latest_package_version(@resource[:name]) ||
+    self.class.latest_package_version(@resource[:name]) ||
       # zypper didn't find updates, pretend the current
       # version is the latest
       @property_hash[:ensure]
@@ -158,26 +159,25 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
 
   def update
     # zypper install can be used for update, too
-    self.install
+    install
   end
 
   def uninstall
-    #extract version numbers and convert to integers
-    major, minor, _ = zypper_version.scan(/\d+/).map{ |x| x.to_i }
+    # extract version numbers and convert to integers
+    major, minor, _ = zypper_version.scan(/\d+/).map(&:to_i)
 
     if major < 1
       super
     else
       options = [:remove, '--no-confirm']
       if major == 1 && minor < 6
-          options << '--force-resolution'
+        options << '--force-resolution'
       end
 
       options << @resource[:name]
 
       zypper(*options)
     end
-
   end
 
   def insync?(is)

data/lib/puppet/provider/package.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 
 class Puppet::Provider::Package < Puppet::Provider
@@ -23,7 +25,7 @@ class Puppet::Provider::Package < Puppet::Provider
       # Purged is the "most uninstalled" a package can be, so a purged package will be in-sync with
       # either `ensure => absent` or `ensure => purged`; an absent package will be out of sync with `ensure => purged`.
       default_status = self.class.feature?(:purgeable) ? :purged : :absent
-      @property_hash = query || { :ensure => ( default_status )}
+      @property_hash = query || { :ensure => default_status }
       @property_hash[:ensure] = default_status if @property_hash.empty?
     end
     @property_hash.dup
@@ -47,12 +49,12 @@ class Puppet::Provider::Package < Puppet::Provider
 
     options.collect do |val|
       case val
-        when Hash
-          val.keys.sort.collect do |k|
-            "#{k}=#{val[k]}"
-          end
-        else
-          val
+      when Hash
+        val.keys.sort.collect do |k|
+          "#{k}=#{val[k]}"
+        end
+      else
+        val
       end
     end.flatten
   end

data/lib/puppet/provider/package_targetable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Targetable package providers implement a `command` attribute.
 #
 # The `packages` hash passed to `Puppet::Provider::Package::prefetch` is deduplicated,
@@ -25,14 +27,14 @@ require_relative '../../puppet/provider/package'
 class Puppet::Provider::Package::Targetable < Puppet::Provider::Package
   # Prefetch our package list, yo.
   def self.prefetch(packages)
-    catalog_packages = packages.values.first.catalog.resources.select{ |p| p.provider.class == self }
-    package_commands = catalog_packages.map { |catalog_package| catalog_package::original_parameters[:command] }.uniq
+    catalog_packages = packages.values.first.catalog.resources.select { |p| p.provider.instance_of?(self) }
+    package_commands = catalog_packages.map { |catalog_package| catalog_package.original_parameters[:command] }.uniq
     package_commands.each do |command|
       instances(command).each do |instance|
         catalog_packages.each do |catalog_package|
           if catalog_package[:name] == instance.name && catalog_package.original_parameters[:command] == command
             catalog_package.provider = instance
-            self.debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: (command || :default) }
+            debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: command || :default }
           end
         end
       end

data/lib/puppet/provider/parsedfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/util/filetype'
 require_relative '../../puppet/util/fileparsing'
@@ -70,7 +72,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
       modified(record[:target] || default_target)
     end
 
-    return unless defined?(@modified) and ! @modified.empty?
+    return unless defined?(@modified) and !@modified.empty?
 
     flushed = []
     begin
@@ -114,9 +116,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Return the header placed at the top of each generated file, warning
   # users that modifying this file manually is probably a bad idea.
   def self.header
-%{# HEADER: This file was autogenerated at #{Time.now}
+    %(# HEADER: This file was autogenerated at #{Time.now}
 # HEADER: by puppet.  While it can still be managed manually, it
-# HEADER: is definitely not recommended.\n}
+# HEADER: is definitely not recommended.\n)
   end
 
   # An optional regular expression matched by third party headers.
@@ -185,12 +187,10 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         # return the should value, so the resource shuts up.
         if @property_hash[attr] or self.class.valid_attr?(self.class.name, attr)
           @property_hash[attr] || :absent
+        elsif defined?(@resource)
+          @resource.should(attr)
         else
-          if defined?(@resource)
-            @resource.should(attr)
-          else
-            nil
-          end
+          nil
         end
       end
 
@@ -235,6 +235,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # @param [Array<Puppet::Resource>] resources A list of resources using this class as a provider
   def self.match_providers_with_resources(resources)
     return unless resources
+
     matchers = resources.dup
     @records.each do |record|
       # Skip things like comments and blank lines
@@ -281,7 +282,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     begin
       target_records = retrieve(target)
       unless target_records
-        raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: self.name }
+        raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: name }
       end
     rescue Puppet::Util::FileType::FileReadError => detail
       if @raise_prefetch_errors
@@ -291,7 +292,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         @failed_prefetch_targets[target] = detail.to_s
       else
         puts detail.backtrace if Puppet[:trace]
-        Puppet.err _("Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty") % { resource: self.resource_type.name, name: self.name, target: target, detail: detail }
+        Puppet.err _("Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty") % { resource: resource_type.name, name: name, target: target, detail: detail }
       end
 
       target_records = []
@@ -305,7 +306,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     target_records = prefetch_hook(target_records) if respond_to?(:prefetch_hook)
 
-    raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: self.name } unless target_records
+    raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: name } unless target_records
 
     target_records
   end
@@ -313,6 +314,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Is there an existing record with this name?
   def self.record?(name)
     return nil unless @records
+
     @records.find { |r| r[:name] == name }
   end
 
@@ -323,13 +325,13 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     text = target_object(path).read
     if text.nil? or text == ""
       # there is no file
-      return []
+      []
     else
       # Set the target, for logging.
       old = @target
       begin
         @target = path
-        return self.parse(text)
+        parse(text)
       rescue Puppet::Error => detail
         detail.file = @target if detail.respond_to?(:file=)
         raise detail
@@ -378,15 +380,16 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   def self.targets(resources = nil)
     targets = []
     # First get the default target
-    raise Puppet::DevError, _("Parsed Providers must define a default target") unless self.default_target
-    targets << self.default_target
+    raise Puppet::DevError, _("Parsed Providers must define a default target") unless default_target
+
+    targets << default_target
 
     # Then get each of the file objects
     targets += @target_objects.keys
 
     # Lastly, check the file from any resource instances
     if resources
-      resources.each do |name, resource|
+      resources.each do |_name, resource|
         value = resource.should(:target)
         if value
           targets << value
@@ -464,12 +467,13 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     # The 'record' could be a resource or a record, depending on how the provider
     # is initialized.  If we got an empty property hash (probably because the resource
     # is just being initialized), then we want to set up some defaults.
-    @property_hash = self.class.record?(resource[:name]) || {:record_type => self.class.name, :ensure => :absent} if @property_hash.empty?
+    @property_hash = self.class.record?(resource[:name]) || { :record_type => self.class.name, :ensure => :absent } if @property_hash.empty?
   end
 
   # Retrieve the current state from disk.
   def prefetch
     raise Puppet::DevError, _("Somehow got told to prefetch with no resource set") unless @resource
+
     self.class.prefetch(@resource[:name] => @resource)
   end