(CONT-801) Autocorrect unsafe group 3

LukasAud · LukasAud · commit 55c4aeaddfbb · 2023-05-23T16:26:07.000+01:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-05-18 13:42:01 UTC using RuboCop version 1.48.1.
+# on 2023-05-18 14:27:28 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -20,12 +20,11 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/functions/get_module_path_spec.rb'
     - 'spec/unit/facter/util/puppet_settings_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
     - 'lib/puppet/parser/functions/str2bool.rb'
-    - 'lib/puppet/provider/file_line/ruby.rb'
 
 # Offense count: 2
 # Configuration parameters: MaximumRangeSize.
@@ -55,17 +54,17 @@ Metrics/BlockLength:
 # Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Max: 14
 
 # Offense count: 8
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 35
+  Max: 33
 
 # Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 19
+  Max: 18
 
 # Offense count: 2
 # Configuration parameters: ForbiddenDelimiters.
@@ -183,70 +182,15 @@ Style/FrozenStringLiteralComment:
   Exclude:
     - 'lib/puppet_x/stdlib/toml_dumper.rb'
 
-# Offense count: 4
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: nonzero?
-Style/IfWithBooleanLiteralBranches:
-  Exclude:
-    - 'lib/facter/pe_version.rb'
-    - 'lib/puppet/parser/functions/fqdn_rotate.rb'
-    - 'lib/puppet/parser/functions/shuffle.rb'
-    - 'lib/puppet/provider/file_line/ruby.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MapToHash:
-  Exclude:
-    - 'lib/puppet/parser/functions/prefix.rb'
-    - 'lib/puppet/parser/functions/suffix.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/puppet/parser/functions/num2bool.rb'
-    - 'lib/puppet/provider/file_line/ruby.rb'
-
 # Offense count: 3
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/puppet/functions/to_json_pretty.rb'
     - 'lib/puppet_x/stdlib/toml_dumper.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/StringChars:
-  Exclude:
-    - 'lib/puppet/parser/functions/fqdn_rotate.rb'
-    - 'lib/puppet/parser/functions/shuffle.rb'
-
-# Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet_x/stdlib/toml_dumper.rb'
-    - 'spec/functions/get_module_path_spec.rb'
-
-# Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
-# AllowedMethods: define_method
-Style/SymbolProc:
-  Exclude:
-    - 'lib/puppet/functions/to_json_pretty.rb'
-    - 'lib/puppet/parser/functions/clamp.rb'
-    - 'lib/puppet/parser/functions/fqdn_uuid.rb'
-    - 'lib/puppet/parser/functions/shell_join.rb'
-    - 'lib/puppet/parser/functions/squeeze.rb'
diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb
@@ -30,11 +30,7 @@
 # Fact: is_pe
 Facter.add('is_pe') do
   setcode do
-    if Facter.value(:pe_version).to_s.empty?
-      false
-    else
-      true
-    end
+    !Facter.value(:pe_version).to_s.empty?
   end
 end
 
diff --git a/lib/puppet/functions/to_json_pretty.rb b/lib/puppet/functions/to_json_pretty.rb
@@ -61,7 +61,7 @@ def to_json_pretty(data, skip_undef = false, opts = nil)
     # It's not possible to make an abstract type that can be either a boolean
     # false or an integer, so we use -1 as the falsey value
     if opts
-      opts = opts.transform_keys { |k| k.to_sym }
+      opts = opts.transform_keys(&:to_sym)
 
       opts[:max_nesting] = false if opts[:max_nesting] == -1
     end
diff --git a/lib/puppet/parser/functions/clamp.rb b/lib/puppet/parser/functions/clamp.rb
@@ -41,6 +41,6 @@ module Puppet::Parser::Functions
 
     # convert to numeric each element
     # then sort them and get a middle value
-    args.map { |n| n.to_i }.sort[1]
+    args.map(&:to_i).sort[1]
   end
 end
diff --git a/lib/puppet/parser/functions/fqdn_rotate.rb b/lib/puppet/parser/functions/fqdn_rotate.rb
@@ -26,13 +26,13 @@
 
   result = value.clone
 
-  string = value.is_a?(String) ? true : false
+  string = value.is_a?(String)
 
   # Check whether it makes sense to rotate ...
   return result if result.size <= 1
 
   # We turn any string value into an array to be able to rotate ...
-  result = string ? result.split('') : result
+  result = string ? result.chars : result
 
   elements = result.size
 
diff --git a/lib/puppet/parser/functions/fqdn_uuid.rb b/lib/puppet/parser/functions/fqdn_uuid.rb
@@ -45,7 +45,7 @@ module Puppet::Parser::Functions
                            0x4f,
                            0xd4,
                            0x30,
-                           0xc8].map { |b| b.chr }.join
+                           0xc8].map(&:chr).join
 
     sha1 = Digest::SHA1.new
     sha1.update(uuid_name_space_dns)
diff --git a/lib/puppet/parser/functions/num2bool.rb b/lib/puppet/parser/functions/num2bool.rb
@@ -42,7 +42,7 @@ module Puppet::Parser::Functions
     number = number.to_i
 
     # Return true for any positive number and false otherwise
-    return number > 0
+    return number.positive?
   end
 end
 
