puppet 6.0.10 → 6.1.0

data/spec/unit/util/windows/sid_spec.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'spec_helper'
 
 describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
@@ -71,12 +72,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
     end
 
     it "should return a SID for a passed user or group name" do
-      expect(subject).to receive(:name_to_principal).with('testers').and_return(double(:sid => 'S-1-5-32-547'))
+      subject.expects(:name_to_principal).with('testers').returns stub(:sid => 'S-1-5-32-547')
       expect(subject.name_to_sid('testers')).to eq('S-1-5-32-547')
     end
 
     it "should return a SID for a passed fully-qualified user or group name" do
-      expect(subject).to receive(:name_to_principal).with('MACHINE\testers').and_return(double(:sid => 'S-1-5-32-547'))
+      subject.expects(:name_to_principal).with('MACHINE\testers').returns stub(:sid => 'S-1-5-32-547')
       expect(subject.name_to_sid('MACHINE\testers')).to eq('S-1-5-32-547')
     end
 
@@ -99,6 +100,7 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
     end
 
     describe "with non-US languages" do
+
       UMLAUT = [195, 164].pack('c*').force_encoding(Encoding::UTF_8)
       let(:username) { SecureRandom.uuid.to_s.gsub(/\-/, '')[0..13] + UMLAUT }
 
@@ -163,20 +165,20 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
   context "#ads_to_principal" do
     it "should raise an error for non-WIN32OLE input" do
       expect {
-        subject.ads_to_principal(double('WIN32OLE', { :Name => 'foo' }))
+        subject.ads_to_principal(stub('WIN32OLE', { :Name => 'foo' }))
       }.to raise_error(Puppet::Error, /ads_object must be an IAdsUser or IAdsGroup instance/)
     end
 
     it "should raise an error for an empty byte array in the objectSID property" do
       expect {
-        subject.ads_to_principal(double('WIN32OLE', { :objectSID => [], :Name => '', :ole_respond_to? => true }))
+        subject.ads_to_principal(stub('WIN32OLE', { :objectSID => [], :Name => '', :ole_respond_to? => true }))
       }.to raise_error(Puppet::Error, /Octet string must be an array of bytes/)
     end
 
     it "should raise an error for a malformed byte array" do
       expect {
         invalid_octet = [2]
-        subject.ads_to_principal(double('WIN32OLE', { :objectSID => invalid_octet, :Name => '', :ole_respond_to? => true }))
+        subject.ads_to_principal(stub('WIN32OLE', { :objectSID => invalid_octet, :Name => '', :ole_respond_to? => true }))
       }.to raise_error do |error|
         expect(error).to be_a(Puppet::Util::Windows::Error)
         expect(error.code).to eq(87) # ERROR_INVALID_PARAMETER
@@ -187,7 +189,7 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       expect {
         # S-1-1-1 is a valid SID that will not resolve
         valid_octet_invalid_user = [1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0]
-        subject.ads_to_principal(double('WIN32OLE', { :objectSID => valid_octet_invalid_user, :Name => unknown_name, :ole_respond_to? => true }))
+        subject.ads_to_principal(stub('WIN32OLE', { :objectSID => valid_octet_invalid_user, :Name => unknown_name, :ole_respond_to? => true }))
       }.to raise_error do |error|
         expect(error).to be_a(Puppet::Error)
         expect(error.cause.code).to eq(1332) # ERROR_NONE_MAPPED
@@ -197,7 +199,7 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
     it "should return a Principal object even when the SID is unresolvable, as long as the Name matches" do
       # S-1-1-1 is a valid SID that will not resolve
       valid_octet_invalid_user = [1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0]
-      unresolvable_user = double('WIN32OLE', { :objectSID => valid_octet_invalid_user, :Name => 'S-1-1-1', :ole_respond_to? => true })
+      unresolvable_user = stub('WIN32OLE', { :objectSID => valid_octet_invalid_user, :Name => 'S-1-1-1', :ole_respond_to? => true })
       principal = subject.ads_to_principal(unresolvable_user)
 
       expect(principal).to be_an_instance_of(Puppet::Util::Windows::SID::Principal)
