puppet 6.0.8 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c442dcdff36534079f025123de1e710b63bee7259dafd6100cb5890a698895
-  data.tar.gz: 48bf09c4410ba31913d5be72cc31268be75012afa22bbbee0a44edf4966bc4aa
+  metadata.gz: 90038612753ba861b1a6905e835d42a6d1b4e66056e7286b7187bfd549614eba
+  data.tar.gz: 59ced40b3a7ab88d3a0b4b2eed6ec93de212a4c2b1cec5df895fe5f467b8c291
 SHA512:
-  metadata.gz: 5c1772a2a8c27fab9f25db315d8cca823f6db28155b2f48c40251f28aad2fcb16047f1859a28dc7fd5bfa25caea5326a458c23aada758d775b450d781c8296fe
-  data.tar.gz: 678cf1f1a887453a22004b4e4cab5810ff2a992c62ccdc3bf9ce9ea4109d7e674e3f6c5cc091368d1219b9261f949999f45235a75520056395cd885e339cc45a
+  metadata.gz: 627d7e125e3a0cc25cf6d624c3defcaf8eb7291e964ff1dad62634054aafd22a445db912dce106887c287e895387982e402996b3c8b8ea6d08872ad8e3950097
+  data.tar.gz: 48292927be7a66aac9b822ea28643ffcac30e869ca309a0a5e586554877a7f6804c3accd90d357aefa22720d8295a20b0320dc229b40c7cb7c4a80e751a11859

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.0.8)
+    puppet (6.0.9)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -32,7 +32,7 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
       locale
-    hashdiff (0.3.8)
+    hashdiff (0.3.9)
     hiera (3.5.0)
     hiera-eyaml (3.0.0)
       highline (~> 1.6.19)
@@ -47,15 +47,15 @@ GEM
     memory_profiler (0.9.13)
     method_source (0.9.2)
     minitar (0.8)
-    msgpack (1.2.9)
+    msgpack (1.2.10)
     multi_json (1.13.1)
     mustache (1.1.0)
     optimist (3.0.0)
-    packaging (0.99.24)
+    packaging (0.99.29)
       artifactory (~> 2)
       rake (~> 12.3)
     parallel (1.17.0)
