(CONT-801) Autocorrect safe group 5

Author: LukasAud

.rubocop_todo.yml

@@ -223,49 +223,12 @@ Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/puppet_x/stdlib/toml_dumper.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-# AllowedMethods: ==, equal?, eql?
-Style/ClassEqualityComparison:
-  Exclude:
-    - 'lib/puppet/parser/functions/fqdn_rotate.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CollectionCompact:
   Exclude:
     - 'lib/puppet/functions/to_json_pretty.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/EachForSimpleLoop:
-  Exclude:
-    - 'spec/functions/deprecation_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/Encoding:
-  Exclude:
-    - 'spec/type_aliases/filemode_spec.rb'
-    - 'spec/type_aliases/yes_no_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
-Style/FetchEnvVar:
-  Exclude:
-    - 'lib/puppet/parser/functions/time.rb'
-
-# Offense count: 32
-# This cop supports safe autocorrection (--autocorrect).
-Style/FileWrite:
-  Exclude:
-    - 'lib/puppet/provider/file_line/ruby.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec_use_cases.rb'
-
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.

lib/puppet/parser/functions/fqdn_rotate.rb

@@ -43,7 +43,7 @@
   if Puppet::Util.respond_to?(:deterministic_rand)
     offset = Puppet::Util.deterministic_rand(seed, elements).to_i
   else
-    return offset = Random.new(seed).rand(elements) if defined?(Random) == 'constant' && Random.class == Class
+    return offset = Random.new(seed).rand(elements) if defined?(Random) == 'constant' && Random.instance_of?(Class)
 
     old_seed = srand(seed)
     offset = rand(elements)

lib/puppet/parser/functions/time.rb

@@ -35,7 +35,7 @@ module Puppet::Parser::Functions
 
     # There is probably a better way to handle Time Zone ...
     if time_zone && !time_zone.empty?
-      original_zone = ENV['TZ']
+      original_zone = ENV.fetch('TZ', nil)
 
       local_time = time.clone
       local_time = local_time.utc

lib/puppet/provider/file_line/ruby.rb

@@ -164,16 +164,12 @@ def handle_destroy_with_match
     end
 
     local_lines = lines
-    File.open(resource[:path], 'w') do |fh|
-      fh.write(local_lines.reject { |line| match_regex.match(line) }.join(''))
-    end
+    File.write(resource[:path], local_lines.reject { |line| match_regex.match(line) }.join(''))
   end
 
   def handle_destroy_line
     local_lines = lines
-    File.open(resource[:path], 'w') do |fh|
-      fh.write(local_lines.reject { |line| line.chomp == resource[:line] }.join(''))
-    end
+    File.write(resource[:path], local_lines.reject { |line| line.chomp == resource[:line] }.join(''))
   end
 
   def handle_append_line

spec/functions/deprecation_spec.rb

@@ -34,23 +34,23 @@
       else
         expect(Puppet).to receive(:warning).with(include('heelo')).once
       end
-      (0..1).each do |_i|
+      2.times do |_i|
         expect(subject).to run.with_params('key', 'heelo')
       end
     end
 
     it 'fails twice with message, with multiple calls. when strict= :error' do
       Puppet.settings[:strict] = :error
       expect(Puppet).not_to receive(:warning).with(include('heelo'))
-      (0..1).each do |_i|
+      2.times do |_i|
         expect(subject).to run.with_params('key', 'heelo').and_raise_error(RuntimeError, %r{deprecation. key. heelo})
       end
     end
 
     it 'displays nothing, despite multiple calls. strict= :off' do
       Puppet.settings[:strict] = :off
       expect(Puppet).not_to receive(:warning).with(include('heelo'))
-      (0..1).each do |_i|
+      2.times do |_i|
         expect(subject).to run.with_params('key', 'heelo')
       end
     end

spec/type_aliases/filemode_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'spec_helper'

spec/type_aliases/yes_no_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'spec_helper'

spec/unit/puppet/provider/file_line/ruby_spec.rb

@@ -28,9 +28,7 @@
   end
 
   before :each do
-    File.open(tmpfile, 'w') do |fh|
-      fh.write(content)
-    end
+    File.write(tmpfile, content)
   end
 
   describe 'line parameter' do

spec/unit/puppet/provider/file_line/ruby_spec_alter.rb

@@ -28,9 +28,7 @@
   end
 
   before :each do