diff --git a/lib/puppet/parser/functions/prefix.rb b/lib/puppet/parser/functions/prefix.rb
@@ -38,10 +38,10 @@ module Puppet::Parser::Functions
                  prefix ? prefix + i : i
                end
              else
-               enumerable.map { |k, v|
+               enumerable.to_h do |k, v|
                  k = k.to_s
                  [prefix ? prefix + k : k, v]
-               }.to_h
+               end
              end
 
     return result
diff --git a/lib/puppet/parser/functions/shell_join.rb b/lib/puppet/parser/functions/shell_join.rb
@@ -22,7 +22,7 @@ module Puppet::Parser::Functions
     raise Puppet::ParseError, "First argument is not an Array: #{array.inspect}" unless array.is_a?(Array)
 
     # explicit conversion to string is required for ruby 1.9
-    array = array.map { |item| item.to_s }
+    array = array.map(&:to_s)
     result = Shellwords.shelljoin(array)
 
     return result
diff --git a/lib/puppet/parser/functions/shuffle.rb b/lib/puppet/parser/functions/shuffle.rb
@@ -20,13 +20,13 @@ module Puppet::Parser::Functions
 
     result = value.clone
 
-    string = value.is_a?(String) ? true : false
+    string = value.is_a?(String)
 
     # Check whether it makes sense to shuffle ...
     return result if result.size <= 1
 
     # We turn any string value into an array to be able to shuffle ...
-    result = string ? result.split('') : result
+    result = string ? result.chars : result
 
     elements = result.size
 
diff --git a/lib/puppet/parser/functions/squeeze.rb b/lib/puppet/parser/functions/squeeze.rb
@@ -21,7 +21,7 @@ module Puppet::Parser::Functions
       if squeezeval
         item.map { |i| i.squeeze(squeezeval) }
       else
-        item.map { |i| i.squeeze }
+        item.map(&:squeeze)
       end
     elsif squeezeval
       item.squeeze(squeezeval)
diff --git a/lib/puppet/parser/functions/suffix.rb b/lib/puppet/parser/functions/suffix.rb
@@ -42,10 +42,10 @@ module Puppet::Parser::Functions
                  suffix ? i + suffix : i
                end
              else
-               enumerable.map { |k, v|
+               enumerable.to_h do |k, v|
                  k = k.to_s
                  [suffix ? k + suffix : k, v]
-               }.to_h
+               end
              end
 
     return result
diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
@@ -17,17 +17,15 @@ def exists?
       found = line.chomp == resource[:line]
       lines_count += 1 if found
     end
-    return found = lines_count > 0 if resource[:match].nil?
+    return found = lines_count.positive? if resource[:match].nil?
 
     match_count = count_matches(new_match_regex)
     found = if resource[:ensure] == :present
               if match_count.zero?
                 if lines_count.zero? && resource[:append_on_no_match].to_s == 'false'
                   true # lies, but gets the job done
-                elsif lines_count.zero? && resource[:append_on_no_match].to_s != 'false'
-                  false
                 else
-                  true
+                  !(lines_count.zero? && resource[:append_on_no_match].to_s != 'false')
                 end
               elsif resource[:replace_all_matches_not_matching_line].to_s == 'true'
                 false # maybe lies, but knows there's still work to do
@@ -50,7 +48,7 @@ def exists?
   end
 
   def create
-    return if resource[:replace].to_s != 'true' && count_matches(new_match_regex) > 0
+    return if resource[:replace].to_s != 'true' && count_matches(new_match_regex).positive?
 
     if resource[:match]
       handle_create_with_match
diff --git a/lib/puppet_x/stdlib/toml_dumper.rb b/lib/puppet_x/stdlib/toml_dumper.rb
@@ -103,9 +103,9 @@ def dump_table_array_pairs(table_array_pairs, prefix)
 
   def print_prefix(prefix, extra_brackets = false)
     new_prefix = prefix.join('.')
-    new_prefix = '[' + new_prefix + ']' if extra_brackets
+    new_prefix = "[#{new_prefix}]" if extra_brackets
 
-    @toml_str += "[" + new_prefix + "]\n" # rubocop:disable Style/StringLiterals
+    @toml_str += "[#{new_prefix}]\n"
   end
 
   def to_toml(obj)
@@ -130,6 +130,6 @@ def bare_key?(key)
   end
 
   def quote_key(key)
-    '"' + key.gsub('"', '\\"') + '"'
+    "\"#{key.gsub('"', '\\"')}\""
   end
 end
diff --git a/spec/functions/get_module_path_spec.rb b/spec/functions/get_module_path_spec.rb
@@ -36,7 +36,7 @@ def initialize(path)
       end
 
       it 'when the modulepath is a list' do
-        Puppet[:modulepath] = modulepath + 'tmp/something_else'
+        Puppet[:modulepath] = "#{modulepath}tmp/something_else"
 
         expect(subject).to run.with_params('foo').and_return(path_of_module_foo.path)
       end
@@ -54,7 +54,7 @@ def initialize(path)
       end
 
       it 'when the modulepath is a list' do
-        Puppet[:modulepath] = modulepath + 'tmp/something_else'
+        Puppet[:modulepath] = "#{modulepath}tmp/something_else"
         expect(subject).to run.with_params('foo').and_return(path_of_module_foo.path)
       end
     end
