chef 14.2.0-universal-mingw32 → 14.3.37-universal-mingw32

data/spec/unit/provider/mount/mount_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Provider::Mount::Mount do
     @new_resource.device_type :device
     @new_resource.fstype      "ext3"
 
-    @new_resource.supports :remount => false
+    @new_resource.supports remount: false
 
     @provider = Chef::Provider::Mount::Mount.new(@new_resource, @run_context)
 
@@ -42,7 +42,7 @@ describe Chef::Provider::Mount::Mount do
 
   describe "when discovering the current fs state" do
     before do
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => ""))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: ""))
       allow(::File).to receive(:foreach).with("/etc/fstab")
     end
 
@@ -54,10 +54,10 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should accept device_type :uuid", :not_supported_on_solaris do
-      @status = double(:stdout => "/dev/sdz1\n", :exitstatus => 1)
+      @status = double(stdout: "/dev/sdz1\n", exitstatus: 1)
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
-      @stdout_findfs = double("STDOUT", :first => "/dev/sdz1")
+      @stdout_findfs = double("STDOUT", first: "/dev/sdz1")
       expect(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(@status)
       @provider.load_current_resource
       @provider.mountable?
@@ -73,7 +73,7 @@ describe Chef::Provider::Mount::Mount do
 
         it "should ignore trailing slash and set mounted to true for network mount (#{type})" do
           @new_resource.device fs_spec
-          allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
+          allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
           @provider.load_current_resource
           expect(@provider.current_resource.mounted).to be_truthy
         end
@@ -94,7 +94,7 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should raise an error if the mount device (uuid) does not exist", :not_supported_on_solaris do
-      status = double(:stdout => "", :exitstatus => 1)
+      status = double(stdout: "", exitstatus: 1)
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
       expect(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
@@ -121,13 +121,13 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should set mounted true if the mount point is found in the mounts list" do
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdz1 on /tmp/foo type ext3 (rw)\n"))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "/dev/sdz1 on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set mounted false if another mount point beginning with the same path is found in the mounts list" do
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdz1 on /tmp/foobar type ext3 (rw)\n"))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "/dev/sdz1 on /tmp/foobar type ext3 (rw)\n"))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_falsey
     end
@@ -136,10 +136,10 @@ describe Chef::Provider::Mount::Mount do
       # expand the target path to correct specs on Windows
       target = ::File.expand_path("/dev/mapper/target")
 
-      allow(::File).to receive(:symlink?).with("#{@new_resource.device}").and_return(true)
-      allow(::File).to receive(:readlink).with("#{@new_resource.device}").and_return(target)
+      allow(::File).to receive(:symlink?).with((@new_resource.device).to_s).and_return(true)
+      allow(::File).to receive(:readlink).with((@new_resource.device).to_s).and_return(target)
 
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "#{target} on /tmp/foo type ext3 (rw)\n"))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{target} on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_truthy
     end
@@ -150,10 +150,10 @@ describe Chef::Provider::Mount::Mount do
       # expand the target path to correct specs on Windows
       absolute_target = ::File.expand_path("/dev/xsdz1")
 
-      allow(::File).to receive(:symlink?).with("#{@new_resource.device}").and_return(true)
-      allow(::File).to receive(:readlink).with("#{@new_resource.device}").and_return(target)
+      allow(::File).to receive(:symlink?).with((@new_resource.device).to_s).and_return(true)
+      allow(::File).to receive(:readlink).with((@new_resource.device).to_s).and_return(target)
 
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "#{absolute_target} on /tmp/foo type ext3 (rw)\n"))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{absolute_target} on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_truthy
     end
@@ -162,7 +162,7 @@ describe Chef::Provider::Mount::Mount do
       mount = "/dev/sdy1 on #{@new_resource.mount_point} type ext3 (rw)\n"
       mount << "#{@new_resource.device} on #{@new_resource.mount_point} type ext3 (rw)\n"
 
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: mount))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_truthy
     end
@@ -171,13 +171,13 @@ describe Chef::Provider::Mount::Mount do
       mount = "#{@new_resource.device} on #{@new_resource.mount_point} type ext3 (rw)\n"
       mount << "/dev/sdy1 on #{@new_resource.mount_point} type ext3 (rw)\n"
 
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: mount))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_falsey
     end
 
     it "mounted should be false if the mount point is not found in the mounts list" do
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       expect(@provider.current_resource.mounted).to be_falsey
     end