@@ -211,13 +213,13 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
 
     it "should return a Puppet::Util::Windows::SID::Principal instance for any valid sid" do
       system_bytes = [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0]
-      adsuser = double('WIN32OLE', { :objectSID => system_bytes, :Name => 'SYSTEM', :ole_respond_to? => true })
+      adsuser = stub('WIN32OLE', { :objectSID => system_bytes, :Name => 'SYSTEM', :ole_respond_to? => true })
       expect(subject.ads_to_principal(adsuser)).to be_an_instance_of(Puppet::Util::Windows::SID::Principal)
     end
 
     it "should properly convert an array of bytes for a well-known non-localized SID, ignoring the Name from the WIN32OLE object" do
       bytes = [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-      adsuser = double('WIN32OLE', { :objectSID => bytes, :Name => unknown_name, :ole_respond_to? => true })
+      adsuser = stub('WIN32OLE', { :objectSID => bytes, :Name => unknown_name, :ole_respond_to? => true })
       converted = subject.ads_to_principal(adsuser)
 
       expect(converted).to be_an_instance_of Puppet::Util::Windows::SID::Principal
@@ -286,8 +288,8 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
     end
 
     it "should raise if the conversion fails" do
-      expect(subject).to receive(:string_to_sid_ptr).with(sid).
-        and_raise(Puppet::Util::Windows::Error.new("Failed to convert string SID: #{sid}", Puppet::Util::Windows::Error::ERROR_ACCESS_DENIED))
+      subject.expects(:string_to_sid_ptr).with(sid).
+        raises(Puppet::Util::Windows::Error.new("Failed to convert string SID: #{sid}", Puppet::Util::Windows::Error::ERROR_ACCESS_DENIED))
 
       expect {
         subject.string_to_sid_ptr(sid) {|ptr| }

data/spec/unit/util/windows/string_spec.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+#!/usr/bin/env ruby
 
 require 'spec_helper'
 require 'puppet/util/windows'

data/spec/unit/util_spec.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'spec_helper'
 
 describe Puppet::Util do
@@ -97,6 +99,7 @@ describe Puppet::Util do
   end
 
   describe "#withenv on Windows", :if => Puppet::Util::Platform.windows? do
+
     let(:process) { Puppet::Util::Windows::Process }
 
     it "should ignore case" do
@@ -120,6 +123,7 @@ describe Puppet::Util do
       end
     end
 
+
     def withenv_utf8(&block)
       env_var_name = SecureRandom.uuid
       utf_8_bytes = [225, 154, 160] # rune ᚠ
@@ -315,8 +319,8 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(true)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+        Puppet.features.stubs(:posix).returns true
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       %w[/ /foo /foo/../bar].each do |path|
@@ -328,8 +332,8 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(false)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
+        Puppet.features.stubs(:posix).returns false
+        Puppet::Util::Platform.stubs(:windows?).returns true
       end
 
       it "should normalize backslashes" do
@@ -462,8 +466,8 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(true)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+        Puppet.features.stubs(:posix).returns true
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       %w[/ /foo /foo/../bar].each do |path|
@@ -501,8 +505,8 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(false)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
+        Puppet.features.stubs(:posix).returns false
+        Puppet::Util::Platform.stubs(:windows?).returns true
       end
 
       it "should url encode \\ as %5C, but not replace : as %3F" do
@@ -594,14 +598,14 @@ describe Puppet::Util do
 
     before :each do
       # Most of the things this method does are bad to do during specs. :/
-      allow(Kernel).to receive(:fork).and_return(pid).and_yield
+      Kernel.stubs(:fork).returns(pid).yields
 
-      allow($stdin).to receive(:reopen)
-      allow($stdout).to receive(:reopen)
-      allow($stderr).to receive(:reopen)
+      $stdin.stubs(:reopen)
+      $stdout.stubs(:reopen)
+      $stderr.stubs(:reopen)
 
       # ensure that we don't really close anything!
-      allow(IO).to receive(:new)
+      (0..256).each {|n| IO.stubs(:new) }
     end
 
     it "should close all open file descriptors except stdin/stdout/stderr when /proc/self/fd exists" do
@@ -612,32 +616,28 @@ describe Puppet::Util do
         if fd == '.' || fd == '..'
           next
         elsif ['0', '1', '2'].include? fd
-          expect(IO).not_to receive(:new).with(fd.to_i)
+          IO.expects(:new).with(fd.to_i).never
         else
-          expect(IO).to receive(:new).with(fd.to_i).and_return(double('io', close: nil))
+          IO.expects(:new).with(fd.to_i).returns mock('io', :close)
         end
       end
 
-      dir_expectation = receive(:foreach).with('/proc/self/fd')
-      fds.each do |fd|
-        dir_expectation = dir_expectation.and_yield(fd)
-      end
-      allow(Dir).to dir_expectation
+      Dir.stubs(:foreach).with('/proc/self/fd').multiple_yields(*fds)
       Puppet::Util.safe_posix_fork
     end
 
     it "should close all open file descriptors except stdin/stdout/stderr when /proc/self/fd doesn't exists" do
       # This is ugly, but I can't really think of a better way to do it without
       # letting it actually close fds, which seems risky
-      (0..2).each {|n| expect(IO).not_to receive(:new).with(n)}
-      (3..256).each {|n| expect(IO).to receive(:new).with(n).and_return(double('io', close: nil))  }
-      allow(Dir).to receive(:foreach).with('/proc/self/fd').and_raise(Errno::ENOENT)
+      (0..2).each {|n| IO.expects(:new).with(n).never}
+      (3..256).each { |n| IO.expects(:new).with(n).returns mock('io', :close)  }
+      Dir.stubs(:foreach).with('/proc/self/fd') { raise Errno::ENOENT }
 
       Puppet::Util.safe_posix_fork
     end
 
     it "should fork a child process to execute the block" do
-      expect(Kernel).to receive(:fork).and_return(pid).and_yield
+      Kernel.expects(:fork).returns(pid).yields
 
       Puppet::Util.safe_posix_fork do
         "Fork this!"
@@ -654,11 +654,11 @@ describe Puppet::Util do
     let(:path) { File.join(base, 'foo') }
 
     before :each do
-      allow(FileTest).to receive(:file?).and_return(false)
-      allow(FileTest).to receive(:file?).with(path).and_return(true)
+      FileTest.stubs(:file?).returns false
+      FileTest.stubs(:file?).with(path).returns true
 
-      allow(FileTest).to receive(:executable?).and_return(false)
-      allow(FileTest).to receive(:executable?).with(path).and_return(true)
+      FileTest.stubs(:executable?).returns false
+      FileTest.stubs(:executable?).with(path).returns true
     end
 
     it "should accept absolute paths" do
@@ -675,8 +675,8 @@ describe Puppet::Util do
       env = {:HOME => nil, :PATH => env_path}
       env.merge!({:HOMEDRIVE => nil, :USERPROFILE => nil}) if Puppet::Util::Platform.windows?
 
-      expect(Puppet::Util::Warnings).to receive(:warnonce).once
       Puppet::Util.withenv(env) do
+        Puppet::Util::Warnings.expects(:warnonce).once
         Puppet::Util.which('foo')
       end
     end
@@ -698,13 +698,13 @@ describe Puppet::Util do
 
     describe "on POSIX systems" do
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(true)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+        Puppet.features.stubs(:posix?).returns true
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       it "should walk the search PATH returning the first executable" do
-        allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(File.expand_path('/bin'))
-        allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(nil)
+        Puppet::Util.stubs(:get_env).with('PATH').returns(File.expand_path('/bin'))
+        Puppet::Util.stubs(:get_env).with('PATHEXT').returns(nil)
 
         expect(Puppet::Util.which('foo')).to eq(path)
       end
@@ -714,16 +714,16 @@ describe Puppet::Util do
       let(:path) { File.expand_path(File.join(base, 'foo.CMD')) }
 
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(false)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
+        Puppet.features.stubs(:posix?).returns false
+        Puppet::Util::Platform.stubs(:windows?).returns true
       end
 
       describe "when a file extension is specified" do
         it "should walk each directory in PATH ignoring PATHEXT" do
-          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(%w[/bar /bin].map{|dir| File.expand_path(dir)}.join(File::PATH_SEPARATOR))
-          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return('.FOOBAR')
+          Puppet::Util.stubs(:get_env).with('PATH').returns(%w[/bar /bin].map{|dir| File.expand_path(dir)}.join(File::PATH_SEPARATOR))
+          Puppet::Util.stubs(:get_env).with('PATHEXT').returns('.FOOBAR')
 
-          expect(FileTest).to receive(:file?).with(File.join(File.expand_path('/bar'), 'foo.CMD')).and_return(false)
+          FileTest.expects(:file?).with(File.join(File.expand_path('/bar'), 'foo.CMD')).returns false
 
           expect(Puppet::Util.which('foo.CMD')).to eq(path)
         end
@@ -732,36 +732,38 @@ describe Puppet::Util do
       describe "when a file extension is not specified" do
         it "should walk each extension in PATHEXT until an executable is found" do
           bar = File.expand_path('/bar')
-          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return("#{bar}#{File::PATH_SEPARATOR}#{base}")
-          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(".EXE#{File::PATH_SEPARATOR}.CMD")
+          Puppet::Util.stubs(:get_env).with('PATH').returns("#{bar}#{File::PATH_SEPARATOR}#{base}")
+          Puppet::Util.stubs(:get_env).with('PATHEXT').returns(".EXE#{File::PATH_SEPARATOR}.CMD")
 
-          expect(FileTest).to receive(:file?).ordered().with(File.join(bar, 'foo.EXE')).and_return(false)
-          expect(FileTest).to receive(:file?).ordered().with(File.join(bar, 'foo.CMD')).and_return(false)
-          expect(FileTest).to receive(:file?).ordered().with(File.join(base, 'foo.EXE')).and_return(false)
-          expect(FileTest).to receive(:file?).ordered().with(path).and_return(true)
+          exts = sequence('extensions')
+          FileTest.expects(:file?).in_sequence(exts).with(File.join(bar, 'foo.EXE')).returns false
+          FileTest.expects(:file?).in_sequence(exts).with(File.join(bar, 'foo.CMD')).returns false
+          FileTest.expects(:file?).in_sequence(exts).with(File.join(base, 'foo.EXE')).returns false
+          FileTest.expects(:file?).in_sequence(exts).with(path).returns true
 
           expect(Puppet::Util.which('foo')).to eq(path)
         end
 
         it "should walk the default extension path if the environment variable is not defined" do
-          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(base)
-          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(nil)
+          Puppet::Util.stubs(:get_env).with('PATH').returns(base)
+          Puppet::Util.stubs(:get_env).with('PATHEXT').returns(nil)
 
+          exts = sequence('extensions')
           %w[.COM .EXE .BAT].each do |ext|
-            expect(FileTest).to receive(:file?).ordered().with(File.join(base, "foo#{ext}")).and_return(false)
+            FileTest.expects(:file?).in_sequence(exts).with(File.join(base, "foo#{ext}")).returns false
           end
-          expect(FileTest).to receive(:file?).ordered().with(path).and_return(true)
+          FileTest.expects(:file?).in_sequence(exts).with(path).returns true
 
           expect(Puppet::Util.which('foo')).to eq(path)
         end
 
         it "should fall back if no extension matches" do
-          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(base)
-          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(".EXE")
+          Puppet::Util.stubs(:get_env).with('PATH').returns(base)
+          Puppet::Util.stubs(:get_env).with('PATHEXT').returns(".EXE")
 
-          allow(FileTest).to receive(:file?).with(File.join(base, 'foo.EXE')).and_return(false)
-          allow(FileTest).to receive(:file?).with(File.join(base, 'foo')).and_return(true)
-          allow(FileTest).to receive(:executable?).with(File.join(base, 'foo')).and_return(true)
+          FileTest.stubs(:file?).with(File.join(base, 'foo.EXE')).returns false
+          FileTest.stubs(:file?).with(File.join(base, 'foo')).returns true
+          FileTest.stubs(:executable?).with(File.join(base, 'foo')).returns true
 
           expect(Puppet::Util.which('foo')).to eq(File.join(base, 'foo'))
         end
@@ -783,7 +785,6 @@ describe Puppet::Util do
 
   context "#replace_file" do
     subject { Puppet::Util }
-
     it { is_expected.to respond_to :replace_file }
 
     let :target do
@@ -854,7 +855,7 @@ describe Puppet::Util do
       subject.replace_file(temp_path, 0440) do |fh|
         fh.puts('some text in there')
       end
-
+      
       expect(File.read(temp_path)).to eq("some text in there\n")
       expect(get_mode(temp_path)).to eq(0440)
     end
@@ -931,6 +932,7 @@ describe Puppet::Util do
   end
 
   describe "#deterministic_rand" do
+
     it "should not fiddle with future rand calls" do
       Puppet::Util.deterministic_rand(123,20)
       rand_one = rand()

data/spec/unit/version_spec.rb

@@ -18,13 +18,12 @@ describe "Puppet.version Public API" do
 
   context "without a VERSION file" do
     before :each do
-      allow(Puppet).to receive(:read_version_file).and_return(nil)
+      Puppet.stubs(:read_version_file).returns(nil)
     end
 
     it "is Puppet::PUPPETVERSION" do
       expect(Puppet.version).to eq(Puppet::PUPPETVERSION)
     end
-
     it "respects the version= setter" do
       Puppet.version = '1.2.3'
       expect(Puppet.version).to eq('1.2.3')
@@ -34,15 +33,14 @@ describe "Puppet.version Public API" do
 
   context "with a VERSION file" do
     it "is the content of the file" do
-      expect(Puppet).to receive(:read_version_file) do |path|
+      Puppet.expects(:read_version_file).with() do |path|
         pathname = Pathname.new(path)
         pathname.basename.to_s == "VERSION"
-      end.and_return('3.0.1-260-g9ca4e54')
+      end.returns('3.0.1-260-g9ca4e54')
 
       expect(Puppet.version).to eq('3.0.1-260-g9ca4e54')
       expect(Puppet.minor_version).to eq('3.0')
     end
-
     it "respects the version= setter" do
       Puppet.version = '1.2.3'
       expect(Puppet.version).to eq('1.2.3')
@@ -52,10 +50,12 @@ describe "Puppet.version Public API" do
 
   context "Using version setter" do
     it "does not read VERSION file if using set version" do
-      expect(Puppet).not_to receive(:read_version_file)
+      Puppet.expects(:read_version_file).never
       Puppet.version = '1.2.3'
       expect(Puppet.version).to eq('1.2.3')
       expect(Puppet.minor_version).to eq('1.2')
     end
   end
 end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.0.10
+  version: 6.1.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -141,12 +141,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CODEOWNERS
 - COMMITTERS.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
+- Guardfile.example
 - LICENSE
+- MAINTAINERS
 - README.md
 - Rakefile
 - bin/puppet
@@ -170,9 +171,6 @@ files:
 - examples/hiera/modules/users/manifests/development.pp
 - examples/hiera/site.pp
 - ext/README.environment
-- ext/autotest/Rakefile
-- ext/autotest/config
-- ext/autotest/readme.rst
 - ext/build_defaults.yaml
 - ext/cert_inspector
 - ext/dbfix.sql
@@ -333,7 +331,6 @@ files:
 - lib/puppet/configurer/plugin_handler.rb
 - lib/puppet/confine.rb
 - lib/puppet/confine/any.rb
-- lib/puppet/confine/boolean.rb
 - lib/puppet/confine/exists.rb
 - lib/puppet/confine/false.rb
 - lib/puppet/confine/feature.rb
@@ -689,6 +686,15 @@ files:
 - lib/puppet/node.rb
 - lib/puppet/node/environment.rb
 - lib/puppet/node/facts.rb
+- lib/puppet/pal/catalog_compiler.rb
+- lib/puppet/pal/compiler.rb
+- lib/puppet/pal/function_signature.rb
+- lib/puppet/pal/json_catalog_encoder.rb
+- lib/puppet/pal/pal_api.rb
+- lib/puppet/pal/pal_impl.rb
+- lib/puppet/pal/plan_signature.rb
+- lib/puppet/pal/script_compiler.rb
+- lib/puppet/pal/task_signature.rb
 - lib/puppet/parameter.rb
 - lib/puppet/parameter/boolean.rb
 - lib/puppet/parameter/package_options.rb
@@ -1017,7 +1023,6 @@ files:
 - lib/puppet/provider/package/windows/package.rb
 - lib/puppet/provider/package/yum.rb
 - lib/puppet/provider/package/zypper.rb
-- lib/puppet/provider/package_targetable.rb
 - lib/puppet/provider/parsedfile.rb
 - lib/puppet/provider/service/base.rb
 - lib/puppet/provider/service/bsd.rb
@@ -1066,6 +1071,7 @@ files:
 - lib/puppet/resource/status.rb
 - lib/puppet/resource/type.rb
 - lib/puppet/resource/type_collection.rb
+- lib/puppet/rest/client.rb
 - lib/puppet/rest/errors.rb
 - lib/puppet/rest/response.rb
 - lib/puppet/rest/route.rb
@@ -1115,7 +1121,9 @@ files:
 - lib/puppet/status.rb
 - lib/puppet/syntax_checkers.rb
 - lib/puppet/syntax_checkers/base64.rb
+- lib/puppet/syntax_checkers/epp.rb
 - lib/puppet/syntax_checkers/json.rb
+- lib/puppet/syntax_checkers/pp.rb
 - lib/puppet/test/test_helper.rb
 - lib/puppet/transaction.rb
 - lib/puppet/transaction/additional_resource_generator.rb
@@ -1545,13 +1553,8 @@ files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load2.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load3.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load4.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load5.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/good_func_load.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcalled.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller.pp
@@ -1637,9 +1640,8 @@ files:
 - spec/fixtures/unit/provider/package/pkg/incomplete
 - spec/fixtures/unit/provider/package/pkg/solaris11
 - spec/fixtures/unit/provider/package/pkg/unknown_status
-- spec/fixtures/unit/provider/package/pkgng/pkg.info
 - spec/fixtures/unit/provider/package/pkgng/pkg.query
-- spec/fixtures/unit/provider/package/pkgng/pkg.query_absent
+- spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh
 - spec/fixtures/unit/provider/package/pkgng/pkg.version
 - spec/fixtures/unit/provider/package/sun/dummy.server
 - spec/fixtures/unit/provider/package/sun/simple
@@ -1714,7 +1716,6 @@ files:
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
-- spec/integration/network/http_pool_spec.rb
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
 - spec/integration/node_spec.rb
@@ -1732,7 +1733,6 @@ files:
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/script_compiler_spec.rb
 - spec/integration/parser/undef_param_spec.rb
-- spec/integration/provider/file/windows_spec.rb
 - spec/integration/provider/service/init_spec.rb
 - spec/integration/provider/service/systemd_spec.rb
 - spec/integration/provider/service/windows_spec.rb
@@ -1788,7 +1788,6 @@ files:
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/handler.rb
-- spec/lib/puppet_spec/https.rb
 - spec/lib/puppet_spec/language.rb
 - spec/lib/puppet_spec/matchers.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
@@ -2347,6 +2346,7 @@ files:
 - spec/unit/resource/type_collection_spec.rb
 - spec/unit/resource/type_spec.rb
 - spec/unit/resource_spec.rb
+- spec/unit/rest/client_spec.rb
 - spec/unit/rest/route_spec.rb
 - spec/unit/scheduler/job_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
@@ -2363,7 +2363,6 @@ files:
 - spec/unit/settings/ini_file_spec.rb
 - spec/unit/settings/path_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
-- spec/unit/settings/server_list_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
 - spec/unit/settings/terminus_setting_spec.rb
 - spec/unit/settings/value_translator_spec.rb
@@ -2491,7 +2490,6 @@ files:
 - spec/unit/util/yaml_spec.rb
 - spec/unit/util_spec.rb
 - spec/unit/version_spec.rb
-- spec/watchr.rb
 - tasks/benchmark.rake
 - tasks/cfpropertylist.rake
 - tasks/ci.rake
@@ -2753,13 +2751,8 @@ test_files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load2.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load3.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load4.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load5.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
-- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/good_func_load.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcalled.pp
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller.pp
@@ -2845,9 +2838,8 @@ test_files:
 - spec/fixtures/unit/provider/package/pkg/incomplete
 - spec/fixtures/unit/provider/package/pkg/solaris11
 - spec/fixtures/unit/provider/package/pkg/unknown_status
-- spec/fixtures/unit/provider/package/pkgng/pkg.info
 - spec/fixtures/unit/provider/package/pkgng/pkg.query
-- spec/fixtures/unit/provider/package/pkgng/pkg.query_absent
+- spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh
 - spec/fixtures/unit/provider/package/pkgng/pkg.version
 - spec/fixtures/unit/provider/package/sun/dummy.server
 - spec/fixtures/unit/provider/package/sun/simple
@@ -2922,7 +2914,6 @@ test_files:
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
-- spec/integration/network/http_pool_spec.rb
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
 - spec/integration/node_spec.rb
@@ -2940,7 +2931,6 @@ test_files:
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/script_compiler_spec.rb
 - spec/integration/parser/undef_param_spec.rb
-- spec/integration/provider/file/windows_spec.rb
 - spec/integration/provider/service/init_spec.rb
 - spec/integration/provider/service/systemd_spec.rb
 - spec/integration/provider/service/windows_spec.rb
@@ -2996,7 +2986,6 @@ test_files:
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/handler.rb
-- spec/lib/puppet_spec/https.rb
 - spec/lib/puppet_spec/language.rb
 - spec/lib/puppet_spec/matchers.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
@@ -3555,6 +3544,7 @@ test_files:
 - spec/unit/resource/type_collection_spec.rb
 - spec/unit/resource/type_spec.rb
 - spec/unit/resource_spec.rb
+- spec/unit/rest/client_spec.rb
 - spec/unit/rest/route_spec.rb
 - spec/unit/scheduler/job_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
@@ -3571,7 +3561,6 @@ test_files:
 - spec/unit/settings/ini_file_spec.rb
 - spec/unit/settings/path_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
-- spec/unit/settings/server_list_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
 - spec/unit/settings/terminus_setting_spec.rb
 - spec/unit/settings/value_translator_spec.rb
@@ -3699,4 +3688,3 @@ test_files:
 - spec/unit/util/yaml_spec.rb
 - spec/unit/util_spec.rb
 - spec/unit/version_spec.rb
-- spec/watchr.rb