Merge pull request #863 from pmcmaw/rubocop_error

(FM-6634) - Addressing rubocop errors

Author: willmeek

lib/facter/facter_dot_d.rb

@@ -23,7 +23,7 @@ def initialize(dir = '/etc/facts.d', cache_file = File.join(Puppet[:libdir], 'fa
 
   def entries
     Dir.entries(@dir).reject { |f| f =~ %r{^\.|\.ttl$} }.sort.map { |f| File.join(@dir, f) }
-  rescue
+  rescue # rubocop:disable Lint/RescueWithoutErrorClass
     []
   end
 
@@ -113,14 +113,14 @@ def script_parser(file)
   def cache_save!
     cache = load_cache
     File.open(@cache_file, 'w', 0o600) { |f| f.write(YAML.dump(cache)) }
-  rescue # rubocop:disable Lint/HandleExceptions - Is meant to be suppressed
+  rescue # rubocop:disable Lint/HandleExceptions, Lint/RescueWithoutErrorClass
   end
 
   def cache_store(file, data)
     load_cache
 
     @cache[file] = { :data => data, :stored => Time.now.to_i }
-  rescue # rubocop:disable Lint/HandleExceptions - Is meant to be suppressed
+  rescue # rubocop:disable Lint/HandleExceptions, Lint/RescueWithoutErrorClass
   end
 
   def cache_lookup(file)
@@ -136,29 +136,27 @@ def cache_lookup(file)
     return cache[file][:data] if ttl == -1
     return cache[file][:data] if (now - cache[file][:stored]) <= ttl
     return nil
-  rescue
+  rescue # rubocop:disable Lint/RescueWithoutErrorClass
     return nil
   end
 
   def cache_time(file)
     meta = file + '.ttl'
 
     return File.read(meta).chomp.to_i
-  rescue
+  rescue # rubocop:disable Lint/RescueWithoutErrorClass
     return 0
   end
 
   def load_cache
-    unless @cache
-      @cache = if File.exist?(@cache_file)
+    @cache ||= if File.exist?(@cache_file)
                  YAML.load_file(@cache_file)
                else
                  {}
                end
-    end
 
     return @cache
-  rescue
+  rescue # rubocop:disable Lint/RescueWithoutErrorClass
     @cache = {}
     return @cache
   end

lib/puppet/parser/functions/abs.rb

@@ -2,10 +2,10 @@
 # abs.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:abs, :type => :rvalue, :doc => <<-EOS
+  newfunction(:abs, :type => :rvalue, :doc => <<-DOC
     Returns the absolute value of a number, for example -34.56 becomes
     34.56. Takes a single integer and float value as an argument.
-    EOS
+    DOC
              ) do |arguments|
 
     raise(Puppet::ParseError, "abs(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?

lib/puppet/parser/functions/any2array.rb

@@ -2,11 +2,11 @@
 # any2array.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:any2array, :type => :rvalue, :doc => <<-EOS
+  newfunction(:any2array, :type => :rvalue, :doc => <<-DOC
     This converts any object to an array containing that object. Empty argument
     lists are converted to an empty array. Arrays are left untouched. Hashes are
     converted to arrays of alternating keys and values.
-  EOS
+  DOC
              ) do |arguments|
 
     if arguments.empty?

lib/puppet/parser/functions/any2bool.rb

@@ -2,7 +2,7 @@
 # any2bool.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:any2bool, :type => :rvalue, :doc => <<-EOS
+  newfunction(:any2bool, :type => :rvalue, :doc => <<-DOC
     This converts 'anything' to a boolean. In practise it does the following:
 
     * Strings such as Y,y,1,T,t,TRUE,yes,'true' will return true
@@ -11,7 +11,7 @@ module Puppet::Parser::Functions
     * Number (or a string representation of a number) > 0 will return true, otherwise false
     * undef will return false
     * Anything else will return true
-  EOS
+  DOC
              ) do |arguments|
 
     raise(Puppet::ParseError, "any2bool(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
@@ -33,7 +33,7 @@ module Puppet::Parser::Functions
 
     valid_float = begin
                     !!Float(arg) # rubocop:disable Style/DoubleNegation : Could not find a better way to check if a boolean
-                  rescue
+                  rescue # rubocop:disable Lint/RescueWithoutErrorClass
                     false
                   end
 

lib/puppet/parser/functions/assert_private.rb

@@ -2,10 +2,10 @@
 # assert_private.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:assert_private, :doc => <<-'EOS'
+  newfunction(:assert_private, :doc => <<-DOC
     Sets the current class or definition as private.
     Calling the class or definition from outside the current module will fail.
-    EOS
+    DOC
              ) do |args|
 
     raise(Puppet::ParseError, "assert_private(): Wrong number of arguments given (#{args.size}}) for 0 or 1)") if args.size > 1

lib/puppet/parser/functions/base64.rb

@@ -1,6 +1,6 @@
 #  Please note: This function is an implementation of a Ruby class and as such may not be entirely UTF8 compatible. To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
 module Puppet::Parser::Functions
-  newfunction(:base64, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
+  newfunction(:base64, :type => :rvalue, :doc => <<-'DOC') do |args|
     Base64 encode or decode a string based on the command and the string submitted
 
     Usage:
@@ -13,7 +13,7 @@ module Puppet::Parser::Functions
       $encodestring = base64('encode', 'thestring', $method)
       $decodestring = base64('decode', 'dGhlc3RyaW5n', $method)
 
-    ENDHEREDOC
+    DOC
 
     require 'base64'
 

lib/puppet/parser/functions/basename.rb

@@ -2,9 +2,9 @@
 # basename.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:basename, :type => :rvalue, :doc => <<-EOS
+  newfunction(:basename, :type => :rvalue, :doc => <<-DOC
     Strips directory (and optional suffix) from a filename
-    EOS
+    DOC
              ) do |arguments|
 
     raise(Puppet::ParseError, 'basename(): No arguments given') if arguments.empty?

lib/puppet/parser/functions/bool2num.rb

@@ -2,12 +2,12 @@
 # bool2num.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:bool2num, :type => :rvalue, :doc => <<-EOS
+  newfunction(:bool2num, :type => :rvalue, :doc => <<-DOC
     Converts a boolean to a number. Converts the values:
       false, f, 0, n, and no to 0
       true, t, 1, y, and yes to 1
     Requires a single boolean or string as an input.
-    EOS
+    DOC
              ) do |arguments|
 
     raise(Puppet::ParseError, "bool2num(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?

lib/puppet/parser/functions/bool2str.rb

@@ -2,7 +2,7 @@
 # bool2str.rb
 #
 module Puppet::Parser::Functions
-  newfunction(:bool2str, :type => :rvalue, :doc => <<-EOS
+  newfunction(:bool2str, :type => :rvalue, :doc => <<-DOC
     Converts a boolean to a string using optionally supplied arguments. The
     optional second and third arguments represent what true and false will be
     converted to respectively. If only one argument is given, it will be
@@ -15,7 +15,7 @@ module Puppet::Parser::Functions
     bool2str(false, 't', 'f')         => 'f'
 
     Requires a single boolean as an input.
-    EOS
+    DOC
              ) do |arguments|
 
     unless arguments.size == 1 || arguments.size == 3

lib/puppet/parser/functions/camelcase.rb

@@ -3,9 +3,9 @@
 #  Please note: This function is an implementation of a Ruby class and as such may not be entirely UTF8 compatible. To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
 #
 module Puppet::Parser::Functions
-  newfunction(:camelcase, :type => :rvalue, :doc => <<-EOS
+  newfunction(:camelcase, :type => :rvalue, :doc => <<-DOC
     Converts the case of a string or all strings in an array to camel case.
-  EOS
+  DOC
              ) do |arguments|
 
     raise(Puppet::ParseError, "camelcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?