Merge pull request #9233 from tvpartytonight/PUP-11767

(PUP-11767) Enable more rubocop styles

Author: joshcooper

.rubocop.yml

@@ -232,3 +232,42 @@ Style/ColonMethodDefinition:
 
 Style/DefWithParentheses:
   Enabled: true
+
+Style/Dir:
+  Enabled: true
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+
+Style/DoubleCopDisableDirective:
+  Enabled: true
+
+Style/EachForSimpleLoop:
+  Enabled: true
+
+Style/EachWithObject:
+  Enabled: true
+
+Style/EmptyBlockParameter:
+  Enabled: true
+
+Style/EmptyCaseCondition:
+  Enabled: true
+
+Style/EmptyLambdaParameter:
+  Enabled: true
+
+Style/EmptyLiteral:
+  Enabled: true
+
+Style/EvalWithLocation:
+  Enabled: true
+
+Style/EvenOdd:
+  Enabled: true
+
+Style/ExpandPathArguments:
+  Enabled: true
+
+Style/FetchEnvVar:
+  Enabled: true

ext/windows/service/daemon.rb

@@ -18,7 +18,7 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
   @run_thread = nil
   @LOG_TO_FILE = false
   @loglevel = 0
-  LOG_FILE =  File.expand_path(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
+  LOG_FILE =  File.expand_path(File.join(ENV.fetch('ALLUSERSPROFILE', nil), 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
   LEVELS.each do |level|
     define_method("log_#{level}") do |msg|
@@ -203,10 +203,10 @@ def load_env(base_dir)
       ENV['Path'] = [
         File.join(base_dir, 'puppet', 'bin'),
         File.join(base_dir, 'bin'),
-      ].join(';').tr('/', '\\') + ';' + ENV['Path']
+      ].join(';').tr('/', '\\') + ';' + ENV.fetch('Path', nil)
 
       # ENV that uses forward slashes
-      ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet', 'lib')};#{ENV['RUBYLIB']}"
+      ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet', 'lib')};#{ENV.fetch('RUBYLIB', nil)}"
     rescue => e
       log_exception(e)
     end

lib/puppet/application/resource.rb

@@ -188,7 +188,7 @@ def handle_editing(text)
       tmpfile.puts text
 
       # edit the content
-      system(ENV["EDITOR"] || 'vi', tmpfile.path)
+      system(ENV.fetch("EDITOR", nil) || 'vi', tmpfile.path)
 
       # ...and, now, pass that file to puppet to apply.  Because
       # many editors rename or replace the original file we need to

lib/puppet/confine/exists.rb

@@ -16,6 +16,6 @@ def message(value)
   end
 
   def summary
-    result.zip(values).inject([]) { |array, args| val, f = args; array << f unless val; array }
+    result.zip(values).each_with_object([]) { |args, array| val, f = args; array << f unless val; }
   end
 end

lib/puppet/confine/variable.rb

@@ -12,7 +12,7 @@ class Puppet::Confine::Variable < Puppet::Confine
   # Only returns failed values, not all required values.
   def self.summarize(confines)
     result = Hash.new { |hash, key| hash[key] = [] }
-    confines.inject(result) { |total, confine| total[confine.name] += confine.values unless confine.valid?; total }
+    confines.each_with_object(result) { |confine, total| total[confine.name] += confine.values unless confine.valid?; }
   end
 
   # This is set by ConfineCollection.

lib/puppet/defaults.rb

@@ -49,7 +49,7 @@ def self.default_cadir
   def self.default_basemodulepath
     if Puppet::Util::Platform.windows?
       path = ['$codedir/modules']
-      installdir = ENV["FACTER_env_windows_installdir"]
+      installdir = ENV.fetch("FACTER_env_windows_installdir", nil)
       if installdir
         path << "#{installdir}/puppet/modules"
       end
@@ -61,7 +61,7 @@ def self.default_basemodulepath
 
   def self.default_vendormoduledir
     if Puppet::Util::Platform.windows?
-      installdir = ENV["FACTER_env_windows_installdir"]
+      installdir = ENV.fetch("FACTER_env_windows_installdir", nil)
       if installdir
         "#{installdir}\\puppet\\vendor_modules"
       else
@@ -373,7 +373,7 @@ def self.initialize_default_settings!(settings)
           Puppet::Util::Platform.default_paths.each do |path|
             next if paths.include?(path)
 
-            ENV['PATH'] = ENV['PATH'] + File::PATH_SEPARATOR + path
+            ENV['PATH'] = ENV.fetch('PATH', nil) + File::PATH_SEPARATOR + path
           end
           value
         end

lib/puppet/face/epp.rb

@@ -180,14 +180,13 @@
           raise Puppet::Error, _("No input to parse given on command line or stdin")
         end
       else
-        templates, missing_files = args.reduce([[], []]) do |memo, file|
+        templates, missing_files = args.each_with_object([[], []]) do |file, memo|
           template_file = effective_template(file, compiler.environment)
           if template_file.nil?
             memo[1] << file
           else
             memo[0] << template_file
           end
-          memo
         end
 
         show_filename = templates.count > 1

lib/puppet/face/module/list.rb

@@ -119,9 +119,8 @@ def unmet_dependencies(environment)
     # Prepare the unmet dependencies for display on the console.
     environment.modules.sort_by { |mod| mod.name }.each do |mod|
       unmet_grouped = Hash.new { |h, k| h[k] = [] }
-      unmet_grouped = mod.unmet_dependencies.inject(unmet_grouped) do |acc, dep|
+      unmet_grouped = mod.unmet_dependencies.each_with_object(unmet_grouped) do |dep, acc|
         acc[dep[:reason]] << dep
-        acc
       end
       unmet_grouped.each do |type, deps|
         unless deps.empty?

lib/puppet/file_system/uniquefile.rb

@@ -153,7 +153,7 @@ def try_convert_to_hash(h)
 
   def tmpdir
     tmp = '.'
-    for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp']
+    for dir in [ENV.fetch('TMPDIR', nil), ENV.fetch('TMP', nil), ENV.fetch('TEMP', nil), @@systmpdir, '/tmp']
       stat = File.stat(dir) if dir
       if stat && stat.directory? && stat.writable?
         tmp = dir

lib/puppet/http/dns.rb

@@ -146,10 +146,9 @@ def expired?(service_name)
     # @yields [[Resolv::DNS::Resource::IN::SRV]] a group of records of
     #         the same priority
     def each_priority(records)
-      pri_hash = records.inject({}) do |groups, element|
+      pri_hash = records.each_with_object({}) do |element, groups|
         groups[element.priority] ||= []
         groups[element.priority] << element
-        groups
       end
 
       pri_hash.keys.sort.each do |key|