puppet 8.5.1-x86-mingw32 → 8.6.0-x86-mingw32

data/lib/puppet/resource/catalog.rb

@@ -93,7 +93,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     else
       a = [nil, nil]
     end
-    return a
+    a
   end
 
   def add_resource_before(other, *resources)
@@ -184,7 +184,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def alias(resource, key)
     ref = resource.ref
     ref =~ /^(.+)\[/
-    class_name = $1 || resource.class.name
+    class_name = ::Regexp.last_match(1) || resource.class.name
 
     newref = [class_name, key].flatten
 
@@ -272,7 +272,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def clear(remove_resources = true)
     super()
     # We have to do this so that the resources clean themselves up.
-    @resource_table.values.each { |resource| resource.remove } if remove_resources
+    @resource_table.values.each(&:remove) if remove_resources
     @resource_table.clear
     @resources = []
 
@@ -304,7 +304,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def finalize
     make_default_resources
 
-    @resource_table.values.each { |resource| resource.finish }
+    @resource_table.values.each(&:finish)
 
     write_graph(:resources)
   end
@@ -467,10 +467,10 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def to_data_hash
-    metadata_hash = metadata.transform_values { |v| v.to_data_hash; }
+    metadata_hash = metadata.transform_values(&:to_data_hash)
     recursive_metadata_hash = recursive_metadata.transform_values do |source_to_meta_hash|
       source_to_meta_hash.transform_values do |metas|
-        metas.map { |meta| meta.to_data_hash }
+        metas.map(&:to_data_hash)
       end
     end
 
@@ -483,7 +483,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       'catalog_format' => catalog_format,
       'environment' => environment.to_s,
       'resources' => @resources.map { |v| @resource_table[v].to_data_hash },
-      'edges' => edges.map { |e| e.to_data_hash },
+      'edges' => edges.map(&:to_data_hash),
       'classes' => classes,
     }.merge(metadata_hash.empty? ?
       {} : { 'metadata' => metadata_hash }).merge(recursive_metadata_hash.empty? ?
@@ -539,7 +539,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       to_print = resources.filter_map do |resource|
         next unless resource.managed?
 
-        "#{resource.ref.downcase}"
+        resource.ref.downcase.to_s
       end
       f.puts to_print.join("\n")
     end
@@ -590,14 +590,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # This pretty much just converts all of the resources from one class to another, using
   # a conversion method.
   def to_catalog(convert)
-    result = self.class.new(self.name, self.environment_instance)
+    result = self.class.new(name, environment_instance)
 
-    result.version = self.version
-    result.code_id = self.code_id
-    result.catalog_uuid = self.catalog_uuid
-    result.catalog_format = self.catalog_format
-    result.metadata = self.metadata
-    result.recursive_metadata = self.recursive_metadata
+    result.version = version
+    result.code_id = code_id
+    result.catalog_uuid = catalog_uuid
+    result.catalog_format = catalog_format
+    result.metadata = metadata
+    result.recursive_metadata = recursive_metadata
 
     map = {}
     resources.each do |resource|
@@ -643,7 +643,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
     map.clear
 
-    result.add_class(*self.classes)
+    result.add_class(*classes)
     result.merge_tags_from(self)
 
     result

data/lib/puppet/resource/status.rb

@@ -102,7 +102,7 @@ module Puppet
       end
 
       def self.from_data_hash(data)
-        obj = self.allocate
+        obj = allocate
         obj.initialize_from_hash(data)
         obj
       end
@@ -216,13 +216,13 @@ module Puppet
           'tags' => @tags.to_a,
           'time' => @time.iso8601(9),
           'failed' => @failed,
-          'failed_to_restart' => self.failed_to_restart?,
+          'failed_to_restart' => failed_to_restart?,
           'changed' => @changed,
           'out_of_sync' => @out_of_sync,
           'skipped' => @skipped,
           'change_count' => @change_count,
           'out_of_sync_count' => @out_of_sync_count,
-          'events' => @events.map { |event| event.to_data_hash },
+          'events' => @events.map(&:to_data_hash),
           'corrective_change' => @corrective_change,
         }
       end

data/lib/puppet/resource/type.rb

@@ -47,7 +47,7 @@ class Puppet::Resource::Type
   attr_reader :type
 
   RESOURCE_KINDS.each do |t|
