puppet 6.15.0 → 6.16.0

data/spec/unit/type/service_spec.rb

@@ -284,20 +284,21 @@ describe test_title, "when changing the host" do
     @service.property(:enable).sync
   end
 
-  it "should always consider the enable state of a static service to be in sync" do
+  it "should let superclass implementation resolve insyncness when provider does not respond to the 'enabled_insync?' method" do
     allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
-    expect(@service.provider).to receive(:cached_enabled?).and_return('static')
-    @service[:enable] = false
-    expect(Puppet).to receive(:debug).with("Unable to enable or disable static service yay")
+    @service[:enable] = true
+    allow(@service.provider).to receive(:respond_to?).with(:enabled_insync?).and_return(false)
+
     expect(@service.property(:enable).insync?(:true)).to eq(true)
   end
 
-  it "should determine insyncness normally when the service is not static" do
+  it "insyncness should be resolved by provider instead of superclass implementation when provider responds to the 'enabled_insync?' method" do
     allow(@service.provider.class).to receive(:supports_parameter?).and_return(true)
-    expect(@service.provider).to receive(:cached_enabled?).and_return('true')
     @service[:enable] = true
-    expect(Puppet).not_to receive(:debug)
-    expect(@service.property(:enable).insync?(:true)).to eq(true)
+    allow(@service.provider).to receive(:respond_to?).with(:enabled_insync?).and_return(true)
+    allow(@service.provider).to receive(:enabled_insync?).and_return(false)
+
+    expect(@service.property(:enable).insync?(:true)).to eq(false)
   end
 
   it "should sync the service's enable state when changing the state of :ensure if :enable is being managed" do

data/spec/unit/type/user_spec.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe Puppet::Type.type(:user) do

data/spec/unit/util/autoload_spec.rb

@@ -23,10 +23,10 @@ describe Puppet::Util::Autoload do
 
     def with_libdir(libdir)
       begin
-        Puppet::Util::Autoload.instance_variable_set(:@initialized, false)
         old_loadpath = $LOAD_PATH.dup
         old_libdir = Puppet[:libdir]
         Puppet[:libdir] = libdir
+        $LOAD_PATH.unshift(libdir)
         yield
       ensure
         Puppet[:libdir] = old_libdir
@@ -83,6 +83,7 @@ describe Puppet::Util::Autoload do
 
       libdir = File.expand_path('/libdir1')
       Puppet[:vendormoduledir] = vendor_dir
+      Puppet.initialize_settings
 
       with_libdir(libdir) do
         expect(@autoload.class).to receive(:gem_directories).and_return(%w{/one /two})

data/spec/unit/util/log/destinations_spec.rb

@@ -44,41 +44,13 @@ describe Puppet::Util::Log.desttypes[:file] do
       end
     end
 
-    describe "on POSIX systems", :if => Puppet.features.posix? do
+    describe "on POSIX systems", :unless => Puppet::Util::Platform.windows? do
       describe "with a normal file" do
         let (:parent) { Pathname.new('/tmp') }
         let (:abspath) { '/tmp/log' }
         let (:relpath) { 'log' }
 
         it_behaves_like "file destination"
-
-        it "logs an error if it can't chown the file owner & group" do
-          allow(File).to receive(:exist?).with(parent).and_return(true)
-          expect(File).to receive(:exist?).with(Pathname.new(abspath)).and_return(false)
-          expect(FileUtils).to receive(:chown).with(Puppet[:user], Puppet[:group], abspath).and_raise(Errno::EPERM)
-          expect(Puppet.features).to receive(:root?).and_return(true)
-          expect(Puppet).to receive(:err).with("Unable to set ownership to #{Puppet[:user]}:#{Puppet[:group]} for log file: #{abspath}")
-
-          @class.new(abspath)
-        end
-
-        it "doesn't attempt to chown when running as non-root" do
-          allow(File).to receive(:exist?).with(parent).and_return(true)
-          expect(File).to receive(:exist?).with(Pathname.new(abspath)).and_return(false)
-          expect(FileUtils).not_to receive(:chown).with(Puppet[:user], Puppet[:group], abspath)
-          expect(Puppet.features).to receive(:root?).and_return(false)
-
-          @class.new(abspath)
-        end
-
-        it "doesn't attempt to chown when file already exists" do
-          allow(File).to receive(:exist?).with(parent).and_return(true)
-          expect(File).to receive(:exist?).with(Pathname.new(abspath)).and_return(true)
-          expect(FileUtils).not_to receive(:chown).with(Puppet[:user], Puppet[:group], abspath)
-          expect(Puppet.features).to receive(:root?).and_return(true)
-
-          @class.new(abspath)
-        end
       end
 
       describe "with a JSON file" do