-    File.open(tmpfile, 'w') do |fh|
-      fh.write(content)
-    end
+    File.write(tmpfile, content)
   end
 
   describe '#create' do
@@ -54,7 +52,7 @@
       end
 
       it 'appends the line if no matches are found' do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo2") }
+        File.write(tmpfile, "foo1\nfoo2")
         expect(provider.exists?).to be false
         provider.create
         expect(File.read(tmpfile).chomp).to eql("foo1\nfoo2\nfoo = bar")
@@ -84,23 +82,23 @@
 
     describe 'using match' do
       it 'raises an error if more than one line matches, and should not have modified the file' do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz") }
+        File.write(tmpfile, "foo1\nfoo=blah\nfoo2\nfoo=baz")
         expect { @provider.create }.to raise_error(Puppet::Error, %r{More than one line.*matches})
         expect(File.read(tmpfile)).to eql("foo1\nfoo=blah\nfoo2\nfoo=baz")
       end
 
       it 'replaces all lines that matches' do
         @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'foo = bar', match: '^foo\s*=.*$', multiple: true)
         @provider = provider_class.new(@resource)
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz") }
+        File.write(tmpfile, "foo1\nfoo=blah\nfoo2\nfoo=baz")
         @provider.create
         expect(File.read(tmpfile).chomp).to eql("foo1\nfoo = bar\nfoo2\nfoo = bar")
       end
 
       it 'replaces all lines that match, even when some lines are correct' do
         @resource = Puppet::Type::File_line.new(name: 'neil', path: tmpfile, line: "\thard\tcore\t0\n", match: '^[ \t]hard[ \t]+core[ \t]+.*', multiple: true)
         @provider = provider_class.new(@resource)
-        File.open(tmpfile, 'w') { |fh| fh.write("\thard\tcore\t90\n\thard\tcore\t0\n") }
+        File.write(tmpfile, "\thard\tcore\t90\n\thard\tcore\t0\n")
         @provider.create
         expect(File.read(tmpfile).chomp).to eql("\thard\tcore\t0\n\thard\tcore\t0")
       end
@@ -114,19 +112,19 @@
       end
 
       it 'replaces a line that matches' do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo=blah\nfoo2") }
+        File.write(tmpfile, "foo1\nfoo=blah\nfoo2")
         @provider.create
         expect(File.read(tmpfile).chomp).to eql("foo1\nfoo = bar\nfoo2")
       end
 
       it 'adds a new line if no lines match' do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo2") }
+        File.write(tmpfile, "foo1\nfoo2")
         @provider.create
         expect(File.read(tmpfile)).to eql("foo1\nfoo2\nfoo = bar\n")
       end
 
       it 'does nothing if the exact line already exists' do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo = bar\nfoo2") }
+        File.write(tmpfile, "foo1\nfoo = bar\nfoo2")
         @provider.create
         expect(File.read(tmpfile).chomp).to eql("foo1\nfoo = bar\nfoo2")
       end
@@ -136,7 +134,7 @@
       it 'replaces line' do
         @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'inserted = line', match: '^foo3$', append_on_no_match: false)
         @provider = provider_class.new(@resource)
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz") }
+        File.write(tmpfile, "foo1\nfoo = blah\nfoo2\nfoo = baz")
         expect(File.read(tmpfile).chomp).to eql("foo1\nfoo = blah\nfoo2\nfoo = baz")
       end
     end
@@ -145,7 +143,7 @@
       it 'does not add line after no matches found' do
         @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'inserted = line', match: '^foo3$', append_on_no_match: false)
         @provider = provider_class.new(@resource)
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz") }
+        File.write(tmpfile, "foo1\nfoo = blah\nfoo2\nfoo = baz")
         expect(File.read(tmpfile).chomp).to eql("foo1\nfoo = blah\nfoo2\nfoo = baz")
       end
     end
@@ -181,7 +179,7 @@
       end
 
       before :each do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo2\nfoo = baz") }
+        File.write(tmpfile, "foo1\nfoo2\nfoo = baz")
       end
 
       describe 'inserts at match' do
@@ -216,7 +214,7 @@
 
     context 'with one line matching the after expression' do
       before :each do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz") }
+        File.write(tmpfile, "foo1\nfoo = blah\nfoo2\nfoo = baz")
       end
 
       it 'inserts the specified line after the line matching the "after" expression' do
