(CONT-803) Rubocop Unsafe Auto Fixes 6-7

- Style/StringConcatenation
- Style/SymbolProc

Author: david22swan

.rubocop_todo.yml

@@ -162,23 +162,3 @@ Style/MixinUsage:
 Style/OptionalBooleanParameter:
   Exclude:
     - 'spec/support/filesystem_helpers.rb'
-
-# Offense count: 14
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet/provider/vcsrepo.rb'
-    - 'lib/puppet/provider/vcsrepo/cvs.rb'
-    - 'lib/puppet/provider/vcsrepo/p4.rb'
-    - 'spec/unit/puppet/provider/vcsrepo/git_spec.rb'
-    - 'spec/unit/puppet/provider/vcsrepo/p4_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/provider/vcsrepo/dummy.rb'
-    - 'lib/puppet/provider/vcsrepo/git.rb'

lib/puppet/provider/vcsrepo.rb

@@ -56,7 +56,7 @@ def at_path # :nodoc:
   end
 
   def tempdir
-    @tempdir ||= File.join(Dir.tmpdir, 'vcsrepo-' + Digest::MD5.hexdigest(@resource.value(:path)))
+    @tempdir ||= File.join(Dir.tmpdir, "vcsrepo-#{Digest::MD5.hexdigest(@resource.value(:path))}")
   end
 
   # If the resource has a umask, then run the block with that umask; otherwise,

lib/puppet/provider/vcsrepo/cvs.rb

@@ -140,14 +140,14 @@ def update_owner
 
   def runcvs(*args)
     if @resource.value(:cvs_rsh)
-      Puppet.debug 'Using CVS_RSH = ' + @resource.value(:cvs_rsh)
+      Puppet.debug "Using CVS_RSH = #{@resource.value(:cvs_rsh)}"
       e = { CVS_RSH: @resource.value(:cvs_rsh) }
     else
       e = {}
     end
 
     if @resource.value(:user) && @resource.value(:user) != Facter['id'].value
-      Puppet.debug 'Running as user ' + @resource.value(:user)
+      Puppet.debug "Running as user #{@resource.value(:user)}"
       Puppet::Util::Execution.execute([:cvs, *args], uid: @resource.value(:user), custom_environment: e, combine: true, failonfail: true)
     else
       Puppet::Util::Execution.execute([:cvs, *args], custom_environment: e, combine: true, failonfail: true)

lib/puppet/provider/vcsrepo/dummy.rb

@@ -10,7 +10,7 @@
 
   def working_copy_exists?
     providers = begin
-      @resource.class.providers.map { |x| x.to_s }.sort.reject { |x| x == 'dummy' }.join(', ')
+      @resource.class.providers.map(&:to_s).sort.reject { |x| x == 'dummy' }.join(', ')
     rescue StandardError
       'none'
     end

lib/puppet/provider/vcsrepo/git.rb

@@ -471,7 +471,7 @@ def tag_revision?(revision = @resource.value(:revision))
 
   # @!visibility private
   def branches
-    at_path { git_with_identity('branch', '--no-color', '-a') }.tr('*', ' ').split(%r{\n}).map { |line| line.strip }
+    at_path { git_with_identity('branch', '--no-color', '-a') }.tr('*', ' ').split(%r{\n}).map(&:strip)
   end
 
   # git < 2.4 returns 'detached from'
@@ -486,7 +486,7 @@ def on_branch?
 
   # @!visibility private
   def tags
-    at_path { git_with_identity('tag', '-l') }.split(%r{\n}).map { |line| line.strip }
+    at_path { git_with_identity('tag', '-l') }.split(%r{\n}).map(&:strip)
   end
 
   # @!visibility private
@@ -595,8 +595,8 @@ def safe_directories
     begin
       d = git_with_identity(*args) || ''
       d.split('\n')
-       .reject { |v| v.empty? }
-       .map { |v| v.chomp }
+       .reject(&:empty?)
+       .map(&:chomp)
     rescue Puppet::ExecutionFailure
       []
     end

lib/puppet/provider/vcsrepo/p4.rb

