(maint) Merge up 3bf0a59 to main

Generated by CI

* commit '3bf0a595c6fb47ad7974cf564f5710762e37d06e':
  (PUP-11634) Rename Struct::{Group,Passwd} to Etc::{Group,Password}
  (PUP-11634) Call `exist?` instead of `exists?`
  (PUP-11634) Expect hash arguments instead of keywords

Author: puppetlabs-jenkins

Guardfile.example

@@ -16,7 +16,7 @@ notification(:terminal_notifier, app_name: "Puppet ::", group: `pwd`.chomp) if `
 
 ## Uncomment and set this to only include directories you want to watch
 # directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
 
 ## Note: if you are using the `directories` clause above and you are not
 ## watching the project directory ('.'), then you will want to move

acceptance/Gemfile

@@ -30,6 +30,6 @@ group(:test) do
   gem "mocha", "~> 0.10.5", :require => false
 end
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

acceptance/tests/environment/custom_type_provider_from_same_environment.rb

@@ -53,7 +53,7 @@ def destroy
             File.unlink(@resource[:name])
           end
           def exists?
-            File.exists?(@resource[:name])
+            File.exist?(@resource[:name])
           end
         end
 PROVIDER

ext/windows/service/daemon.rb

@@ -48,7 +48,7 @@ def service_main(*argsv)
     #
     # Example code to register an event source;
     # eventlogdll =  File.expand_path(File.join(basedir, 'puppet', 'ext', 'windows', 'eventlog', 'puppetres.dll'))
-    # if (File.exists?(eventlogdll))
+    # if (File.exist?(eventlogdll))
     #   Win32::EventLog.add_event_source(
     #      'source' => "Application",
     #      'key_name' => "Puppet Agent",

spec/integration/application/agent_spec.rb

@@ -527,7 +527,7 @@ def with_another_agent_running(&block)
       }
 
       # ensure file is written before yielding
-      until File.exists?(path) && File.size(path) > 0 do
+      until File.exist?(path) && File.size(path) > 0 do
         sleep 0.1
       end
 

spec/unit/application/agent_spec.rb

@@ -524,7 +524,7 @@ def run(options = {}); end
       end
 
       it "should stop the daemon" do
-        expect(@daemon).to receive(:stop).with(:exit => false)
+        expect(@daemon).to receive(:stop).with({:exit => false})
 
         expect { execute_agent }.to exit_with 0
       end

spec/unit/application/device_spec.rb

@@ -535,7 +535,7 @@
         end
 
         it "makes the Puppet::Pops::Loaders available" do
-          expect(configurer).to receive(:run).with(:network_device => true, :pluginsync => false) do
+          expect(configurer).to receive(:run).with({:network_device => true, :pluginsync => false}) do
             fail('Loaders not available') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
             true
           end.and_return(6, 2)

spec/unit/application/resource_spec.rb

@@ -122,7 +122,7 @@
       allow(@resource_app.command_line).to receive(:args).and_return(['type','name','param=temp'])
 
       expect(Puppet::Resource.indirection).to receive(:save).with(@res, 'type/name').and_return([@res, @report])
-      expect(Puppet::Resource).to receive(:new).with('type', 'name', :parameters => {'param' => 'temp'}).and_return(@res)
+      expect(Puppet::Resource).to receive(:new).with('type', 'name', {:parameters => {'param' => 'temp'}}).and_return(@res)
 
       @resource_app.main
     end

spec/unit/daemon_spec.rb

@@ -180,7 +180,7 @@ def run_loop(jobs)
 
     it "should shut down without exiting" do
       daemon.argv = %w{foo}
-      expect(daemon).to receive(:stop).with(:exit => false)
+      expect(daemon).to receive(:stop).with({:exit => false})
       daemon.reexec
     end
 

spec/unit/file_bucket/dipper_spec.rb

@@ -322,7 +322,7 @@ def make_tmp_file(contents)
         file = make_tmp_file(plaintext)
 
         expect(Puppet::FileBucket::File.indirection).to receive(:head).with(
-          %r{#{digest_algorithm}/#{checksum}}, :bucket_path => "/my/bucket"
+          %r{#{digest_algorithm}/#{checksum}}, {:bucket_path => "/my/bucket"}
         ).and_return(true)
         expect(Puppet::FileBucket::File.indirection).not_to receive(:save)
         expect(@dipper.backup(file)).to eq(checksum)