puppet 8.5.1 → 8.7.0

data/lib/puppet/external/dot.rb

@@ -100,17 +100,17 @@ module DOT
 
   # options for graph declaration
 
-  GRAPH_OPTS = [
-    'bgcolor',
-    'center', 'clusterrank', 'color', 'concentrate',
-    'fontcolor', 'fontname', 'fontsize',
-    'label', 'layerseq',
-    'margin', 'mclimit',
-    'nodesep', 'nslimit',
-    'ordering', 'orientation',
-    'page',
-    'rank', 'rankdir', 'ranksep', 'ratio',
-    'size'
+  GRAPH_OPTS = %w[
+    bgcolor
+    center clusterrank color concentrate
+    fontcolor fontname fontsize
+    label layerseq
+    margin mclimit
+    nodesep nslimit
+    ordering orientation
+    page
+    rank rankdir ranksep ratio
+    size
   ]
 
   # a root class for any element in dot notation
@@ -119,7 +119,7 @@ module DOT
     attr_accessor :name
 
     def initialize(params = {})
-      @label = params['name'] ? params['name'] : ''
+      @label = params['name'] || ''
     end
 
     def to_s
@@ -135,8 +135,8 @@ module DOT
 
     def initialize(params = {}, option_list = [])
       super(params)
-      @name   = params['name']   ? params['name']   : nil
-      @parent = params['parent'] ? params['parent'] : nil
+      @name   = params['name']   || nil
+      @parent = params['parent'] || nil
       @options = {}
       option_list.each { |i|
         @options[i] = params[i] if params[i]
@@ -161,11 +161,11 @@ module DOT
 
     def initialize(params = {})
       super(params)
-      @name = params['label'] ? params['label'] : ''
+      @name = params['label'] || ''
     end
 
     def to_s
-      (@name && @name != "" ? "<#{@name}>" : "") + "#{@label}"
+      (@name && @name != "" ? "<#{@name}>" : "") + @label.to_s
     end
   end
 
@@ -174,7 +174,7 @@ module DOT
   class DOTNode < DOTElement
     def initialize(params = {}, option_list = NODE_OPTS)
       super(params, option_list)
-      @ports = params['ports'] ? params['ports'] : []
+      @ports = params['ports'] || []
     end
 
     def each_port
@@ -196,16 +196,20 @@ module DOT
     def to_s(t = '')
       # This code is totally incomprehensible; it needs to be replaced!
 
-      label = @options['shape'] != 'record' && @ports.length == 0 ?
-          @options['label'] ?
-            t + $tab + "label = #{stringify(@options['label'])}\n" :
-            '' :
-          t + $tab + 'label = "' + " \\\n" +
-            t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
-            @ports.collect { |i|
-              t + $tab2 + i.to_s
-            }.join("| \\\n") + " \\\n" +
-            t + $tab + '"' + "\n"
+      label = if @options['shape'] != 'record' && @ports.length == 0
+                if @options['label']
+                  t + $tab + "label = #{stringify(@options['label'])}\n"
+                else
+                  ''
+                end
+              else
+                t + $tab + 'label = "' + " \\\n" +
+                  t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
+                  @ports.collect { |i|
+                    t + $tab2 + i.to_s
+                  }.join("| \\\n") + " \\\n" +
+                  t + $tab + '"' + "\n"
+              end
 
       t + "#{@name} [\n" +
         @options.to_a.filter_map { |i|
@@ -229,7 +233,7 @@ module DOT
   class DOTSubgraph < DOTElement
     def initialize(params = {}, option_list = GRAPH_OPTS)
       super(params, option_list)
-      @nodes      = params['nodes'] ? params['nodes'] : []
+      @nodes      = params['nodes'] || []
       @dot_string = 'graph'
     end
 
@@ -253,9 +257,11 @@ module DOT
       hdr = t + "#{@dot_string} #{@name} {\n"
 
       options = @options.to_a.filter_map { |name, val|
-        val && name != 'label' ?
-          t + $tab + "#{name} = #{val}" :
+        if val && name != 'label'
+          t + $tab + "#{name} = #{val}"
+        else
           name ? t + $tab + "#{name} = \"#{val}\"" : nil
+        end
       }.join("\n") + "\n"
 
       nodes = @nodes.collect { |i|
@@ -281,8 +287,8 @@ module DOT
 
     def initialize(params = {}, option_list = EDGE_OPTS)
       super(params, option_list)
-      @from = params['from'] ? params['from'] : nil
-      @to   = params['to'] ? params['to'] : nil
+      @from = params['from'] || nil
+      @to   = params['to'] || nil
     end
 
     def edge_link
@@ -292,9 +298,11 @@ module DOT
     def to_s(t = '')
       t + "#{@from} #{edge_link} #{to} [\n" +
         @options.to_a.filter_map { |i|
-          i[1] && i[0] != 'label' ?
-            t + $tab + "#{i[0]} = #{i[1]}" :
+          if i[1] && i[0] != 'label'
+            t + $tab + "#{i[0]} = #{i[1]}"
+          else
             i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
+          end
         }.join("\n") + "\n#{t}]\n"
     end
   end

data/lib/puppet/face/catalog/select.rb

@@ -44,7 +44,7 @@ Puppet::Face.define(:catalog, '0.0.1') do
       if value.nil? then
         _("no matching resources found")
       else
-        value.map { |x| x.to_s }.join("\n")
+        value.map(&:to_s).join("\n")
       end
     end
   end

data/lib/puppet/face/epp.rb

@@ -71,7 +71,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       status = true # no validation error yet
       files = args
       if files.empty?
-        if not STDIN.tty?
+        if !STDIN.tty?
           tmp = validate_template_string(STDIN.read)
           status &&= tmp
         else
@@ -194,7 +194,7 @@ Puppet::Face.define(:epp, '0.0.1') do
           buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
         end
 
-        if !missing_files.empty?
+        unless missing_files.empty?
           raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{missing_files_list}") %
                                { missing_files_list: missing_files.collect { |f| "   #{f}" }.join("\n") }
         end
@@ -350,12 +350,10 @@ Puppet::Face.define(:epp, '0.0.1') do
           show_filename = args.count > 1
           file_nbr = 0
           args.each do |file|
-            begin
-              buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
-            rescue Puppet::ParseError => detail
-              Puppet.err(detail.message)
-              status = false
-            end
+            buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
+          rescue Puppet::ParseError => detail
+            Puppet.err(detail.message)
+            status = false
           end
         end
         raise Puppet::Error, _("error while rendering epp") unless status
@@ -417,7 +415,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       rescue => e
         Puppet.err(_("Could not load --values_file %{error}") % { error: e.message })
       end
-      if !(template_values.nil? || template_values.is_a?(Hash))
+      unless template_values.nil? || template_values.is_a?(Hash)
         Puppet.err(_("--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'") % { template_class: template_values.class })
       end
     end

data/lib/puppet/face/help.rb

@@ -95,7 +95,7 @@ Puppet::Face.define(:help, '0.0.1') do
   end
 
   def render_application_help(applicationname)
-    return Puppet::Application[applicationname].help
+    Puppet::Application[applicationname].help
   rescue StandardError, LoadError => detail
     message = []
     message << _('Could not load help for the application %{application_name}.') % { application_name: applicationname }
@@ -107,7 +107,7 @@ Puppet::Face.define(:help, '0.0.1') do
 
   def render_face_help(facename, actionname, version)
     face, action = load_face_help(facename, actionname, version)
-    return template_for(face, action).result(binding)
+    template_for(face, action).result(binding)
   rescue StandardError, LoadError => detail
     message = []
     message << _('Could not load help for the face %{face_name}.') % { face_name: facename }
@@ -121,7 +121,7 @@ Puppet::Face.define(:help, '0.0.1') do
     face = Puppet::Face[facename.to_sym, version]
     if actionname
       action = face.get_action(actionname.to_sym)
-      if !action
+      unless action
         fail ArgumentError, _("Unable to load action %{actionname} from %{face}") % { actionname: actionname, face: face }
       end
     end
@@ -141,13 +141,13 @@ Puppet::Face.define(:help, '0.0.1') do
     template = (Pathname(__FILE__).dirname + "help" + name)
     erb = Puppet::Util.create_erb(template.read)
     erb.filename = template.to_s
-    return erb
+    erb
   end
 
   # Return a list of applications that are not simply just stubs for Faces.
   def legacy_applications
     Puppet::Application.available_application_names.reject do |appname|
-      (is_face_app?(appname)) or (exclude_from_docs?(appname))
+      is_face_app?(appname) or exclude_from_docs?(appname)
     end.sort
   end
 
@@ -160,9 +160,9 @@ Puppet::Face.define(:help, '0.0.1') do
     available_application_names_special_sort().inject([]) do |result, appname|
       next result if exclude_from_docs?(appname)
 
-      if (appname == COMMON || appname == SPECIALIZED || appname == BLANK)
+      if appname == COMMON || appname == SPECIALIZED || appname == BLANK
         result << appname
-      elsif (is_face_app?(appname))
+      elsif is_face_app?(appname)
         begin
           face = Puppet::Face[appname, :current]
           # Add deprecation message to summary if the face is deprecated
@@ -194,7 +194,7 @@ Puppet::Face.define(:help, '0.0.1') do
   BLANK = "\n"
   def available_application_names_special_sort
     full_list = Puppet::Application.available_application_names
-    a_list = full_list & %w{apply agent config help lookup module resource}
+    a_list = full_list & %w[apply agent config help lookup module resource]
     a_list = a_list.sort
     also_ran = full_list - a_list
     also_ran = also_ran.sort
@@ -207,13 +207,13 @@ Puppet::Face.define(:help, '0.0.1') do
     # depends on the implementation coincidence of how our pages are
     # formatted.  If we can't match the pattern we expect we return the empty
     # string to ensure we don't blow up in the summary. --daniel 2011-04-11
-    while line = help.shift do # rubocop:disable Lint/AssignmentInCondition
-      md = /^puppet-#{appname}\([^\)]+\) -- (.*)$/.match(line)
+    while line = help.shift # rubocop:disable Lint/AssignmentInCondition
+      md = /^puppet-#{appname}\([^)]+\) -- (.*)$/.match(line)
       if md
         return md[1]
       end
     end
-    return ''
+    ''
   end
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.
@@ -221,7 +221,7 @@ Puppet::Face.define(:help, '0.0.1') do
   # private :horribly_extract_summary_from
 
   def exclude_from_docs?(appname)
-    %w{face_base indirection_base report status}.include? appname
+    %w[face_base indirection_base report status].include? appname
   end
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.

data/lib/puppet/face/module/changes.rb

@@ -38,9 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
       else
         Puppet.warning _("%{count} files modified") % { count: return_value.size }
       end
-      return_value.map do |changed_file|
-        "#{changed_file}"
-      end.join("\n")
+      return_value.map(&:to_s).join("\n")
     end
   end
 end

data/lib/puppet/face/module/list.rb

@@ -117,28 +117,28 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     # Prepare the unmet dependencies for display on the console.
-    environment.modules.sort_by { |mod| mod.name }.each do |mod|
+    environment.modules.sort_by(&:name).each do |mod|
       unmet_grouped = Hash.new { |h, k| h[k] = [] }
       unmet_grouped = mod.unmet_dependencies.each_with_object(unmet_grouped) do |dep, acc|
         acc[dep[:reason]] << dep
       end
       unmet_grouped.each do |type, deps|
-        unless deps.empty?
-          unmet_grouped[type].sort_by { |dep| dep[:name] }.each do |dep|
-            dep_name           = dep[:name].tr('/', '-')
-            installed_version  = dep[:mod_details][:installed_version]
-            version_constraint = dep[:version_constraint]
-            parent_name        = dep[:parent][:name].tr('/', '-')
-            parent_version     = dep[:parent][:version]
-
-            msg = _("'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})") % { parent_name: parent_name, parent_version: parent_version, dependency_name: dep_name, dependency_version: version_constraint }
-            unmet_deps[type][dep[:name]][:errors] << msg
-            unmet_deps[type][dep[:name]][:parent] = {
-              :name => dep[:parent][:name],
-              :version => parent_version
-            }
-            unmet_deps[type][dep[:name]][:version] = installed_version
-          end
+        next if deps.empty?
+
+        unmet_grouped[type].sort_by { |dep| dep[:name] }.each do |dep|
+          dep_name           = dep[:name].tr('/', '-')
+          installed_version  = dep[:mod_details][:installed_version]
+          version_constraint = dep[:version_constraint]
+          parent_name        = dep[:parent][:name].tr('/', '-')
+          parent_version     = dep[:parent][:version]
+
+          msg = _("'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})") % { parent_name: parent_name, parent_version: parent_version, dependency_name: dep_name, dependency_version: version_constraint }
+          unmet_deps[type][dep[:name]][:errors] << msg
+          unmet_deps[type][dep[:name]][:parent] = {
+            :name => dep[:parent][:name],
+            :version => parent_version
+          }
+          unmet_deps[type][dep[:name]][:version] = installed_version
         end
       end
     end
@@ -151,24 +151,24 @@ Puppet::Face.define(:module, '1.0.0') do
     # Display unmet dependencies by category.
     error_display_order = [:non_semantic_version, :version_mismatch, :missing]
     error_display_order.each do |type|
-      unless @unmet_deps[type].empty?
-        @unmet_deps[type].keys.sort.each do |dep|
-          name    = dep.tr('/', '-')
-          errors  = @unmet_deps[type][dep][:errors]
-          version = @unmet_deps[type][dep][:version]
-
-          msg = case type
-                when :version_mismatch
-                  _("Module '%{name}' (v%{version}) fails to meet some dependencies:\n") % { name: name, version: version }
-                when :non_semantic_version
-                  _("Non semantic version dependency %{name} (v%{version}):\n") % { name: name, version: version }
-                else
-                  _("Missing dependency '%{name}':\n") % { name: name }
-                end
-
-          errors.each { |error_string| msg << "  #{error_string}\n" }
-          Puppet.warning msg.chomp
-        end
+      next if @unmet_deps[type].empty?
+
+      @unmet_deps[type].keys.sort.each do |dep|
+        name    = dep.tr('/', '-')
+        errors  = @unmet_deps[type][dep][:errors]
+        version = @unmet_deps[type][dep][:version]
+
+        msg = case type
+              when :version_mismatch
+                _("Module '%{name}' (v%{version}) fails to meet some dependencies:\n") % { name: name, version: version }
+              when :non_semantic_version
+                _("Non semantic version dependency %{name} (v%{version}):\n") % { name: name, version: version }
+              else
+                _("Missing dependency '%{name}':\n") % { name: name }
+              end
+
+        errors.each { |error_string| msg << "  #{error_string}\n" }
+        Puppet.warning msg.chomp
       end
     end
   end
@@ -259,8 +259,8 @@ Puppet::Face.define(:module, '1.0.0') do
         str << '  ' + colorize(:red, _('invalid'))
       elsif parent.respond_to?(:forge_name)
         unmet_parent = @unmet_deps[:version_mismatch][mod.forge_name][:parent]
-        if (unmet_parent[:name] == parent.forge_name &&
-            unmet_parent[:version] == "v#{parent.version}")
+        if unmet_parent[:name] == parent.forge_name &&
+           unmet_parent[:version] == "v#{parent.version}"
           str << '  ' + colorize(:red, _('invalid'))
         end
       end

data/lib/puppet/face/node/clean.rb

@@ -104,6 +104,6 @@ Puppet::Face.define(:node, '0.0.1') do
       return true if type && type.arguments.keys.include?('ensure')
     end
 
-    return false
+    false
   end
 end

data/lib/puppet/face/parser.rb

@@ -42,7 +42,7 @@ Puppet::Face.define(:parser, '0.0.1') do
       parse_errors = {}
 
       if files.empty?
-        if not STDIN.tty?
+        if !STDIN.tty?
           Puppet[:code] = STDIN.read
           error = validate_manifest(nil)
           parse_errors['STDIN'] = error if error
@@ -214,13 +214,11 @@ Puppet::Face.define(:parser, '0.0.1') do
     loaders = Puppet::Pops::Loaders.new(env)
 
     Puppet.override({ :loaders => loaders }, _('For puppet parser validate')) do
-      begin
-        validation_environment = manifest ? env.override_with(:manifest => manifest) : env
-        validation_environment.check_for_reparse
-        validation_environment.known_resource_types.clear
-      rescue Puppet::ParseError => parse_error
-        return parse_error
-      end
+      validation_environment = manifest ? env.override_with(:manifest => manifest) : env
+      validation_environment.check_for_reparse
+      validation_environment.known_resource_types.clear
+    rescue Puppet::ParseError => parse_error
+      return parse_error
     end
 
     nil

data/lib/puppet/face/report.rb

@@ -41,13 +41,11 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
           return report
     EOT
     when_invoked do |report, _options|
-      begin
-        Puppet::Transaction::Report.indirection.terminus_class = :rest
-        Puppet::Face[:report, "0.0.1"].save(report)
-        Puppet.notice _("Uploaded report for %{name}") % { name: report.name }
-      rescue => detail
-        Puppet.log_exception(detail, _("Could not send report: %{detail}") % { detail: detail })
-      end
+      Puppet::Transaction::Report.indirection.terminus_class = :rest
+      Puppet::Face[:report, "0.0.1"].save(report)
+      Puppet.notice _("Uploaded report for %{name}") % { name: report.name }
+    rescue => detail
+      Puppet.log_exception(detail, _("Could not send report: %{detail}") % { detail: detail })
     end
   end
   deactivate_action(:find)

data/lib/puppet/facter_impl.rb

@@ -58,7 +58,7 @@ module Puppet
     end
 
     def load_external(value)
-      ::Facter.load_external(value) if self.load_external?
+      ::Facter.load_external(value) if load_external?
     end
 
     private

data/lib/puppet/feature/base.rb

@@ -24,7 +24,7 @@ raise Puppet::Error, _("Cannot determine basic system flavour") unless Puppet.fe
 Puppet.features.add(:ldap, :libs => ["ldap"])
 
 # We have the Rdoc::Usage library.
-Puppet.features.add(:usage, :libs => %w{rdoc/ri/ri_paths rdoc/usage})
+Puppet.features.add(:usage, :libs => %w[rdoc/ri/ri_paths rdoc/usage])
 
 # We have libshadow, useful for managing passwords.
 Puppet.features.add(:libshadow, :libs => ["shadow"])
@@ -36,7 +36,7 @@ Puppet.features.add(:root) do
 end
 
 # We have lcs diff
-Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}
+Puppet.features.add :diff, :libs => %w[diff/lcs diff/lcs/hunk]
 
 # We have OpenSSL
 Puppet.features.add(:openssl, :libs => ["openssl"])
@@ -59,15 +59,13 @@ Puppet.features.add(:manages_symlinks) do
       extend FFI::Library
 
       def self.is_implemented # rubocop:disable Naming/PredicateName
-        begin
-          ffi_lib :kernel32
-          attach_function :CreateSymbolicLinkW, [:lpwstr, :lpwstr, :dword], :boolean
-
-          true
-        rescue LoadError
-          Puppet.debug { "CreateSymbolicLink is not available" }
-          false
-        end
+        ffi_lib :kernel32
+        attach_function :CreateSymbolicLinkW, [:lpwstr, :lpwstr, :dword], :boolean
+
+        true
+      rescue LoadError
+        Puppet.debug { "CreateSymbolicLink is not available" }
+        false
       end
     end
 

data/lib/puppet/feature/pe_license.rb

@@ -3,4 +3,4 @@
 require_relative '../../puppet/util/feature'
 
 # Is the pe license library installed providing the ability to read licenses.
-Puppet.features.add(:pe_license, :libs => %{pe_license})
+Puppet.features.add(:pe_license, :libs => %(pe_license))

data/lib/puppet/feature/ssh.rb

@@ -2,4 +2,4 @@
 
 require_relative '../../puppet/util/feature'
 
-Puppet.features.add(:ssh, :libs => %{net/ssh})
+Puppet.features.add(:ssh, :libs => %(net/ssh))

data/lib/puppet/feature/telnet.rb

@@ -3,9 +3,7 @@
 require_relative '../../puppet/util/feature'
 
 Puppet.features.add :telnet do
-  begin
-    require 'net/telnet'
-  rescue LoadError
-    false
-  end
+  require 'net/telnet'
+rescue LoadError
+  false
 end

data/lib/puppet/feature/zlib.rb

@@ -4,4 +4,4 @@ require_relative '../../puppet/util/feature'
 
 # We want this to load if possible, but it's not automatically
 # required.
-Puppet.features.add(:zlib, :libs => %{zlib})
+Puppet.features.add(:zlib, :libs => %(zlib))

data/lib/puppet/ffi/windows/constants.rb

@@ -109,7 +109,7 @@ module Puppet::FFI::Windows
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364571(v=vs.85).aspx
     FSCTL_GET_REPARSE_POINT = 0x900a8
 
-    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
+    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16_384
 
     # Priority constants
     # https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setpriorityclass

data/lib/puppet/ffi/windows/functions.rb

@@ -287,7 +287,7 @@ module Puppet::FFI::Windows
     #   LPDWORD        pcbBytesNeeded
     # );
     SC_STATUS_TYPE = enum(
-      :SC_STATUS_PROCESS_INFO, 0,
+      :SC_STATUS_PROCESS_INFO, 0
     )
     ffi_lib :advapi32
     attach_function_private :QueryServiceStatusEx,
@@ -425,7 +425,7 @@ module Puppet::FFI::Windows
     #   LPCWSTR      pszGroupName
     # );
     SC_ENUM_TYPE = enum(
-      :SC_ENUM_PROCESS_INFO, 0,
+      :SC_ENUM_PROCESS_INFO, 0
     )
     ffi_lib :advapi32
     attach_function_private :EnumServicesStatusExW,

data/lib/puppet/ffi/windows/structs.rb

@@ -198,7 +198,7 @@ module Puppet::FFI::Windows
         :dwWin32ExitCode, :dword,
         :dwServiceSpecificExitCode, :dword,
         :dwCheckPoint, :dword,
-        :dwWaitHint, :dword,
+        :dwWaitHint, :dword
       )
     end
 
@@ -223,7 +223,7 @@ module Puppet::FFI::Windows
         :dwTagId, :dword,
         :lpDependencies, :pointer,
         :lpServiceStartName, :pointer,
-        :lpDisplayName, :pointer,
+        :lpDisplayName, :pointer
       )
     end
 
@@ -258,7 +258,7 @@ module Puppet::FFI::Windows
       )
     end
 
