puppet 2.7.9 → 2.7.11

data/spec/unit/util_spec.rb

@@ -5,6 +5,24 @@ require 'spec_helper'
 describe Puppet::Util do
   include PuppetSpec::Files
 
+  if Puppet.features.microsoft_windows?
+    def set_mode(mode, file)
+      Puppet::Util::Windows::Security.set_mode(mode, file)
+    end
+
+    def get_mode(file)
+      Puppet::Util::Windows::Security.get_mode(file) & 07777
+    end
+  else
+    def set_mode(mode, file)
+      File.chmod(mode, file)
+    end
+
+    def get_mode(file)
+      File.lstat(file).mode & 07777
+    end
+  end
+
   def process_status(exitstatus)
     return exitstatus if Puppet.features.microsoft_windows?
 
@@ -560,4 +578,112 @@ describe Puppet::Util do
       expect { Puppet::Util.binread('/path/does/not/exist') }.to raise_error(Errno::ENOENT)
     end
   end
+
+  context "#replace_file" do
+    describe "on POSIX platforms", :if => Puppet.features.posix? do
+      subject { Puppet::Util }
+      it { should respond_to :replace_file }
+
+      let :target do
+        target = Tempfile.new("puppet-util-replace-file")
+        target.puts("hello, world")
+        target.flush              # make sure content is on disk.
+        target.fsync rescue nil
+        target.close
+        target
+      end
+
+      it "should fail if no block is given" do
+        expect { subject.replace_file(target.path, 0600) }.to raise_error /block/
+      end
+
+      it "should replace a file when invoked" do
+        # Check that our file has the expected content.
+        File.read(target.path).should == "hello, world\n"
+
+        # Replace the file.
+        subject.replace_file(target.path, 0600) do |fh|
+          fh.puts "I am the passenger..."
+        end
+
+        # ...and check the replacement was complete.
+        File.read(target.path).should == "I am the passenger...\n"
+      end
+
+      [0555, 0600, 0660, 0700, 0770].each do |mode|
+        it "should copy 0#{mode.to_s(8)} permissions from the target file by default" do
+          set_mode(mode, target.path)
+
+          get_mode(target.path).should == mode
+
+          subject.replace_file(target.path, 0000) {|fh| fh.puts "bazam" }
+
+          get_mode(target.path).should == mode
+          File.read(target.path).should == "bazam\n"
+        end
+      end
+
+      it "should copy the permissions of the source file before yielding" do
+        set_mode(0555, target.path)
+        inode = File.stat(target.path).ino unless Puppet.features.microsoft_windows?
+
+        yielded = false
+        subject.replace_file(target.path, 0600) do |fh|
+          get_mode(fh.path).should == 0555
+          yielded = true
+        end
+        yielded.should be_true
+
+        # We can't check inode on Windows
+        File.stat(target.path).ino.should_not == inode unless Puppet.features.microsoft_windows?
+
+        get_mode(target.path).should == 0555
+      end
+
+      it "should use the default permissions if the source file doesn't exist" do
+        new_target = target.path + '.foo'
+        File.should_not be_exist(new_target)
+
+        begin
+          subject.replace_file(new_target, 0555) {|fh| fh.puts "foo" }
+          get_mode(new_target).should == 0555
+        ensure
+          File.unlink(new_target) if File.exists?(new_target)
+        end
+      end
+
+      it "should not replace the file if an exception is thrown in the block" do
+        yielded = false
+        threw   = false
+
+        begin
+          subject.replace_file(target.path, 0600) do |fh|
+            yielded = true
+            fh.puts "different content written, then..."
+            raise "...throw some random failure"
+          end
+        rescue Exception => e
+          if e.to_s =~ /some random failure/
+            threw = true
+          else
+            raise
+          end
+        end
+
+        yielded.should be_true
+        threw.should be_true
+
+        # ...and check the replacement was complete.
+        File.read(target.path).should == "hello, world\n"
+      end
+    end
+
+    describe "on Windows platforms" do
+      it "should fail and complain" do
+        Puppet.features.stubs(:microsoft_windows?).returns true
+
+        expect { Puppet::Util.replace_file("C:/foo", 0644) {} }.to raise_error(Puppet::DevError, "replace_file is non-functional on Windows")
+      end
+    end
+  end
 end

data/tasks/rake/apple.rake