-    parser (2.6.2.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -84,10 +84,10 @@ GEM
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-its (1.2.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-mocks (3.8.0)

data/lib/puppet/application.rb

@@ -395,7 +395,7 @@ class Application
   end
 
   def setup_logs
-    handle_logdest_arg(Puppet[:logdest])
+    handle_logdest_arg(Puppet[:logdest]) if !options[:setdest]
 
     unless options[:setdest]
       if options[:debug] || options[:verbose]
@@ -418,7 +418,7 @@ class Application
   end
 
   def handle_logdest_arg(arg)
-    return if options[:setdest] || arg.nil?
+    return if arg.nil?
 
     begin
       Puppet[:logdest] = arg

data/lib/puppet/provider/package/gem.rb

@@ -19,23 +19,36 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
   commands :gemcmd => "gem"
 
+  # CommandDefiner in provider.rb creates convenience execution methods that set failonfail, combine, and optionally, environment.
+  # And when a child provider defines its own command via commands() or has_command(), the provider-specific path is always returned by command().
+  # But when the convenience execution method is invoked, the last convenience method to be defined is executed.
+  # This makes invoking those convenience execution methods unsuitable for inherited providers.
+  #
+  # In this case, causing the puppet_gem provider to inherit the parent gem provider's convenience gemcmd() methods, with the wrong path.
+
+  def self.execute_gem_command(command_options)
+    cmd = [command(:gemcmd)] << command_options
+
+    execute(cmd, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
+  end
+
   def self.gemlist(options)
-    gem_list_command = [command(:gemcmd), "list"]
+    command_options = ["list"]
 
     if options[:local]
-      gem_list_command << "--local"
+      command_options << "--local"
     else
-      gem_list_command << "--remote"
+      command_options << "--remote"
     end
     if options[:source]
-      gem_list_command << "--source" << options[:source]
+      command_options << "--source" << options[:source]
     end
     if name = options[:justme]
-      gem_list_command << '\A' + name + '\z'
+      command_options << '\A' + name + '\z'
     end
 
     begin
-      list = execute(gem_list_command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).lines.
+      list = execute_gem_command(command_options).lines.
         map {|set| gemsplit(set) }.
         reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
@@ -92,14 +105,27 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     is.any? { |version| dependency.match?('', version) }
   end
 
+  def rubygem_version
+    command_options = ["--version"]
+
+    self.class.execute_gem_command(command_options)
+  end
+
   def install(useversion = true)
-    command = [command(:gemcmd), "install"]
-    command += install_options if resource[:install_options]
+    command_options = ["install"]
+    command_options += install_options if resource[:install_options]
+
     if Puppet::Util::Platform.windows?
       version = resource[:ensure]
-      command << "-v" << %Q["#{version}"] if (! resource[:ensure].is_a? Symbol) and useversion
+      command_options << "-v" << %Q["#{version}"] if (! resource[:ensure].is_a? Symbol) and useversion
+    else
+      command_options << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
+    end
+
+    if Puppet::Util::Package.versioncmp(rubygem_version, '2.0.0') == -1
+      command_options << "--no-rdoc" << "--no-ri"
     else
-      command << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
+      command_options << "--no-document"
     end
 
     if source = resource[:source]
@@ -112,35 +138,35 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       case uri.scheme
       when nil
         # no URI scheme => interpret the source as a local file
-        command << source
+        command_options << source
       when /file/i
-        command << uri.path
+        command_options << uri.path
       when 'puppet'
         # we don't support puppet:// URLs (yet)
         raise Puppet::Error.new(_("puppet:// URLs are not supported as gem sources"))
       else
         # check whether it's an absolute file path to help Windows out
         if Puppet::Util.absolute_path?(source)
-          command << source
+          command_options << source
         else
           # interpret it as a gem repository
-          command << "--source" << "#{source}" << resource[:name]
+          command_options << "--source" << "#{source}" << resource[:name]
         end
       end
     else
-      command << "--no-rdoc" << "--no-ri" << resource[:name]
+      command_options << resource[:name]
     end
 
-    output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
-    # Apparently some stupid gem versions don't exit non-0 on failure
+    output = self.class.execute_gem_command(command_options)
+    # Apparently some gem versions don't exit non-0 on failure
     self.fail _("Could not install: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
 
   def latest
     # This always gets the latest version available.
-    gemlist_options = {:justme => resource[:name]}
-    gemlist_options.merge!({:source => resource[:source]}) unless resource[:source].nil?
-    hash = self.class.gemlist(gemlist_options)
+    options = {:justme => resource[:name]}
+    options.merge!({:source => resource[:source]}) unless resource[:source].nil?
+    hash = self.class.gemlist(options)
 
     hash[:ensure][0]
   end
@@ -150,14 +176,12 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   end
 
   def uninstall
-    command = [command(:gemcmd), "uninstall"]
-    command << "--executables" << "--all" << resource[:name]
-
-    command += uninstall_options if resource[:uninstall_options]
-
-    output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
+    command_options = ["uninstall"]
+    command_options << "--executables" << "--all" << resource[:name]
+    command_options += uninstall_options if resource[:uninstall_options]
 
-    # Apparently some stupid gem versions don't exit non-0 on failure
+    output = self.class.execute_gem_command(command_options)
+    # Apparently some gem versions don't exit non-0 on failure
     self.fail _("Could not uninstall: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
 

data/lib/puppet/provider/user/directoryservice.rb

@@ -302,7 +302,7 @@ Puppet::Type.type(:user).provide :directoryservice do
             merge_attribute_with_dscl('Groups', group, 'GroupMembers', @guid)
           end
         else
-          merge_attribute_with_dscl('Users', @resource.name, self.class.ns_to_ds_attribute_map[attribute], value)
+          create_attribute_with_dscl('Users', @resource.name, self.class.ns_to_ds_attribute_map[attribute], value)
         end
       end
     end
@@ -429,11 +429,14 @@ Puppet::Type.type(:user).provide :directoryservice do
   # the case we rescue the error from dscl and alert the user.
   #
   # In the event that the user doesn't HAVE a value for the attribute, the
-  # provider should use the -merge option with dscl to add the attribute value
+  # provider should use the -create option with dscl to add the attribute value
   # for the user record
   ['home', 'uid', 'gid', 'comment', 'shell'].each do |setter_method|
     define_method("#{setter_method}=") do |value|
       if @property_hash[setter_method.intern]
+        if self.class.get_os_version == '10.14' && %w(home uid).include?(setter_method)
+          raise Puppet::Error, "OS X version 10\.14 does not allow changing #{setter_method} using puppet"
+        end
         begin
           dscl '.', '-change', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], @property_hash[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
@@ -442,7 +445,7 @@ Puppet::Type.type(:user).provide :directoryservice do
         end
       else
         begin
-          dscl '.', '-merge', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
+          dscl '.', '-create', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
           raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
                "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
@@ -472,10 +475,19 @@ Puppet::Type.type(:user).provide :directoryservice do
     '/var/db/shadow/hash'
   end
 
+  # This method will create a given value using dscl
+  def create_attribute_with_dscl(path, username, keyname, value)
+    set_attribute_with_dscl('-create', path, username, keyname, value)
+  end
+
   # This method will merge in a given value using dscl
   def merge_attribute_with_dscl(path, username, keyname, value)
+    set_attribute_with_dscl('-merge', path, username, keyname, value)
+  end
+
+  def set_attribute_with_dscl(dscl_command, path, username, keyname, value)
     begin
-      dscl '.', '-merge', "/#{path}/#{username}", keyname, value
+      dscl '.', dscl_command, "/#{path}/#{username}", keyname, value
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not set the dscl #{keyname} key with value: #{value} - #{detail.inspect}", detail.backtrace
     end

data/lib/puppet/type/schedule.rb

@@ -220,6 +220,10 @@ module Puppet
 
         See the `periodmatch` attribute for tuning whether to match
         times by their distance apart or by their specific value.
+        
+        > **Tip**: You can use `period => never,` to prevent a resource from being applied
+        in the given `range`. This is useful if you need to create a blackout window to
+        perform sensitive operations without interruption.
       EOT
 
       newvalues(:hourly, :daily, :weekly, :monthly, :never)

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.0.8'
+  PUPPETVERSION = '6.0.9'
 
   ##
   # version is a public API method intended to always provide a fast and

data/man/man5/puppet.conf.5

@@ -876,7 +876,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: Puppet/6\.0\.8 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/6\.0\.9 Ruby/2\.4\.1\-p111 (x86_64\-linux)
 .
 .IP "" 0
 .

data/man/man8/puppet.8

@@ -25,4 +25,4 @@ Specialized:
 catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.0\.8
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.0\.9

data/spec/unit/application_spec.rb

@@ -6,7 +6,6 @@ require 'getoptlong'
 require 'timeout'
 
 describe Puppet::Application do
-
   before(:each) do
     @app = Class.new(Puppet::Application).new
     @appclass = @app.class
@@ -350,7 +349,6 @@ describe Puppet::Application do
   end
 
   describe "when parsing command-line options" do
-
     before :each do
       allow(@app.command_line).to receive(:args).and_return([])
 
@@ -676,13 +674,6 @@ describe Puppet::Application do
       expect(@app.options[:setdest]).to be_truthy
     end
 
-    it "does not set the log destination if setdest is true" do
-      expect(Puppet::Util::Log).not_to receive(:newdestination)
-      @app.options[:setdest] = true
-
-      @app.handle_logdest_arg(test_arg)
-    end
-
     it "does not set the log destination if arg is nil" do
       expect(Puppet::Util::Log).not_to receive(:newdestination)
 

data/spec/unit/provider/package/gem_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 context Puppet::Type.type(:package).provider(:gem) do
+
+  let(:provider_gem_cmd) { '/provider/gem' }
+
   context 'installing myresource' do
     let(:resource) do
       Puppet::Type.type(:package).new(
@@ -15,49 +18,61 @@ context Puppet::Type.type(:package).provider(:gem) do
       provider
     end
 
+    let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}} }
+
     before :each do
       resource.provider = provider
+      allow(described_class).to receive(:command).with(:gemcmd).and_return(provider_gem_cmd)
     end
 
     context "when installing" do
-      it "should use the path to the gem" do
-        allow(described_class).to receive(:command).with(:gemcmd).and_return("/my/gem")
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[0]).to eq("/my/gem") }.and_return("")
+      before :each do
+        allow(provider).to receive(:rubygem_version).and_return('1.9.9')
+      end
+
+      it "should use the path to the gem command" do
+        allow(described_class).to receive(:which).with(provider_gem_cmd).and_return(provider_gem_cmd)
+        expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return("")
         provider.install
       end
 
       it "should specify that the gem is being installed" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[1]).to eq("install") }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[0]).to eq("install") }.and_return("")