@@ -28,7 +28,7 @@ def working_copy_exists?
 
     # Check if workspace is setup
     args = ['where']
-    args.push(@resource.value(:path) + '/...')
+    args.push("#{@resource.value(:path)}/...")
     hash = p4(args, raise: false)
 
     (hash['code'] != 'error')
@@ -88,7 +88,7 @@ def revision=(desired)
 
   def source
     args = ['where']
-    args.push(@resource.value(:path) + '/...')
+    args.push("#{@resource.value(:path)}/...")
     hash = p4(args, raise: false)
 
     hash['depotFile']
@@ -126,7 +126,7 @@ def client_name
     # default (generated) client name
     path = @resource.value(:path)
     host = Facter.value('hostname')
-    default = 'puppet-' + Digest::MD5.hexdigest(path + host)
+    default = "puppet-#{Digest::MD5.hexdigest(path + host)}"
 
     # check config for client name
     set_client = nil
@@ -159,11 +159,11 @@ def create_client(client)
     if source
       parts = source.split(%r{/})
       if parts && parts.length >= 4
-        source = '//' + parts[2] + '/' + parts[3]
+        source = "//#{parts[2]}/#{parts[3]}"
         streams = p4(['streams', source], raise: false)
         if streams['code'] == 'stat'
           hash['Stream'] = streams['Stream']
-          notice 'Streams' + streams['Stream'].inspect
+          notice "Streams#{streams['Stream'].inspect}"
         end
       end
     end
@@ -235,7 +235,7 @@ def p4(args, options = {})
     Open3.popen3(config, cmd_str) do |i, o, e, t|
       # Send input stream if provided
       if opts[:input]
-        Puppet.debug "input:\n" + opts[:input]
+        Puppet.debug "input:\n#{opts[:input]}"
         i.write opts[:input]
         i.close
       end

spec/unit/puppet/provider/vcsrepo/git_spec.rb

@@ -7,7 +7,7 @@ def branch_a_list(include_branch = nil?)
     <<BRANCHES
   end
   #{'*  main' unless include_branch.nil?}
-  #{'*  ' + include_branch if include_branch}
+  #{"*  #{include_branch}" if include_branch}
    remote/origin/main
    remote/origin/foo
 

spec/unit/puppet/provider/vcsrepo/p4_spec.rb

@@ -30,7 +30,7 @@
 
         expect(provider).to receive(:p4).with(['client', '-o', 'client_ws1']).and_return({})
         expect(provider).to receive(:p4).with(['client', '-i'], spec)
-        expect(provider).to receive(:p4).with(['sync', resource.value(:source) + '@' + resource.value(:revision)])
+        expect(provider).to receive(:p4).with(['sync', "#{resource.value(:source)}@#{resource.value(:revision)}"])
         provider.create
       end
     end
@@ -53,7 +53,7 @@
 
         path = resource.value(:path)
         host = Facter.value('hostname')
-        default = 'puppet-' + Digest::MD5.hexdigest(path + host)
+        default = "puppet-#{Digest::MD5.hexdigest(path + host)}"
 
         expect(provider).to receive(:p4).with(['client', '-o', default]).and_return({})
         expect(provider).to receive(:p4).with(['client', '-i'], spec)
@@ -75,15 +75,15 @@
   describe 'checking existence' do
     it 'checks for the directory' do
       expect(provider).to receive(:p4).with(['info'], marshal: false).and_return({})
-      expect(provider).to receive(:p4).with(['where', resource.value(:path) + '/...'], raise: false).and_return({})
+      expect(provider).to receive(:p4).with(['where', "#{resource.value(:path)}/..."], raise: false).and_return({})
       provider.exists?
     end
   end
 
   describe 'checking the source property' do
     it "runs 'p4 where'" do
       resource[:source] = '//public/something'
-      expect(provider).to receive(:p4).with(['where', resource.value(:path) + '/...'],
+      expect(provider).to receive(:p4).with(['where', "#{resource.value(:path)}/..."],
                                             raise: false).and_return('depotFile' => '//public/something')
       expect(provider.source).to eq(resource.value(:source))
     end