@@ -227,7 +225,7 @@
 
     context 'with multiple lines matching the after expression' do
       before :each do
-        File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo = blah\nfoo2\nfoo1\nfoo = baz") }
+        File.write(tmpfile, "foo1\nfoo = blah\nfoo2\nfoo1\nfoo = baz")
       end
 
       it 'errors out stating "One or no line must match the pattern"' do
@@ -248,7 +246,7 @@
       end
 
       before :each do
-        File.open(tmpfile, 'w') { |fh| fh.write(content) }
+        File.write(tmpfile, content)
       end
 
       it 'appends the specified line to the file' do
@@ -273,27 +271,27 @@
     end
 
     it 'removes the line if it exists' do
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2")
     end
 
     it 'removes the line without touching the last new line' do
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2\n") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2\n")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2\n")
     end
 
     it 'removes any occurence of the line' do
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2\nfoo\nfoo") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2\nfoo\nfoo")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2\n")
     end
 
     it 'example in the docs' do
       @resource = Puppet::Type::File_line.new(name: 'bashrc_proxy', ensure: 'absent', path: tmpfile, line: 'export HTTP_PROXY=http://squid.puppetlabs.vm:3128')
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo2\nexport HTTP_PROXY=http://squid.puppetlabs.vm:3128\nfoo4\n") }
+      File.write(tmpfile, "foo1\nfoo2\nexport HTTP_PROXY=http://squid.puppetlabs.vm:3128\nfoo4\n")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2\nfoo4\n")
     end
@@ -313,57 +311,57 @@
     end
 
     it 'finds a line to match' do
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       expect(@provider.exists?).to be true
     end
 
     it 'removes one line if it matches' do
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2")
     end
 
     it 'the line parameter is actually not used at all but is silently ignored if here' do
       @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'supercalifragilisticexpialidocious', ensure: 'absent', match: 'o$', match_for_absence: true)
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2")
     end
 
     it 'and may not be here and does not need to be here' do
       @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, ensure: 'absent', match: 'o$', match_for_absence: true)
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2")
     end
 
     it 'raises an error if more than one line matches' do
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2\nfoo\nfoo") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2\nfoo\nfoo")
       expect { @provider.destroy }.to raise_error(Puppet::Error, %r{More than one line})
     end
 
     it 'removes multiple lines if :multiple is true' do
       @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'foo2', ensure: 'absent', match: 'o$', multiple: true, match_for_absence: true)
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2\nfoo\nfoo") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2\nfoo\nfoo")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2\n")
     end
 
     it 'ignores the match if match_for_absence is not specified' do
       @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'foo2', ensure: 'absent', match: 'o$')
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo\n")
     end
 
     it 'ignores the match if match_for_absence is false' do
       @resource = Puppet::Type::File_line.new(name: 'foo', path: tmpfile, line: 'foo2', ensure: 'absent', match: 'o$', match_for_absence: false)
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo\nfoo2") }
+      File.write(tmpfile, "foo1\nfoo\nfoo2")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo\n")
     end
@@ -374,15 +372,15 @@
         match: '^export\ HTTP_PROXY\=', match_for_absence: true
       )
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo2\nexport HTTP_PROXY=foo\nfoo4\n") }
+      File.write(tmpfile, "foo1\nfoo2\nexport HTTP_PROXY=foo\nfoo4\n")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2\nfoo4\n")
     end
 
     it 'example in the docs showing line is redundant' do
       @resource = Puppet::Type::File_line.new(name: 'bashrc_proxy', ensure: 'absent', path: tmpfile, match: '^export\ HTTP_PROXY\=', match_for_absence: true)
       @provider = provider_class.new(@resource)
-      File.open(tmpfile, 'w') { |fh| fh.write("foo1\nfoo2\nexport HTTP_PROXY=foo\nfoo4\n") }
+      File.write(tmpfile, "foo1\nfoo2\nexport HTTP_PROXY=foo\nfoo4\n")
       @provider.destroy
       expect(File.read(tmpfile)).to eql("foo1\nfoo2\nfoo4\n")
     end

spec/unit/puppet/provider/file_line/ruby_spec_use_cases.rb

@@ -28,9 +28,7 @@
   end
 
   before :each do
-    File.open(tmpfile, 'w') do |fh|
-      fh.write(content)
-    end
+    File.write(tmpfile, content)
   end
 
   describe 'customer use cases - no lines' do