-    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
+    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16_384
 
     # SYMLINK_REPARSE_DATA_BUFFER
     # https://msdn.microsoft.com/en-us/library/cc232006.aspx

data/lib/puppet/file_bucket/dipper.rb

@@ -52,7 +52,7 @@ class Puppet::FileBucket::Dipper
         Puppet::FileBucket::File.indirection.save(file_bucket_file, dest_path)
       end
 
-      return file_bucket_file.checksum_data
+      file_bucket_file.checksum_data
     rescue => detail
       message = _("Could not back up %{file}: %{detail}") % { file: file, detail: detail }
       Puppet.log_exception(detail, message)
@@ -139,7 +139,7 @@ class Puppet::FileBucket::Dipper
         changed = nil
         if Puppet::FileSystem.exist?(file_handle) and !Puppet::FileSystem.writable?(file_handle)
           changed = Puppet::FileSystem.stat(file_handle).mode
-          ::File.chmod(changed | 0200, file)
+          ::File.chmod(changed | 0o200, file)
         end
         ::File.open(file, ::File::WRONLY | ::File::TRUNC | ::File::CREAT) { |of|
           of.binmode
@@ -152,9 +152,9 @@ class Puppet::FileBucket::Dipper
         Puppet.err _("Could not find file with checksum %{sum}") % { sum: sum }
         return nil
       end
-      return newsum
+      newsum
     else
-      return nil
+      nil
     end
   end