+        provider.install
+      end
+
+      it "should specify that --rdoc should not be included when gem version is < 2.0.0" do
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[1]).to eq("--no-rdoc") }.and_return("")
         provider.install
       end
 
-      it "should specify that documentation should not be included" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[2]).to eq("--no-rdoc") }.and_return("")
+      it "should specify that --ri should not be included when gem version is < 2.0.0" do
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[2]).to eq("--no-ri") }.and_return("")
         provider.install
       end
 
-      it "should specify that RI should not be included" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[3]).to eq("--no-ri") }.and_return("")
+      it "should specify that --document should not be included when gem version is >= 2.0.0" do
+        allow(provider).to receive(:rubygem_version).and_return('2.0.0')
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[1]).to eq("--no-document") }.and_return("")
         provider.install
       end
 
       it "should specify the package name" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[4]).to eq("myresource") }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[3]).to eq("myresource") }.and_return("")
         provider.install
       end
 
       it "should not append install_options by default" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args.length).to eq(5) }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args.length).to eq(4) }.and_return("")
         provider.install
       end
 
       it "should allow setting an install_options parameter" do
         resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) do |args|
-          expect(args[2]).to eq('--force')
-          expect(args[3]).to eq('--bindir=/usr/bin')
-        end.and_return('')
-
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) do |args|
+          expect(args[1]).to eq('--force')
+          expect(args[2]).to eq('--bindir=/usr/bin')
+        end.and_return("")
         provider.install
       end
 