-    define_method("#{t}?") { self.type == t }
+    define_method("#{t}?") { type == t }
   end
 
   # Are we a child of the passed class?  Do a recursive search up our
@@ -56,7 +56,7 @@ class Puppet::Resource::Type
     return true if override
     return false unless parent
 
-    return(klass == parent_type ? true : parent_type.child_of?(klass))
+    (klass == parent_type ? true : parent_type.child_of?(klass))
   end
 
   # Now evaluate the code associated with this class or definition.
@@ -140,7 +140,7 @@ class Puppet::Resource::Type
     # This might just be an empty, stub class.
     return unless other.code
 
-    unless self.code
+    unless code
       self.code = other.code
       return
     end
@@ -189,7 +189,7 @@ class Puppet::Resource::Type
       parent_type(scope).ensure_in_catalog(scope)
     end
 
-    if ['Class', 'Node'].include? resource.type
+    if %w[Class Node].include? resource.type
       scope.catalog.merge_tags_from(resource)
     end
   end
@@ -237,7 +237,7 @@ class Puppet::Resource::Type
       scope[TITLE] = resource.title
       scope[NAME] = resource.name
     end
-    scope.class_set(self.name, scope) if hostclass? || node?
+    scope.class_set(name, scope) if hostclass? || node?
 
     param_hash = scope.with_parameter_scope(resource.to_s, arguments.keys) do |param_scope|
       # Assign directly to the parameter scope to avoid scope parameter validation at this point. It
@@ -376,7 +376,7 @@ class Puppet::Resource::Type
     ary = fullname.split(DOUBLE_COLON)
     n = ary.pop || ""
     ns = ary.join(DOUBLE_COLON)
-    return ns, n
+    [ns, n]
   end
 
   def parent_scope(scope, klass)
@@ -401,9 +401,9 @@ class Puppet::Resource::Type
     return unless Puppet::Type.metaparamclass(param)
 
     if default
-      warnonce _("%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition") % { param: param, name: self.name }
+      warnonce _("%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition") % { param: param, name: name }
     else
-      raise Puppet::ParseError, _("%{param} is a metaparameter; please choose another parameter name in the %{name} definition") % { param: param, name: self.name }
+      raise Puppet::ParseError, _("%{param} is a metaparameter; please choose another parameter name in the %{name} definition") % { param: param, name: name }
     end
   end
 

data/lib/puppet/resource/type_collection.rb

@@ -168,7 +168,7 @@ class Puppet::Resource::TypeCollection
   end
 
   def version
-    if !defined?(@version)
+    unless defined?(@version)
       if environment.config_version.nil? || environment.config_version == ""
         @version = Time.now.to_i
       else

data/lib/puppet/resource.rb

@@ -44,7 +44,7 @@ class Puppet::Resource
   VALUE_KEY = 'value'
 
   def self.from_data_hash(data)
-    resource = self.allocate
+    resource = allocate
     resource.initialize_from_hash(data)
     resource
   end
@@ -116,7 +116,7 @@ class Puppet::Resource
     converter = stringify ? Puppet::Pops::Serialization::ToStringifiedConverter.new : nil
 
     params = {}
-    self.to_hash.each_pair do |param, value|
+    to_hash.each_pair do |param, value|
       # Don't duplicate the title as the namevar
       unless param == namevar && value == title
         if stringify
@@ -162,12 +162,12 @@ class Puppet::Resource
   end
 
   def yaml_property_munge(x)
-    self.value.to_json_data(x)
+    value.to_json_data(x)
   end
 
   # Proxy these methods to the parameters hash.  It's likely they'll
   # be overridden at some point, but this works for now.
-  %w{has_key? keys length delete empty? <<}.each do |method|
+  %w[has_key? keys length delete empty? <<].each do |method|
     define_method(method) do |*args|
       parameters.send(method, *args)
     end
@@ -187,7 +187,7 @@ class Puppet::Resource
   end
 
   def ==(other)
-    return false unless other.respond_to?(:title) and self.type == other.type and self.title == other.title
+    return false unless other.respond_to?(:title) and type == other.type and title == other.title
 
     return false unless to_hash == other.to_hash
 