@@ -205,8 +205,8 @@ describe Chef::Provider::Mount::Mount do
     it "should set enabled to true if the symlink target is in fstab" do
       target = "/dev/mapper/target"
 
-      allow(::File).to receive(:symlink?).with("#{@new_resource.device}").and_return(true)
-      allow(::File).to receive(:readlink).with("#{@new_resource.device}").and_return(target)
+      allow(::File).to receive(:symlink?).with((@new_resource.device).to_s).and_return(true)
+      allow(::File).to receive(:readlink).with((@new_resource.device).to_s).and_return(target)
 
       fstab = "/dev/sdz1  /tmp/foo ext3  defaults  1 2\n"
 
@@ -219,8 +219,8 @@ describe Chef::Provider::Mount::Mount do
     it "should set enabled to true if the symlink target is relative and is in fstab - CHEF-4957" do
       target = "xsdz1"
 
-      allow(::File).to receive(:symlink?).with("#{@new_resource.device}").and_return(true)
-      allow(::File).to receive(:readlink).with("#{@new_resource.device}").and_return(target)
+      allow(::File).to receive(:symlink?).with((@new_resource.device).to_s).and_return(true)
+      allow(::File).to receive(:readlink).with((@new_resource.device).to_s).and_return(target)
 
       fstab = "/dev/sdz1  /tmp/foo ext3  defaults  1 2\n"
 
@@ -307,7 +307,7 @@ describe Chef::Provider::Mount::Mount do
       end
 
       it "should mount the filesystem specified by uuid", :not_supported_on_solaris do
-        status = double(:stdout => "/dev/sdz1\n", :exitstatus => 1)
+        status = double(stdout: "/dev/sdz1\n", exitstatus: 1)
         @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
         @new_resource.device_type :uuid
         allow(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
@@ -341,14 +341,14 @@ describe Chef::Provider::Mount::Mount do
 
     describe "remount_fs" do
       it "should use mount -o remount if remount is supported" do
-        @new_resource.supports({ :remount => true })
+        @new_resource.supports({ remount: true })
         @current_resource.mounted(true)
         expect(@provider).to receive(:shell_out!).with("mount -o remount,defaults #{@new_resource.mount_point}")
         @provider.remount_fs
       end
 
       it "should use mount -o remount with new mount options if remount is supported" do
-        @new_resource.supports({ :remount => true })
+        @new_resource.supports({ remount: true })
         options = "rw,noexec,noauto"
         @new_resource.options(%w{rw noexec noauto})
         @current_resource.mounted(true)
@@ -357,7 +357,7 @@ describe Chef::Provider::Mount::Mount do
       end
 
       it "should umount and mount if remount is not supported" do
-        @new_resource.supports({ :remount => false })
+        @new_resource.supports({ remount: false })
         @current_resource.mounted(true)
         expect(@provider).to receive(:umount_fs)
         expect(@provider).to receive(:sleep).with(1)
@@ -499,7 +499,7 @@ describe Chef::Provider::Mount::Mount do
     context "when the device is described differently", :not_supported_on_solaris do
       it "should update the existing line" do
         @current_resource.enabled(true)
-        status = double(:stdout => "/dev/sdz1\n", :exitstatus => 1)
+        status = double(stdout: "/dev/sdz1\n", exitstatus: 1)
         expect(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
 
         filesystems = [%q{/dev/sdy1 /tmp/foo  ext3  defaults  1 2},

data/spec/unit/provider/mount/solaris_spec.rb

@@ -48,7 +48,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
     new_resource.fsck_device fsck_device
     new_resource.fstype      fstype
     new_resource.options     options
-    new_resource.supports :remount => false
+    new_resource.supports remount: false
     new_resource
   end
 
@@ -92,7 +92,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
 
   before do
     stub_const("Chef::Provider::Mount::Solaris::VFSTAB", vfstab_file.path )
-    allow(provider).to receive(:shell_out!).with("mount -v").and_return(OpenStruct.new(:stdout => mount_output))
+    allow(provider).to receive(:shell_out!).with("mount -v").and_return(OpenStruct.new(stdout: mount_output))
     allow(File).to receive(:symlink?).with(device).and_return(false)
     allow(File).to receive(:exist?).and_call_original # Tempfile.open on ruby 1.8.7 calls File.exist?
     allow(File).to receive(:exist?).with(device).and_return(true)

data/spec/unit/provider/mount/windows_spec.rb

@@ -29,8 +29,8 @@ class Chef
   end
 end
 
-GUID = "\\\\?\\Volume{578e72b5-6e70-11df-b5c5-000c29d4a7d9}\\"
-REMOTE = "\\\\server-name\\path"
+GUID = "\\\\?\\Volume{578e72b5-6e70-11df-b5c5-000c29d4a7d9}\\".freeze
+REMOTE = "\\\\server-name\\path".freeze
 
 describe Chef::Provider::Mount::Windows do
   before(:each) do
@@ -99,10 +99,10 @@ describe Chef::Provider::Mount::Windows do
       end
 
       it "should mount the filesystem if it is not mounted" do
-        expect(@vol).to receive(:add).with(:remote => @new_resource.device,
-                                           :username => @new_resource.username,
-                                           :domainname => @new_resource.domain,
-                                           :password => @new_resource.password)
+        expect(@vol).to receive(:add).with(remote: @new_resource.device,
+                                           username: @new_resource.username,
+                                           domainname: @new_resource.domain,
+                                           password: @new_resource.password)
         @provider.mount_fs
       end
 

data/spec/unit/provider/ohai_spec.rb

@@ -29,16 +29,16 @@ describe Chef::Provider::Ohai do
     @platform_version = "example-platform"
     Chef::Config[:node_name] = @fqdn
     mock_ohai = {
-      :fqdn => @fqdn,
-      :hostname => @hostname,
-      :platform => @platform,
-      :platform_version => @platform_version,
-      :data => {
-        :origdata => "somevalue",
+      fqdn: @fqdn,
+      hostname: @hostname,
+      platform: @platform,
+      platform_version: @platform_version,
+      data: {
+        origdata: "somevalue",
       },
-      :data2 => {
-        :origdata => "somevalue",
-        :newdata => "somevalue",
+      data2: {
+        origdata: "somevalue",
+        newdata: "somevalue",
       },
     }
     allow(mock_ohai).to receive(:all_plugins).and_return(true)

data/spec/unit/provider/osx_profile_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Provider::OsxProfile do
   let(:shell_out_success) do
-    double("shell_out", :exitstatus => 0, :error? => false)
+    double("shell_out", exitstatus: 0, error?: false)
   end
   describe "action_create" do
     let(:node) { Chef::Node.new }

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,29 +31,29 @@ describe Chef::Provider::Package::Apt do
     allow(@run_context).to receive(:logger).and_return(logger)
     @new_resource = Chef::Resource::AptPackage.new("irssi", @run_context)
 
-    @status = double("Status", :exitstatus => 0)
+    @status = double("Status", exitstatus: 0)
     @provider = Chef::Provider::Package::Apt.new(@new_resource, @run_context)
     @stdin = StringIO.new
-    @stdout = <<-PKG_STATUS
-irssi:
-  Installed: (none)
-  Candidate: 0.8.14-1ubuntu4
-  Version table:
-     0.8.14-1ubuntu4 0
-        500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
+    @stdout = <<~PKG_STATUS
+      irssi:
+        Installed: (none)
+        Candidate: 0.8.14-1ubuntu4
+        Version table:
+           0.8.14-1ubuntu4 0
+              500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
     PKG_STATUS
     @stderr = ""
-    @shell_out = OpenStruct.new(:stdout => @stdout, :stdin => @stdin, :stderr => @stderr, :status => @status, :exitstatus => 0)
+    @shell_out = OpenStruct.new(stdout: @stdout, stdin: @stdin, stderr: @stderr, status: @status, exitstatus: 0)
     @timeout = 900
   end
 
   describe "when loading current resource" do
 
     it "should create a current resource with the name of the new_resource" do
-      expect(@provider).to receive(:shell_out!).with(
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "policy", @new_resource.package_name,
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(@shell_out)
       @provider.load_current_resource
 
@@ -65,19 +65,19 @@ irssi:
     end
 
     it "should set the installed version if package has one" do
-      @stdout.replace(<<-INSTALLED)
-sudo:
-  Installed: 1.7.2p1-1ubuntu5.3
-  Candidate: 1.7.2p1-1ubuntu5.3
-  Version table:
- *** 1.7.2p1-1ubuntu5.3 0
-        500 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main Packages
-        500 http://security.ubuntu.com/ubuntu/ lucid-security/main Packages
-        100 /var/lib/dpkg/status
-     1.7.2p1-1ubuntu5 0
-        500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
+      @stdout.replace(<<~INSTALLED)
+        sudo:
+          Installed: 1.7.2p1-1ubuntu5.3
+          Candidate: 1.7.2p1-1ubuntu5.3
+          Version table:
+         *** 1.7.2p1-1ubuntu5.3 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main Packages
+                500 http://security.ubuntu.com/ubuntu/ lucid-security/main Packages
+                100 /var/lib/dpkg/status
+             1.7.2p1-1ubuntu5 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
       INSTALLED
-      expect(@provider).to receive(:shell_out!).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       @provider.load_current_resource
       expect(@provider.current_resource.version).to eq(["1.7.2p1-1ubuntu5.3"])
       expect(@provider.candidate_version).to eql(["1.7.2p1-1ubuntu5.3"])
@@ -86,23 +86,23 @@ sudo:
     # it is the superclasses responsibility to throw most exceptions
     it "if the package does not exist in the cache sets installed + candidate version to nil" do
       @new_resource.package_name("conic-smarms")
-      policy_out = <<-POLICY_STDOUT
-N: Unable to locate package conic-smarms
+      policy_out = <<~POLICY_STDOUT
+        N: Unable to locate package conic-smarms
       POLICY_STDOUT
-      policy = double(:stdout => policy_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      policy = double(stdout: policy_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "policy", "conic-smarms",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(policy)
-      showpkg_out = <<-SHOWPKG_STDOUT
-N: Unable to locate package conic-smarms
+      showpkg_out = <<~SHOWPKG_STDOUT
+        N: Unable to locate package conic-smarms
       SHOWPKG_STDOUT
-      showpkg = double(:stdout => showpkg_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      showpkg = double(stdout: showpkg_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "showpkg", "conic-smarms",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(showpkg)
       @provider.load_current_resource
     end
@@ -111,104 +111,104 @@ N: Unable to locate package conic-smarms
     # list of virtual packages: http://www.debian.org/doc/packaging-manuals/virtual-package-names-list.txt
     it "should not install the virtual package there is a single provider package and it is installed" do
       @new_resource.package_name("libmysqlclient15-dev")
-      virtual_package_out = <<-VPKG_STDOUT
-libmysqlclient15-dev:
-  Installed: (none)
-  Candidate: (none)
-  Version table:
+      virtual_package_out = <<~VPKG_STDOUT
+        libmysqlclient15-dev:
+          Installed: (none)
+          Candidate: (none)
+          Version table:
       VPKG_STDOUT
-      virtual_package = double(:stdout => virtual_package_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      virtual_package = double(stdout: virtual_package_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "policy", "libmysqlclient15-dev",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(virtual_package)
-      showpkg_out = <<-SHOWPKG_STDOUT
-Package: libmysqlclient15-dev
-Versions:
-
-Reverse Depends:
-  libmysqlclient-dev,libmysqlclient15-dev
-  libmysqlclient-dev,libmysqlclient15-dev
-  libmysqlclient-dev,libmysqlclient15-dev
-  libmysqlclient-dev,libmysqlclient15-dev
-  libmysqlclient-dev,libmysqlclient15-dev
-  libmysqlclient-dev,libmysqlclient15-dev
-Dependencies:
-Provides:
-Reverse Provides:
-libmysqlclient-dev 5.1.41-3ubuntu12.7
-libmysqlclient-dev 5.1.41-3ubuntu12.10
-libmysqlclient-dev 5.1.41-3ubuntu12
+      showpkg_out = <<~SHOWPKG_STDOUT
+        Package: libmysqlclient15-dev
+        Versions:
+
+        Reverse Depends:
+          libmysqlclient-dev,libmysqlclient15-dev
+          libmysqlclient-dev,libmysqlclient15-dev
+          libmysqlclient-dev,libmysqlclient15-dev
+          libmysqlclient-dev,libmysqlclient15-dev
+          libmysqlclient-dev,libmysqlclient15-dev
+          libmysqlclient-dev,libmysqlclient15-dev
+        Dependencies:
+        Provides:
+        Reverse Provides:
+        libmysqlclient-dev 5.1.41-3ubuntu12.7
+        libmysqlclient-dev 5.1.41-3ubuntu12.10
+        libmysqlclient-dev 5.1.41-3ubuntu12
       SHOWPKG_STDOUT
-      showpkg = double(:stdout => showpkg_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      showpkg = double(stdout: showpkg_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "showpkg", "libmysqlclient15-dev",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(showpkg)
-      real_package_out = <<-RPKG_STDOUT
-libmysqlclient-dev:
-  Installed: 5.1.41-3ubuntu12.10
-  Candidate: 5.1.41-3ubuntu12.10
-  Version table:
- *** 5.1.41-3ubuntu12.10 0
-        500 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main Packages
-        100 /var/lib/dpkg/status
-     5.1.41-3ubuntu12.7 0
-        500 http://security.ubuntu.com/ubuntu/ lucid-security/main Packages
-     5.1.41-3ubuntu12 0
-        500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
+      real_package_out = <<~RPKG_STDOUT
+        libmysqlclient-dev:
+          Installed: 5.1.41-3ubuntu12.10
+          Candidate: 5.1.41-3ubuntu12.10
+          Version table:
+         *** 5.1.41-3ubuntu12.10 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main Packages
+                100 /var/lib/dpkg/status
+             5.1.41-3ubuntu12.7 0
+                500 http://security.ubuntu.com/ubuntu/ lucid-security/main Packages
+             5.1.41-3ubuntu12 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
       RPKG_STDOUT
-      real_package = double(:stdout => real_package_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      real_package = double(stdout: real_package_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "policy", "libmysqlclient-dev",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(real_package)
       @provider.load_current_resource
     end
 
     it "should raise an exception if you specify a virtual package with multiple provider packages" do
       @new_resource.package_name("mp3-decoder")
-      virtual_package_out = <<-VPKG_STDOUT
-mp3-decoder:
-  Installed: (none)
-  Candidate: (none)
-  Version table:
+      virtual_package_out = <<~VPKG_STDOUT
+        mp3-decoder:
+          Installed: (none)
+          Candidate: (none)
+          Version table:
       VPKG_STDOUT
-      virtual_package = double(:stdout => virtual_package_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      virtual_package = double(stdout: virtual_package_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "policy", "mp3-decoder",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(virtual_package)
-      showpkg_out = <<-SHOWPKG_STDOUT
-Package: mp3-decoder
-Versions:
-
-Reverse Depends:
-  nautilus,mp3-decoder
-  vux,mp3-decoder
-  plait,mp3-decoder
-  ecasound,mp3-decoder
-  nautilus,mp3-decoder
-Dependencies:
-Provides:
-Reverse Provides:
-vlc-nox 1.0.6-1ubuntu1.8
-vlc 1.0.6-1ubuntu1.8
-vlc-nox 1.0.6-1ubuntu1
-vlc 1.0.6-1ubuntu1
-opencubicplayer 1:0.1.17-2
-mpg321 0.2.10.6
-mpg123 1.12.1-0ubuntu1
+      showpkg_out = <<~SHOWPKG_STDOUT
+        Package: mp3-decoder
+        Versions:
+
+        Reverse Depends:
+          nautilus,mp3-decoder
+          vux,mp3-decoder
+          plait,mp3-decoder
+          ecasound,mp3-decoder
+          nautilus,mp3-decoder
+        Dependencies:
+        Provides:
+        Reverse Provides:
+        vlc-nox 1.0.6-1ubuntu1.8
+        vlc 1.0.6-1ubuntu1.8
+        vlc-nox 1.0.6-1ubuntu1
+        vlc 1.0.6-1ubuntu1
+        opencubicplayer 1:0.1.17-2
+        mpg321 0.2.10.6
+        mpg123 1.12.1-0ubuntu1
       SHOWPKG_STDOUT
-      showpkg = double(:stdout => showpkg_out, :exitstatus => 0)
-      expect(@provider).to receive(:shell_out!).with(
+      showpkg = double(stdout: showpkg_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "showpkg", "mp3-decoder",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(showpkg)
       expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Package)
     end
@@ -219,20 +219,20 @@ mpg123 1.12.1-0ubuntu1
 
       @new_resource.default_release("lenny-backports")
       @new_resource.provider(nil)
-      expect(@provider).to receive(:shell_out!).with(
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "-o", "APT::Default-Release=lenny-backports", "policy", "irssi",
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
       ).and_return(@shell_out)
       @provider.load_current_resource
     end
 
     it "raises an exception if a source is specified (CHEF-5113)" do
       @new_resource.source "pluto"
-      expect(@provider).to receive(:shell_out!).with(
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "apt-cache", "policy", @new_resource.package_name,
-        :env => { "DEBIAN_FRONTEND" => "noninteractive" } ,
-        :timeout => @timeout
+        env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
+        timeout: @timeout
       ).and_return(@shell_out)
       expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
@@ -258,19 +258,19 @@ mpg123 1.12.1-0ubuntu1
 
     describe "install_package" do
       it "should run apt-get install with the package name and version" do
-        expect(@provider).to receive(:shell_out!). with(
+        expect(@provider).to receive(:shell_out_compacted!). with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "install", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.install_package(["irssi"], ["0.8.12-7"])
       end
 
       it "should run apt-get install with the package name and version and options if specified" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "--force-yes", "install", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @new_resource.options("--force-yes")
         @provider.install_package(["irssi"], ["0.8.12-7"])
@@ -283,20 +283,20 @@ mpg123 1.12.1-0ubuntu1
         @new_resource.provider = nil
         @provider.new_resource = @new_resource
 
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "-o", "APT::Default-Release=lenny-backports", "install", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
 
         @provider.install_package(["irssi"], ["0.8.12-7"])
       end
 
       it "should run apt-get install with the package name and quotes options if specified" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "--force-yes", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confnew", "install", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @new_resource.options('--force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew"')
         @provider.install_package(["irssi"], ["0.8.12-7"])
@@ -314,19 +314,19 @@ mpg123 1.12.1-0ubuntu1
     describe Chef::Resource::AptPackage, "remove_package" do
 
       it "should run apt-get remove with the package name" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "remove", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.remove_package(["irssi"], ["0.8.12-7"])
       end
 
       it "should run apt-get remove with the package name and options if specified" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "--force-yes", "remove", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @new_resource.options("--force-yes")
 
@@ -337,19 +337,19 @@ mpg123 1.12.1-0ubuntu1
     describe "when purging a package" do
 
       it "should run apt-get purge with the package name" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "purge", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.purge_package(["irssi"], ["0.8.12-7"])
       end
 
       it "should run apt-get purge with the package name and options if specified" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "--force-yes", "purge", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @new_resource.options("--force-yes")
 
@@ -365,20 +365,20 @@ mpg123 1.12.1-0ubuntu1
       it "should get the full path to the preseed response file" do
         file = "/tmp/irssi-0.8.12-7.seed"
 
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "debconf-set-selections", "/tmp/irssi-0.8.12-7.seed",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
 
         @provider.preseed_package(file)
       end
 
       it "should run debconf-set-selections on the preseed file if it has changed" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "debconf-set-selections", "/tmp/irssi-0.8.12-7.seed",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         file = @provider.get_preseed_file("irssi", "0.8.12-7")
         @provider.preseed_package(file)
@@ -389,17 +389,17 @@ mpg123 1.12.1-0ubuntu1
         @current_resource.version "0.8.11"
         @new_resource.response_file "/tmp/file"
         allow(@provider).to receive(:get_preseed_file).and_return(false)
-        expect(@provider).not_to receive(:shell_out!)
+        expect(@provider).not_to receive(:shell_out_compacted!)
         @provider.run_action(:reconfig)
       end
     end
 
     describe "when reconfiguring a package" do
       it "should run dpkg-reconfigure package" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "dpkg-reconfigure", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.reconfig_package("irssi", "0.8.12-7")
       end
@@ -407,16 +407,16 @@ mpg123 1.12.1-0ubuntu1
 
     describe "when locking a package" do
       it "should run apt-mark hold package" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-mark", "hold", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.lock_package("irssi", "0.8.12-7")
       end
       it "should not lock if the package is already locked" do
-        allow(@provider).to receive(:shell_out_compact_timeout!).with(
-          "apt-mark", "showhold"
+        allow(@provider).to receive(:shell_out_compacted!).with(
+          "apt-mark", "showhold", timeout: 900
         ).and_return(instance_double(
           Mixlib::ShellOut, stdout: "irssi")
                     )
@@ -428,16 +428,16 @@ mpg123 1.12.1-0ubuntu1
 
     describe "when unlocking a package" do
       it "should run apt-mark unhold package" do
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-mark", "unhold", "irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.unlock_package("irssi", "0.8.12-7")
       end
       it "should not unlock if the package is already unlocked" do
-        allow(@provider).to receive(:shell_out_compact_timeout!).with(
-          "apt-mark", "showhold"
+        allow(@provider).to receive(:shell_out_compacted!).with(
+          "apt-mark", "showhold", timeout: 900
         ).and_return(instance_double(
           Mixlib::ShellOut, stdout: "")
                     )
@@ -450,10 +450,10 @@ mpg123 1.12.1-0ubuntu1
     describe "when installing a virtual package" do
       it "should install the package without specifying a version" do
         @provider.package_data["libmysqlclient15-dev"][:virtual] = true
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "install", "libmysqlclient15-dev",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.install_package(["libmysqlclient15-dev"], ["not_a_real_version"])
       end
@@ -462,10 +462,10 @@ mpg123 1.12.1-0ubuntu1
     describe "when removing a virtual package" do
       it "should remove the resolved name instead of the virtual package name" do
         expect(@provider).to receive(:resolve_virtual_package_name).with("libmysqlclient15-dev").and_return("libmysqlclient-dev")
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "remove", "libmysqlclient-dev",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.remove_package(["libmysqlclient15-dev"], ["not_a_real_version"])
       end
@@ -474,10 +474,10 @@ mpg123 1.12.1-0ubuntu1
     describe "when purging a virtual package" do
       it "should purge the resolved name instead of the virtual package name" do
         expect(@provider).to receive(:resolve_virtual_package_name).with("libmysqlclient15-dev").and_return("libmysqlclient-dev")
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "purge", "libmysqlclient-dev",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.purge_package(["libmysqlclient15-dev"], ["not_a_real_version"])
       end
@@ -486,10 +486,10 @@ mpg123 1.12.1-0ubuntu1
     describe "when installing multiple packages" do
       it "can install a virtual package followed by a non-virtual package" do
         # https://github.com/chef/chef/issues/2914
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "install", "libmysqlclient15-dev", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.install_package(["libmysqlclient15-dev", "irssi"], ["not_a_real_version", "0.8.12-7"])
       end
@@ -499,8 +499,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run dpkg to compare versions if an existing version is installed" do
         allow(@provider).to receive(:get_current_versions).and_return("1.4.0")
         allow(@new_resource).to receive(:allow_downgrade).and_return(false)
-        expect(@provider).to receive(:shell_out_compact_timeout).with(
-          "dpkg", "--compare-versions", "1.4.0", "gt", "0.8.12-7"
+        expect(@provider).to receive(:shell_out_compacted).with(
+          "dpkg", "--compare-versions", "1.4.0", "gt", "0.8.12-7", timeout: 900
         ).and_return(double(error?: false))
         @provider.run_action(:upgrade)
       end
@@ -509,10 +509,10 @@ mpg123 1.12.1-0ubuntu1
         allow(@provider).to receive(:get_current_versions).and_return("0.4.0")
         allow(@new_resource).to receive(:allow_downgrade).and_return(false)
         expect(@provider).to receive(:version_compare).and_return(-1)
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "install", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.run_action(:upgrade)
       end
@@ -521,10 +521,10 @@ mpg123 1.12.1-0ubuntu1
         allow(@provider).to receive(:get_current_versions).and_return(nil)
         allow(@new_resource).to receive(:allow_downgrade).and_return(false)
         expect(@provider).not_to receive(:version_compare)
-        expect(@provider).to receive(:shell_out!).with(
+        expect(@provider).to receive(:shell_out_compacted!).with(
           "apt-get", "-q", "-y", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "install", "irssi=0.8.12-7",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive" },
-          :timeout => @timeout
+          env: { "DEBIAN_FRONTEND" => "noninteractive" },
+          timeout: @timeout
         )
         @provider.run_action(:upgrade)
       end