data/spec/unit/util/package/version/range_spec.rb

@@ -34,12 +34,33 @@ describe Puppet::Util::Package::Version::Range do
       expect { Puppet::Util::Package::Version::Range.parse('=a', IntegerVersion) }.to raise_error(Puppet::Util::Package::Version::Range::ValidationFailure)
     end
     it 'should raise if operator cannot be parsed' do
-      expect { Puppet::Util::Package::Version::Range.parse('~=a', IntegerVersion) }.to raise_error(Puppet::Util::Package::Version::Range::ValidationFailure)
+      expect { Puppet::Util::Package::Version::Range.parse('~=a', IntegerVersion) }.to raise_error(IntegerVersion::ValidationFailure)
     end
     it 'should raise if version cannot be parsed' do
       expect { Puppet::Util::Package::Version::Range.parse('>=a', IntegerVersion) }.to raise_error(IntegerVersion::ValidationFailure)
     end
   end
+
+  context 'when creating new version range with regular version' do
+    it 'it does not include greater version' do
+      vr = Puppet::Util::Package::Version::Range.parse('3', IntegerVersion)
+      v = IntegerVersion.parse('4')
+      expect(vr.include?(v)).to eql(false)
+    end
+
+    it 'it includes specified version' do
+      vr = Puppet::Util::Package::Version::Range.parse('3', IntegerVersion)
+      v = IntegerVersion.parse('3')
+      expect(vr.include?(v)).to eql(true)
+    end
+
+    it 'it does not include lower version' do
+      vr = Puppet::Util::Package::Version::Range.parse('3', IntegerVersion)
+      v = IntegerVersion.parse('2')
+      expect(vr.include?(v)).to eql(false)
+    end
+  end
+
   context 'when creating new version range with greater or equal operator' do
     it 'it includes greater version' do
       vr = Puppet::Util::Package::Version::Range.parse('>=3', IntegerVersion)

data/tasks/manpages.rake

@@ -1,27 +1,17 @@
-# require 'fileutils'
-
 desc "Build Puppet manpages"
 task :gen_manpages do
   require 'puppet/face'
   require 'fileutils'
 
-  # TODO: this line is unfortunate.  In an ideal world, faces would serve
-  #  as a clear, well-defined entry-point into the code and could be
-  #  responsible for state management all on their own; this really should
-  #  not be necessary.  When we can, we should get rid of it.
-  #  --cprice 2012-05-16
-  Puppet.initialize_settings()
-
+  Puppet.initialize_settings
   helpface = Puppet::Face[:help, '0.0.1']
-  manface  = Puppet::Face[:man, '0.0.1']
 