@@ -227,9 +227,9 @@ class Puppet::Resource
     super || parameters.keys.include?(parameter_name(parameter))
   end
 
-  %w{exported virtual strict}.each do |m|
+  %w[exported virtual strict].each do |m|
     define_method(m + "?") do
-      self.send(m)
+      send(m)
     end
   end
 
@@ -275,7 +275,7 @@ class Puppet::Resource
       self.kind = src.kind
       self.exported = src.exported
       self.virtual = src.virtual
-      self.set_tags(src)
+      set_tags(src)
       self.environment = src.environment
       @rstype = src.resource_type
       @type = src.type
@@ -343,7 +343,7 @@ class Puppet::Resource
 
       self.kind = self.class.to_kind(rt) unless kind
       if strict? && rt.nil?
-        if self.class?
+        if class?
           raise ArgumentError, _("Could not find declared class %{title}") % { title: title }
         else
           raise ArgumentError, _("Invalid resource type %{type}") % { type: type }
@@ -388,7 +388,7 @@ class Puppet::Resource
     when TYPE_NODE; environment.known_resource_types.node(title)
     else
       result = Puppet::Type.type(type)
-      if !result
+      unless result
         krt = environment.known_resource_types
         result = krt.definition(type)
       end
@@ -428,11 +428,11 @@ class Puppet::Resource
 
   def uniqueness_key
     # Temporary kludge to deal with inconsistent use patterns; ensure we don't return nil for namevar/:name
-    h = self.to_hash
+    h = to_hash
     name = h[namevar] || h[:name] || self.name
     h[namevar] ||= name
     h[:name]   ||= name
-    h.values_at(*key_attributes.sort_by { |k| k.to_s })
+    h.values_at(*key_attributes.sort_by(&:to_s))
   end
 
   def key_attributes
@@ -460,7 +460,7 @@ class Puppet::Resource
     }.join
     # rubocop:enable Lint/FormatParameterMismatch
 
-    "  %s:\n%s" % [self.title, attributes]
+    "  %s:\n%s" % [title, attributes]
   end
 
   # Convert our resource to a hiera hash suitable for serialization.
@@ -475,7 +475,7 @@ class Puppet::Resource
     res['ensure'] = value if value
     res.merge!(params.sort.to_h)
 
-    return { h['title'] => res }
+    { h['title'] => res }
   end
 
   # Convert our resource to Puppet code.
@@ -497,8 +497,8 @@ class Puppet::Resource
     }.join
     # rubocop:enable Lint/FormatParameterMismatch
 
