Merge pull request #9227 from tvpartytonight/PUP-11767

(PUP-11767) Add Style Cops

Author: tvpartytonight

.rubocop.yml

@@ -199,3 +199,12 @@ RSpec/FactoryBot/SyntaxMethods: # new in 2.7
 
 RSpec/Rails/AvoidSetupHook: # new in 2.4
   Enabled: true
+
+Style/AutoResourceCleanup:
+  Enabled: true
+
+Style/CaseEquality:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true

lib/hiera/scope.rb

@@ -20,11 +20,12 @@ def initialize(real)
     end
 
     def [](key)
-      if key == CALLING_CLASS
+      case key
+      when CALLING_CLASS
         ans = find_hostclass(@real)
-      elsif key == CALLING_CLASS_PATH
+      when CALLING_CLASS_PATH
         ans = find_hostclass(@real).gsub(/::/, '/')
-      elsif key == CALLING_MODULE
+      when CALLING_MODULE
         ans = safe_lookupvar(MODULE_NAME)
       else
         ans = safe_lookupvar(key)

lib/puppet/etc.rb

@@ -165,10 +165,11 @@ def override_field_values_to_utf8(struct)
 
       new_struct = struct.is_a?(Etc::Passwd) ? puppet_etc_passwd_class.new : puppet_etc_group_class.new
       struct.each_pair do |member, value|
-        if value.is_a?(String)
+        case value
+        when String
           new_struct["canonical_#{member}".to_sym] = value.dup
           new_struct[member] = Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value).scrub
-        elsif value.is_a?(Array)
+        when Array
           new_struct["canonical_#{member}".to_sym] = value.inject([]) { |acc, elem| acc << elem.dup }
           new_struct[member] = value.inject([]) do |acc, elem|
             acc << Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(elem).scrub

lib/puppet/face/epp.rb

@@ -406,9 +406,10 @@ def get_values(compiler, options)
     values_file = options[:values_file]
     if values_file
       begin
-        if values_file =~ /\.yaml$/
+        case values_file
+        when /\.yaml$/
           template_values = Puppet::Util::Yaml.safe_load_file(values_file, [Symbol])
-        elsif values_file =~ /\.pp$/
+        when /\.pp$/
           evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
           template_values = evaluating_parser.evaluate_file(compiler.topscope, values_file)
         else

lib/puppet/face/module/install.rb

@@ -131,10 +131,11 @@
     end
 
     when_rendering :console do |return_value, name, _options|
-      if return_value[:result] == :noop
+      case return_value[:result]
+      when :noop
         Puppet.notice _("Module %{name} %{version} is already installed.") % { name: name, version: return_value[:version] }
         exit 0
-      elsif return_value[:result] == :failure
+      when :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else

lib/puppet/face/module/upgrade.rb

@@ -71,10 +71,11 @@
     end
 
     when_rendering :console do |return_value|
-      if return_value[:result] == :noop
+      case return_value[:result]
+      when :noop
         Puppet.notice return_value[:error][:multiline]
         exit 0
-      elsif return_value[:result] == :failure
+      when :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else

lib/puppet/functions/abs.rb

@@ -52,9 +52,10 @@ def on_string(x)
     # These patterns for conversion are backwards compatible with the stdlib
     # version of this function.
     #
-    if x =~ %r{^-?(?:\d+)(?:\.\d+){1}$}
+    case x
+    when %r{^-?(?:\d+)(?:\.\d+){1}$}
       x.to_f.abs
-    elsif x =~ %r{^-?\d+$}
+    when %r{^-?\d+$}
       x.to_i.abs
     else
       raise(ArgumentError, 'abs(): Requires float or integer to work with - was given non decimal string')

lib/puppet/indirector/catalog/compiler.rb

@@ -116,11 +116,12 @@ def require_environment?
   # @return [Puppet::Node::Facts] facts object deserialized from supplied string
   # @api private
   def convert_wire_facts(facts, format)
-    if format == 'pson'
+    case format
+    when 'pson'
       # We unescape here because the corresponding code in Puppet::Configurer::FactHandler encodes with Puppet::Util.uri_query_encode
       # PSON is deprecated, but continue to accept from older agents
       return Puppet::Node::Facts.convert_from('pson', CGI.unescape(facts))
-    elsif format == 'application/json'
+    when 'application/json'
       return Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
     else
       raise ArgumentError, _("Unsupported facts format")

lib/puppet/network/formats.rb

@@ -193,11 +193,12 @@ def render_multiple(data)
                                       :weight => 0) do
   def flatten_hash(hash)
     hash.each_with_object({}) do |(k, v), h|
-      if v.is_a? Hash
+      case v
+      when Hash
         flatten_hash(v).map do |h_k, h_v|
           h["#{k}.#{h_k}"] = h_v
         end
-      elsif v.is_a? Array
+      when Array
         v.each_with_index do |el, i|
           if el.is_a? Hash
             flatten_hash(el).map do |el_k, el_v|
@@ -240,10 +241,11 @@ def render(datum)
     return datum if datum.is_a?(String) || datum.is_a?(Numeric)
 
     # Simple hash
-    if datum.is_a?(Hash)
+    case datum
+    when Hash
       data = flatten_hash(datum)
       return construct_output(data)
-    elsif datum.is_a?(Array)
+    when Array
       data = flatten_array(datum)
       return construct_output(data)
     end

lib/puppet/node/facts.rb

@@ -138,16 +138,14 @@ def quote_special_strings(fact_hash)
   end
 
   def sanitize_fact(fact)
-    if fact.is_a? Hash then
+    case fact
+    when Hash
       ret = {}
       fact.each_pair { |k, v| ret[sanitize_fact k] = sanitize_fact v }
       ret
-    elsif fact.is_a? Array then
+    when Array
       fact.collect { |i| sanitize_fact i }
-    elsif fact.is_a? Numeric \
-      or fact.is_a? TrueClass \
-      or fact.is_a? FalseClass \
-      or fact.is_a? String
+    when Numeric, TrueClass, FalseClass, String
       fact
     else
       result = fact.to_s