-  sbins = Dir.glob(%w{sbin/*})
   bins  = Dir.glob(%w{bin/*})
   non_face_applications = helpface.legacy_applications
   faces = Puppet::Face.faces.map(&:to_s)
   apps = non_face_applications + faces
 
-  ronn_args = '--manual="Puppet manual" --organization="Puppet, Inc." -r'
+  ronn_args = '--manual="Puppet manual" --organization="Puppet, Inc." --roff'
 
   # Locate ronn
   begin
@@ -35,14 +25,6 @@ task :gen_manpages do
     abort("Ronn does not appear to be installed")
   end
 
-#   def write_manpage(text, filename)
-#     IO.popen("#{ronn} #{ronn_args} -r > #{filename}") do |fh| fh.write text end
-#   end
-
-  # Create puppet.conf.5 man page
-#   IO.popen("#{ronn} #{ronn_args} > ./man/man5/puppet.conf.5", 'w') do |fh|
-#     fh.write %x{RUBYLIB=./lib:$RUBYLIB bin/puppetdoc --reference configuration}
-#   end
   %x{mkdir -p ./man/man5 ./man/man8}
   %x{RUBYLIB=./lib:$RUBYLIB bin/puppet doc --reference configuration > ./man/man5/puppetconf.5.ronn}
   %x{#{ronn} #{ronn_args} ./man/man5/puppetconf.5.ronn}
@@ -50,31 +32,19 @@ task :gen_manpages do
   FileUtils.rm("./man/man5/puppetconf.5.ronn")
 
   # Create LEGACY binary man pages (i.e. delete me for 2.8.0)
-  binary = bins + sbins
-  binary.each do |bin|
+  bins.each do |bin|
     b = bin.gsub( /^s?bin\//, "")
     %x{RUBYLIB=./lib:$RUBYLIB #{bin} --help > ./man/man8/#{b}.8.ronn}
     %x{#{ronn} #{ronn_args} ./man/man8/#{b}.8.ronn}
     FileUtils.rm("./man/man8/#{b}.8.ronn")
   end
 
-  # Create regular non-face man pages
-  non_face_applications.each do |app|
-    %x{RUBYLIB=./lib:$RUBYLIB bin/puppet #{app} --help > ./man/man8/puppet-#{app}.8.ronn}
+  apps.each do |app|
+    %x{RUBYLIB=./lib:$RUBYLIB bin/puppet help #{app} --ronn > ./man/man8/puppet-#{app}.8.ronn}
     %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{app}.8.ronn}
     FileUtils.rm("./man/man8/puppet-#{app}.8.ronn")
   end
 
-  # Create face man pages
-  faces.each do |face|
-    File.open("./man/man8/puppet-#{face}.8.ronn", 'w') do |fh|
-      fh.write manface.man("#{face}")
-    end
-
-    %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{face}.8.ronn}
-    FileUtils.rm("./man/man8/puppet-#{face}.8.ronn")
-  end
-
   # Delete orphaned manpages if binary was deleted
   Dir.glob(%w{./man/man8/puppet-*.8}) do |app|
     appname = app.match(/puppet-(.*)\.8/)[1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.15.0
+  version: 6.16.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -716,6 +716,7 @@ files:
 - lib/puppet/network/http/base_pool.rb
 - lib/puppet/network/http/compression.rb
 - lib/puppet/network/http/connection.rb
+- lib/puppet/network/http/connection_adapter.rb
 - lib/puppet/network/http/error.rb
 - lib/puppet/network/http/factory.rb
 - lib/puppet/network/http/handler.rb
@@ -1278,6 +1279,7 @@ files:
 - lib/puppet/util/package/version/gem.rb
 - lib/puppet/util/package/version/pip.rb
 - lib/puppet/util/package/version/range.rb
+- lib/puppet/util/package/version/range/eq.rb
 - lib/puppet/util/package/version/range/gt.rb
 - lib/puppet/util/package/version/range/gt_eq.rb
 - lib/puppet/util/package/version/range/lt.rb
@@ -1723,7 +1725,7 @@ files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
-- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-enabled.txt
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -1754,6 +1756,7 @@ files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
+- spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out
 - spec/fixtures/unit/provider/parsedfile/aliases.txt
 - spec/fixtures/unit/provider/parsedfile/simple.txt
 - spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding
@@ -2140,6 +2143,7 @@ files:
 - spec/unit/indirector/file_content/selector_spec.rb
 - spec/unit/indirector/file_metadata/file_server_spec.rb
 - spec/unit/indirector/file_metadata/file_spec.rb
+- spec/unit/indirector/file_metadata/http_spec.rb
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb
@@ -2998,7 +3002,7 @@ test_files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
-- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-enabled.txt
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -3029,6 +3033,7 @@ test_files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
+- spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out
 - spec/fixtures/unit/provider/parsedfile/aliases.txt
 - spec/fixtures/unit/provider/parsedfile/simple.txt
 - spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding
@@ -3415,6 +3420,7 @@ test_files:
 - spec/unit/indirector/file_content/selector_spec.rb
 - spec/unit/indirector/file_metadata/file_server_spec.rb
 - spec/unit/indirector/file_metadata/file_spec.rb
+- spec/unit/indirector/file_metadata/http_spec.rb
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb