(PUP-11993) Style/RedundantInterpolation

This commit enables the Style/RedundantInterpolation cop and fixes
35 (unsafe) autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -652,10 +652,6 @@ Style/OptionalBooleanParameter:
 Style/PreferredHashMethods:
   Enabled: false
 
-# This cop supports unsafe auto-correction (--auto-correct-all).
-Style/RedundantInterpolation:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:

lib/puppet/application.rb

@@ -184,7 +184,7 @@ def option(*options, &block)
         define_method(fname, &block)
       else
         define_method(fname) do |value|
-          self.options["#{long}".to_sym] = value
+          self.options[long.to_s.to_sym] = value
         end
       end
       self.option_parser_commands << [options, fname]
@@ -330,7 +330,7 @@ def clear_everything_for_tests
   # See also `lib/puppet/util/command_line.rb` for some special case early
   # handling of this.
   option("--version", "-V") do |_arg|
-    puts "#{Puppet.version}"
+    puts Puppet.version
     exit(0)
   end
 

lib/puppet/external/dot.rb

@@ -165,7 +165,7 @@ def initialize(params = {})
     end
 
     def to_s
-      (@name && @name != "" ? "<#{@name}>" : "") + "#{@label}"
+      (@name && @name != "" ? "<#{@name}>" : "") + @label.to_s
     end
   end
 

lib/puppet/face/module/changes.rb

@@ -39,7 +39,7 @@
         Puppet.warning _("%{count} files modified") % { count: return_value.size }
       end
       return_value.map do |changed_file|
-        "#{changed_file}"
+        changed_file.to_s
       end.join("\n")
     end
   end

lib/puppet/http/proxy.rb

@@ -60,7 +60,7 @@ def self.no_proxy?(dest)
         dest_string     = "#{dest.host}:#{dest.port}"
       else
         no_proxy_regex  = /#{host}$/
-        dest_string     = "#{dest.host}"
+        dest_string     = dest.host.to_s
       end
 
       if no_proxy_regex.match(dest_string)

lib/puppet/module_tool/applications/installer.rb

@@ -378,7 +378,7 @@ def resolve_install_conflicts(graph, is_dependency = false)
               :version => release[:version][:vstring]
             }
             dependency = is_dependency ? dependency_info : nil
-            all_versions = @versions["#{@module_name}"].sort_by { |h| h[:semver] }
+            all_versions = @versions[@module_name.to_s].sort_by { |h| h[:semver] }
             versions = all_versions.select { |x| x[:semver].special == '' }
             versions = all_versions if versions.empty?
             latest_version = versions.last[:vstring]

lib/puppet/module_tool/errors/base.rb

@@ -10,7 +10,7 @@ def vstring
       if @action == :upgrade
         "#{v(@installed_version)} -> #{v(@requested_version)}"
       else
-        "#{v(@installed_version || @requested_version)}"
+        v(@installed_version || @requested_version).to_s
       end
     end
   end

lib/puppet/module_tool/shared_behaviors.rb

@@ -100,7 +100,7 @@ def resolve_constraints(dependencies, source = [{ :name => :you }], seen = {}, a
         next if range === seen[mod][:semver]
 
         req_module   = @module_name
-        req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
+        req_versions = @versions[@module_name.to_s].map { |v| v[:semver] }
         raise InvalidDependencyCycleError,
               :module_name => mod,
               :source => (source + [{ :name => mod, :version => source.last[:dependency] }]),
@@ -121,14 +121,14 @@ def resolve_constraints(dependencies, source = [{ :name => :you }], seen = {}, a
         @conditions.each { |_, conds| conds.delete_if { |c| c[:module] == mod } }
       end
 
-      versions = @versions["#{mod}"].select { |h| range === h[:semver] }
+      versions = @versions[mod.to_s].select { |h| range === h[:semver] }
       valid_versions = versions.select { |x| x[:semver].special == '' }
       valid_versions = versions if valid_versions.empty?
 
       version = valid_versions.last
       unless version
         req_module   = @module_name
-        req_versions = @versions["#{@module_name}"].map { |v| v[:semver] }
+        req_versions = @versions[@module_name.to_s].map { |v| v[:semver] }
         raise NoVersionsSatisfyError,
               :requested_name => req_module,
               :requested_version => @version || annotated_version(req_module, req_versions),

lib/puppet/network/formats.rb

@@ -222,7 +222,7 @@ def flatten_array(array)
           a["#{i}.#{el_k}"] = el_v
         end
       else
-        a["#{i}"] = el
+        a[i.to_s] = el
       end
     end
     a

lib/puppet/pops/serialization/abstract_writer.rb

@@ -213,7 +213,7 @@ def register_types
   end
 
   def to_s
-    "#{self.class.name}"
+    self.class.name.to_s
   end
 
   def inspect