puppet 6.17.0 → 6.18.0

data/spec/unit/util/command_line_spec.rb

@@ -62,7 +62,7 @@ describe Puppet::Util::CommandLine do
       it "should print the version and exit if #{arg} is given" do
         expect do
           described_class.new("puppet", [arg]).execute
-        end.to have_printed(/^#{Regexp.escape(Puppet.version)}$/)
+        end.to output(/^#{Regexp.escape(Puppet.version)}$/).to_stdout
       end
     end
 
@@ -73,7 +73,8 @@ describe Puppet::Util::CommandLine do
 
         expect {
           commandline.execute
-        }.to have_printed(/Usage: puppet <subcommand> \[options\] <action> \[options\]/).and_exit_with(0)
+        }.to exit_with(0)
+         .and output(/Usage: puppet <subcommand> \[options\] <action> \[options\]/).to_stdout
       end
     end
 
@@ -95,7 +96,8 @@ describe Puppet::Util::CommandLine do
 
       expect {
         commandline.execute
-      }.to have_printed(/Usage: puppet <subcommand> \[options\] <action> \[options\]/).and_exit_with(0)
+      }.to exit_with(0)
+       .and output(/Usage: puppet <subcommand> \[options\] <action> \[options\]/).to_stdout
     end
   end
 
@@ -124,7 +126,8 @@ describe Puppet::Util::CommandLine do
 
           expect {
             commandline.execute
-          }.to have_printed(/Unknown Puppet subcommand 'whatever'/).and_exit_with(1)
+          }.to exit_with(1)
+           .and output(/Unknown Puppet subcommand 'whatever'/).to_stdout
         end
 
         it "should abort and show the help message" do
@@ -134,7 +137,8 @@ describe Puppet::Util::CommandLine do
 
           expect {
             commandline.execute
-          }.to have_printed(/See 'puppet help' for help on available puppet subcommands/).and_exit_with(1)
+          }.to exit_with(1)
+           .and output(/See 'puppet help' for help on available puppet subcommands/).to_stdout
         end
 
         %w{--version -V}.each do |arg|