@@ -65,7 +80,7 @@ context Puppet::Type.type(:package).provider(:gem) do
         context "as a normal file" do
           it "should use the file name instead of the gem name" do
             resource[:source] = "/my/file"
-            expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[2]).to eq("/my/file") }.and_return("")
+            expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[3]).to eq("/my/file") }.and_return("")
             provider.install
           end
         end
@@ -73,7 +88,7 @@ context Puppet::Type.type(:package).provider(:gem) do
         context "as a file url" do
           it "should use the file name instead of the gem name" do
             resource[:source] = "file:///my/file"
-            expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[2]).to eq("/my/file") }.and_return("")
+            expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[3]).to eq("/my/file") }.and_return("")
             provider.install
           end
         end
@@ -88,7 +103,7 @@ context Puppet::Type.type(:package).provider(:gem) do
         context "as a non-file and non-puppet url" do
           it "should treat the source as a gem repository" do
             resource[:source] = "http://host/my/file"
-            expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[2..4]).to eq(["--source", "http://host/my/file", "myresource"]) }.and_return("")
+            expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[3..5]).to eq(["--source", "http://host/my/file", "myresource"]) }.and_return("")
             provider.install
           end
         end
@@ -96,7 +111,7 @@ context Puppet::Type.type(:package).provider(:gem) do
         context "as a windows path on windows", :if => Puppet::Util::Platform.windows? do
           it "should treat the source as a local path" do
             resource[:source] = "c:/this/is/a/path/to/a/gem.gem"