@@ -0,0 +1,176 @@
+# Title:        Rake task to build Apple packages for Puppet.
+# Author:       Gary Larizza
+# Date:         12/5/2011
+# Description:  This task will create a DMG-encapsulated package that will
+#               install Puppet on OS X systems. This happens by building
+#               a directory tree of files that will then be fed to the
+#               packagemaker binary (can be installed by installing the
+#               XCode Tools) which will create the .pkg file.
+#
+require 'fileutils'
+require 'erb'
+require 'find'
+require 'pathname'
+
+# Path to Binaries (Constants)
+TAR           = '/usr/bin/tar'
+CP            = '/bin/cp'
+INSTALL       = '/usr/bin/install'
+DITTO         = '/usr/bin/ditto'
+PACKAGEMAKER  = '/Developer/usr/bin/packagemaker'
+SED           = '/usr/bin/sed'
+
+# Setup task to populate all the variables
+task :setup do
+  @version               = `git describe`.chomp
+  @title                 = "puppet-#{@version}"
+  @reverse_domain        = 'com.puppetlabs.puppet'
+  @package_major_version = @version.split('.')[0]
+  @package_minor_version = @version.split('.')[1] +
+                           @version.split('.')[2].split('-')[0].split('rc')[0]
+  @pm_restart            = 'None'
+  @build_date            = Time.new.strftime("%Y-%m-%dT%H:%M:%SZ")
+end
+
+# method:       make_directory_tree
+# description:  This method sets up the directory structure that packagemaker
+#               needs to build a package. A prototype.plist file (holding
+#               package-specific options) is built from an ERB template located
+#               in the tasks/rake/templates directory.
+def make_directory_tree
+  puppet_tmp      = '/tmp/puppet'
+  @scratch       = "#{puppet_tmp}/#{@title}"
+  @working_tree  = {
+     'scripts'   => "#{@scratch}/scripts",
+     'resources' => "#{@scratch}/resources",
+     'working'   => "#{@scratch}/root",
+     'payload'   => "#{@scratch}/payload",
+  }
+  puts "Cleaning Tree: #{puppet_tmp}"
+  FileUtils.rm_rf(puppet_tmp)
+  @working_tree.each do |key,val|
+    puts "Creating: #{val}"
+    FileUtils.mkdir_p(val)
+  end
+  File.open("#{@scratch}/#{'prototype.plist'}", "w+") do |f|
+    f.write(ERB.new(File.read('tasks/rake/templates/prototype.plist.erb')).result())
+  end
+end
+
+# method:        build_dmg
+# description:   This method builds a package from the directory structure in
+#                /tmp/puppet and puts it in the
+#                /tmp/puppet/puppet-#{version}/payload directory. A DMG is
+#                created, using hdiutil, based on the contents of the
+#                /tmp/puppet/puppet-#{version}/payload directory. The resultant
+#                DMG is placed in the pkg/apple directory.
+#
+def build_dmg
+  # Local Variables
+  dmg_format_code   = 'UDZO'
+  zlib_level        = '9'
+  dmg_format_option = "-imagekey zlib-level=#{zlib_level}"
+  dmg_format        = "#{dmg_format_code} #{dmg_format_option}"
+  dmg_file          = "#{@title}.dmg"
+  package_file      = "#{@title}.pkg"
+  pm_extra_args     = '--verbose --no-recommend --no-relocate'
+  package_target_os = '10.4'
+
+  # Build .pkg file
+  system("sudo #{PACKAGEMAKER} --root #{@working_tree['working']} \
+    --id #{@reverse_domain} \
+    --filter DS_Store \
+    --target #{package_target_os} \
+    --title #{@title} \
+    --info #{@scratch}/prototype.plist \
+    --scripts #{@working_tree['scripts']} \
+    --resources #{@working_tree['resources']} \
+    --version #{@version} \
+    #{pm_extra_args} --out #{@working_tree['payload']}/#{package_file}")
+
+  # Build .dmg file
+  system("sudo hdiutil create -volname #{@title} \
+    -srcfolder #{@working_tree['payload']} \
+    -uid 99 \
+    -gid 99 \
+    -ov \
+    -format #{dmg_format} \
+    #{dmg_file}")
+
+  if File.directory?("#{Pathname.pwd}/pkg/apple")
+    FileUtils.mv("#{Pathname.pwd}/#{dmg_file}", "#{Pathname.pwd}/pkg/apple/#{dmg_file}")
+    puts "moved:   #{dmg_file} has been moved to #{Pathname.pwd}/pkg/apple/#{dmg_file}"
+  else
+    FileUtils.mkdir_p("#{Pathname.pwd}/pkg/apple")
+    FileUtils.mv(dmg_file, "#{Pathname.pwd}/pkg/apple/#{dmg_file}")
+    puts "moved:   #{dmg_file} has been moved to #{Pathname.pwd}/pkg/apple/#{dmg_file}"
+  end
+end
+
+# method:        pack_puppet_source
+# description:   This method copies the puppet source into a directory
+#                structure in /tmp/puppet/puppet-#{version}/root mirroring the
+#                structure on the target system for which the package will be
+#                installed. Anything installed into /tmp/puppet/root will be
+#                installed as the package's payload.
+#
+def pack_puppet_source
+  work          = "#{@working_tree['working']}"
+  puppet_source = Pathname.pwd
+
+  # Make all necessary directories
+  directories = ["#{work}/private/etc/puppet/",
+                 "#{work}/usr/bin",
+                 "#{work}/usr/sbin",
+                 "#{work}/usr/share/doc/puppet",
+                 "#{work}/usr/share/man/man5",
+                 "#{work}/usr/share/man/man8",
+                 "#{work}/usr/lib/ruby/site_ruby/1.8/puppet"]
+  FileUtils.mkdir_p(directories)
+
+  # Install necessary files
+  system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/conf/auth.conf #{work}/private/etc/puppet/auth.conf")
+  system("#{DITTO} #{puppet_source}/bin/ #{work}/usr/bin")
+  system("#{DITTO} #{puppet_source}/sbin/ #{work}/usr/sbin")
+  system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/man/man5/puppet.conf.5 #{work}/usr/share/man/man5/")
+  system("#{DITTO} #{puppet_source}/man/man8/ #{work}/usr/share/man/man8")
+  system("#{DITTO} #{puppet_source}/lib/ #{work}/usr/lib/ruby/site_ruby/1.8/")
+
+  # Setup a preflight script and replace variables in the files with
+  # the correct paths.
+  system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/conf/osx/preflight #{@working_tree['scripts']}")
+  system("#{SED} -i '' \"s\#{SITELIBDIR}\#/usr/lib/ruby/site_ruby/1.8\#g\" #{@working_tree['scripts']}/preflight")
+  system("#{SED} -i '' \"s\#{BINDIR}\#/usr/bin\#g\" #{@working_tree['scripts']}/preflight")
+
+  # Install documentation (matching for files with capital letters)
+  Dir.foreach("#{puppet_source}") do |file|
+    system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/#{file} #{work}/usr/share/doc/puppet") if file =~ /^[A-Z][A-Z]/
+  end
+
+  # Set Permissions
+  executable_directories = [ "#{work}/usr/bin",
+                             "#{work}/usr/sbin",
+                             "#{work}/usr/share/man/man8"]
+  FileUtils.chmod_R(0755, executable_directories)
+  FileUtils.chown_R('root', 'wheel', directories)
+  FileUtils.chmod_R(0644, "#{work}/usr/lib/ruby/site_ruby/1.8/")
+  FileUtils.chown_R('root', 'wheel', "#{work}/usr/lib/ruby/site_ruby/1.8/")
+  Find.find("#{work}/usr/lib/ruby/site_ruby/1.8/") do |dir|
+    FileUtils.chmod(0755, dir) if File.directory?(dir)
+  end
+end
+
+namespace :package do
+  desc "Task for building an Apple Package"
+  task :apple => [:setup] do
+    # Test for Root and Packagemaker binary
+    raise "Please run rake as root to build Apple Packages" unless Process.uid == 0
+    raise "Packagemaker must be installed. Please install XCode Tools" unless \
+      File.exists?('/Developer/usr/bin/packagemaker')
+
+    make_directory_tree
+    pack_puppet_source
+    build_dmg
+    FileUtils.chmod_R(0775, "#{Pathname.pwd}/pkg")
+  end
+end