@@ -145,7 +149,8 @@ describe Puppet::Util::CommandLine do
 
             expect {
               commandline.execute
-            }.to have_printed(%r[^#{Regexp.escape(Puppet.version)}$]).and_exit_with(1)
+            }.to exit_with(1)
+             .and output(%r[^#{Regexp.escape(Puppet.version)}$]).to_stdout
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.17.0
+  version: 6.18.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1338,6 +1338,7 @@ files:
 - lib/puppet/util/windows/error.rb
 - lib/puppet/util/windows/eventlog.rb
 - lib/puppet/util/windows/file.rb
+- lib/puppet/util/windows/monkey_patches/dir.rb
 - lib/puppet/util/windows/principal.rb
 - lib/puppet/util/windows/process.rb
 - lib/puppet/util/windows/registry.rb
@@ -1397,6 +1398,8 @@ files:
 - man/man8/puppet.8
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
+- spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
+- spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
 - spec/fixtures/integration/node/environment/sitedir/01_b.pp
 - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
@@ -1529,7 +1532,9 @@ files:
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/functions/data.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/metadata.json
+- spec/fixtures/unit/forge/bacula-releases.json
 - spec/fixtures/unit/forge/bacula.json
+- spec/fixtures/unit/forge/bacula.tar.gz
 - spec/fixtures/unit/functions/hiera/hiera/backend/hieraspec_backend.rb
 - spec/fixtures/unit/functions/lookup/data/common.yaml
 - spec/fixtures/unit/functions/lookup/hiera/backend/custom_backend.rb
@@ -1791,9 +1796,12 @@ files:
 - spec/integration/agent/logging_spec.rb
 - spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
+- spec/integration/application/config_spec.rb
 - spec/integration/application/doc_spec.rb
 - spec/integration/application/filebucket_spec.rb
+- spec/integration/application/help_spec.rb
 - spec/integration/application/lookup_spec.rb
+- spec/integration/application/module_spec.rb
 - spec/integration/application/plugin_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
@@ -1803,14 +1811,6 @@ files:
 - spec/integration/environments/setting_hooks_spec.rb
 - spec/integration/environments/settings_interpolation_spec.rb
 - spec/integration/environments/settings_spec.rb
-- spec/integration/faces/config_spec.rb
-- spec/integration/faces/documentation_spec.rb
-- spec/integration/file_bucket/file_spec.rb
-- spec/integration/file_serving/content_spec.rb
-- spec/integration/file_serving/fileset_spec.rb
-- spec/integration/file_serving/metadata_spec.rb
-- spec/integration/file_serving/terminus_helper_spec.rb
-- spec/integration/file_system/uniquefile_spec.rb
 - spec/integration/http/client_spec.rb
 - spec/integration/indirector/catalog/compiler_spec.rb
 - spec/integration/indirector/direct_file_server_spec.rb
@@ -1818,8 +1818,6 @@ files:
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
 - spec/integration/indirector/report/yaml.rb
-- spec/integration/module_tool/forge_spec.rb
-- spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -1842,16 +1840,8 @@ files:
 - 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
-- spec/integration/reference/providers_spec.rb
-- spec/integration/reports_spec.rb
 - spec/integration/resource/catalog_spec.rb
 - spec/integration/resource/type_collection_spec.rb
-- spec/integration/ssl/certificate_request_spec.rb
-- spec/integration/ssl/host_spec.rb
-- spec/integration/ssl/key_spec.rb
 - spec/integration/transaction/report_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
@@ -1865,6 +1855,7 @@ files:
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/windows/adsi_spec.rb
+- spec/integration/util/windows/monkey_patches/dir_spec.rb
 - spec/integration/util/windows/principal_spec.rb
 - spec/integration/util/windows/process_spec.rb
 - spec/integration/util/windows/registry_spec.rb
@@ -1916,7 +1907,6 @@ files:
 - spec/shared_behaviours/documentation_on_faces.rb
 - spec/shared_behaviours/file_server_terminus.rb
 - spec/shared_behaviours/file_serving.rb
-- spec/shared_behaviours/file_serving_model.rb
 - spec/shared_behaviours/hiera_indirections.rb
 - spec/shared_behaviours/iterative_functions.rb
 - spec/shared_behaviours/memory_terminus.rb
@@ -1943,6 +1933,7 @@ files:
 - spec/unit/application/filebucket_spec.rb
 - spec/unit/application/indirection_base_spec.rb
 - spec/unit/application/lookup_spec.rb
+- spec/unit/application/man_spec.rb
 - spec/unit/application/resource_spec.rb
 - spec/unit/application/ssl_spec.rb
 - spec/unit/application_spec.rb
@@ -1979,7 +1970,6 @@ files:
 - spec/unit/face/generate_spec.rb
 - spec/unit/face/help_spec.rb
 - spec/unit/face/key_spec.rb
-- spec/unit/face/man_spec.rb
 - spec/unit/face/module/install_spec.rb
 - spec/unit/face/module/list_spec.rb
 - spec/unit/face/module/search_spec.rb
@@ -2185,7 +2175,6 @@ files:
 - spec/unit/interface/option_builder_spec.rb
 - spec/unit/interface/option_spec.rb
 - spec/unit/interface_spec.rb
-- spec/unit/man_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/module_tool/application_spec.rb
 - spec/unit/module_tool/applications/checksummer_spec.rb
@@ -2674,6 +2663,8 @@ summary: Puppet, an automated configuration management tool
 test_files:
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
+- spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
+- spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
 - spec/fixtures/integration/node/environment/sitedir/01_b.pp
 - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
@@ -2806,7 +2797,9 @@ test_files:
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/functions/data.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/production/modules/xyz/metadata.json
+- spec/fixtures/unit/forge/bacula-releases.json
 - spec/fixtures/unit/forge/bacula.json
+- spec/fixtures/unit/forge/bacula.tar.gz
 - spec/fixtures/unit/functions/hiera/hiera/backend/hieraspec_backend.rb
 - spec/fixtures/unit/functions/lookup/data/common.yaml
 - spec/fixtures/unit/functions/lookup/hiera/backend/custom_backend.rb
@@ -3068,9 +3061,12 @@ test_files:
 - spec/integration/agent/logging_spec.rb
 - spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
+- spec/integration/application/config_spec.rb
 - spec/integration/application/doc_spec.rb
 - spec/integration/application/filebucket_spec.rb
+- spec/integration/application/help_spec.rb
 - spec/integration/application/lookup_spec.rb
+- spec/integration/application/module_spec.rb
 - spec/integration/application/plugin_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
@@ -3080,14 +3076,6 @@ test_files:
 - spec/integration/environments/setting_hooks_spec.rb
 - spec/integration/environments/settings_interpolation_spec.rb
 - spec/integration/environments/settings_spec.rb
-- spec/integration/faces/config_spec.rb
-- spec/integration/faces/documentation_spec.rb
-- spec/integration/file_bucket/file_spec.rb
-- spec/integration/file_serving/content_spec.rb
-- spec/integration/file_serving/fileset_spec.rb
-- spec/integration/file_serving/metadata_spec.rb
-- spec/integration/file_serving/terminus_helper_spec.rb
-- spec/integration/file_system/uniquefile_spec.rb
 - spec/integration/http/client_spec.rb
 - spec/integration/indirector/catalog/compiler_spec.rb
 - spec/integration/indirector/direct_file_server_spec.rb
@@ -3095,8 +3083,6 @@ test_files:
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
 - spec/integration/indirector/report/yaml.rb
-- spec/integration/module_tool/forge_spec.rb
-- spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -3119,16 +3105,8 @@ test_files:
 - 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
-- spec/integration/reference/providers_spec.rb
-- spec/integration/reports_spec.rb
 - spec/integration/resource/catalog_spec.rb
 - spec/integration/resource/type_collection_spec.rb
-- spec/integration/ssl/certificate_request_spec.rb
-- spec/integration/ssl/host_spec.rb
-- spec/integration/ssl/key_spec.rb
 - spec/integration/transaction/report_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
@@ -3142,6 +3120,7 @@ test_files:
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/windows/adsi_spec.rb
+- spec/integration/util/windows/monkey_patches/dir_spec.rb
 - spec/integration/util/windows/principal_spec.rb
 - spec/integration/util/windows/process_spec.rb
 - spec/integration/util/windows/registry_spec.rb
@@ -3193,7 +3172,6 @@ test_files:
 - spec/shared_behaviours/documentation_on_faces.rb
 - spec/shared_behaviours/file_server_terminus.rb
 - spec/shared_behaviours/file_serving.rb
-- spec/shared_behaviours/file_serving_model.rb
 - spec/shared_behaviours/hiera_indirections.rb
 - spec/shared_behaviours/iterative_functions.rb
 - spec/shared_behaviours/memory_terminus.rb
@@ -3220,6 +3198,7 @@ test_files:
 - spec/unit/application/filebucket_spec.rb
 - spec/unit/application/indirection_base_spec.rb
 - spec/unit/application/lookup_spec.rb
+- spec/unit/application/man_spec.rb
 - spec/unit/application/resource_spec.rb
 - spec/unit/application/ssl_spec.rb
 - spec/unit/application_spec.rb
@@ -3256,7 +3235,6 @@ test_files:
 - spec/unit/face/generate_spec.rb
 - spec/unit/face/help_spec.rb
 - spec/unit/face/key_spec.rb
-- spec/unit/face/man_spec.rb
 - spec/unit/face/module/install_spec.rb
 - spec/unit/face/module/list_spec.rb
 - spec/unit/face/module/search_spec.rb
@@ -3462,7 +3440,6 @@ test_files:
 - spec/unit/interface/option_builder_spec.rb
 - spec/unit/interface/option_spec.rb
 - spec/unit/interface_spec.rb
-- spec/unit/man_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/module_tool/application_spec.rb
 - spec/unit/module_tool/applications/checksummer_spec.rb

data/spec/integration/faces/config_spec.rb

@@ -1,91 +0,0 @@
-require 'spec_helper'
-require 'puppet/face'
-
-describe Puppet::Face[:config, '0.0.1'] do
-  include PuppetSpec::Files
-
-  # different UTF-8 widths
-  # 1-byte A
-  # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
-  # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
-  # 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
-  MIXED_UTF8 = "A\u06FF\u16A0\u{2070E}" # Aۿᚠ𠜎
-  let (:tmp_environment_path) { tmpdir('envpath') }
-  let (:tmp_config) { tmpfile('puppet.conf') }
-
-  def load_settings(path)
-    test_settings = Puppet::Settings.new
-
-    test_settings.define_settings(:main,
-      :config => {
-        :type => :file,
-        :default => path,
-        :desc => '',
-      },
-      :environmentpath => {
-        :default => tmp_environment_path,
-        :desc => '',
-      },
-      :basemodulepath => {
-        :default => '',
-        :desc => '',
-      },
-      # definition required to use the value
-      :rando_key => {
-        :default => '',
-        :desc => ''
-      },
-      MIXED_UTF8.to_sym => {
-        :default => '',
-        :desc => ''
-      },
-    )
-
-    test_settings.initialize_global_settings
-    test_settings
-  end
-
-  before :each do
-    File.open(tmp_config, 'w', :encoding => 'UTF-8') do |file|
-      file.puts <<-EOF
-[main]
-rando_key=foobar
-#{MIXED_UTF8}=foobar
-      EOF
-    end
-  end
-
-  context 'when getting / setting UTF8 values' do
-
-    let(:config) { described_class }
-
-    def render(action, result)
-      config.get_action(action).when_rendering(:console).call(result)
-    end
-
-    before :each do
-      allow(subject).to receive(:report_section_and_environment)
-    end
-
-    # key must be a defined setting
-    ['rando_key', MIXED_UTF8].each do |key|
-      it "can change '#{key}' keyed ASCII value to a UTF-8 value and read it back" do
-        value = "value#{key.reverse}value"
-
-        # needed for the subject.set to write to correct file
-        allow(Puppet.settings).to receive(:which_configuration_file).and_return(tmp_config)
-        subject.set(key, value)
-
-        # make sure subject.print looks at the newly modified settings
-        test_settings = load_settings(tmp_config)
-        # instead of the default Puppet.settings (implementation detail)
-        allow(Puppet).to receive(:settings).and_return(test_settings)
-
-        result = subject.print()
-        expect(render(:print, result)).to match(/^#{key} = #{value}$/)
-        result = subject.print(key, :section => 'main')
-        expect(render(:print, result)).to eq("#{value}\n")
-      end
-    end
-  end
-end

data/spec/integration/faces/documentation_spec.rb

@@ -1,57 +0,0 @@
-require 'spec_helper'
-require 'puppet/face'
-
-describe "documentation of faces" do
-  it "should generate global help" do
-    help = nil
-    expect { help = Puppet::Face[:help, :current].help }.not_to raise_error
-    expect(help).to be_an_instance_of String
-    expect(help.length).to be > 200
-  end
-
-  ########################################################################
-  # Can we actually generate documentation for the face, and the actions it
-  # has?  This avoids situations where the ERB template turns out to have a
-  # bug in it, triggered in something the user might do.
-
-  context "face help messages" do
-    Puppet::Face.faces.sort.each do |face_name|
-      # REVISIT: We should walk all versions of the face here...
-      let :help do Puppet::Face[:help, :current] end
-
-      context "generating help" do
-        it "for #{face_name}" do
-          expect {
-            text = help.help(face_name)
-            expect(text).to be_an_instance_of String
-            expect(text.length).to be > 100
-          }.not_to raise_error
-        end
-
-        Puppet::Face[face_name, :current].actions.sort.each do |action_name|
-          it "for #{face_name}.#{action_name}" do
-            expect {
-              text = help.help(face_name, action_name)
-              expect(text).to be_an_instance_of String
-              expect(text.length).to be > 100
-            }.not_to raise_error
-          end
-        end
-      end
-
-      ########################################################################
-      # Ensure that we have authorship and copyright information in *our* faces;
-      # if you apply this to third party faces you might well be disappointed.
-      context "licensing of Puppet Inc. face '#{face_name}'" do
-        subject { Puppet::Face[face_name, :current] }
-        its :license   do should =~ /Apache\s*2/ end
-        its :copyright do should =~ /Puppet Inc\./ end
-
-        # REVISIT: This is less that ideal, I think, but right now I am more
-        # comfortable watching us ship with some copyright than without any; we
-        # can redress that when it becomes appropriate. --daniel 2011-04-27
-        its :copyright do should =~ /20\d{2}/ end
-      end
-    end
-  end
-end

data/spec/integration/file_bucket/file_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/file_bucket/file'
-
-describe Puppet::FileBucket::File do
-  describe "#indirection" do
-    before :each do
-      # Never connect to the network, no matter what
-      allow_any_instance_of(described_class.indirection.terminus(:rest).class).to receive(:find)
-    end
-
-    describe "when running another application" do
-      {
-        "md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
-        "filebucket://puppetmaster:8140/md5/d41d8cd98f00b204e9800998ecf8427e" => :rest,
-      }.each do |key, terminus|
-        it "should use the #{terminus} terminus when requesting #{key.inspect}" do
-          expect_any_instance_of(described_class.indirection.terminus(terminus).class).to receive(:find)
-
-          described_class.indirection.find(key)
-        end
-      end
-    end
-  end
-
-  describe "saving binary files" do
-    context "given multiple backups of identical files" do
-      it "does not error given content with binary external encoding" do
-        binary = "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT)
-        bucket_file = Puppet::FileBucket::File.new(binary)
-        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
-        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
-      end
-
-      it "also does not error if the content is reported with UTF-8 external encoding" do
-        # PUP-7951 - ensure accurate size comparison across encodings If binary
-        # content arrives as a string with UTF-8 default external encoding, its
-        # character count might be different than the same bytes with binary
-        # external encoding. Ensure our equality comparison does not fail due to this.
-        # As would be the case with our friend snowman:
-        # Unicode snowman \u2603 - \xE2 \x98 \x83
-        # character size 1, if interpreted as UTF-8, 3 "characters" if interpreted as binary
-        utf8 = "\u2603".force_encoding(Encoding::UTF_8)
-        bucket_file = Puppet::FileBucket::File.new(utf8)
-        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
-        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
-      end
-    end
-  end
-end