-    escaped = self.title.gsub(/'/, "\\\\'")
-    "%s { '%s':\n%s}" % [self.type.to_s.downcase, escaped, attributes]
+    escaped = title.gsub(/'/, "\\\\'")
+    "%s { '%s':\n%s}" % [type.to_s.downcase, escaped, attributes]
   end
 
   def to_ref
@@ -513,15 +513,15 @@ class Puppet::Resource
   # must check its kind before deciding whether the catalog format is of an older
   # version or not.
   def to_ral
-    if self.kind == COMPILABLE_TYPE_STRING
-      typeklass = Puppet::Type.type(self.type)
-    elsif self.catalog && self.catalog.catalog_format >= 2
+    if kind == COMPILABLE_TYPE_STRING
+      typeklass = Puppet::Type.type(type)
+    elsif catalog && catalog.catalog_format >= 2
       typeklass = Puppet::Type.type(:component)
     else
-      typeklass = Puppet::Type.type(self.type) || Puppet::Type.type(:component)
+      typeklass = Puppet::Type.type(type) || Puppet::Type.type(:component)
     end
 
-    raise(Puppet::Error, "Resource type '#{self.type}' was not found") unless typeklass
+    raise(Puppet::Error, "Resource type '#{type}' was not found") unless typeklass
 
     typeklass.new(self)
   end
@@ -589,9 +589,9 @@ class Puppet::Resource
 
   def self.extract_type_and_title(argtype, argtitle)
     if (argtype.nil? || argtype == :component || argtype == :whit) &&
-       argtitle =~ /^([^\[\]]+)\[(.+)\]$/m                  then [$1, $2]
+       argtitle =~ /^([^\[\]]+)\[(.+)\]$/m                  then [::Regexp.last_match(1), ::Regexp.last_match(2)]
     elsif argtitle.nil? && argtype.is_a?(String) &&
-          argtype =~ /^([^\[\]]+)\[(.+)\]$/m                   then [$1,                 $2]
+          argtype =~ /^([^\[\]]+)\[(.+)\]$/m                   then [::Regexp.last_match(1), ::Regexp.last_match(2)]
     elsif argtitle                                             then [argtype,            argtitle]
     elsif argtype.is_a?(Puppet::Type)                          then [argtype.class.name, argtype.title]
     else  raise ArgumentError, _("No title provided and %{type} is not a valid resource reference") % { type: argtype.inspect } # rubocop:disable Lint/ElseLayout
@@ -646,32 +646,32 @@ class Puppet::Resource
     if type.respond_to?(:title_patterns) && !type.title_patterns.nil?
       type.title_patterns.each do |regexp, symbols_and_lambdas|
         captures = regexp.match(title.to_s)
-        if captures
-          symbols_and_lambdas.zip(captures[1..]).each do |symbol_and_lambda, capture|
-            symbol, proc = symbol_and_lambda
-            # Many types pass "identity" as the proc; we might as well give
-            # them a shortcut to delivering that without the extra cost.
-            #
-            # Especially because the global type defines title_patterns and
-            # uses the identity patterns.
-            #
-            # This was worth about 8MB of memory allocation saved in my
-            # testing, so is worth the complexity for the API.
-            if proc then
-              h[symbol] = proc.call(capture)
-            else
-              h[symbol] = capture
-            end
+        next unless captures
+
+        symbols_and_lambdas.zip(captures[1..]).each do |symbol_and_lambda, capture|
+          symbol, proc = symbol_and_lambda
+          # Many types pass "identity" as the proc; we might as well give
+          # them a shortcut to delivering that without the extra cost.
+          #
+          # Especially because the global type defines title_patterns and
+          # uses the identity patterns.
+          #
+          # This was worth about 8MB of memory allocation saved in my
+          # testing, so is worth the complexity for the API.
+          if proc then
+            h[symbol] = proc.call(capture)
+          else
+            h[symbol] = capture
           end
-          return h
         end
+        return h
       end
       # If we've gotten this far, then none of the provided title patterns
       # matched. Since there's no way to determine the title then the
       # resource should fail here.
       raise Puppet::Error, _("No set of title patterns matched the title \"%{title}\".") % { title: title }
     else
-      return { :name => title.to_s }
+      { :name => title.to_s }
     end
   end
 end

data/lib/puppet/scheduler/scheduler.rb

@@ -8,7 +8,7 @@ module Puppet::Scheduler
 
     def run_loop(jobs)
       mark_start_times(jobs, @timer.now)
-      while not enabled(jobs).empty?
+      until enabled(jobs).empty?
         @timer.wait_for(min_interval_to_next_run_from(jobs, @timer.now))
         run_ready(jobs, @timer.now)
       end

data/lib/puppet/settings/alias_setting.rb

@@ -26,11 +26,9 @@ class Puppet::Settings::AliasSetting
   end
 
   def method_missing(method, *args)
-    begin
-      alias_for.send(method, *args)
-    rescue => e
-      Puppet.log_exception(self.class, e.message)
-    end
+    alias_for.send(method, *args)
+  rescue => e
+    Puppet.log_exception(self.class, e.message)
   end
 
   private

data/lib/puppet/settings/base_setting.rb

@@ -89,7 +89,7 @@ class Puppet::Settings::BaseSetting
   def initialize(args = {})
     @settings = args.delete(:settings)
     unless @settings
-      raise ArgumentError.new("You must refer to a settings object")
+      raise ArgumentError, "You must refer to a settings object"
     end
 
     # explicitly set name prior to calling other param= methods to provide meaningful feedback during
@@ -97,25 +97,25 @@ class Puppet::Settings::BaseSetting
     @name = args[:name] if args.include? :name
 
     # set the default value for call_hook
-    @call_hook = :on_write_only if args[:hook] and not args[:call_hook]
+    @call_hook = :on_write_only if args[:hook] and !(args[:call_hook])
     @has_hook = false
 
-    if args[:call_hook] and not args[:hook]
+    if args[:call_hook] and !(args[:hook])
       # TRANSLATORS ':call_hook' and ':hook' are specific setting names and should not be translated
       raise ArgumentError, _("Cannot reference :call_hook for :%{name} if no :hook is defined") % { name: @name }
     end
 
     args.each do |param, value|
       method = param.to_s + "="
-      unless self.respond_to? method
+      unless respond_to? method
         raise ArgumentError, _("%{class_name} (setting '%{setting}') does not accept %{parameter}") %
                              { class_name: self.class, setting: args[:name], parameter: param }
       end
 
-      self.send(method, value)
+      send(method, value)
     end
-    unless self.desc
-      raise ArgumentError, _("You must provide a description for the %{class_name} config option") % { class_name: self.name }
+    unless desc
+      raise ArgumentError, _("You must provide a description for the %{class_name} config option") % { class_name: name }
     end
   end
 
@@ -146,7 +146,7 @@ class Puppet::Settings::BaseSetting
     end
     return default_value unless check_application_defaults_first
 
-    return @settings.value(name, :application_defaults, true) || default_value
+    @settings.value(name, :application_defaults, true) || default_value
   end
 
   # Convert the object to a config statement.
@@ -161,7 +161,7 @@ class Puppet::Settings::BaseSetting
     # If the value has not been overridden, then print it out commented
     # and unconverted, so it's clear that that's the default and how it
     # works.
-    value = @settings.value(self.name)
+    value = @settings.value(name)
 
     if value != @default
       line = "#{@name} = #{value}"
@@ -180,7 +180,7 @@ class Puppet::Settings::BaseSetting
   # @return [String] Retrieves the value, or if it's not set, retrieves the default.
   # @api public
   def value(bypass_interpolation = false)
-    @settings.value(self.name, nil, bypass_interpolation)
+    @settings.value(name, nil, bypass_interpolation)
   end
 
   # Modify the value when it is first evaluated
@@ -223,6 +223,6 @@ class Puppet::Settings::BaseSetting
   end
 
   def inspect
-    %Q{<#{self.class}:#{self.object_id} @name="#{@name}" @section="#{@section}" @default="#{@default}" @call_hook="#{@call_hook}">}
+    %Q(<#{self.class}:#{object_id} @name="#{@name}" @section="#{@section}" @default="#{@default}" @call_hook="#{@call_hook}">)
   end
 end

data/lib/puppet/settings/boolean_setting.rb

@@ -21,8 +21,8 @@ class Puppet::Settings::BooleanSetting < Puppet::Settings::BaseSetting
 
   def munge(value)
     case value
-    when true, "true"; return true
-    when false, "false"; return false
+    when true, "true"; true
+    when false, "false"; false
     else
       raise Puppet::Settings::ValidationError, _("Invalid value '%{value}' for boolean parameter: %{name}") % { value: value.inspect, name: @name }
     end

data/lib/puppet/settings/config_file.rb

@@ -22,7 +22,7 @@ class Puppet::Settings::ConfigFile
   # @return A Struct with a +sections+ array representing each configuration section
   def parse_file(file, text, allowed_section_names = [])
     result = Conf.new
-    if !allowed_section_names.empty?
+    unless allowed_section_names.empty?
       allowed_section_names << 'main' unless allowed_section_names.include?('main')
     end
 
@@ -123,10 +123,11 @@ class Puppet::Settings::ConfigFile
   def extract_fileinfo(string)
     result = {}
     value = string.sub(/\{\s*([^}]+)\s*\}/) do
-      params = $1
+      params = ::Regexp.last_match(1)
       params.split(/\s*,\s*/).each do |str|
-        if str =~ /^\s*(\w+)\s*=\s*([\w]+)\s*$/
-          param, value = $1.intern, $2
+        if str =~ /^\s*(\w+)\s*=\s*(\w+)\s*$/
+          param = ::Regexp.last_match(1).intern
+          value = ::Regexp.last_match(2)
           result[param] = value
           unless [:owner, :mode, :group].include?(param)
             raise ArgumentError, _("Invalid file option '%{parameter}'") % { parameter: param }

data/lib/puppet/settings/duration_setting.rb

@@ -24,8 +24,8 @@ class Puppet::Settings::DurationSetting < Puppet::Settings::BaseSetting
   def munge(value)
     if value.is_a?(Integer) || value.nil?
       value
-    elsif (value.is_a?(String) and value =~ FORMAT)
-      $1.to_i * UNITMAP[$2 || 's']
+    elsif value.is_a?(String) and value =~ FORMAT
+      ::Regexp.last_match(1).to_i * UNITMAP[::Regexp.last_match(2) || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid duration format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }
     end

data/lib/puppet/settings/environment_conf.rb

@@ -149,7 +149,7 @@ class Puppet::Settings::EnvironmentConf
     end
 
     extraneous_settings = main.settings.map(&:name) - VALID_SETTINGS
-    if !extraneous_settings.empty?
+    unless extraneous_settings.empty?
       # warn once per config file path
       Puppet.warn_once(
         :invalid_settings, "EnvironmentConf-settings:#{path_to_conf_file}",
@@ -161,7 +161,7 @@ class Puppet::Settings::EnvironmentConf
       valid = false
     end
 
-    return valid
+    valid
   end
   private_class_method :validate
 
@@ -174,7 +174,7 @@ class Puppet::Settings::EnvironmentConf
   def expand_glob(path)
     return nil if path.nil?
 
-    if path =~ /[*?\[\{]/
+    if path =~ /[*?\[{]/
       Dir.glob(path)
     else
       path

data/lib/puppet/settings/file_or_directory_setting.rb

@@ -2,7 +2,7 @@
 
 class Puppet::Settings::FileOrDirectorySetting < Puppet::Settings::FileSetting
   def type
-    if Puppet::FileSystem.directory?(self.value) || @path_ends_with_slash
+    if Puppet::FileSystem.directory?(value) || @path_ends_with_slash
       :directory
     else
       :file
@@ -12,7 +12,7 @@ class Puppet::Settings::FileOrDirectorySetting < Puppet::Settings::FileSetting
   # Overrides munge to be able to read the un-munged value (the FileSetting.munch removes trailing slash)
   #
   def munge(value)
-    if value.is_a?(String) && value =~ /[\\\/]$/
+    if value.is_a?(String) && value =~ %r{[\\/]$}
       @path_ends_with_slash = true
     end
     super

data/lib/puppet/settings/file_setting.rb

@@ -126,7 +126,7 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     type = self.type
     return nil unless type
 
-    path = self.value
+    path = value
 
     return nil unless path.is_a?(String)
 
@@ -134,12 +134,12 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     path = File.expand_path(path)
 
     return nil unless type == :directory || Puppet::FileSystem.exist?(path)
-    return nil if path =~ /^\/dev/ || path =~ /^[A-Z]:\/dev/i
+    return nil if path =~ %r{^/dev} || path =~ %r{^[A-Z]:/dev}i
 
     resource = Puppet::Resource.new(:file, path)
 
     if Puppet[:manage_internal_file_permissions]
-      if self.mode
+      if mode
         # This ends up mimicking the munge method of the mode
         # parameter to make sure that we're always passing the string
         # version of the octal number.  If we were setting the
@@ -156,8 +156,8 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
 
       # REMIND fails on Windows because chown/chgrp functionality not supported yet
       if Puppet.features.root? and !Puppet::Util::Platform.windows?
-        resource[:owner] = self.owner if self.owner
-        resource[:group] = self.group if self.group
+        resource[:owner] = owner if owner
+        resource[:group] = group if group
       end
     end
 
@@ -166,7 +166,7 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     resource[:links] = :follow
     resource[:backup] = false
 
-    resource.tag(self.section, self.name, "settings")
+    resource.tag(section, name, "settings")
 
     resource
   end
@@ -215,14 +215,14 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
 
     Puppet::Util::SUIDManager.asuser(*chown) do
       # Update the umask to make non-executable files
-      Puppet::Util.withumask(File.umask ^ 0111) do
-        yielded_value = case self.mode
+      Puppet::Util.withumask(File.umask ^ 0o111) do
+        yielded_value = case mode
                         when String
-                          self.mode.to_i(8)
+                          mode.to_i(8)
                         when NilClass
-                          0640
+                          0o640
                         else
-                          self.mode
+                          mode
                         end
 
         yield yielded_value