-            expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[2]).to eq("c:/this/is/a/path/to/a/gem.gem") }.and_return("")
+            expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[3]).to eq("c:/this/is/a/path/to/a/gem.gem") }.and_return("")
             provider.install
           end
         end
@@ -139,16 +154,16 @@ context Puppet::Type.type(:package).provider(:gem) do
 
     context "#instances" do
       before do
-        allow(described_class).to receive(:command).with(:gemcmd).and_return("/my/gem")
+        allow(described_class).to receive(:command).with(:gemcmd).and_return(provider_gem_cmd)
       end
 
       it "should return an empty array when no gems installed" do
-        expect(described_class).to receive(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).and_return("\n")
+        expect(described_class).to receive(:execute_gem_command).with(%w{list --local}).and_return("\n")
         expect(described_class.instances).to eq([])
       end
 
       it "should return ensure values as an array of installed versions" do
-        expect(described_class).to receive(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).and_return(<<-HEREDOC.gsub(/        /, ''))
+        expect(described_class).to receive(:execute_gem_command).with(%w{list --local}).and_return(<<-HEREDOC.gsub(/        /, ''))
         systemu (1.2.0)
         vagrant (0.8.7, 0.6.9)
         HEREDOC
@@ -160,7 +175,7 @@ context Puppet::Type.type(:package).provider(:gem) do
       end
 
       it "should ignore platform specifications" do
-        expect(described_class).to receive(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).and_return(<<-HEREDOC.gsub(/        /, ''))
+        expect(described_class).to receive(:execute_gem_command).with(%w{list --local}).and_return(<<-HEREDOC.gsub(/        /, ''))
         systemu (1.2.0)
         nokogiri (1.6.1 ruby java x86-mingw32 x86-mswin32-60, 1.4.4.1 x86-mswin32)
         HEREDOC
@@ -172,7 +187,7 @@ context Puppet::Type.type(:package).provider(:gem) do
       end
 
       it "should not list 'default: ' text from rubygems''" do
-        expect(described_class).to receive(:execute).with(%w{/my/gem list --local}, anything).and_return(<<-HEREDOC.gsub(/        /, ''))
+        expect(described_class).to receive(:execute_gem_command).with(%w{list --local}).and_return(<<-HEREDOC.gsub(/        /, ''))
         bundler (1.16.1, default: 1.16.0, 1.15.1)
         HEREDOC
 
@@ -182,8 +197,7 @@ context Puppet::Type.type(:package).provider(:gem) do
       end
 
       it "should not fail when an unmatched line is returned" do
-        expect(described_class).to receive(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).
-          and_return(File.read(my_fixture('line-with-1.8.5-warning')))
+        expect(described_class).to receive(:execute_gem_command).with(%w{list --local}).and_return(File.read(my_fixture('line-with-1.8.5-warning')))
 
         expect(described_class.instances.map {|p| p.properties}).
           to eq([{provider: :gem, ensure: ["0.3.2"],    name: "columnize"},
@@ -202,7 +216,7 @@ context Puppet::Type.type(:package).provider(:gem) do
     context "listing gems" do
       context "searching for a single package" do
         it "searches for an exact match" do
-          expect(described_class).to receive(:execute).with(include('\Abundler\z'), {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).and_return(File.read(my_fixture('gem-list-single-package')))
+          expect(described_class).to receive(:execute_gem_command).with(include('\Abundler\z')).and_return(File.read(my_fixture('gem-list-single-package')))
           expected = {:name => 'bundler', :ensure => %w[1.6.2], :provider => :gem}
           expect(described_class.gemlist({:justme => 'bundler'})).to eq(expected)
         end
@@ -294,49 +308,51 @@ context Puppet::Type.type(:package).provider(:gem) do
       provider
     end
 
+    let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}} }
+
     before :each do
       resource.provider = provider