data/tasks/rake/templates/prototype.plist.erb

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string><%= @title %></string>
+	<key>CFBundleShortVersionString</key>
+	<string><%= @version %></string>
+	<key>IFMajorVersion</key>
+	<integer><%= @package_major_version %></integer>
+	<key>IFMinorVersion</key>
+	<integer><%= @package_minor_version %></integer>
+	<key>IFPkgBuildDate</key>
+	<date><%= @build_date %></date>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>RootAuthorization</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagIsRequired</key>
+	<false/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string><%= @pm_restart %></string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+</dict>
+</plist>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 7
-  - 9
-  version: 2.7.9
+  - 11
+  version: 2.7.11
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-10 00:00:00 Z
+date: 2012-02-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
@@ -63,6 +63,7 @@ files:
 - bin/puppet
 - bin/puppetdoc
 - bin/ralsh
+- lib/puppet/agent/disabler.rb
 - lib/puppet/agent/locker.rb
 - lib/puppet/agent.rb
 - lib/puppet/application/agent.rb
@@ -84,11 +85,13 @@ files:
 - lib/puppet/application/help.rb
 - lib/puppet/application/indirection_base.rb
 - lib/puppet/application/inspect.rb
+- lib/puppet/application/instrumentation_data.rb
+- lib/puppet/application/instrumentation_listener.rb
+- lib/puppet/application/instrumentation_probe.rb
 - lib/puppet/application/key.rb
 - lib/puppet/application/kick.rb
 - lib/puppet/application/man.rb
 - lib/puppet/application/master.rb