+      allow(described_class).to receive(:command).with(:gemcmd).and_return(provider_gem_cmd)
     end
 
     context "when uninstalling" do
-      it "should use the path to the gem" do
-        allow(described_class).to receive(:command).with(:gemcmd).and_return("/my/gem")
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[0]).to eq("/my/gem") }.and_return("")
+      it "should use the path to the gem command" do
+        allow(described_class).to receive(:which).with(provider_gem_cmd).and_return(provider_gem_cmd)
+        expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return("")
         provider.uninstall
       end
 
       it "should specify that the gem is being uninstalled" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[1]).to eq("uninstall") }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[0]).to eq("uninstall") }.and_return("")
         provider.uninstall
       end
 
       it "should specify that the relevant executables should be removed without confirmation" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[2]).to eq("--executables") }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[1]).to eq("--executables") }.and_return("")
         provider.uninstall
       end
 
       it "should specify that all the matching versions should be removed" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[3]).to eq("--all") }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[2]).to eq("--all") }.and_return("")
         provider.uninstall
       end
 
       it "should specify the package name" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args[4]).to eq("myresource") }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args[3]).to eq("myresource") }.and_return("")
         provider.uninstall
       end
 
       it "should not append uninstall_options by default" do
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) { |args| expect(args.length).to eq(5) }.and_return("")
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) { |args| expect(args.length).to eq(4) }.and_return("")
         provider.uninstall
       end
 
       it "should allow setting an uninstall_options parameter" do
         resource[:uninstall_options] = [ '--ignore-dependencies', {'--version' => '0.1.1' } ]
-        expect(provider).to receive(:execute).with(be_a(Array), be_a(Hash)) do |args|
-          expect(args[5]).to eq('--ignore-dependencies')
-          expect(args[6]).to eq('--version=0.1.1')
+        expect(described_class).to receive(:execute_gem_command).with(be_a(Array)) do |args|
+          expect(args[4]).to eq('--ignore-dependencies')
+          expect(args[5]).to eq('--version=0.1.1')
         end.and_return('')
-
         provider.uninstall
       end
     end

data/spec/unit/provider/package/puppet_gem_spec.rb

@@ -15,70 +15,58 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
   end
 
   if Puppet::Util::Platform.windows?
-    let(:puppet_gem) { 'gem' }
+    let(:provider_gem_cmd) { 'gem' }
   else
-    let(:puppet_gem) { '/opt/puppetlabs/puppet/bin/gem' }
+    let(:provider_gem_cmd) { '/opt/puppetlabs/puppet/bin/gem' }
   end
 
+  let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}} }
+
   before :each do
     resource.provider = provider
+    allow(described_class).to receive(:command).with(:gemcmd).and_return(provider_gem_cmd)
   end
 
   context "when installing" do
-    it "should use the path to the gem" do
-      expect(described_class).to receive(:which).with(puppet_gem).and_return(puppet_gem)
-      expect(provider).to receive(:execute) do |args|
-        expect(args[0]).to eq(puppet_gem)
-        ''
-      end
+    before :each do
+      allow(provider).to receive(:rubygem_version).and_return('1.9.9')
+    end
+
+    it "should use the path to the gem command" do
+      allow(described_class).to receive(:which).with(provider_gem_cmd).and_return(provider_gem_cmd)
+      expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return('')
       provider.install
     end
 
     it "should not append install_options by default" do
-      expect(provider).to receive(:execute) do |args|
-        expect(args.length).to eq(5)
-        ''
-      end
+      expect(described_class).to receive(:execute_gem_command).with(%w{install --no-rdoc --no-ri myresource}).and_return('')
       provider.install
     end
 
     it "should allow setting an install_options parameter" do
       resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-      expect(provider).to receive(:execute) do |args|
-        expect(args[2]).to eq('--force')
-        expect(args[3]).to eq('--bindir=/usr/bin')
-        ''
-      end
+      expect(described_class).to receive(:execute_gem_command).with(%w{install --force --bindir=/usr/bin --no-rdoc --no-ri myresource}).and_return('')
       provider.install
     end
   end
 
   context "when uninstalling" do