-- lib/puppet/application/module.rb
 - lib/puppet/application/node.rb
 - lib/puppet/application/parser.rb
 - lib/puppet/application/plugin.rb
@@ -142,6 +145,9 @@ files:
 - lib/puppet/face/help/global.erb
 - lib/puppet/face/help/man.erb
 - lib/puppet/face/help.rb
+- lib/puppet/face/instrumentation_data.rb
+- lib/puppet/face/instrumentation_listener.rb
+- lib/puppet/face/instrumentation_probe.rb
 - lib/puppet/face/key.rb
 - lib/puppet/face/man.rb
 - lib/puppet/face/module/build.rb
@@ -149,8 +155,9 @@ files:
 - lib/puppet/face/module/clean.rb
 - lib/puppet/face/module/generate.rb
 - lib/puppet/face/module/install.rb
+- lib/puppet/face/module/list.rb
 - lib/puppet/face/module/search.rb
-- lib/puppet/face/module.rb
+- lib/puppet/face/module/uninstall.rb
 - lib/puppet/face/node/clean.rb
 - lib/puppet/face/node.rb
 - lib/puppet/face/parser.rb
@@ -237,6 +244,15 @@ files:
 - lib/puppet/indirector/file_metadata.rb
 - lib/puppet/indirector/file_server.rb
 - lib/puppet/indirector/indirection.rb
+- lib/puppet/indirector/instrumentation_data/local.rb
+- lib/puppet/indirector/instrumentation_data/rest.rb
+- lib/puppet/indirector/instrumentation_data.rb
+- lib/puppet/indirector/instrumentation_listener/local.rb
+- lib/puppet/indirector/instrumentation_listener/rest.rb
+- lib/puppet/indirector/instrumentation_listener.rb
+- lib/puppet/indirector/instrumentation_probe/local.rb
+- lib/puppet/indirector/instrumentation_probe/rest.rb
+- lib/puppet/indirector/instrumentation_probe.rb
 - lib/puppet/indirector/inventory/yaml.rb
 - lib/puppet/indirector/key/ca.rb
 - lib/puppet/indirector/key/file.rb
@@ -292,6 +308,7 @@ files:
 - lib/puppet/module_tool/applications/generator.rb
 - lib/puppet/module_tool/applications/installer.rb
 - lib/puppet/module_tool/applications/searcher.rb
+- lib/puppet/module_tool/applications/uninstaller.rb
 - lib/puppet/module_tool/applications/unpacker.rb
 - lib/puppet/module_tool/applications.rb
 - lib/puppet/module_tool/cache.rb
@@ -672,6 +689,7 @@ files:
 - lib/puppet/type/zpool.rb
 - lib/puppet/type.rb
 - lib/puppet/util/adsi.rb
+- lib/puppet/util/anonymous_filelock.rb
 - lib/puppet/util/autoload/file_cache.rb
 - lib/puppet/util/autoload.rb
 - lib/puppet/util/backups.rb
@@ -693,6 +711,13 @@ files:
 - lib/puppet/util/inifile.rb
 - lib/puppet/util/inline_docs.rb
 - lib/puppet/util/instance_loader.rb
+- lib/puppet/util/instrumentation/data.rb
+- lib/puppet/util/instrumentation/indirection_probe.rb
+- lib/puppet/util/instrumentation/instrumentable.rb
+- lib/puppet/util/instrumentation/listener.rb
+- lib/puppet/util/instrumentation/listeners/log.rb
+- lib/puppet/util/instrumentation/listeners/performance.rb
+- lib/puppet/util/instrumentation.rb
 - lib/puppet/util/ldap/connection.rb
 - lib/puppet/util/ldap/generator.rb
 - lib/puppet/util/ldap/manager.rb
@@ -738,6 +763,7 @@ files:
 - lib/puppet/util/rdoc.rb
 - lib/puppet/util/reference.rb
 - lib/puppet/util/resource_template.rb
+- lib/puppet/util/retryaction.rb
 - lib/puppet/util/run_mode.rb
 - lib/puppet/util/selinux.rb
 - lib/puppet/util/settings/boolean_setting.rb
@@ -747,6 +773,7 @@ files:
 - lib/puppet/util/storage.rb
 - lib/puppet/util/subclass_loader.rb
 - lib/puppet/util/suidmanager.rb
+- lib/puppet/util/symbolic_file_mode.rb
 - lib/puppet/util/tagging.rb
 - lib/puppet/util/user_attr.rb
 - lib/puppet/util/warnings.rb
@@ -879,6 +906,7 @@ files:
 - ext/emacs/puppet-mode-init.el
 - ext/emacs/puppet-mode.el
 - ext/envpuppet
+- ext/envpuppet.bat
 - ext/ldap/puppet.schema
 - ext/logcheck/puppet
 - ext/nagios/check_puppet.rb
@@ -905,6 +933,7 @@ files:
 - ext/vim/README
 - ext/vim/syntax/puppet.vim
 - ext/yaml_nodes.rb
+- tasks/rake/apple.rake
 - tasks/rake/changelog.rake
 - tasks/rake/ci.rake
 - tasks/rake/dailybuild.rake
@@ -913,6 +942,7 @@ files:
 - tasks/rake/manpages.rake
 - tasks/rake/metrics.rake
 - tasks/rake/sign.rake
+- tasks/rake/templates/prototype.plist.erb
 - tasks/rake/testbranch.rake
 - tasks/rake/yard.rake
 - test/data/failers/badclassnoparam
@@ -1097,7 +1127,6 @@ files:
 - test/util/log.rb
 - test/util/metrics.rb
 - test/util/package.rb
-- test/util/pidlock.rb
 - test/util/settings.rb
 - test/util/storage.rb
 - test/util/subclass_loader.rb
@@ -1271,6 +1300,7 @@ files:
 - spec/shared_behaviours/things_that_declare_options.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/unit/agent/disabler_spec.rb
 - spec/unit/agent/locker_spec.rb
 - spec/unit/agent_spec.rb
 - spec/unit/application/agent_spec.rb
@@ -1308,13 +1338,10 @@ files:
 - spec/unit/face/facts_spec.rb
 - spec/unit/face/file_spec.rb
 - spec/unit/face/help_spec.rb
+- spec/unit/face/instrumentation_data.rb
+- spec/unit/face/instrumentation_listener.rb
+- spec/unit/face/instrumentation_probe.rb
 - spec/unit/face/key_spec.rb
-- spec/unit/face/module/build_spec.rb
-- spec/unit/face/module/changes_spec.rb
-- spec/unit/face/module/clean_spec.rb
-- spec/unit/face/module/generate_spec.rb
-- spec/unit/face/module/install_spec.rb
-- spec/unit/face/module/search_spec.rb
 - spec/unit/face/module_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/plugin_spec.rb
@@ -1381,6 +1408,12 @@ files:
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_server_spec.rb
 - spec/unit/indirector/indirection_spec.rb
+- spec/unit/indirector/instrumentation_data/local_spec.rb
+- spec/unit/indirector/instrumentation_data/rest_spec.rb
+- spec/unit/indirector/instrumentation_listener/local_spec.rb
+- spec/unit/indirector/instrumentation_listener/rest_spec.rb
+- spec/unit/indirector/instrumentation_probe/local_spec.rb
+- spec/unit/indirector/instrumentation_probe/rest_spec.rb
 - spec/unit/indirector/inventory/yaml_spec.rb
 - spec/unit/indirector/key/ca_spec.rb
 - spec/unit/indirector/key/file_spec.rb
@@ -1427,6 +1460,7 @@ files:
 - spec/unit/module_tool/application_spec.rb
 - spec/unit/module_tool/metadata_spec.rb
 - spec/unit/module_tool/repository_spec.rb
+- spec/unit/module_tool/uninstaller_spec.rb
 - spec/unit/module_tool_spec.rb
 - spec/unit/network/authconfig_spec.rb
 - spec/unit/network/authstore_spec.rb
@@ -1538,6 +1572,7 @@ files:
 - spec/unit/provider/file/windows_spec.rb
 - spec/unit/provider/group/groupadd_spec.rb
 - spec/unit/provider/group/ldap_spec.rb
+- spec/unit/provider/group/pw_spec.rb
 - spec/unit/provider/group/windows_adsi_spec.rb
 - spec/unit/provider/host/parsed_spec.rb
 - spec/unit/provider/interface/cisco_spec.rb
@@ -1586,6 +1621,7 @@ files:
 - spec/unit/provider/sshkey/parsed_spec.rb
 - spec/unit/provider/user/hpux_spec.rb
 - spec/unit/provider/user/ldap_spec.rb
+- spec/unit/provider/user/pw_spec.rb
 - spec/unit/provider/user/user_role_add_spec.rb
 - spec/unit/provider/user/useradd_spec.rb
 - spec/unit/provider/user/windows_adsi_spec.rb
@@ -1655,6 +1691,7 @@ files:
 - spec/unit/type/group_spec.rb
 - spec/unit/type/host_spec.rb
 - spec/unit/type/interface_spec.rb
+- spec/unit/type/k5login_spec.rb
 - spec/unit/type/macauthorization_spec.rb
 - spec/unit/type/maillist_spec.rb
 - spec/unit/type/mcx_spec.rb
@@ -1680,6 +1717,7 @@ files:
 - spec/unit/type/zpool_spec.rb
 - spec/unit/type_spec.rb
 - spec/unit/util/adsi_spec.rb
+- spec/unit/util/anonymous_filelock_spec.rb
 - spec/unit/util/autoload/file_cache_spec.rb
 - spec/unit/util/autoload_spec.rb
 - spec/unit/util/backups_spec.rb
@@ -1695,6 +1733,13 @@ files:
 - spec/unit/util/file_locking_spec.rb
 - spec/unit/util/filetype_spec.rb
 - spec/unit/util/inline_docs_spec.rb
+- spec/unit/util/instrumentation/data_spec.rb
+- spec/unit/util/instrumentation/indirection_probe_spec.rb
+- spec/unit/util/instrumentation/instrumentable_spec.rb
+- spec/unit/util/instrumentation/listener_spec.rb
+- spec/unit/util/instrumentation/listeners/log_spec.rb
+- spec/unit/util/instrumentation/listeners/performance_spec.rb
+- spec/unit/util/instrumentation_spec.rb
 - spec/unit/util/ldap/connection_spec.rb
 - spec/unit/util/ldap/generator_spec.rb
 - spec/unit/util/ldap/manager_spec.rb
@@ -1715,6 +1760,7 @@ files:
 - spec/unit/util/network_device/transport/telnet_spec.rb
 - spec/unit/util/network_device_spec.rb
 - spec/unit/util/package_spec.rb
+- spec/unit/util/pidlock_spec.rb
 - spec/unit/util/posix_spec.rb
 - spec/unit/util/pson_spec.rb
 - spec/unit/util/queue/stomp_spec.rb
@@ -1724,12 +1770,14 @@ files:
 - spec/unit/util/reference_serializer_spec.rb
 - spec/unit/util/reference_spec.rb
 - spec/unit/util/resource_template_spec.rb
+- spec/unit/util/retryaction_spec.rb
 - spec/unit/util/run_mode_spec.rb
 - spec/unit/util/selinux_spec.rb
 - spec/unit/util/settings/file_setting_spec.rb
 - spec/unit/util/settings_spec.rb
 - spec/unit/util/storage_spec.rb
 - spec/unit/util/suidmanager_spec.rb
+- spec/unit/util/symbolic_file_mode_spec.rb
 - spec/unit/util/tagging_spec.rb
 - spec/unit/util/user_attr_spec.rb
 - spec/unit/util/warnings_spec.rb