-    it "should use the path to the gem" do
-      expect(described_class).to receive(:which).with(puppet_gem).and_return(puppet_gem)
-      expect(provider).to receive(:execute) do |args|
-        expect(args[0]).to eq(puppet_gem)
-        ''
-      end
-      provider.install
+    it "should use the path to the gem command" do
+      allow(described_class).to receive(:which).with(provider_gem_cmd).and_return(provider_gem_cmd)
+      expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return('')
+      provider.uninstall
     end
 
     it "should not append uninstall_options by default" do
-      expect(provider).to receive(:execute) do |args|
-        expect(args.length).to eq(5)
-        ''
-      end
+      expect(described_class).to receive(:execute_gem_command).with(%w{uninstall --executables --all myresource}).and_return('')
       provider.uninstall
     end
 
     it "should allow setting an uninstall_options parameter" do
       resource[:uninstall_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-      expect(provider).to receive(:execute) do |args|
-        expect(args[5]).to eq('--force')
-        expect(args[6]).to eq('--bindir=/usr/bin')
-        ''
-      end
+      expect(described_class).to receive(:execute_gem_command).with(%w{uninstall --executables --all myresource --force --bindir=/usr/bin}).and_return('')
       provider.uninstall
     end
   end
+
 end

data/spec/unit/provider/user/directoryservice_spec.rb

@@ -294,7 +294,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     before :each do
       # Stub out all calls to dscl with default values from above
       defaults.each do |key, val|
-        allow(provider).to receive(:merge_attribute_with_dscl).with('Users', username, key, val)
+        allow(provider).to receive(:create_attribute_with_dscl).with('Users', username, key, val)
       end
 
       # Mock the rest of the dscl calls. We can't assume that our Linux
@@ -327,11 +327,41 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     it 'should convert group names into integers' do
       resource[:gid] = 'somegroup'
       expect(Puppet::Util).to receive(:gid).with('somegroup').and_return(21)
-      expect(provider).to receive(:merge_attribute_with_dscl).with('Users', username, 'PrimaryGroupID', 21)
+      expect(provider).to receive(:create_attribute_with_dscl).with('Users', username, 'PrimaryGroupID', 21)
       provider.create
     end
   end
 
+  describe 'Update existing user' do
+    describe 'home=' do
+      context 'on OS X 10.14' do
+        before do
+          provider.instance_variable_set(:@property_hash, { home: 'value' })
+          allow(provider.class).to receive(:get_os_version).and_return('10.14')
+        end
+
+        it 'raises error' do
+          expect { provider.home = 'new' }.to \
+            raise_error(Puppet::Error, "OS X version 10.14 does not allow changing home using puppet")
+        end
+      end
+  end
+
+  describe 'uid=' do
+    context 'on OS X 10.14' do
+      before do
+        provider.instance_variable_set(:@property_hash, { uid: 'value' })
+        allow(provider.class).to receive(:get_os_version).and_return('10.14')
+      end
+
+      it 'raises error' do
+        expect { provider.uid = 'new' }.to \
+          raise_error(Puppet::Error, "OS X version 10.14 does not allow changing uid using puppet")
+      end
+    end
+  end
+end
+
   describe 'self#instances' do
     it 'should create an array of provider instances' do
       expect(provider.class).to receive(:get_all_users).and_return(['foo', 'bar'])
@@ -988,6 +1018,13 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
+  describe '#create_attribute_with_dscl' do
+    it 'should raise an error if a dscl command raises an error' do
+      expect(provider).to receive(:dscl).with('.', '-create', user_path, 'GeneratedUID', 'GUID').and_raise(Puppet::ExecutionFailure, 'boom')
+      expect { provider.create_attribute_with_dscl('Users', username, 'GeneratedUID', 'GUID') }.to raise_error Puppet::Error, /Could not set the dscl GeneratedUID key with value: GUID/
+    end
+  end
+
   describe '#get_users_plist' do
     let(:test_hash) do
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 6.0.9
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter