From 35603c7ce1bd3ccf35334ed65152140f0ecaf080 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:25:16 -0700
Subject: fix Style/HashSyntax

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/apt_spec.rb           | 134 ++++++++---------
 spec/unit/provider/package/bff_spec.rb           |  24 ++--
 spec/unit/provider/package/chocolatey_spec.rb    |  46 +++---
 spec/unit/provider/package/dpkg_spec.rb          |   8 +-
 spec/unit/provider/package/freebsd/pkg_spec.rb   |  26 ++--
 spec/unit/provider/package/freebsd/pkgng_spec.rb |  10 +-
 spec/unit/provider/package/freebsd/port_spec.rb  |  18 +--
 spec/unit/provider/package/homebrew_spec.rb      |   8 +-
 spec/unit/provider/package/ips_spec.rb           |   4 +-
 spec/unit/provider/package/macports_spec.rb      |   8 +-
 spec/unit/provider/package/openbsd_spec.rb       |  22 +--
 spec/unit/provider/package/pacman_spec.rb        |   8 +-
 spec/unit/provider/package/paludis_spec.rb       |  10 +-
 spec/unit/provider/package/portage_spec.rb       |   8 +-
 spec/unit/provider/package/powershell_spec.rb    | 176 +++++++++++------------
 spec/unit/provider/package/smartos_spec.rb       |  20 +--
 spec/unit/provider/package/solaris_spec.rb       |  12 +-
 spec/unit/provider/package/windows/exe_spec.rb   |   2 +-
 spec/unit/provider/package/windows/msi_spec.rb   |   2 +-
 spec/unit/provider/package/windows_spec.rb       |   2 +-
 spec/unit/provider/package/zypper_spec.rb        |  12 +-
 21 files changed, 280 insertions(+), 280 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb
index f15929880d..1047534f98 100644
--- a/spec/unit/provider/package/apt_spec.rb
+++ b/spec/unit/provider/package/apt_spec.rb
@@ -31,7 +31,7 @@ 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
@@ -43,7 +43,7 @@ irssi:
         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
 
@@ -52,8 +52,8 @@ irssi:
     it "should create a current resource with the name of the new_resource" do
       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
 
@@ -89,20 +89,20 @@ sudo:
       policy_out = <<-POLICY_STDOUT
 N: Unable to locate package conic-smarms
       POLICY_STDOUT
-      policy = double(:stdout => policy_out, :exitstatus => 0)
+      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_STDOUT
-      showpkg = double(:stdout => showpkg_out, :exitstatus => 0)
+      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
@@ -117,11 +117,11 @@ libmysqlclient15-dev:
   Candidate: (none)
   Version table:
       VPKG_STDOUT
-      virtual_package = double(:stdout => virtual_package_out, :exitstatus => 0)
+      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
@@ -141,11 +141,11 @@ 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)
+      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:
@@ -160,11 +160,11 @@ libmysqlclient-dev:
      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)
+      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
@@ -177,11 +177,11 @@ mp3-decoder:
   Candidate: (none)
   Version table:
       VPKG_STDOUT
-      virtual_package = double(:stdout => virtual_package_out, :exitstatus => 0)
+      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
@@ -204,11 +204,11 @@ 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)
+      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
@@ -221,8 +221,8 @@ mpg123 1.12.1-0ubuntu1
       @new_resource.provider(nil)
       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
@@ -231,8 +231,8 @@ mpg123 1.12.1-0ubuntu1
       @new_resource.source "pluto"
       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
@@ -260,8 +260,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get install with the package name and version" do
         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
@@ -269,8 +269,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get install with the package name and version and options if specified" do
         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"])
@@ -285,8 +285,8 @@ mpg123 1.12.1-0ubuntu1
 
         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"])
@@ -295,8 +295,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get install with the package name and quotes options if specified" do
         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"])
@@ -316,8 +316,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get remove with the package name" do
         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
@@ -325,8 +325,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get remove with the package name and options if specified" do
         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")
 
@@ -339,8 +339,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get purge with the package name" do
         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
@@ -348,8 +348,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-get purge with the package name and options if specified" do
         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")
 
@@ -367,8 +367,8 @@ mpg123 1.12.1-0ubuntu1
 
         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)
@@ -377,8 +377,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run debconf-set-selections on the preseed file if it has changed" do
         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)
@@ -398,8 +398,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run dpkg-reconfigure package" do
         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
@@ -409,8 +409,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-mark hold package" do
         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
@@ -430,8 +430,8 @@ mpg123 1.12.1-0ubuntu1
       it "should run apt-mark unhold package" do
         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
@@ -452,8 +452,8 @@ mpg123 1.12.1-0ubuntu1
         @provider.package_data["libmysqlclient15-dev"][:virtual] = true
         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
@@ -464,8 +464,8 @@ mpg123 1.12.1-0ubuntu1
         expect(@provider).to receive(:resolve_virtual_package_name).with("libmysqlclient15-dev").and_return("libmysqlclient-dev")
         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
@@ -476,8 +476,8 @@ mpg123 1.12.1-0ubuntu1
         expect(@provider).to receive(:resolve_virtual_package_name).with("libmysqlclient15-dev").and_return("libmysqlclient-dev")
         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
@@ -488,8 +488,8 @@ mpg123 1.12.1-0ubuntu1
         # https://github.com/chef/chef/issues/2914
         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
@@ -511,8 +511,8 @@ mpg123 1.12.1-0ubuntu1
         expect(@provider).to receive(:version_compare).and_return(-1)
         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
@@ -523,8 +523,8 @@ mpg123 1.12.1-0ubuntu1
         expect(@provider).not_to receive(:version_compare)
         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
diff --git a/spec/unit/provider/package/bff_spec.rb b/spec/unit/provider/package/bff_spec.rb
index df407914d3..7606092762 100644
--- a/spec/unit/provider/package/bff_spec.rb
+++ b/spec/unit/provider/package/bff_spec.rb
@@ -38,11 +38,11 @@ describe Chef::Provider::Package::Bff do
       @bffinfo = "/usr/lib/objrepos:samba.base:3.3.12.0::COMMITTED:I:Samba for AIX:
   /etc/objrepos:samba.base:3.3.12.0::COMMITTED:I:Samba for AIX:"
 
-      @empty_status = double("Status", :stdout => "", :exitstatus => 0)
+      @empty_status = double("Status", stdout: "", exitstatus: 0)
     end
 
     it "should create a current resource with the name of new_resource" do
-      status = double("Status", :stdout => @bffinfo, :exitstatus => 0)
+      status = double("Status", stdout: @bffinfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
       expect(@provider).to receive(:shell_out_compacted).with("lslpp", "-lcq", "samba.base", timeout: 900).and_return(@empty_status)
       @provider.load_current_resource
@@ -50,7 +50,7 @@ describe Chef::Provider::Package::Bff do
     end
 
     it "should set the current resource bff package name to the new resource bff package name" do
-      status = double("Status", :stdout => @bffinfo, :exitstatus => 0)
+      status = double("Status", stdout: @bffinfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
       expect(@provider).to receive(:shell_out_compacted).with("lslpp", "-lcq", "samba.base", timeout: 900).and_return(@empty_status)
       @provider.load_current_resource
@@ -66,7 +66,7 @@ describe Chef::Provider::Package::Bff do
     end
 
     it "should get the source package version from lslpp if provided" do
-      status = double("Status", :stdout => @bffinfo, :exitstatus => 0)
+      status = double("Status", stdout: @bffinfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
       expect(@provider).to receive(:shell_out_compacted).with("lslpp", "-lcq", "samba.base", timeout: 900).and_return(@empty_status)
       @provider.load_current_resource
@@ -78,7 +78,7 @@ describe Chef::Provider::Package::Bff do
     it "should warn if the package is not a fileset" do
       info = "samba.base:samba.base.samples:3.3.12.0::COMMITTED:I:Samba for AIX:
   /etc/objrepos:samba.base:3.3.12.0::COMMITTED:I:Samba for AIX:"
-      status = double("Status", :stdout => info, :exitstatus => 0)
+      status = double("Status", stdout: info, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
       expect(@provider).to receive(:shell_out_compacted).with("lslpp", "-lcq", "samba.base", timeout: 900).and_return(@empty_status)
       expect(logger).to receive(:warn).once.with(%r{bff package by product name})
@@ -89,7 +89,7 @@ describe Chef::Provider::Package::Bff do
     end
 
     it "should return the current version installed if found by lslpp" do
-      status = double("Status", :stdout => @bffinfo, :exitstatus => 0)
+      status = double("Status", stdout: @bffinfo, exitstatus: 0)
       @stdout = StringIO.new(@bffinfo)
       @stdin, @stderr = StringIO.new, StringIO.new
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
@@ -99,7 +99,7 @@ describe Chef::Provider::Package::Bff do
     end
 
     it "should raise an exception if the source is not set but we are installing" do
-      status = double("Status", :stdout => "", :exitstatus => 1, :format_for_exception => "")
+      status = double("Status", stdout: "", exitstatus: 1, format_for_exception: "")
       @new_resource = Chef::Resource::Package.new("samba.base")
       @provider = Chef::Provider::Package::Bff.new(@new_resource, @run_context)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
@@ -107,13 +107,13 @@ describe Chef::Provider::Package::Bff do
     end
 
     it "should raise an exception if installp/lslpp fails to run" do
-      status = double(:stdout => "", :exitstatus => -1, :format_for_exception => "")
+      status = double(stdout: "", exitstatus: -1, format_for_exception: "")
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
       expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should return a current resource with a nil version if the package is not found" do
-      status = double("Status", :stdout => @bffinfo, :exitstatus => 0)
+      status = double("Status", stdout: @bffinfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
       expect(@provider).to receive(:shell_out_compacted).with("lslpp", "-lcq", "samba.base", timeout: 900).and_return(@empty_status)
       @provider.load_current_resource
@@ -123,7 +123,7 @@ describe Chef::Provider::Package::Bff do
     it "should raise an exception if the source doesn't provide the requested package" do
       wrongbffinfo = "/usr/lib/objrepos:openssl.base:0.9.8.2400::COMMITTED:I:Open Secure Socket Layer:
 /etc/objrepos:openssl.base:0.9.8.2400::COMMITTED:I:Open Secure Socket Layer:"
-      status = double("Status", :stdout => wrongbffinfo, :exitstatus => 0)
+      status = double("Status", stdout: wrongbffinfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("installp", "-L", "-d", "/tmp/samba.base", timeout: 900).and_return(status)
       expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Package)
     end
@@ -137,13 +137,13 @@ describe Chef::Provider::Package::Bff do
     end
 
     it "should lookup the candidate_version if the variable is not already set" do
-      status = double(:stdout => "", :exitstatus => 0)
+      status = double(stdout: "", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).and_return(status)
       @provider.candidate_version
     end
 
     it "should throw and exception if the exitstatus is not 0" do
-      @status = double(:stdout => "", :exitstatus => 1, :format_for_exception => "")
+      @status = double(stdout: "", exitstatus: 1, format_for_exception: "")
       allow(@provider).to receive(:shell_out_compacted).and_return(@status)
       expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
     end
diff --git a/spec/unit/provider/package/chocolatey_spec.rb b/spec/unit/provider/package/chocolatey_spec.rb
index a0a73c445a..40fca821d9 100644
--- a/spec/unit/provider/package/chocolatey_spec.rb
+++ b/spec/unit/provider/package/chocolatey_spec.rb
@@ -45,8 +45,8 @@ ConEmu|15.10.25.0
   before do
     allow(provider).to receive(:choco_install_path).and_return(choco_install_path)
     allow(provider).to receive(:choco_exe).and_return(choco_exe)
-    local_list_obj = double(:stdout => local_list_stdout)
-    allow(provider).to receive(:shell_out_compacted!).with("#{choco_exe} list -l -r", { :returns => [0], :timeout => timeout }).and_return(local_list_obj)
+    local_list_obj = double(stdout: local_list_stdout)
+    allow(provider).to receive(:shell_out_compacted!).with("#{choco_exe} list -l -r", { returns: [0], timeout: timeout }).and_return(local_list_obj)
   end
 
   def allow_remote_list(package_names, args = nil)
@@ -60,7 +60,7 @@ munin-node|1.6.1.20130823
     EOF
     remote_list_obj = double(stdout: remote_list_stdout)
     package_names.each do |pkg|
-      allow(provider).to receive(:shell_out_compacted!).with("#{choco_exe} list -r #{pkg}#{args}", { :returns => [0], timeout: timeout }).and_return(remote_list_obj)
+      allow(provider).to receive(:shell_out_compacted!).with("#{choco_exe} list -r #{pkg}#{args}", { returns: [0], timeout: timeout }).and_return(remote_list_obj)
     end
   end
 
@@ -182,7 +182,7 @@ munin-node|1.6.1.20130823
     it "should install a single package" do
       allow_remote_list(["git"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -193,7 +193,7 @@ munin-node|1.6.1.20130823
         allow_remote_list(["git"])
         new_resource.timeout(timeout)
         provider.load_current_resource
-        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { :returns => [0], :timeout => timeout }).and_return(double)
+        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { returns: [0], timeout: timeout }).and_return(double)
         provider.run_action(:install)
         expect(new_resource).to be_updated_by_last_action
       end
@@ -222,7 +222,7 @@ munin-node|1.6.1.20130823
       new_resource.package_name("ConEmu")
       new_resource.version("15.10.25.1")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -235,7 +235,7 @@ munin-node|1.6.1.20130823
       new_resource.package_name(%w{chocolatey ConEmu})
       new_resource.version([nil, "15.10.25.1"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -245,7 +245,7 @@ munin-node|1.6.1.20130823
       new_resource.package_name("conemu")
       new_resource.version("15.10.25.1")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -255,8 +255,8 @@ munin-node|1.6.1.20130823
       new_resource.package_name(%w{ConEmu git})
       new_resource.version(["15.10.25.1", nil])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { :returns => [0], :timeout => timeout }).and_return(double)
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -265,7 +265,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["git", "munin-node"])
       new_resource.package_name(["git", "munin-node"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git munin-node", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git munin-node", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -275,7 +275,7 @@ munin-node|1.6.1.20130823
         allow_remote_list(["git"], " -source localpackages")
         new_resource.source("localpackages")
         provider.load_current_resource
-        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -source localpackages git", { :returns => [0], :timeout => timeout }).and_return(double)
+        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -source localpackages git", { returns: [0], timeout: timeout }).and_return(double)
         provider.run_action(:install)
         expect(new_resource).to be_updated_by_last_action
       end
@@ -285,7 +285,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["git"])
       new_resource.options("-force")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -force git", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -force git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -319,7 +319,7 @@ munin-node|1.6.1.20130823
     it "should install a package that is not installed" do
       allow_remote_list(["git"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y git", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -328,7 +328,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["ConEmu"])
       new_resource.package_name("ConEmu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -337,7 +337,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["conemu"])
       new_resource.package_name("conemu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -346,7 +346,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["chocolatey"])
       new_resource.package_name("chocolatey")
       provider.load_current_resource
-      expect(provider).not_to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y chocolatey", { :returns => [0], :timeout => timeout })
+      expect(provider).not_to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y chocolatey", { returns: [0], timeout: timeout })
       provider.run_action(:upgrade)
       expect(new_resource).not_to be_updated_by_last_action
     end
@@ -355,7 +355,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["git"])
       new_resource.version("2.6.2")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y --version 2.6.2 git", { :returns => [0], :timeout => timeout })
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y --version 2.6.2 git", { returns: [0], timeout: timeout })
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -363,7 +363,7 @@ munin-node|1.6.1.20130823
     it "upgrading multiple packages uses a single command" do
       allow_remote_list(%w{conemu git})
       new_resource.package_name(%w{conemu git})
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu git", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -415,7 +415,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["ConEmu"])
       new_resource.package_name("ConEmu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y ConEmu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y ConEmu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -424,7 +424,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(["conemu"])
       new_resource.package_name("conemu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -434,7 +434,7 @@ munin-node|1.6.1.20130823
       allow_remote_list(%w{git conemu})
       new_resource.package_name(%w{git conemu})
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y conemu", { :returns => [0], :timeout => timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -457,7 +457,7 @@ describe "behavior when Chocolatey is not installed" do
     provider.instance_variable_set("@choco_install_path", nil)
 
     # we don't care what this returns, but we have to let it be called.
-    allow(provider).to receive(:shell_out_compacted!).and_return(double(:stdout => ""))
+    allow(provider).to receive(:shell_out_compacted!).and_return(double(stdout: ""))
   end
 
   let(:error_regex) do
diff --git a/spec/unit/provider/package/dpkg_spec.rb b/spec/unit/provider/package/dpkg_spec.rb
index c99e91dd46..cf8f5097f0 100644
--- a/spec/unit/provider/package/dpkg_spec.rb
+++ b/spec/unit/provider/package/dpkg_spec.rb
@@ -31,7 +31,7 @@ describe Chef::Provider::Package::Dpkg do
   let(:provider) { Chef::Provider::Package::Dpkg.new(new_resource, run_context) }
 
   let(:dpkg_deb_version) { "1.11.4" }
-  let(:dpkg_deb_status) { status = double(:stdout => "#{package}\t#{dpkg_deb_version}", :exitstatus => 0) }
+  let(:dpkg_deb_status) { status = double(stdout: "#{package}\t#{dpkg_deb_version}", exitstatus: 0) }
   let(:dpkg_s_version) { "1.11.4-1ubuntu1" }
   let(:dpkg_s_status) do
     stdout = <<-DPKG_S
@@ -47,7 +47,7 @@ Config-Version: #{dpkg_s_version}
 Depends: libc6 (>= 2.8~20080505), libssl0.9.8 (>= 0.9.8f-5)
 Conflicts: wget-ssl
     DPKG_S
-    status = double(:stdout => stdout, :exitstatus => 1)
+    status = double(stdout: stdout, exitstatus: 1)
   end
 
   before(:each) do
@@ -112,7 +112,7 @@ Conflicts: wget-ssl
 
     describe "gets the source package version from dpkg-deb" do
       def check_version(version)
-        status = double(:stdout => "wget\t#{version}", :exitstatus => 0)
+        status = double(stdout: "wget\t#{version}", exitstatus: 0)
         expect(provider).to receive(:shell_out_compacted!).with("dpkg-deb", "-W", source, timeout: 900).and_return(status)
         provider.load_current_resource
         expect(provider.current_resource.package_name).to eq(["wget"])
@@ -206,7 +206,7 @@ Section: ruby
     end
 
     it "should raise an exception if dpkg-deb -W fails to run" do
-      status = double(:stdout => "", :exitstatus => -1)
+      status = double(stdout: "", exitstatus: -1)
       expect(provider).to receive(:shell_out_compacted!).with("dpkg-deb", "-W", "/tmp/wget_1.11.4-1ubuntu1_amd64.deb", timeout: 900).and_raise(Mixlib::ShellOut::ShellCommandFailed)
       expect { provider.load_current_resource }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
     end
diff --git a/spec/unit/provider/package/freebsd/pkg_spec.rb b/spec/unit/provider/package/freebsd/pkg_spec.rb
index 259bd7a4c4..6ad6813503 100644
--- a/spec/unit/provider/package/freebsd/pkg_spec.rb
+++ b/spec/unit/provider/package/freebsd/pkg_spec.rb
@@ -78,21 +78,21 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
     end
 
     it "should return the version number when it is installed" do
-      pkg_info = OpenStruct.new(:stdout => "zsh-4.3.6_7")
+      pkg_info = OpenStruct.new(stdout: "zsh-4.3.6_7")
       expect(@provider).to receive(:shell_out_compacted!).with("pkg_info", "-E", "zsh*", env: nil, returns: [0, 1], timeout: 900).and_return(pkg_info)
       allow(@provider).to receive(:package_name).and_return("zsh")
       expect(@provider.current_installed_version).to eq("4.3.6_7")
     end
 
     it "does not set the current version number when the package is not installed" do
-      pkg_info = OpenStruct.new(:stdout => "")
+      pkg_info = OpenStruct.new(stdout: "")
       expect(@provider).to receive(:shell_out_compacted!).with("pkg_info", "-E", "zsh*", env: nil, returns: [0, 1], timeout: 900).and_return(pkg_info)
       allow(@provider).to receive(:package_name).and_return("zsh")
       expect(@provider.current_installed_version).to be_nil
     end
 
     it "should return the port path for a valid port name" do
-      whereis = OpenStruct.new(:stdout => "zsh: /usr/ports/shells/zsh")
+      whereis = OpenStruct.new(stdout: "zsh: /usr/ports/shells/zsh")
       expect(@provider).to receive(:shell_out_compacted!).with("whereis", "-s", "zsh", env: nil, timeout: 900).and_return(whereis)
       allow(@provider).to receive(:port_name).and_return("zsh")
       expect(@provider.port_path).to eq("/usr/ports/shells/zsh")
@@ -101,7 +101,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
     # Not happy with the form of these tests as they are far too closely tied to the implementation and so very fragile.
     it "should return the ports candidate version when given a valid port path" do
       allow(@provider).to receive(:port_path).and_return("/usr/ports/shells/zsh")
-      make_v = OpenStruct.new(:stdout => "4.3.6\n", :exitstatus => 0)
+      make_v = OpenStruct.new(stdout: "4.3.6\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with("make", "-V", "PORTVERSION", { cwd: "/usr/ports/shells/zsh", returns: [0, 1], env: nil, timeout: 900 }).and_return(make_v)
       expect(@provider.ports_candidate_version).to eq("4.3.6")
     end
@@ -109,7 +109,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
     it "should figure out the package name when we have ports" do
       allow(::File).to receive(:exist?).with("/usr/ports/Makefile").and_return(true)
       allow(@provider).to receive(:port_path).and_return("/usr/ports/shells/zsh")
-      make_v = OpenStruct.new(:stdout => "zsh-4.3.6_7\n", :exitstatus => 0)
+      make_v = OpenStruct.new(stdout: "zsh-4.3.6_7\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with("make", "-V", "PKGNAME", { cwd: "/usr/ports/shells/zsh", env: nil, returns: [0, 1], timeout: 900 }).and_return(make_v)
       #@provider.should_receive(:ports_makefile_variable_value).with("PKGNAME").and_return("zsh-4.3.6_7")
       expect(@provider.package_name).to eq("zsh")
@@ -118,7 +118,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
 
   describe Chef::Provider::Package::Freebsd::Pkg, "install_package" do
     before(:each) do
-      @cmd_result = OpenStruct.new(:status => true)
+      @cmd_result = OpenStruct.new(status: true)
 
       @provider.current_resource = @current_resource
       allow(@provider).to receive(:package_name).and_return("zsh")
@@ -141,7 +141,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
     end
 
     it "should figure out the port path from the package_name using whereis" do
-      whereis = OpenStruct.new(:stdout => "zsh: /usr/ports/shells/zsh")
+      whereis = OpenStruct.new(stdout: "zsh: /usr/ports/shells/zsh")
       expect(@provider).to receive(:shell_out_compacted!).with("whereis", "-s", "zsh", env: nil, timeout: 900).and_return(whereis)
       expect(@provider.port_path).to eq("/usr/ports/shells/zsh")
     end
@@ -174,7 +174,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
       allow(@provider).to receive(:package_name).and_return("ruby18-iconv")
       allow(@provider).to receive(:latest_link_name).and_return("ruby18-iconv")
 
-      @install_result = OpenStruct.new(:status => true)
+      @install_result = OpenStruct.new(status: true)
     end
 
     it "should run pkg_add -r with the package name" do
@@ -185,7 +185,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
 
   describe Chef::Provider::Package::Freebsd::Pkg, "remove_package" do
     before(:each) do
-      @pkg_delete = OpenStruct.new(:status => true)
+      @pkg_delete = OpenStruct.new(status: true)
       @new_resource.version "4.3.6_7"
       @current_resource.version "4.3.6_7"
       @provider.current_resource = @current_resource
@@ -212,14 +212,14 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
     end
 
     it "should return the port path for a valid port name" do
-      whereis = OpenStruct.new(:stdout => "bonnie++: /usr/ports/benchmarks/bonnie++")
+      whereis = OpenStruct.new(stdout: "bonnie++: /usr/ports/benchmarks/bonnie++")
       expect(@provider).to receive(:shell_out_compacted!).with("whereis", "-s", "bonnie++", env: nil, timeout: 900).and_return(whereis)
       allow(@provider).to receive(:port_name).and_return("bonnie++")
       expect(@provider.port_path).to eq("/usr/ports/benchmarks/bonnie++")
     end
 
     it "should return the version number when it is installed" do
-      pkg_info = OpenStruct.new(:stdout => "bonnie++-1.96")
+      pkg_info = OpenStruct.new(stdout: "bonnie++-1.96")
       expect(@provider).to receive(:shell_out_compacted!).with("pkg_info", "-E", "bonnie++*", env: nil, returns: [0, 1], timeout: 900).and_return(pkg_info)
       allow(@provider).to receive(:package_name).and_return("bonnie++")
       expect(@provider.current_installed_version).to eq("1.96")
@@ -252,7 +252,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
       allow(@provider).to receive(:package_name).and_return("perl")
       allow(@provider).to receive(:latest_link_name).and_return("perl")
 
-      cmd = OpenStruct.new(:status => true)
+      cmd = OpenStruct.new(status: true)
       expect(@provider).to receive(:shell_out_compacted!).with("pkg_add", "-r", "perl", env: nil, timeout: 900).and_return(cmd)
       @provider.install_package("perl5.8", "5.8.8_1")
     end
@@ -266,7 +266,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
       allow(@provider).to receive(:package_name).and_return("mysql-server")
       allow(@provider).to receive(:latest_link_name).and_return("mysql50-server")
 
-      cmd = OpenStruct.new(:status => true)
+      cmd = OpenStruct.new(status: true)
       expect(@provider).to receive(:shell_out_compacted!).with("pkg_add", "-r", "mysql50-server", env: nil, timeout: 900).and_return(cmd)
       @provider.install_package("mysql50-server", "5.0.45_1")
     end
diff --git a/spec/unit/provider/package/freebsd/pkgng_spec.rb b/spec/unit/provider/package/freebsd/pkgng_spec.rb
index 2fdcb87758..a4da5bb235 100644
--- a/spec/unit/provider/package/freebsd/pkgng_spec.rb
+++ b/spec/unit/provider/package/freebsd/pkgng_spec.rb
@@ -63,7 +63,7 @@ describe Chef::Provider::Package::Freebsd::Port do
   describe "determining current installed version" do
     before(:each) do
       allow(@provider).to receive(:supports_pkgng?)
-      @pkg_info = OpenStruct.new(:stdout => "zsh-3.1.7\nVersion             : 3.1.7\n")
+      @pkg_info = OpenStruct.new(stdout: "zsh-3.1.7\nVersion             : 3.1.7\n")
     end
 
     it "should query pkg database" do
@@ -74,14 +74,14 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "determining candidate version" do
     it "should query repository" do
-      pkg_query = OpenStruct.new(:stdout => "5.0.5\n", :exitstatus => 0)
+      pkg_query = OpenStruct.new(stdout: "5.0.5\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with("pkg", "rquery", "%v", "zsh", env: nil, timeout: 900).and_return(pkg_query)
       expect(@provider.candidate_version).to eq("5.0.5")
     end
 
     it "should query specified repository when given option" do
       @provider.new_resource.options("-r LocalMirror") # This requires LocalMirror repo configuration.
-      pkg_query = OpenStruct.new(:stdout => "5.0.3\n", :exitstatus => 0)
+      pkg_query = OpenStruct.new(stdout: "5.0.3\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with("pkg", "rquery", "-r", "LocalMirror", "%v", "zsh", env: nil, timeout: 900).and_return(pkg_query)
       expect(@provider.candidate_version).to eq("5.0.3")
     end
@@ -94,7 +94,7 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "installing a binary package" do
     before(:each) do
-      @install_result = OpenStruct.new(:status => true)
+      @install_result = OpenStruct.new(status: true)
     end
 
     it "should handle package source from file" do
@@ -129,7 +129,7 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "removing a binary package" do
     before(:each) do
-      @install_result = OpenStruct.new(:status => true)
+      @install_result = OpenStruct.new(status: true)
     end
 
     it "should call pkg delete" do
diff --git a/spec/unit/provider/package/freebsd/port_spec.rb b/spec/unit/provider/package/freebsd/port_spec.rb
index 26a960dedc..1406235725 100644
--- a/spec/unit/provider/package/freebsd/port_spec.rb
+++ b/spec/unit/provider/package/freebsd/port_spec.rb
@@ -62,7 +62,7 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "determining current installed version" do
     before(:each) do
-      @pkg_info = OpenStruct.new(:stdout => "zsh-3.1.7\n")
+      @pkg_info = OpenStruct.new(stdout: "zsh-3.1.7\n")
     end
 
     it "should check 'pkg_info' if system uses pkg_* tools" do
@@ -73,7 +73,7 @@ describe Chef::Provider::Package::Freebsd::Port do
     end
 
     it "should check 'pkg info' if make supports WITH_PKGNG if freebsd version is < 1000017" do
-      pkg_enabled = OpenStruct.new(:stdout => "yes\n")
+      pkg_enabled = OpenStruct.new(stdout: "yes\n")
       [1000016, 1000000, 901503, 902506, 802511].each do |freebsd_version|
         @node.automatic_attrs[:os_version] = freebsd_version
         expect(@new_resource).to receive(:shell_out_compacted!).with("make", "-V", "WITH_PKGNG", env: nil).and_return(pkg_enabled)
@@ -92,7 +92,7 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "determining candidate version" do
     before(:each) do
-      @port_version = OpenStruct.new(:stdout => "5.0.5\n", :exitstatus => 0)
+      @port_version = OpenStruct.new(stdout: "5.0.5\n", exitstatus: 0)
     end
 
     it "should return candidate version if port exists" do
@@ -121,13 +121,13 @@ describe Chef::Provider::Package::Freebsd::Port do
     end
 
     it "should query system for path given just a name" do
-      whereis = OpenStruct.new(:stdout => "zsh: /usr/ports/shells/zsh\n")
+      whereis = OpenStruct.new(stdout: "zsh: /usr/ports/shells/zsh\n")
       expect(@provider).to receive(:shell_out_compacted!).with("whereis", "-s", "zsh", env: nil, timeout: 900).and_return(whereis)
       expect(@provider.port_dir).to eq("/usr/ports/shells/zsh")
     end
 
     it "should raise exception if not found" do
-      whereis = OpenStruct.new(:stdout => "zsh:\n")
+      whereis = OpenStruct.new(stdout: "zsh:\n")
       expect(@provider).to receive(:shell_out_compacted!).with("whereis", "-s", "zsh", env: nil, timeout: 900).and_return(whereis)
       expect { @provider.port_dir }.to raise_error(Chef::Exceptions::Package, "Could not find port with the name zsh")
     end
@@ -135,13 +135,13 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "building a binary package" do
     before(:each) do
-      @install_result = OpenStruct.new(:status => true)
+      @install_result = OpenStruct.new(status: true)
     end
 
     it "should run make install in port directory" do
       allow(@provider).to receive(:port_dir).and_return("/usr/ports/shells/zsh")
       expect(@provider).to receive(:shell_out_compacted!).
-        with("make", "-DBATCH", "install", "clean", :timeout => 1800, :cwd => "/usr/ports/shells/zsh", :env => nil).
+        with("make", "-DBATCH", "install", "clean", timeout: 1800, cwd: "/usr/ports/shells/zsh", env: nil).
         and_return(@install_result)
       @provider.install_package("zsh", "5.0.5")
     end
@@ -149,13 +149,13 @@ describe Chef::Provider::Package::Freebsd::Port do
 
   describe "removing a binary package" do
     before(:each) do
-      @install_result = OpenStruct.new(:status => true)
+      @install_result = OpenStruct.new(status: true)
     end
 
     it "should run make deinstall in port directory" do
       allow(@provider).to receive(:port_dir).and_return("/usr/ports/shells/zsh")
       expect(@provider).to receive(:shell_out_compacted!).
-        with("make", "deinstall", :timeout => 300, :cwd => "/usr/ports/shells/zsh", :env => nil).
+        with("make", "deinstall", timeout: 300, cwd: "/usr/ports/shells/zsh", env: nil).
         and_return(@install_result)
       @provider.remove_package("zsh", "5.0.5")
     end
diff --git a/spec/unit/provider/package/homebrew_spec.rb b/spec/unit/provider/package/homebrew_spec.rb
index 833fa7bd3e..903aebc93e 100644
--- a/spec/unit/provider/package/homebrew_spec.rb
+++ b/spec/unit/provider/package/homebrew_spec.rb
@@ -173,16 +173,16 @@ describe Chef::Provider::Package::Homebrew do
   describe "brew" do
     before do
       expect(provider).to receive(:find_homebrew_uid).and_return(homebrew_uid)
-      expect(Etc).to receive(:getpwuid).with(homebrew_uid).and_return(OpenStruct.new(:name => "name", :dir => "/"))
+      expect(Etc).to receive(:getpwuid).with(homebrew_uid).and_return(OpenStruct.new(name: "name", dir: "/"))
     end
 
     it "passes a single to the brew command and return stdout" do
-      allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "zombo"))
+      allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
       expect(provider.brew).to eql("zombo")
     end
 
     it "takes multiple arguments as an array" do
-      allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "homestarrunner"))
+      allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "homestarrunner"))
       expect(provider.brew("info", "opts", "bananas")).to eql("homestarrunner")
     end
 
@@ -190,7 +190,7 @@ describe Chef::Provider::Package::Homebrew do
       let(:new_resource) { Chef::Resource::Package.new("emacs") }
 
       it "does not try to read homebrew_user from Package, which does not have it" do
-        allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "zombo"))
+        allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
         expect(provider.brew).to eql("zombo")
       end
     end
diff --git a/spec/unit/provider/package/ips_spec.rb b/spec/unit/provider/package/ips_spec.rb
index eac0fd90f3..46f0c72399 100644
--- a/spec/unit/provider/package/ips_spec.rb
+++ b/spec/unit/provider/package/ips_spec.rb
@@ -41,7 +41,7 @@ installed on the system.  Try specifying -r to query remotely:
 
    crypto/gnupg
 PKG_STATUS
-    OpenStruct.new(:stdout => stdout, :stdin => stdin, :stderr => stderr, :status => @status, :exitstatus => 1)
+    OpenStruct.new(stdout: stdout, stdin: stdin, stderr: stderr, status: @status, exitstatus: 1)
   end
 
   def remote_output
@@ -59,7 +59,7 @@ Packaging Date: April  1, 2012 05:55:52 PM
 PKG_STATUS
     stdin = StringIO.new
     stderr = ""
-    OpenStruct.new(:stdout => stdout, :stdin => stdin, :stderr => stderr, :status => @status, :exitstatus => 0)
+    OpenStruct.new(stdout: stdout, stdin: stdin, stderr: stderr, status: @status, exitstatus: 0)
   end
 
   context "when loading current resource" do
diff --git a/spec/unit/provider/package/macports_spec.rb b/spec/unit/provider/package/macports_spec.rb
index 04e0a9177e..54c5340d72 100644
--- a/spec/unit/provider/package/macports_spec.rb
+++ b/spec/unit/provider/package/macports_spec.rb
@@ -75,13 +75,13 @@ The following ports are currently installed:
   openssl @0.9.8k_0 (active)
 EOF
 
-      status = double(:stdout => stdout, :exitstatus => 0)
+      status = double(stdout: stdout, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).and_return(status)
       expect(@provider.current_installed_version).to eq("0.9.8k_0")
     end
 
     it "should return nil if a package is not currently installed" do
-      status = double(:stdout => "       \n", :exitstatus => 0)
+      status = double(stdout: "       \n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).and_return(status)
       expect(@provider.current_installed_version).to be_nil
     end
@@ -89,13 +89,13 @@ EOF
 
   describe "macports_candidate_version" do
     it "should return the latest available version of a given package" do
-      status = double(:stdout => "version: 4.2.7\n", :exitstatus => 0)
+      status = double(stdout: "version: 4.2.7\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).and_return(status)
       expect(@provider.macports_candidate_version).to eq("4.2.7")
     end
 
     it "should return nil if there is no version for a given package" do
-      status = double(:stdout => "Error: port fadsfadsfads not found\n", :exitstatus => 0)
+      status = double(stdout: "Error: port fadsfadsfads not found\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).and_return(status)
       expect(@provider.macports_candidate_version).to be_nil
     end
diff --git a/spec/unit/provider/package/openbsd_spec.rb b/spec/unit/provider/package/openbsd_spec.rb
index 07950acf6e..01d6571f65 100644
--- a/spec/unit/provider/package/openbsd_spec.rb
+++ b/spec/unit/provider/package/openbsd_spec.rb
@@ -45,7 +45,7 @@ describe Chef::Provider::Package::Openbsd do
 
     context "when not already installed" do
       before do
-        allow(provider).to receive(:shell_out_compacted!).with("pkg_info", "-e", "#{name}->0", anything()).and_return(instance_double("shellout", :stdout => ""))
+        allow(provider).to receive(:shell_out_compacted!).with("pkg_info", "-e", "#{name}->0", anything()).and_return(instance_double("shellout", stdout: ""))
       end
 
       context "when there is a single candidate" do
@@ -53,11 +53,11 @@ describe Chef::Provider::Package::Openbsd do
         context "when source is not provided" do
           it "should run the installation command" do
             expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", name, anything()).and_return(
-              instance_double("shellout", :stdout => "#{name}-#{version}\n"))
+              instance_double("shellout", stdout: "#{name}-#{version}\n"))
             expect(provider).to receive(:shell_out_compacted!).with(
               "pkg_add", "-r", "#{name}-#{version}",
-              { :env => { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
-            ) { OpenStruct.new :status => true }
+              { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
+            ) { OpenStruct.new status: true }
             provider.run_action(:install)
           end
         end
@@ -70,7 +70,7 @@ describe Chef::Provider::Package::Openbsd do
         context "if no version is specified" do
           it "should raise an exception" do
             expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", name, anything()).and_return(
-              instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor_a}\n#{name}-#{version}-#{flavor_b}\n"))
+              instance_double("shellout", stdout: "#{name}-#{version}-#{flavor_a}\n#{name}-#{version}-#{flavor_b}\n"))
             expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package, /multiple matching candidates/)
           end
         end
@@ -83,13 +83,13 @@ describe Chef::Provider::Package::Openbsd do
 
           context "if no version is specified" do
             it "should run the installation command" do
-              expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-e", "#{package_name}->0", anything()).and_return(instance_double("shellout", :stdout => ""))
+              expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-e", "#{package_name}->0", anything()).and_return(instance_double("shellout", stdout: ""))
               expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", name, anything()).and_return(
-                instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor}\n"))
+                instance_double("shellout", stdout: "#{name}-#{version}-#{flavor}\n"))
               expect(provider).to receive(:shell_out_compacted!).with(
                 "pkg_add", "-r", "#{name}-#{version}-#{flavor}",
                 { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
-              ) { OpenStruct.new :status => true }
+              ) { OpenStruct.new status: true }
               provider.run_action(:install)
             end
           end
@@ -99,13 +99,13 @@ describe Chef::Provider::Package::Openbsd do
         context "if a version is specified" do
           it "should use the flavor from the version" do
             expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", "#{name}-#{version}-#{flavor_b}", anything()).and_return(
-              instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor_a}\n"))
+              instance_double("shellout", stdout: "#{name}-#{version}-#{flavor_a}\n"))
 
             new_resource.version("#{version}-#{flavor_b}")
             expect(provider).to receive(:shell_out_compacted!).with(
               "pkg_add", "-r", "#{name}-#{version}-#{flavor_b}",
               { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
-            ) { OpenStruct.new :status => true }
+            ) { OpenStruct.new status: true }
             provider.run_action(:install)
           end
         end
@@ -124,7 +124,7 @@ describe Chef::Provider::Package::Openbsd do
     it "should run the command to delete the installed package" do
       expect(@provider).to receive(:shell_out_compacted!).with(
         "pkg_delete", @name, env: nil, timeout: 900
-      ) { OpenStruct.new :status => true }
+      ) { OpenStruct.new status: true }
       @provider.remove_package(@name, nil)
     end
   end
diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index d41df8c24b..9fbba202f5 100644
--- a/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
@@ -26,7 +26,7 @@ describe Chef::Provider::Package::Pacman do
     @new_resource = Chef::Resource::Package.new("nano")
     @current_resource = Chef::Resource::Package.new("nano")
 
-    @status = double(:stdout => "", :exitstatus => 0)
+    @status = double(stdout: "", exitstatus: 0)
     @provider = Chef::Provider::Package::Pacman.new(@new_resource, @run_context)
     allow(Chef::Resource::Package).to receive(:new).and_return(@current_resource)
 
@@ -88,14 +88,14 @@ Install Script : Yes
 Description    : Pico editor clone with enhancements
 PACMAN
 
-      status = double(:stdout => stdout, :exitstatus => 0)
+      status = double(stdout: stdout, exitstatus: 0)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
       @provider.load_current_resource
       expect(@current_resource.version).to eq("2.2.2-1")
     end
 
     it "should set the candidate version if pacman has one" do
-      status = double(:stdout => "core nano 2.2.3-1", :exitstatus => 0)
+      status = double(stdout: "core nano 2.2.3-1", exitstatus: 0)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
       @provider.load_current_resource
       expect(@provider.candidate_version).to eql("2.2.3-1")
@@ -120,7 +120,7 @@ Include = /etc/pacman.d/mirrorlist
 Include = /etc/pacman.d/mirrorlist
 PACMAN_CONF
 
-      status = double(:stdout => "customrepo nano 1.2.3-4", :exitstatus => 0)
+      status = double(stdout: "customrepo nano 1.2.3-4", exitstatus: 0)
       allow(::File).to receive(:exist?).with("/etc/pacman.conf").and_return(true)
       allow(::File).to receive(:read).with("/etc/pacman.conf").and_return(@pacman_conf)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
diff --git a/spec/unit/provider/package/paludis_spec.rb b/spec/unit/provider/package/paludis_spec.rb
index 5481a33c0d..a9ae5bf9d3 100644
--- a/spec/unit/provider/package/paludis_spec.rb
+++ b/spec/unit/provider/package/paludis_spec.rb
@@ -42,7 +42,7 @@ user/ntp 0 installed-accounts
 net/ntp 4.2.6_p5-r1 installed
 PKG_STATUS
     @pid = 12345
-    @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)
   end
 
   context "when loading current resource" do
@@ -86,12 +86,12 @@ INSTALLED
 
   context "when installing a package" do
     it "should run pkg install with the package name and version" do
-      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { timeout: @new_resource.timeout || 900 })
       @provider.install_package("net/ntp", "4.2.6_p5-r2")
     end
 
     it "should run pkg install with the package name and version and options if specified" do
-      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "--preserve-world", "=net/ntp-4.2.6_p5-r2", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "--preserve-world", "=net/ntp-4.2.6_p5-r2", { timeout: @new_resource.timeout || 900 })
       @new_resource.options "--preserve-world"
       @provider.install_package("net/ntp", "4.2.6_p5-r2")
     end
@@ -101,7 +101,7 @@ INSTALLED
 sys-process/lsof 4.87 arbor
 sys-process/lsof 4.87 x86_64
 PKG_STATUS
-      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=sys-process/lsof-4.87", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=sys-process/lsof-4.87", { timeout: @new_resource.timeout || 900 })
       @provider.install_package("sys-process/lsof", "4.87")
     end
 
@@ -119,7 +119,7 @@ PKG_STATUS
 
   context "when upgrading a package" do
     it "should run pkg install with the package name and version" do
-      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { timeout: @new_resource.timeout || 900 })
       @provider.upgrade_package("net/ntp", "4.2.6_p5-r2")
     end
   end
diff --git a/spec/unit/provider/package/portage_spec.rb b/spec/unit/provider/package/portage_spec.rb
index 7bf8e7f2e8..889053e826 100644
--- a/spec/unit/provider/package/portage_spec.rb
+++ b/spec/unit/provider/package/portage_spec.rb
@@ -113,19 +113,19 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do
       end
 
       it "should throw an exception if the exitstatus is not 0" do
-        status = double(:stdout => "", :stderr => "", :exitstatus => 1)
+        status = double(stdout: "", stderr: "", exitstatus: 1)
         allow(@provider).to receive(:shell_out_compacted).and_return(status)
         expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
       end
 
       it "should find the candidate_version if a category is specifed and there are no duplicates" do
-        status = double(:stdout => "dev-vcs/git-2.16.2", :exitstatus => 0)
+        status = double(stdout: "dev-vcs/git-2.16.2", exitstatus: 0)
         expect(@provider).to receive(:shell_out_compacted).and_return(status)
         expect(@provider.candidate_version).to eq("2.16.2")
       end
 
       it "should find the candidate_version if a category is not specifed and there are no duplicates" do
-        status = double(:stdout => "dev-vcs/git-2.16.2", :exitstatus => 0)
+        status = double(stdout: "dev-vcs/git-2.16.2", exitstatus: 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
         expect(@provider).to receive(:shell_out_compacted).and_return(status)
         expect(@provider.candidate_version).to eq("2.16.2")
@@ -139,7 +139,7 @@ You specified an unqualified atom that matched multiple packages:
 
 Please use a more specific atom.
 EOF
-        status = double(:stdout => "", :stderr => stderr_output, :exitstatus => 1)
+        status = double(stdout: "", stderr: stderr_output, exitstatus: 1)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
         expect(@provider).to receive(:shell_out_compacted).and_return(status)
         expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
diff --git a/spec/unit/provider/package/powershell_spec.rb b/spec/unit/provider/package/powershell_spec.rb
index 63f611ac23..c7a16acaa2 100644
--- a/spec/unit/provider/package/powershell_spec.rb
+++ b/spec/unit/provider/package/powershell_spec.rb
@@ -34,63 +34,63 @@ describe Chef::Provider::Package::Powershell do
   end
 
   let(:package_xcertificate_installed) do
-    double("powershell_out", :stdout => "2.1.0.0\r\n")
+    double("powershell_out", stdout: "2.1.0.0\r\n")
   end
 
   let(:package_xcertificate_installed_2_0_0_0) do
-    double("powershell_out", :stdout => "2.0.0.0\r\n")
+    double("powershell_out", stdout: "2.0.0.0\r\n")
   end
 
   let(:package_xcertificate_available) do
-    double("powershell_out", :stdout => "2.1.0.0\r\n")
+    double("powershell_out", stdout: "2.1.0.0\r\n")
   end
 
   let(:package_xcertificate_available_2_0_0_0) do
-    double("powershell_out", :stdout => "2.0.0.0\r\n")
+    double("powershell_out", stdout: "2.0.0.0\r\n")
   end
 
   let(:package_xcertificate_not_installed) do
-    double("powershell_out", :stdout => "")
+    double("powershell_out", stdout: "")
   end
 
   let(:package_xcertificate_not_available) do
-    double("powershell_out", :stdout => "")
+    double("powershell_out", stdout: "")
   end
 
   let(:package_xnetworking_installed) do
-    double("powershell_out", :stdout => "2.12.0.0\r\n")
+    double("powershell_out", stdout: "2.12.0.0\r\n")
   end
 
   let(:package_xnetworking_installed_2_11_0_0) do
-    double("powershell_out", :stdout => "2.11.0.0\r\n")
+    double("powershell_out", stdout: "2.11.0.0\r\n")
   end
 
   let(:package_xnetworking_available) do
-    double("powershell_out", :stdout => "2.12.0.0\r\n")
+    double("powershell_out", stdout: "2.12.0.0\r\n")
   end
 
   let(:package_xnetworking_available_2_11_0_0) do
-    double("powershell_out", :stdout => "2.11.0.0\r\n")
+    double("powershell_out", stdout: "2.11.0.0\r\n")
   end
 
   let(:package_xnetworking_not_installed) do
-    double("powershell_out", :stdout => "")
+    double("powershell_out", stdout: "")
   end
 
   let(:package_xnetworking_not_available) do
-    double("powershell_out", :stdout => "")
+    double("powershell_out", stdout: "")
   end
 
   let(:package_7zip_available) do
-    double("powershell_out", :stdout => "16.02\r\n")
+    double("powershell_out", stdout: "16.02\r\n")
   end
 
   let(:package_7zip_not_installed) do
-    double("powershell_out", :stdout => "")
+    double("powershell_out", stdout: "")
   end
 
   let(:powershell_installed_version) do
-    double("powershell_out", :stdout => "5")
+    double("powershell_out", stdout: "5")
   end
 
   let(:generated_command) { "( Get-Package posh-git -Force -ForceBootstrap ).Version" }
@@ -116,14 +116,14 @@ describe Chef::Provider::Package::Powershell do
   describe "#candidate_version" do
 
     it "should set the candidate_version to the latest version when not pinning" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
       new_resource.package_name(["xNetworking"])
       new_resource.version(nil)
       expect(provider.candidate_version).to eql(["2.12.0.0"])
     end
 
     it "should use the candidate_version from the correct source" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -Source MyGallery ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -Source MyGallery ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
       new_resource.package_name(["xNetworking"])
       new_resource.version(nil)
       new_resource.source("MyGallery")
@@ -131,60 +131,60 @@ describe Chef::Provider::Package::Powershell do
     end
 
     it "should set the candidate_version to the latest version when not pinning and package name is space seperated" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_7zip_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_7zip_available)
       new_resource.package_name(["7-Zip 16.02 (x64)"])
       new_resource.version(nil)
       expect(provider.candidate_version).to eql(["16.02"])
     end
 
     it "should set the candidate_version to pinned version if available" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.0.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available_2_0_0_0)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.0.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available_2_0_0_0)
       new_resource.package_name(["xCertificate"])
       new_resource.version(["2.0.0.0"])
       expect(provider.candidate_version).to eql(["2.0.0.0"])
     end
 
     it "should set the candidate_version to nil if there is no candidate" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
       new_resource.package_name(["xCertificate"])
       expect(provider.candidate_version).to eql([nil])
     end
 
     it "should set the candidate_version correctly when there are two packages to install" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(nil)
       expect(provider.candidate_version).to eql(["2.1.0.0", "2.12.0.0"])
     end
 
     it "should set the candidate_version correctly when only the first is installable" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(nil)
       expect(provider.candidate_version).to eql(["2.1.0.0", nil])
     end
 
     it "should set the candidate_version correctly when only the last is installable" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(nil)
       expect(provider.candidate_version).to eql([nil, "2.12.0.0"])
     end
 
     it "should set the candidate_version correctly when neither are is installable and version is passed as nil array" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       new_resource.package_name(%w{xNetworking xCertificate})
       new_resource.version([nil, nil])
       expect(provider.candidate_version).to eql([nil, nil])
     end
 
     it "should set the candidate_version correctly when neither are is installable and version is not passed" do
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       new_resource.package_name(%w{xNetworking xCertificate})
       new_resource.version(nil)
       expect(provider.candidate_version).to eql([nil, nil])
@@ -283,10 +283,10 @@ describe Chef::Provider::Package::Powershell do
       provider.load_current_resource
       new_resource.package_name(["xCertificate"])
       new_resource.version(nil)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -296,10 +296,10 @@ describe Chef::Provider::Package::Powershell do
       new_resource.package_name(["xCertificate"])
       new_resource.version(nil)
       new_resource.source("MyGallery")
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -Source MyGallery ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -Source MyGallery ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -Source MyGallery ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -Source MyGallery ).Version", { timeout: new_resource.timeout })
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -309,10 +309,10 @@ describe Chef::Provider::Package::Powershell do
       new_resource.package_name(["xCertificate"])
       new_resource.version(nil)
       new_resource.skip_publisher_check(true)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -SkipPublisherCheck ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -SkipPublisherCheck ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -SkipPublisherCheck ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -SkipPublisherCheck ).Version", { timeout: new_resource.timeout })
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -321,10 +321,10 @@ describe Chef::Provider::Package::Powershell do
       provider.load_current_resource
       new_resource.package_name(["7-Zip 16.02 (x64)"])
       new_resource.version(nil)
-      allow(provider).to receive(:powershell_out).with("( Find-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_7zip_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_7zip_not_installed)
+      allow(provider).to receive(:powershell_out).with("( Find-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_7zip_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_7zip_not_installed)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap -RequiredVersion 16.02 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package '7-Zip 16.02 (x64)' -Force -ForceBootstrap -RequiredVersion 16.02 ).Version", { timeout: new_resource.timeout })
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -336,10 +336,10 @@ describe Chef::Provider::Package::Powershell do
         provider.load_current_resource
         new_resource.package_name(["xCertificate"])
         new_resource.version(nil)
-        allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-        allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+        allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+        allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
         allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-        expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
+        expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
         provider.run_action(:install)
         expect(new_resource).to be_updated_by_last_action
       end
@@ -348,8 +348,8 @@ describe Chef::Provider::Package::Powershell do
     it "should not install packages that are up-to-date" do
       new_resource.package_name(["xCertificate"])
       new_resource.version(nil)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       provider.load_current_resource
       expect(provider).not_to receive(:install_package)
@@ -360,8 +360,8 @@ describe Chef::Provider::Package::Powershell do
     it "should not install packages that are up-to-date" do
       new_resource.package_name(["xNetworking"])
       new_resource.version(["2.11.0.0"])
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available_2_11_0_0)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available_2_11_0_0)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       provider.load_current_resource
       expect(provider).not_to receive(:install_package)
@@ -374,13 +374,13 @@ describe Chef::Provider::Package::Powershell do
       # new_version.resource[0]
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version([nil, "2.11.0.0"])
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available_2_11_0_0)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available_2_11_0_0)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.11.0.0 ).Version", { timeout: new_resource.timeout })
       provider.load_current_resource
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
@@ -389,13 +389,13 @@ describe Chef::Provider::Package::Powershell do
     it "should split up commands when given two packages, one with a version pin" do
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(["2.1.0.0", nil])
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.12.0.0 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.12.0.0 ).Version", { timeout: new_resource.timeout })
 
       provider.load_current_resource
       provider.run_action(:install)
@@ -405,13 +405,13 @@ describe Chef::Provider::Package::Powershell do
     it "should do multipackage installs when given two packages without constraints" do
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(nil)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.12.0.0 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.12.0.0 ).Version", { timeout: new_resource.timeout })
       provider.load_current_resource
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
@@ -421,13 +421,13 @@ describe Chef::Provider::Package::Powershell do
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(nil)
       new_resource.source("MyGallery")
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -Source MyGallery ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -Source MyGallery ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -Source MyGallery ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap -Source MyGallery ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -Source MyGallery ).Version", { :timeout => new_resource.timeout })
-      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.12.0.0 -Source MyGallery ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -Source MyGallery ).Version", { timeout: new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Install-Package 'xNetworking' -Force -ForceBootstrap -RequiredVersion 2.12.0.0 -Source MyGallery ).Version", { timeout: new_resource.timeout })
       provider.load_current_resource
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
@@ -439,8 +439,8 @@ describe Chef::Provider::Package::Powershell do
       provider.load_current_resource
       new_resource.package_name(["xCertificate"])
       new_resource.version(["2.1.0.0"])
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       expect(provider).not_to receive(:remove_package)
       provider.run_action(:remove)
@@ -451,11 +451,11 @@ describe Chef::Provider::Package::Powershell do
       new_resource.package_name(["xCertificate"])
       new_resource.version(["2.1.0.0"])
       new_resource.source("MyGallery")
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -Source MyGallery).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 -Source MyGallery).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       provider.load_current_resource
-      expect(provider).to receive(:powershell_out).with("( Uninstall-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Uninstall-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -463,10 +463,10 @@ describe Chef::Provider::Package::Powershell do
     it "does nothing when all the packages are already removed" do
       new_resource.package_name(%w{xCertificate xNetworking})
       new_resource.version(nil)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xnetworking_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xNetworking' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xnetworking_not_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       provider.load_current_resource
       expect(provider).not_to receive(:remove_package)
@@ -477,11 +477,11 @@ describe Chef::Provider::Package::Powershell do
     it "removes a package when version is specified" do
       new_resource.package_name(["xCertificate"])
       new_resource.version(["2.1.0.0"])
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       provider.load_current_resource
-      expect(provider).to receive(:powershell_out).with("( Uninstall-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { :timeout => new_resource.timeout })
+      expect(provider).to receive(:powershell_out).with("( Uninstall-Package 'xCertificate' -Force -ForceBootstrap -RequiredVersion 2.1.0.0 ).Version", { timeout: new_resource.timeout })
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -489,11 +489,11 @@ describe Chef::Provider::Package::Powershell do
     it "removes a package when version is not specified" do
       new_resource.package_name(["xCertificate"])
       new_resource.version(nil)
-      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
-      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Find-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
+      allow(provider).to receive(:powershell_out).with("( Get-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_available)
       allow(provider).to receive(:powershell_out).with("$PSVersionTable.PSVersion.Major").and_return(powershell_installed_version)
       provider.load_current_resource
-      expect(provider).to receive(:powershell_out).with("( Uninstall-Package 'xCertificate' -Force -ForceBootstrap ).Version", { :timeout => new_resource.timeout }).and_return(package_xcertificate_not_available)
+      expect(provider).to receive(:powershell_out).with("( Uninstall-Package 'xCertificate' -Force -ForceBootstrap ).Version", { timeout: new_resource.timeout }).and_return(package_xcertificate_not_available)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
diff --git a/spec/unit/provider/package/smartos_spec.rb b/spec/unit/provider/package/smartos_spec.rb
index cb5e987a85..172bfbac84 100644
--- a/spec/unit/provider/package/smartos_spec.rb
+++ b/spec/unit/provider/package/smartos_spec.rb
@@ -28,14 +28,14 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
     @new_resource     = Chef::Resource::Package.new("varnish")
     @current_resource = Chef::Resource::Package.new("varnish")
 
-    @status = double("Status", :exitstatus => 0)
+    @status = double("Status", exitstatus: 0)
     @provider = Chef::Provider::Package::SmartOS.new(@new_resource, @run_context)
     allow(Chef::Resource::Package).to receive(:new).and_return(@current_resource)
     @stdin = StringIO.new
     @stdout = "varnish-2.1.5nb2\n"
     @stderr = StringIO.new
     @pid = 10
-    @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)
   end
 
   describe "when loading current resource" do
@@ -59,7 +59,7 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
     end
 
     it "should set the installed version to nil if it's not installed" do
-      out = OpenStruct.new(:stdout => nil)
+      out = OpenStruct.new(stdout: nil)
       expect(@provider).to receive(:shell_out_compacted!).and_return(out)
       @provider.load_current_resource
       expect(@current_resource.version).to eq(nil)
@@ -79,8 +79,8 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
       expect(search).to receive(:each_line).
         and_yield("something-varnish-1.1.1   something varnish like\n").
         and_yield("varnish-2.3.4             actual varnish\n")
-      @shell_out = double("shell_out!", :stdout => search)
-      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "se", "varnish", :env => nil, :returns => [0, 1], :timeout => 900).and_return(@shell_out)
+      @shell_out = double("shell_out!", stdout: search)
+      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "se", "varnish", env: nil, returns: [0, 1], timeout: 900).and_return(@shell_out)
       expect(@provider.candidate_version).to eq("2.3.4")
     end
 
@@ -89,8 +89,8 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
       expect(search).to receive(:each_line).
         and_yield("something-varnish-1.1.1;;something varnish like\n").
         and_yield("varnish-2.3.4;;actual varnish\n")
-      @shell_out = double("shell_out!", :stdout => search)
-      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "se", "varnish", :env => nil, :returns => [0, 1], :timeout => 900).and_return(@shell_out)
+      @shell_out = double("shell_out!", stdout: search)
+      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "se", "varnish", env: nil, returns: [0, 1], timeout: 900).and_return(@shell_out)
       expect(@provider.candidate_version).to eq("2.3.4")
     end
   end
@@ -98,9 +98,9 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
   describe "when manipulating a resource" do
 
     it "run pkgin and install the package" do
-      out = OpenStruct.new(:stdout => nil)
-      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/sbin/pkg_info", "-E", "varnish*", { :env => nil, :returns => [0, 1], :timeout => 900 }).and_return(@shell_out)
-      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "-y", "install", "varnish-2.1.5nb2", { :env => nil, :timeout => 900 }).and_return(out)
+      out = OpenStruct.new(stdout: nil)
+      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/sbin/pkg_info", "-E", "varnish*", { env: nil, returns: [0, 1], timeout: 900 }).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "-y", "install", "varnish-2.1.5nb2", { env: nil, timeout: 900 }).and_return(out)
       @provider.load_current_resource
       @provider.install_package("varnish", "2.1.5nb2")
     end
diff --git a/spec/unit/provider/package/solaris_spec.rb b/spec/unit/provider/package/solaris_spec.rb
index 57a0288f58..2ebf8fe4be 100644
--- a/spec/unit/provider/package/solaris_spec.rb
+++ b/spec/unit/provider/package/solaris_spec.rb
@@ -46,7 +46,7 @@ INSTDATE:  Nov 04 2009 01:02
 HOTLINE:  Please contact your local service provider
 PKGINFO
 
-      @status = double("Status", :stdout => "", :exitstatus => 0)
+      @status = double("Status", stdout: "", exitstatus: 0)
     end
 
     it "should create a current resource with the name of new_resource" do
@@ -70,7 +70,7 @@ PKGINFO
     end
 
     it "should get the source package version from pkginfo if provided" do
-      status = double(:stdout => @pkginfo, :exitstatus => 0)
+      status = double(stdout: @pkginfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("pkginfo", "-l", "-d", "/tmp/bash.pkg", "SUNWbash", { timeout: 900 }).and_return(status)
       expect(@provider).to receive(:shell_out_compacted).with("pkginfo", "-l", "SUNWbash", { timeout: 900 }).and_return(@status)
       @provider.load_current_resource
@@ -80,7 +80,7 @@ PKGINFO
     end
 
     it "should return the current version installed if found by pkginfo" do
-      status = double(:stdout => @pkginfo, :exitstatus => 0)
+      status = double(stdout: @pkginfo, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted).with("pkginfo", "-l", "-d", "/tmp/bash.pkg", "SUNWbash", { timeout: 900 }).and_return(@status)
       expect(@provider).to receive(:shell_out_compacted).with("pkginfo", "-l", "SUNWbash", { timeout: 900 }).and_return(status)
       @provider.load_current_resource
@@ -95,7 +95,7 @@ PKGINFO
     end
 
     it "should raise an exception if pkginfo fails to run" do
-      status = double(:stdout => "", :exitstatus => -1)
+      status = double(stdout: "", exitstatus: -1)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
       expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Package)
     end
@@ -116,14 +116,14 @@ PKGINFO
     end
 
     it "should lookup the candidate_version if the variable is not already set" do
-      status = double(:stdout => "", :exitstatus => 0)
+      status = double(stdout: "", exitstatus: 0)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
       expect(@provider).to receive(:shell_out_compacted)
       @provider.candidate_version
     end
 
     it "should throw and exception if the exitstatus is not 0" do
-      status = double(:stdout => "", :exitstatus => 1)
+      status = double(stdout: "", exitstatus: 1)
       allow(@provider).to receive(:shell_out_compacted).and_return(status)
       expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
     end
diff --git a/spec/unit/provider/package/windows/exe_spec.rb b/spec/unit/provider/package/windows/exe_spec.rb
index f18cbf3dca..f8c4e83fc5 100644
--- a/spec/unit/provider/package/windows/exe_spec.rb
+++ b/spec/unit/provider/package/windows/exe_spec.rb
@@ -126,7 +126,7 @@ describe Chef::Provider::Package::Windows::Exe do
       it "removes installed package and quotes uninstall string" do
         new_resource.timeout = 300
         allow(::File).to receive(:exist?).with("uninst_dir/uninst_file").and_return(true)
-        expect(provider).to receive(:shell_out!).with(/start \"\" \/wait \"uninst_dir\/uninst_file\" \/S \/NCRC & exit %%%%ERRORLEVEL%%%%/, :timeout => 300, :returns => [0])
+        expect(provider).to receive(:shell_out!).with(/start \"\" \/wait \"uninst_dir\/uninst_file\" \/S \/NCRC & exit %%%%ERRORLEVEL%%%%/, timeout: 300, returns: [0])
         provider.remove_package
       end
     end
diff --git a/spec/unit/provider/package/windows/msi_spec.rb b/spec/unit/provider/package/windows/msi_spec.rb
index aa528ab90e..0e939610db 100644
--- a/spec/unit/provider/package/windows/msi_spec.rb
+++ b/spec/unit/provider/package/windows/msi_spec.rb
@@ -22,7 +22,7 @@ require "chef/provider/package/windows/msi"
 describe Chef::Provider::Package::Windows::MSI do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
-  let(:run_context) { double("Chef::RunContext", :node => node, :events => events) }
+  let(:run_context) { double("Chef::RunContext", node: node, events: events) }
   let(:package_name) { "calculator" }
   let(:resource_source) { "calculator.msi" }
   let(:resource_version) { nil }
diff --git a/spec/unit/provider/package/windows_spec.rb b/spec/unit/provider/package/windows_spec.rb
index aed0ca88be..3030b7f04a 100644
--- a/spec/unit/provider/package/windows_spec.rb
+++ b/spec/unit/provider/package/windows_spec.rb
@@ -50,7 +50,7 @@ describe Chef::Provider::Package::Windows, :windows_only do
       before(:each) do
         allow(Chef::Util::PathHelper).to receive(:validate_path)
         allow(provider).to receive(:package_provider).and_return(double("package_provider",
-          :installed_version => "1.0", :package_version => "2.0"))
+          installed_version: "1.0", package_version: "2.0"))
       end
 
       it "creates a current resource with the name of the new resource" do
diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb
index 4ba8ac36ac..6795f9e051 100644
--- a/spec/unit/provider/package/zypper_spec.rb
+++ b/spec/unit/provider/package/zypper_spec.rb
@@ -30,7 +30,7 @@ describe Chef::Provider::Package::Zypper do
     Chef::Provider::Package::Zypper.new(new_resource, run_context)
   end
 
-  let(:status) { double(:stdout => "\n", :exitstatus => 0) }
+  let(:status) { double(stdout: "\n", exitstatus: 0) }
 
   before(:each) do
     allow(Chef::Resource::Package).to receive(:new).and_return(current_resource)
@@ -73,7 +73,7 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should set the installed version if zypper info has one (zypper version < 1.13.0)" do
-      status = double(:stdout => "Version: 1.0\nInstalled: Yes\n", :exitstatus => 0)
+      status = double(stdout: "Version: 1.0\nInstalled: Yes\n", exitstatus: 0)
 
       allow(provider).to receive(:shell_out_compacted!).and_return(status)
       expect(current_resource).to receive(:version).with(["1.0"]).and_return(true)
@@ -81,7 +81,7 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should set the installed version if zypper info has one (zypper version >= 1.13.0)" do
-      status = double(:stdout => "Version        : 1.0                             \nInstalled      : Yes                             \n", :exitstatus => 0)
+      status = double(stdout: "Version        : 1.0                             \nInstalled      : Yes                             \n", exitstatus: 0)
 
       allow(provider).to receive(:shell_out_compacted!).and_return(status)
       expect(current_resource).to receive(:version).with(["1.0"]).and_return(true)
@@ -89,7 +89,7 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should set the installed version if zypper info has one (zypper version >= 1.13.17)" do
-      status = double(:stdout => "Version        : 1.0\nInstalled      : Yes (automatically)\n", :exitstatus => 0)
+      status = double(stdout: "Version        : 1.0\nInstalled      : Yes (automatically)\n", exitstatus: 0)
 
       allow(provider).to receive(:shell_out_compacted!).and_return(status)
       expect(current_resource).to receive(:version).with(["1.0"]).and_return(true)
@@ -97,7 +97,7 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should set the candidate version if zypper info has one (zypper version < 1.13.0)" do
-      status = double(:stdout => "Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)", :exitstatus => 0)
+      status = double(stdout: "Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)", exitstatus: 0)
 
       allow(provider).to receive(:shell_out_compacted!).and_return(status)
       provider.load_current_resource
@@ -105,7 +105,7 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should set the candidate version if zypper info has one (zypper version >= 1.13.0)" do
-      status = double(:stdout => "Version        : 1.0                             \nInstalled      : No                              \nStatus         : out-of-date (version 0.9 installed)", :exitstatus => 0)
+      status = double(stdout: "Version        : 1.0                             \nInstalled      : No                              \nStatus         : out-of-date (version 0.9 installed)", exitstatus: 0)
 
       allow(provider).to receive(:shell_out_compacted!).and_return(status)
       provider.load_current_resource
-- 
cgit v1.2.1


From dcac6762380d011f73cf53a50476d31dab0025ee Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:27:03 -0700
Subject: fix Layout/IndentHeredoc

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/apt_spec.rb        | 162 +++++++++++++-------------
 spec/unit/provider/package/cab_spec.rb        | 112 +++++++++---------
 spec/unit/provider/package/chocolatey_spec.rb |  22 ++--
 spec/unit/provider/package/dpkg_spec.rb       |  42 +++----
 spec/unit/provider/package/ips_spec.rb        | 138 +++++++++++-----------
 spec/unit/provider/package/macports_spec.rb   |   6 +-
 spec/unit/provider/package/msu_spec.rb        |  96 +++++++--------
 spec/unit/provider/package/pacman_spec.rb     |  76 ++++++------
 spec/unit/provider/package/paludis_spec.rb    |  40 +++----
 spec/unit/provider/package/portage_spec.rb    |  12 +-
 spec/unit/provider/package/rubygems_spec.rb   | 104 ++++++++---------
 spec/unit/provider/package/solaris_spec.rb    |  24 ++--
 12 files changed, 417 insertions(+), 417 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb
index 1047534f98..97eda1d774 100644
--- a/spec/unit/provider/package/apt_spec.rb
+++ b/spec/unit/provider/package/apt_spec.rb
@@ -34,13 +34,13 @@ describe Chef::Provider::Package::Apt do
     @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)
@@ -65,17 +65,17 @@ 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_compacted!).and_return(@shell_out)
       @provider.load_current_resource
@@ -86,8 +86,8 @@ 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_compacted!).with(
@@ -95,8 +95,8 @@ N: Unable to locate package conic-smarms
         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_compacted!).with(
@@ -111,11 +111,11 @@ 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_compacted!).with(
@@ -123,23 +123,23 @@ libmysqlclient15-dev:
         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_compacted!).with(
@@ -147,18 +147,18 @@ libmysqlclient-dev 5.1.41-3ubuntu12
         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_compacted!).with(
@@ -171,11 +171,11 @@ libmysqlclient-dev:
 
     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_compacted!).with(
@@ -183,26 +183,26 @@ mp3-decoder:
         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_compacted!).with(
diff --git a/spec/unit/provider/package/cab_spec.rb b/spec/unit/provider/package/cab_spec.rb
index 5c86f781f3..bdfcd06be3 100644
--- a/spec/unit/provider/package/cab_spec.rb
+++ b/spec/unit/provider/package/cab_spec.rb
@@ -31,20 +31,20 @@ describe Chef::Provider::Package::Cab do
   end
 
   let(:installed_package_list_stdout) do
-    <<-EOF
-Packages listing:
-Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
-Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
+    <<~EOF
+      Packages listing:
+      Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
+      Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
     EOF
   end
 
   let(:package_version_stdout) do
-    <<-EOF
-Package information:
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-State : Installed
-Dependency : Language Pack
-The operation completed successfully
+    <<~EOF
+      Package information:
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      State : Installed
+      Dependency : Language Pack
+      The operation completed successfully
     EOF
   end
 
@@ -57,20 +57,20 @@ The operation completed successfully
   end
 
   def allow_package_info(package_path = nil, package_name = nil)
-    get_package_info_stdout = <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
-
-Image Version: 6.1.7600.16385
-
-Package information:
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-Applicable : Yes
-Copyright : Microsoft Corporation
-Company : Microsoft Corporation
-State : Installed
-Dependency : Language Pack
-The operation completed successfully
+    get_package_info_stdout = <<~EOF
+      Deployment Image Servicing and Management tool
+      Version: 6.1.7600.16385
+      
+      Image Version: 6.1.7600.16385
+      
+      Package information:
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      Applicable : Yes
+      Copyright : Microsoft Corporation
+      Company : Microsoft Corporation
+      State : Installed
+      Dependency : Language Pack
+      The operation completed successfully
     EOF
     get_package_info_obj = double(stdout: get_package_info_stdout)
     if package_path
@@ -81,30 +81,30 @@ The operation completed successfully
   end
 
   def allow_get_packages
-    get_packages_stdout = <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
-
-Image Version: 6.1.7600.16385
-
-Packages listing:
-
-Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
-State : Installed
-Release Type : Language Pack
-Install Time : 2/11/2015 11:33 PM
-
-Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
-State : Installed
-Release Type : Language Pack
-Install Time : 2/11/2015 11:33 PM
-
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-State : Installed
-Release Type : Feature Pack
-Install Time : 11/21/2010 3:40 AM
-
-The operation completed successfully.
+    get_packages_stdout = <<~EOF
+      Deployment Image Servicing and Management tool
+      Version: 6.1.7600.16385
+      
+      Image Version: 6.1.7600.16385
+      
+      Packages listing:
+      
+      Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
+      State : Installed
+      Release Type : Language Pack
+      Install Time : 2/11/2015 11:33 PM
+      
+      Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
+      State : Installed
+      Release Type : Language Pack
+      Install Time : 2/11/2015 11:33 PM
+      
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      State : Installed
+      Release Type : Feature Pack
+      Install Time : 11/21/2010 3:40 AM
+      
+      The operation completed successfully.
     EOF
     get_packages_obj = double(stdout: get_packages_stdout)
     allow(provider).to receive(:dism_command).with("/Get-Packages").and_return(get_packages_obj)
@@ -248,14 +248,14 @@ The operation completed successfully.
 
   context "Invalid package source" do
     def package_version_stdout
-      package_version_stdout = <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
-Image Version: 6.1.7600.16385
-An error occurred trying to open - c:\\temp\\test6.1-KB2664825-v3-x64.cab Error: 0x80070003
-Error: 3
-The system cannot find the path specified.
-The DISM log file can be found at C:\\Windows\\Logs\\DISM\\dism.log.
+      package_version_stdout = <<~EOF
+        Deployment Image Servicing and Management tool
+        Version: 6.1.7600.16385
+        Image Version: 6.1.7600.16385
+        An error occurred trying to open - c:\\temp\\test6.1-KB2664825-v3-x64.cab Error: 0x80070003
+        Error: 3
+        The system cannot find the path specified.
+        The DISM log file can be found at C:\\Windows\\Logs\\DISM\\dism.log.
       EOF
     end
 
diff --git a/spec/unit/provider/package/chocolatey_spec.rb b/spec/unit/provider/package/chocolatey_spec.rb
index 40fca821d9..48f8a562de 100644
--- a/spec/unit/provider/package/chocolatey_spec.rb
+++ b/spec/unit/provider/package/chocolatey_spec.rb
@@ -35,10 +35,10 @@ describe Chef::Provider::Package::Chocolatey do
 
   # installed packages (ConEmu is upgradable)
   let(:local_list_stdout) do
-    <<-EOF
-Chocolatey v0.9.9.11
-chocolatey|0.9.9.11
-ConEmu|15.10.25.0
+    <<~EOF
+      Chocolatey v0.9.9.11
+      chocolatey|0.9.9.11
+      ConEmu|15.10.25.0
     EOF
   end
 
@@ -50,13 +50,13 @@ ConEmu|15.10.25.0
   end
 
   def allow_remote_list(package_names, args = nil)
-    remote_list_stdout = <<-EOF
-Chocolatey v0.9.9.11
-chocolatey|0.9.9.11
-ConEmu|15.10.25.1
-Git|2.6.1
-Git|2.6.2
-munin-node|1.6.1.20130823
+    remote_list_stdout = <<~EOF
+      Chocolatey v0.9.9.11
+      chocolatey|0.9.9.11
+      ConEmu|15.10.25.1
+      Git|2.6.1
+      Git|2.6.2
+      munin-node|1.6.1.20130823
     EOF
     remote_list_obj = double(stdout: remote_list_stdout)
     package_names.each do |pkg|
diff --git a/spec/unit/provider/package/dpkg_spec.rb b/spec/unit/provider/package/dpkg_spec.rb
index cf8f5097f0..9df19f0f1b 100644
--- a/spec/unit/provider/package/dpkg_spec.rb
+++ b/spec/unit/provider/package/dpkg_spec.rb
@@ -34,18 +34,18 @@ describe Chef::Provider::Package::Dpkg do
   let(:dpkg_deb_status) { status = double(stdout: "#{package}\t#{dpkg_deb_version}", exitstatus: 0) }
   let(:dpkg_s_version) { "1.11.4-1ubuntu1" }
   let(:dpkg_s_status) do
-    stdout = <<-DPKG_S
-Package: #{package}
-Status: install ok installed
-Priority: important
-Section: web
-Installed-Size: 1944
-Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Architecture: amd64
-Version: #{dpkg_s_version}
-Config-Version: #{dpkg_s_version}
-Depends: libc6 (>= 2.8~20080505), libssl0.9.8 (>= 0.9.8f-5)
-Conflicts: wget-ssl
+    stdout = <<~DPKG_S
+      Package: #{package}
+      Status: install ok installed
+      Priority: important
+      Section: web
+      Installed-Size: 1944
+      Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+      Architecture: amd64
+      Version: #{dpkg_s_version}
+      Config-Version: #{dpkg_s_version}
+      Depends: libc6 (>= 2.8~20080505), libssl0.9.8 (>= 0.9.8f-5)
+      Conflicts: wget-ssl
     DPKG_S
     status = double(stdout: stdout, exitstatus: 1)
   end
@@ -172,10 +172,10 @@ Conflicts: wget-ssl
 
     it "on new debian/ubuntu we get an exit(1) and no stdout from dpkg -s for uninstalled" do
       dpkg_s_status = double(
-        exitstatus: 1, stdout: "", stderr: <<-EOF
-dpkg-query: package '#{package}' is not installed and no information is available
-Use dpkg --info (= dpkg-deb --info) to examine archive files,
-and dpkg --contents (= dpkg-deb --contents) to list their contents.
+        exitstatus: 1, stdout: "", stderr: <<~EOF
+          dpkg-query: package '#{package}' is not installed and no information is available
+          Use dpkg --info (= dpkg-deb --info) to examine archive files,
+          and dpkg --contents (= dpkg-deb --contents) to list their contents.
         EOF
       )
       expect(provider).to receive(:shell_out_compacted!).with("dpkg", "-s", package, returns: [0, 1], timeout: 900).and_return(dpkg_s_status)
@@ -185,11 +185,11 @@ and dpkg --contents (= dpkg-deb --contents) to list their contents.
 
     it "on old debian/ubuntu we get an exit(0) and we get info on stdout from dpkg -s for uninstalled" do
       dpkg_s_status = double(
-        exitstatus: 0, stderr: "", stdout: <<-EOF
-Package: #{package}
-Status: unknown ok not-installed
-Priority: extra
-Section: ruby
+        exitstatus: 0, stderr: "", stdout: <<~EOF
+          Package: #{package}
+          Status: unknown ok not-installed
+          Priority: extra
+          Section: ruby
         EOF
       )
       expect(provider).to receive(:shell_out_compacted!).with("dpkg", "-s", package, returns: [0, 1], timeout: 900).and_return(dpkg_s_status)
diff --git a/spec/unit/provider/package/ips_spec.rb b/spec/unit/provider/package/ips_spec.rb
index 46f0c72399..b5fb05f7ec 100644
--- a/spec/unit/provider/package/ips_spec.rb
+++ b/spec/unit/provider/package/ips_spec.rb
@@ -35,27 +35,27 @@ describe Chef::Provider::Package::Ips do
   def local_output
     stdin  = StringIO.new
     stdout = ""
-    stderr = <<-PKG_STATUS
-pkg: info: no packages matching the following patterns you specified are
-installed on the system.  Try specifying -r to query remotely:
-
-   crypto/gnupg
+    stderr = <<~PKG_STATUS
+      pkg: info: no packages matching the following patterns you specified are
+      installed on the system.  Try specifying -r to query remotely:
+      
+         crypto/gnupg
 PKG_STATUS
     OpenStruct.new(stdout: stdout, stdin: stdin, stderr: stderr, status: @status, exitstatus: 1)
   end
 
   def remote_output
-    stdout = <<-PKG_STATUS
-          Name: security/sudo
-       Summary: sudo - authority delegation tool
-         State: Not Installed
-     Publisher: omnios
-       Version: 1.8.4.1 (1.8.4p1)
- Build Release: 5.11
-        Branch: 0.151002
-Packaging Date: April  1, 2012 05:55:52 PM
-          Size: 2.57 MB
-          FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
+    stdout = <<~PKG_STATUS
+                Name: security/sudo
+             Summary: sudo - authority delegation tool
+               State: Not Installed
+           Publisher: omnios
+             Version: 1.8.4.1 (1.8.4p1)
+       Build Release: 5.11
+              Branch: 0.151002
+      Packaging Date: April  1, 2012 05:55:52 PM
+                Size: 2.57 MB
+                FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
 PKG_STATUS
     stdin = StringIO.new
     stderr = ""
@@ -92,20 +92,20 @@ PKG_STATUS
 
     it "should set the installed version if package has one" do
       local = local_output
-      local.stdout = <<-INSTALLED
-          Name: crypto/gnupg
-       Summary: GNU Privacy Guard
-   Description: A complete and free implementation of the OpenPGP Standard as
-                defined by RFC4880.
-      Category: Applications/System Utilities
-         State: Installed
-     Publisher: solaris
-       Version: 2.0.17
- Build Release: 5.11
-        Branch: 0.175.0.0.0.2.537
-Packaging Date: October 19, 2011 09:14:50 AM
-          Size: 8.07 MB
-          FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
+      local.stdout = <<~INSTALLED
+                  Name: crypto/gnupg
+               Summary: GNU Privacy Guard
+           Description: A complete and free implementation of the OpenPGP Standard as
+                        defined by RFC4880.
+              Category: Applications/System Utilities
+                 State: Installed
+             Publisher: solaris
+               Version: 2.0.17
+         Build Release: 5.11
+                Branch: 0.175.0.0.0.2.537
+        Packaging Date: October 19, 2011 09:14:50 AM
+                  Size: 8.07 MB
+                  FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
 INSTALLED
       expect(@provider).to receive(:shell_out_compacted).with("pkg", "info", @new_resource.package_name, timeout: 900).and_return(local)
       expect(@provider).to receive(:shell_out_compacted!).with("pkg", "info", "-r", @new_resource.package_name, timeout: 900).and_return(remote_output)
@@ -140,17 +140,17 @@ INSTALLED
 
     it "should not include the human-readable version in the candidate_version" do
       remote = remote_output
-      remote.stdout = <<-PKG_STATUS
-          Name: security/sudo
-       Summary: sudo - authority delegation tool
-         State: Not Installed
-     Publisher: omnios
-       Version: 1.8.4.1 (1.8.4p1)
- Build Release: 5.11
-        Branch: 0.151002
-Packaging Date: April  1, 2012 05:55:52 PM
-          Size: 2.57 MB
-          FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
+      remote.stdout = <<~PKG_STATUS
+                  Name: security/sudo
+               Summary: sudo - authority delegation tool
+                 State: Not Installed
+             Publisher: omnios
+               Version: 1.8.4.1 (1.8.4p1)
+         Build Release: 5.11
+                Branch: 0.151002
+        Packaging Date: April  1, 2012 05:55:52 PM
+                  Size: 2.57 MB
+                  FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
 PKG_STATUS
       expect(@provider).to receive(:shell_out_compacted).with("pkg", "info", @new_resource.package_name, timeout: 900).and_return(local_output)
       expect(@provider).to receive(:shell_out_compacted!).with("pkg", "info", "-r", @new_resource.package_name, timeout: 900).and_return(remote)
@@ -161,36 +161,36 @@ PKG_STATUS
 
     it "should not upgrade the package if it is already installed" do
       local = local_output
-      local.stdout = <<-INSTALLED
-          Name: crypto/gnupg
-       Summary: GNU Privacy Guard
-   Description: A complete and free implementation of the OpenPGP Standard as
-                defined by RFC4880.
-      Category: Applications/System Utilities
-         State: Installed
-     Publisher: solaris
-       Version: 2.0.17
- Build Release: 5.11
-        Branch: 0.175.0.0.0.2.537
-Packaging Date: October 19, 2011 09:14:50 AM
-          Size: 8.07 MB
-          FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
+      local.stdout = <<~INSTALLED
+                  Name: crypto/gnupg
+               Summary: GNU Privacy Guard
+           Description: A complete and free implementation of the OpenPGP Standard as
+                        defined by RFC4880.
+              Category: Applications/System Utilities
+                 State: Installed
+             Publisher: solaris
+               Version: 2.0.17
+         Build Release: 5.11
+                Branch: 0.175.0.0.0.2.537
+        Packaging Date: October 19, 2011 09:14:50 AM
+                  Size: 8.07 MB
+                  FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
 INSTALLED
       remote = remote_output
-      remote.stdout = <<-REMOTE
-          Name: crypto/gnupg
-       Summary: GNU Privacy Guard
-   Description: A complete and free implementation of the OpenPGP Standard as
-                defined by RFC4880.
-      Category: Applications/System Utilities
-         State: Not Installed
-     Publisher: solaris
-       Version: 2.0.18
- Build Release: 5.11
-        Branch: 0.175.0.0.0.2.537
-Packaging Date: October 19, 2011 09:14:50 AM
-          Size: 8.07 MB
-          FMRI: pkg://solaris/crypto/gnupg@2.0.18,5.11-0.175.0.0.0.2.537:20111019T091450Z
+      remote.stdout = <<~REMOTE
+                  Name: crypto/gnupg
+               Summary: GNU Privacy Guard
+           Description: A complete and free implementation of the OpenPGP Standard as
+                        defined by RFC4880.
+              Category: Applications/System Utilities
+                 State: Not Installed
+             Publisher: solaris
+               Version: 2.0.18
+         Build Release: 5.11
+                Branch: 0.175.0.0.0.2.537
+        Packaging Date: October 19, 2011 09:14:50 AM
+                  Size: 8.07 MB
+                  FMRI: pkg://solaris/crypto/gnupg@2.0.18,5.11-0.175.0.0.0.2.537:20111019T091450Z
 REMOTE
 
       expect(@provider).to receive(:shell_out_compacted).with("pkg", "info", @new_resource.package_name, timeout: 900).and_return(local)
diff --git a/spec/unit/provider/package/macports_spec.rb b/spec/unit/provider/package/macports_spec.rb
index 54c5340d72..8b75e40d72 100644
--- a/spec/unit/provider/package/macports_spec.rb
+++ b/spec/unit/provider/package/macports_spec.rb
@@ -70,9 +70,9 @@ describe Chef::Provider::Package::Macports do
 
   describe "current_installed_version" do
     it "should return the current version if the package is installed" do
-      stdout = <<EOF
-The following ports are currently installed:
-  openssl @0.9.8k_0 (active)
+      stdout = <<~EOF
+        The following ports are currently installed:
+          openssl @0.9.8k_0 (active)
 EOF
 
       status = double(stdout: stdout, exitstatus: 0)
diff --git a/spec/unit/provider/package/msu_spec.rb b/spec/unit/provider/package/msu_spec.rb
index de805fcb39..49b723e572 100644
--- a/spec/unit/provider/package/msu_spec.rb
+++ b/spec/unit/provider/package/msu_spec.rb
@@ -31,66 +31,66 @@ describe Chef::Provider::Package::Msu, :windows_only do
   end
 
   let(:installed_package_list_stdout) do
-    <<-EOF
-Packages listing:
-Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
-Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
+    <<~EOF
+      Packages listing:
+      Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
+      Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
     EOF
   end
 
   let(:package_version_stdout) do
-    <<-EOF
-Package information:
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-State : Installed
-Dependency : Language Pack
-The operation completed successfully
+    <<~EOF
+      Package information:
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      State : Installed
+      Dependency : Language Pack
+      The operation completed successfully
     EOF
   end
 
   let(:get_package_info_stdout) do
-    <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
-
-Image Version: 6.1.7600.16385
-
-Package information:
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-Applicable : Yes
-Copyright : Microsoft Corporation
-Company : Microsoft Corporation
-State : Installed
-Dependency : Language Pack
-The operation completed successfully
+    <<~EOF
+      Deployment Image Servicing and Management tool
+      Version: 6.1.7600.16385
+      
+      Image Version: 6.1.7600.16385
+      
+      Package information:
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      Applicable : Yes
+      Copyright : Microsoft Corporation
+      Company : Microsoft Corporation
+      State : Installed
+      Dependency : Language Pack
+      The operation completed successfully
     EOF
   end
 
   def allow_get_packages
-    get_packages_stdout = <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
-
-Image Version: 6.1.7600.16385
-
-Packages listing:
-
-Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
-State : Installed
-Release Type : Language Pack
-Install Time : 2/11/2015 11:33 PM
-
-Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
-State : Installed
-Release Type : Language Pack
-Install Time : 2/11/2015 11:33 PM
-
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-State : Installed
-Release Type : Feature Pack
-Install Time : 11/21/2010 3:40 AM
-
-The operation completed successfully.
+    get_packages_stdout = <<~EOF
+      Deployment Image Servicing and Management tool
+      Version: 6.1.7600.16385
+      
+      Image Version: 6.1.7600.16385
+      
+      Packages listing:
+      
+      Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
+      State : Installed
+      Release Type : Language Pack
+      Install Time : 2/11/2015 11:33 PM
+      
+      Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
+      State : Installed
+      Release Type : Language Pack
+      Install Time : 2/11/2015 11:33 PM
+      
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      State : Installed
+      Release Type : Feature Pack
+      Install Time : 11/21/2010 3:40 AM
+      
+      The operation completed successfully.
     EOF
     get_packages_obj = double(stdout: get_packages_stdout)
     allow_any_instance_of(Chef::Provider::Package::Cab).to receive(:dism_command).with("/Get-Packages").and_return(get_packages_obj)
diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index 9fbba202f5..a07c3b236d 100644
--- a/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
@@ -32,8 +32,8 @@ describe Chef::Provider::Package::Pacman do
 
     allow(@provider).to receive(:shell_out_compacted).and_return(@status)
     @stdin = StringIO.new
-    @stdout = StringIO.new(<<-ERR)
-error: package "nano" not found
+    @stdout = StringIO.new(<<~ERR)
+      error: package "nano" not found
 ERR
     @stderr = StringIO.new
     @pid = 2342
@@ -66,26 +66,26 @@ ERR
     end
 
     it "should set the installed version if pacman has one" do
-      stdout = <<-PACMAN
-Name           : nano
-Version        : 2.2.2-1
-URL            : http://www.nano-editor.org
-Licenses       : GPL
-Groups         : base
-Provides       : None
-Depends On     : glibc  ncurses
-Optional Deps  : None
-Required By    : None
-Conflicts With : None
-Replaces       : None
-Installed Size : 1496.00 K
-Packager       : Andreas Radke <andyrtr@archlinux.org>
-Architecture   : i686
-Build Date     : Mon 18 Jan 2010 06:16:16 PM CET
-Install Date   : Mon 01 Feb 2010 10:06:30 PM CET
-Install Reason : Explicitly installed
-Install Script : Yes
-Description    : Pico editor clone with enhancements
+      stdout = <<~PACMAN
+        Name           : nano
+        Version        : 2.2.2-1
+        URL            : http://www.nano-editor.org
+        Licenses       : GPL
+        Groups         : base
+        Provides       : None
+        Depends On     : glibc  ncurses
+        Optional Deps  : None
+        Required By    : None
+        Conflicts With : None
+        Replaces       : None
+        Installed Size : 1496.00 K
+        Packager       : Andreas Radke <andyrtr@archlinux.org>
+        Architecture   : i686
+        Build Date     : Mon 18 Jan 2010 06:16:16 PM CET
+        Install Date   : Mon 01 Feb 2010 10:06:30 PM CET
+        Install Reason : Explicitly installed
+        Install Script : Yes
+        Description    : Pico editor clone with enhancements
 PACMAN
 
       status = double(stdout: stdout, exitstatus: 0)
@@ -102,22 +102,22 @@ PACMAN
     end
 
     it "should use pacman.conf to determine valid repo names for package versions" do
-      @pacman_conf = <<-PACMAN_CONF
-[options]
-HoldPkg      = pacman glibc
-Architecture = auto
-
-[customrepo]
-Server = https://my.custom.repo
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
+      @pacman_conf = <<~PACMAN_CONF
+        [options]
+        HoldPkg      = pacman glibc
+        Architecture = auto
+        
+        [customrepo]
+        Server = https://my.custom.repo
+        
+        [core]
+        Include = /etc/pacman.d/mirrorlist
+        
+        [extra]
+        Include = /etc/pacman.d/mirrorlist
+        
+        [community]
+        Include = /etc/pacman.d/mirrorlist
 PACMAN_CONF
 
       status = double(stdout: "customrepo nano 1.2.3-4", exitstatus: 0)
diff --git a/spec/unit/provider/package/paludis_spec.rb b/spec/unit/provider/package/paludis_spec.rb
index a9ae5bf9d3..10c0d0f7e8 100644
--- a/spec/unit/provider/package/paludis_spec.rb
+++ b/spec/unit/provider/package/paludis_spec.rb
@@ -33,13 +33,13 @@ describe Chef::Provider::Package::Paludis do
 
     @stdin = StringIO.new
     @stderr = StringIO.new
-    @stdout = <<-PKG_STATUS
-group/ntp 0 accounts
-group/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r2 arbor
-user/ntp 0 accounts
-user/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r1 installed
+    @stdout = <<~PKG_STATUS
+      group/ntp 0 accounts
+      group/ntp 0 installed-accounts
+      net/ntp 4.2.6_p5-r2 arbor
+      user/ntp 0 accounts
+      user/ntp 0 installed-accounts
+      net/ntp 4.2.6_p5-r1 installed
 PKG_STATUS
     @pid = 12345
     @shell_out = OpenStruct.new(stdout: @stdout, stdin: @stdin, stderr: @stderr, status: @status, exitstatus: 0)
@@ -64,13 +64,13 @@ PKG_STATUS
     end
 
     it "should return new version if package is installed" do
-      @stdout.replace(<<-INSTALLED)
-group/ntp 0 accounts
-group/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r2 arbor
-user/ntp 0 accounts
-user/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r1 installed
+      @stdout.replace(<<~INSTALLED)
+        group/ntp 0 accounts
+        group/ntp 0 installed-accounts
+        net/ntp 4.2.6_p5-r2 arbor
+        user/ntp 0 accounts
+        user/ntp 0 installed-accounts
+        net/ntp 4.2.6_p5-r1 installed
 INSTALLED
       expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       @provider.load_current_resource
@@ -97,18 +97,18 @@ INSTALLED
     end
 
     it "should not contain invalid characters for the version string" do
-      @stdout.replace(<<-PKG_STATUS)
-sys-process/lsof 4.87 arbor
-sys-process/lsof 4.87 x86_64
+      @stdout.replace(<<~PKG_STATUS)
+        sys-process/lsof 4.87 arbor
+        sys-process/lsof 4.87 x86_64
 PKG_STATUS
       expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=sys-process/lsof-4.87", { timeout: @new_resource.timeout || 900 })
       @provider.install_package("sys-process/lsof", "4.87")
     end
 
     it "should not include the human-readable version in the candidate_version" do
-      @stdout.replace(<<-PKG_STATUS)
-sys-process/lsof 4.87 arbor
-sys-process/lsof 4.87 x86_64
+      @stdout.replace(<<~PKG_STATUS)
+        sys-process/lsof 4.87 arbor
+        sys-process/lsof 4.87 x86_64
 PKG_STATUS
       expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       @provider.load_current_resource
diff --git a/spec/unit/provider/package/portage_spec.rb b/spec/unit/provider/package/portage_spec.rb
index 889053e826..08d80d3a7d 100644
--- a/spec/unit/provider/package/portage_spec.rb
+++ b/spec/unit/provider/package/portage_spec.rb
@@ -132,12 +132,12 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do
       end
 
       it "should throw an exception if a category is not specified and there are duplicates" do
-        stderr_output = <<EOF
-You specified an unqualified atom that matched multiple packages:
-* app-misc/sphinx
-* dev-python/sphinx
-
-Please use a more specific atom.
+        stderr_output = <<~EOF
+          You specified an unqualified atom that matched multiple packages:
+          * app-misc/sphinx
+          * dev-python/sphinx
+          
+          Please use a more specific atom.
 EOF
         status = double(stdout: "", stderr: stderr_output, exitstatus: 1)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb
index 3b1a13e49c..6b33ab97f9 100644
--- a/spec/unit/provider/package/rubygems_spec.rb
+++ b/spec/unit/provider/package/rubygems_spec.rb
@@ -253,32 +253,32 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
   end
 
   it "detects when the target gem environment is the jruby platform" do
-    gem_env_out = <<-JRUBY_GEM_ENV
-RubyGems Environment:
-  - RUBYGEMS VERSION: 1.3.6
-  - RUBY VERSION: 1.8.7 (2010-05-12 patchlevel 249) [java]
-  - INSTALLATION DIRECTORY: /Users/you/.rvm/gems/jruby-1.5.0
-  - RUBY EXECUTABLE: /Users/you/.rvm/rubies/jruby-1.5.0/bin/jruby
-  - EXECUTABLE DIRECTORY: /Users/you/.rvm/gems/jruby-1.5.0/bin
-  - RUBYGEMS PLATFORMS:
-    - ruby
-    - universal-java-1.6
-  - GEM PATHS:
-     - /Users/you/.rvm/gems/jruby-1.5.0
-     - /Users/you/.rvm/gems/jruby-1.5.0@global
-  - GEM CONFIGURATION:
-     - :update_sources => true
-     - :verbose => true
-     - :benchmark => false
-     - :backtrace => false
-     - :bulk_threshold => 1000
-     - "install" => "--env-shebang"
-     - "update" => "--env-shebang"
-     - "gem" => "--no-rdoc --no-ri"
-     - :sources => ["https://rubygems.org/", "http://gems.github.com/"]
-  - REMOTE SOURCES:
-     - https://rubygems.org/
-     - http://gems.github.com/
+    gem_env_out = <<~JRUBY_GEM_ENV
+      RubyGems Environment:
+        - RUBYGEMS VERSION: 1.3.6
+        - RUBY VERSION: 1.8.7 (2010-05-12 patchlevel 249) [java]
+        - INSTALLATION DIRECTORY: /Users/you/.rvm/gems/jruby-1.5.0
+        - RUBY EXECUTABLE: /Users/you/.rvm/rubies/jruby-1.5.0/bin/jruby
+        - EXECUTABLE DIRECTORY: /Users/you/.rvm/gems/jruby-1.5.0/bin
+        - RUBYGEMS PLATFORMS:
+          - ruby
+          - universal-java-1.6
+        - GEM PATHS:
+           - /Users/you/.rvm/gems/jruby-1.5.0
+           - /Users/you/.rvm/gems/jruby-1.5.0@global
+        - GEM CONFIGURATION:
+           - :update_sources => true
+           - :verbose => true
+           - :benchmark => false
+           - :backtrace => false
+           - :bulk_threshold => 1000
+           - "install" => "--env-shebang"
+           - "update" => "--env-shebang"
+           - "gem" => "--no-rdoc --no-ri"
+           - :sources => ["https://rubygems.org/", "http://gems.github.com/"]
+        - REMOTE SOURCES:
+           - https://rubygems.org/
+           - http://gems.github.com/
     JRUBY_GEM_ENV
     expect(@gem_env).to receive(:shell_out_compacted!).with("/usr/weird/bin/gem env").and_return(double("jruby_gem_env", stdout: gem_env_out))
     expected = ["ruby", Gem::Platform.new("universal-java-1.6")]
@@ -295,32 +295,32 @@ RubyGems Environment:
   end
 
   it "uses the current gem platforms when the target env is not jruby" do
-    gem_env_out = <<-RBX_GEM_ENV
-RubyGems Environment:
-  - RUBYGEMS VERSION: 1.3.6
-  - RUBY VERSION: 1.8.7 (2010-05-14 patchlevel 174) [x86_64-apple-darwin10.3.0]
-  - INSTALLATION DIRECTORY: /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514
-  - RUBYGEMS PREFIX: /Users/ddeleo/.rvm/rubies/rbx-1.0.0-20100514
-  - RUBY EXECUTABLE: /Users/ddeleo/.rvm/rubies/rbx-1.0.0-20100514/bin/rbx
-  - EXECUTABLE DIRECTORY: /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514/bin
-  - RUBYGEMS PLATFORMS:
-    - ruby
-    - x86_64-darwin-10
-    - x86_64-rubinius-1.0
-  - GEM PATHS:
-     - /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514
-     - /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514@global
-  - GEM CONFIGURATION:
-     - :update_sources => true
-     - :verbose => true
-     - :benchmark => false
-     - :backtrace => false
-     - :bulk_threshold => 1000
-     - :sources => ["https://rubygems.org/", "http://gems.github.com/"]
-     - "gem" => "--no-rdoc --no-ri"
-  - REMOTE SOURCES:
-     - https://rubygems.org/
-     - http://gems.github.com/
+    gem_env_out = <<~RBX_GEM_ENV
+      RubyGems Environment:
+        - RUBYGEMS VERSION: 1.3.6
+        - RUBY VERSION: 1.8.7 (2010-05-14 patchlevel 174) [x86_64-apple-darwin10.3.0]
+        - INSTALLATION DIRECTORY: /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514
+        - RUBYGEMS PREFIX: /Users/ddeleo/.rvm/rubies/rbx-1.0.0-20100514
+        - RUBY EXECUTABLE: /Users/ddeleo/.rvm/rubies/rbx-1.0.0-20100514/bin/rbx
+        - EXECUTABLE DIRECTORY: /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514/bin
+        - RUBYGEMS PLATFORMS:
+          - ruby
+          - x86_64-darwin-10
+          - x86_64-rubinius-1.0
+        - GEM PATHS:
+           - /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514
+           - /Users/ddeleo/.rvm/gems/rbx-1.0.0-20100514@global
+        - GEM CONFIGURATION:
+           - :update_sources => true
+           - :verbose => true
+           - :benchmark => false
+           - :backtrace => false
+           - :bulk_threshold => 1000
+           - :sources => ["https://rubygems.org/", "http://gems.github.com/"]
+           - "gem" => "--no-rdoc --no-ri"
+        - REMOTE SOURCES:
+           - https://rubygems.org/
+           - http://gems.github.com/
     RBX_GEM_ENV
     expect(@gem_env).to receive(:shell_out_compacted!).with("/usr/weird/bin/gem env").and_return(double("rbx_gem_env", stdout: gem_env_out))
     expect(@gem_env.gem_platforms).to eq(Gem.platforms)
diff --git a/spec/unit/provider/package/solaris_spec.rb b/spec/unit/provider/package/solaris_spec.rb
index 2ebf8fe4be..2aa37fe8b3 100644
--- a/spec/unit/provider/package/solaris_spec.rb
+++ b/spec/unit/provider/package/solaris_spec.rb
@@ -32,18 +32,18 @@ describe Chef::Provider::Package::Solaris do
 
   describe "assessing the current package status" do
     before do
-      @pkginfo = <<-PKGINFO
-PKGINST:  SUNWbash
-NAME:  GNU Bourne-Again shell (bash)
-CATEGORY:  system
-ARCH:  sparc
-VERSION:  11.10.0,REV=2005.01.08.05.16
-BASEDIR:  /
-VENDOR:  Sun Microsystems, Inc.
-DESC:  GNU Bourne-Again shell (bash) version 3.0
-PSTAMP:  sfw10-patch20070430084444
-INSTDATE:  Nov 04 2009 01:02
-HOTLINE:  Please contact your local service provider
+      @pkginfo = <<~PKGINFO
+        PKGINST:  SUNWbash
+        NAME:  GNU Bourne-Again shell (bash)
+        CATEGORY:  system
+        ARCH:  sparc
+        VERSION:  11.10.0,REV=2005.01.08.05.16
+        BASEDIR:  /
+        VENDOR:  Sun Microsystems, Inc.
+        DESC:  GNU Bourne-Again shell (bash) version 3.0
+        PSTAMP:  sfw10-patch20070430084444
+        INSTDATE:  Nov 04 2009 01:02
+        HOTLINE:  Please contact your local service provider
 PKGINFO
 
       @status = double("Status", stdout: "", exitstatus: 0)
-- 
cgit v1.2.1


From 878560a22f37aec0c2dfe681b3743e027155be88 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:29:13 -0700
Subject: fix Layout/DotPosition

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/freebsd/pkgng_spec.rb | 28 ++++++++++++------------
 spec/unit/provider/package/freebsd/port_spec.rb  | 16 +++++++-------
 spec/unit/provider/package/rpm_spec.rb           | 12 +++++-----
 spec/unit/provider/package/smartos_spec.rb       | 12 +++++-----
 4 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/freebsd/pkgng_spec.rb b/spec/unit/provider/package/freebsd/pkgng_spec.rb
index a4da5bb235..13e5dd17fd 100644
--- a/spec/unit/provider/package/freebsd/pkgng_spec.rb
+++ b/spec/unit/provider/package/freebsd/pkgng_spec.rb
@@ -99,30 +99,30 @@ describe Chef::Provider::Package::Freebsd::Port do
 
     it "should handle package source from file" do
       @provider.new_resource.source("/nas/pkg/repo/zsh-5.0.1.txz")
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("pkg", "add", "/nas/pkg/repo/zsh-5.0.1.txz", env: { "LC_ALL" => nil }, timeout: 900).
-        and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("pkg", "add", "/nas/pkg/repo/zsh-5.0.1.txz", env: { "LC_ALL" => nil }, timeout: 900)
+        .and_return(@install_result)
       @provider.install_package("zsh", "5.0.1")
     end
 
     it "should handle package source over ftp or http" do
       @provider.new_resource.source("http://repo.example.com/zsh-5.0.1.txz")
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("pkg", "add", "http://repo.example.com/zsh-5.0.1.txz", env: { "LC_ALL" => nil }, timeout: 900).
-        and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("pkg", "add", "http://repo.example.com/zsh-5.0.1.txz", env: { "LC_ALL" => nil }, timeout: 900)
+        .and_return(@install_result)
       @provider.install_package("zsh", "5.0.1")
     end
 
     it "should handle a package name" do
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("pkg", "install", "-y", "zsh", env: { "LC_ALL" => nil }, timeout: 900).and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("pkg", "install", "-y", "zsh", env: { "LC_ALL" => nil }, timeout: 900).and_return(@install_result)
       @provider.install_package("zsh", "5.0.1")
     end
 
     it "should handle a package name with a specified repo" do
       @provider.new_resource.options("-r LocalMirror") # This requires LocalMirror repo configuration.
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("pkg", "install", "-y", "-r", "LocalMirror", "zsh", env: { "LC_ALL" => nil }, timeout: 900).and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("pkg", "install", "-y", "-r", "LocalMirror", "zsh", env: { "LC_ALL" => nil }, timeout: 900).and_return(@install_result)
       @provider.install_package("zsh", "5.0.1")
     end
   end
@@ -133,15 +133,15 @@ describe Chef::Provider::Package::Freebsd::Port do
     end
 
     it "should call pkg delete" do
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("pkg", "delete", "-y", "zsh-5.0.1", env: nil, timeout: 900).and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("pkg", "delete", "-y", "zsh-5.0.1", env: nil, timeout: 900).and_return(@install_result)
       @provider.remove_package("zsh", "5.0.1")
     end
 
     it "should not include repo option in pkg delete" do
       @provider.new_resource.options("-r LocalMirror") # This requires LocalMirror repo configuration.
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("pkg", "delete", "-y", "zsh-5.0.1", env: nil, timeout: 900).and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("pkg", "delete", "-y", "zsh-5.0.1", env: nil, timeout: 900).and_return(@install_result)
       @provider.remove_package("zsh", "5.0.1")
     end
   end
diff --git a/spec/unit/provider/package/freebsd/port_spec.rb b/spec/unit/provider/package/freebsd/port_spec.rb
index 1406235725..af5216dc04 100644
--- a/spec/unit/provider/package/freebsd/port_spec.rb
+++ b/spec/unit/provider/package/freebsd/port_spec.rb
@@ -98,8 +98,8 @@ describe Chef::Provider::Package::Freebsd::Port do
     it "should return candidate version if port exists" do
       allow(::File).to receive(:exist?).with("/usr/ports/Makefile").and_return(true)
       allow(@provider).to receive(:port_dir).and_return("/usr/ports/shells/zsh")
-      expect(@provider).to receive(:shell_out_compacted!).with("make", "-V", "PORTVERSION", cwd: "/usr/ports/shells/zsh", env: nil, returns: [0, 1], timeout: 900).
-        and_return(@port_version)
+      expect(@provider).to receive(:shell_out_compacted!).with("make", "-V", "PORTVERSION", cwd: "/usr/ports/shells/zsh", env: nil, returns: [0, 1], timeout: 900)
+        .and_return(@port_version)
       expect(@provider.candidate_version).to eq("5.0.5")
     end
 
@@ -140,9 +140,9 @@ describe Chef::Provider::Package::Freebsd::Port do
 
     it "should run make install in port directory" do
       allow(@provider).to receive(:port_dir).and_return("/usr/ports/shells/zsh")
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("make", "-DBATCH", "install", "clean", timeout: 1800, cwd: "/usr/ports/shells/zsh", env: nil).
-        and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("make", "-DBATCH", "install", "clean", timeout: 1800, cwd: "/usr/ports/shells/zsh", env: nil)
+        .and_return(@install_result)
       @provider.install_package("zsh", "5.0.5")
     end
   end
@@ -154,9 +154,9 @@ describe Chef::Provider::Package::Freebsd::Port do
 
     it "should run make deinstall in port directory" do
       allow(@provider).to receive(:port_dir).and_return("/usr/ports/shells/zsh")
-      expect(@provider).to receive(:shell_out_compacted!).
-        with("make", "deinstall", timeout: 300, cwd: "/usr/ports/shells/zsh", env: nil).
-        and_return(@install_result)
+      expect(@provider).to receive(:shell_out_compacted!)
+        .with("make", "deinstall", timeout: 300, cwd: "/usr/ports/shells/zsh", env: nil)
+        .and_return(@install_result)
       @provider.remove_package("zsh", "5.0.5")
     end
   end
diff --git a/spec/unit/provider/package/rpm_spec.rb b/spec/unit/provider/package/rpm_spec.rb
index 91d4ca69b4..3682043dcd 100644
--- a/spec/unit/provider/package/rpm_spec.rb
+++ b/spec/unit/provider/package/rpm_spec.rb
@@ -85,13 +85,13 @@ describe Chef::Provider::Package::Rpm do
   describe "when the package source is valid" do
 
     before do
-      expect(provider).to receive(:shell_out_compacted!).
-        with("rpm", "-qp", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", package_source, timeout: 900).
-        and_return(rpm_qp_status)
+      expect(provider).to receive(:shell_out_compacted!)
+        .with("rpm", "-qp", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", package_source, timeout: 900)
+        .and_return(rpm_qp_status)
 
-      expect(provider).to receive(:shell_out_compacted).
-        with("rpm", "-q", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", package_name, timeout: 900).
-        and_return(rpm_q_status)
+      expect(provider).to receive(:shell_out_compacted)
+        .with("rpm", "-q", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", package_name, timeout: 900)
+        .and_return(rpm_q_status)
     end
 
     context "when rpm fails when querying package installed state" do
diff --git a/spec/unit/provider/package/smartos_spec.rb b/spec/unit/provider/package/smartos_spec.rb
index 172bfbac84..cd85e1b3d9 100644
--- a/spec/unit/provider/package/smartos_spec.rb
+++ b/spec/unit/provider/package/smartos_spec.rb
@@ -76,9 +76,9 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
 
     it "should lookup the candidate_version if the variable is not already set (pkgin separated by spaces)" do
       search = double()
-      expect(search).to receive(:each_line).
-        and_yield("something-varnish-1.1.1   something varnish like\n").
-        and_yield("varnish-2.3.4             actual varnish\n")
+      expect(search).to receive(:each_line)
+        .and_yield("something-varnish-1.1.1   something varnish like\n")
+        .and_yield("varnish-2.3.4             actual varnish\n")
       @shell_out = double("shell_out!", stdout: search)
       expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "se", "varnish", env: nil, returns: [0, 1], timeout: 900).and_return(@shell_out)
       expect(@provider.candidate_version).to eq("2.3.4")
@@ -86,9 +86,9 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
 
     it "should lookup the candidate_version if the variable is not already set (pkgin separated by semicolons)" do
       search = double()
-      expect(search).to receive(:each_line).
-        and_yield("something-varnish-1.1.1;;something varnish like\n").
-        and_yield("varnish-2.3.4;;actual varnish\n")
+      expect(search).to receive(:each_line)
+        .and_yield("something-varnish-1.1.1;;something varnish like\n")
+        .and_yield("varnish-2.3.4;;actual varnish\n")
       @shell_out = double("shell_out!", stdout: search)
       expect(@provider).to receive(:shell_out_compacted!).with("/opt/local/bin/pkgin", "se", "varnish", env: nil, returns: [0, 1], timeout: 900).and_return(@shell_out)
       expect(@provider.candidate_version).to eq("2.3.4")
-- 
cgit v1.2.1


From 34a6dd714503abbb0e6d240a4832f245d5c3ab06 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:30:53 -0700
Subject: clean up whitespace again

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/apt_spec.rb     |  4 ++--
 spec/unit/provider/package/cab_spec.rb     | 16 ++++++++--------
 spec/unit/provider/package/ips_spec.rb     |  2 +-
 spec/unit/provider/package/msu_spec.rb     | 16 ++++++++--------
 spec/unit/provider/package/pacman_spec.rb  |  8 ++++----
 spec/unit/provider/package/portage_spec.rb |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb
index 97eda1d774..05be08f332 100644
--- a/spec/unit/provider/package/apt_spec.rb
+++ b/spec/unit/provider/package/apt_spec.rb
@@ -126,7 +126,7 @@ describe Chef::Provider::Package::Apt do
       showpkg_out = <<~SHOWPKG_STDOUT
         Package: libmysqlclient15-dev
         Versions:
-        
+
         Reverse Depends:
           libmysqlclient-dev,libmysqlclient15-dev
           libmysqlclient-dev,libmysqlclient15-dev
@@ -186,7 +186,7 @@ describe Chef::Provider::Package::Apt do
       showpkg_out = <<~SHOWPKG_STDOUT
         Package: mp3-decoder
         Versions:
-        
+
         Reverse Depends:
           nautilus,mp3-decoder
           vux,mp3-decoder
diff --git a/spec/unit/provider/package/cab_spec.rb b/spec/unit/provider/package/cab_spec.rb
index bdfcd06be3..9c5865ec31 100644
--- a/spec/unit/provider/package/cab_spec.rb
+++ b/spec/unit/provider/package/cab_spec.rb
@@ -60,9 +60,9 @@ describe Chef::Provider::Package::Cab do
     get_package_info_stdout = <<~EOF
       Deployment Image Servicing and Management tool
       Version: 6.1.7600.16385
-      
+
       Image Version: 6.1.7600.16385
-      
+
       Package information:
       Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
       Applicable : Yes
@@ -84,26 +84,26 @@ describe Chef::Provider::Package::Cab do
     get_packages_stdout = <<~EOF
       Deployment Image Servicing and Management tool
       Version: 6.1.7600.16385
-      
+
       Image Version: 6.1.7600.16385
-      
+
       Packages listing:
-      
+
       Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
       State : Installed
       Release Type : Language Pack
       Install Time : 2/11/2015 11:33 PM
-      
+
       Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
       State : Installed
       Release Type : Language Pack
       Install Time : 2/11/2015 11:33 PM
-      
+
       Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
       State : Installed
       Release Type : Feature Pack
       Install Time : 11/21/2010 3:40 AM
-      
+
       The operation completed successfully.
     EOF
     get_packages_obj = double(stdout: get_packages_stdout)
diff --git a/spec/unit/provider/package/ips_spec.rb b/spec/unit/provider/package/ips_spec.rb
index b5fb05f7ec..70e1c3fe32 100644
--- a/spec/unit/provider/package/ips_spec.rb
+++ b/spec/unit/provider/package/ips_spec.rb
@@ -38,7 +38,7 @@ describe Chef::Provider::Package::Ips do
     stderr = <<~PKG_STATUS
       pkg: info: no packages matching the following patterns you specified are
       installed on the system.  Try specifying -r to query remotely:
-      
+
          crypto/gnupg
 PKG_STATUS
     OpenStruct.new(stdout: stdout, stdin: stdin, stderr: stderr, status: @status, exitstatus: 1)
diff --git a/spec/unit/provider/package/msu_spec.rb b/spec/unit/provider/package/msu_spec.rb
index 49b723e572..b2f0b22963 100644
--- a/spec/unit/provider/package/msu_spec.rb
+++ b/spec/unit/provider/package/msu_spec.rb
@@ -52,9 +52,9 @@ describe Chef::Provider::Package::Msu, :windows_only do
     <<~EOF
       Deployment Image Servicing and Management tool
       Version: 6.1.7600.16385
-      
+
       Image Version: 6.1.7600.16385
-      
+
       Package information:
       Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
       Applicable : Yes
@@ -70,26 +70,26 @@ describe Chef::Provider::Package::Msu, :windows_only do
     get_packages_stdout = <<~EOF
       Deployment Image Servicing and Management tool
       Version: 6.1.7600.16385
-      
+
       Image Version: 6.1.7600.16385
-      
+
       Packages listing:
-      
+
       Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
       State : Installed
       Release Type : Language Pack
       Install Time : 2/11/2015 11:33 PM
-      
+
       Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
       State : Installed
       Release Type : Language Pack
       Install Time : 2/11/2015 11:33 PM
-      
+
       Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
       State : Installed
       Release Type : Feature Pack
       Install Time : 11/21/2010 3:40 AM
-      
+
       The operation completed successfully.
     EOF
     get_packages_obj = double(stdout: get_packages_stdout)
diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index a07c3b236d..10bb3492b2 100644
--- a/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
@@ -106,16 +106,16 @@ PACMAN
         [options]
         HoldPkg      = pacman glibc
         Architecture = auto
-        
+
         [customrepo]
         Server = https://my.custom.repo
-        
+
         [core]
         Include = /etc/pacman.d/mirrorlist
-        
+
         [extra]
         Include = /etc/pacman.d/mirrorlist
-        
+
         [community]
         Include = /etc/pacman.d/mirrorlist
 PACMAN_CONF
diff --git a/spec/unit/provider/package/portage_spec.rb b/spec/unit/provider/package/portage_spec.rb
index 08d80d3a7d..e1036bea74 100644
--- a/spec/unit/provider/package/portage_spec.rb
+++ b/spec/unit/provider/package/portage_spec.rb
@@ -136,7 +136,7 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do
           You specified an unqualified atom that matched multiple packages:
           * app-misc/sphinx
           * dev-python/sphinx
-          
+
           Please use a more specific atom.
 EOF
         status = double(stdout: "", stderr: stderr_output, exitstatus: 1)
-- 
cgit v1.2.1


From cdad2f684debda15e8cf773185e78f93892eda35 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:31:50 -0700
Subject: fix Layout/LeadingCommentSpace

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/freebsd/pkg_spec.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/freebsd/pkg_spec.rb b/spec/unit/provider/package/freebsd/pkg_spec.rb
index 6ad6813503..8c3e25a0f9 100644
--- a/spec/unit/provider/package/freebsd/pkg_spec.rb
+++ b/spec/unit/provider/package/freebsd/pkg_spec.rb
@@ -66,15 +66,15 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
 
   describe "when querying for package state and attributes" do
     before do
-      #@new_resource = Chef::Resource::Package.new("zsh")
+      # @new_resource = Chef::Resource::Package.new("zsh")
 
-      #@provider = Chef::Provider::Package::Freebsd::Pkg.new(@node, @new_resource)
+      # @provider = Chef::Provider::Package::Freebsd::Pkg.new(@node, @new_resource)
 
-      #@status = double("Status", :exitstatus => 0)
-      #@stdin = double("STDIN", :null_object => true)
-      #@stdout = double("STDOUT", :null_object => true)
-      #@stderr = double("STDERR", :null_object => true)
-      #@pid = double("PID", :null_object => true)
+      # @status = double("Status", :exitstatus => 0)
+      # @stdin = double("STDIN", :null_object => true)
+      # @stdout = double("STDOUT", :null_object => true)
+      # @stderr = double("STDERR", :null_object => true)
+      # @pid = double("PID", :null_object => true)
     end
 
     it "should return the version number when it is installed" do
@@ -111,7 +111,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
       allow(@provider).to receive(:port_path).and_return("/usr/ports/shells/zsh")
       make_v = OpenStruct.new(stdout: "zsh-4.3.6_7\n", exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with("make", "-V", "PKGNAME", { cwd: "/usr/ports/shells/zsh", env: nil, returns: [0, 1], timeout: 900 }).and_return(make_v)
-      #@provider.should_receive(:ports_makefile_variable_value).with("PKGNAME").and_return("zsh-4.3.6_7")
+      # @provider.should_receive(:ports_makefile_variable_value).with("PKGNAME").and_return("zsh-4.3.6_7")
       expect(@provider.package_name).to eq("zsh")
     end
   end
@@ -134,7 +134,7 @@ describe Chef::Provider::Package::Freebsd::Pkg, "load_current_resource" do
 
   describe Chef::Provider::Package::Freebsd::Pkg, "port path" do
     before do
-      #@node = Chef::Node.new
+      # @node = Chef::Node.new
       @new_resource = Chef::Resource::Package.new("zsh")
       @new_resource.cookbook_name = "adventureclub"
       @provider = Chef::Provider::Package::Freebsd::Pkg.new(@new_resource, @run_context)
-- 
cgit v1.2.1


From 0bdd618fc5146dad3fa5a90d10a4b5e608e4663d Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:32:45 -0700
Subject: fix Style/UnneededInterpolation

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/cab_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/cab_spec.rb b/spec/unit/provider/package/cab_spec.rb
index 9c5865ec31..619240de23 100644
--- a/spec/unit/provider/package/cab_spec.rb
+++ b/spec/unit/provider/package/cab_spec.rb
@@ -49,7 +49,7 @@ describe Chef::Provider::Package::Cab do
   end
 
   before do
-    new_resource.source = File.join("#{ENV['TEMP']}", "test6.1-kb2664825-v3-x64.cab")
+    new_resource.source = File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab")
     installed_package_list_obj = double(stdout: installed_package_list_stdout)
     allow(provider).to receive(:dism_command).with("/Get-Packages").and_return(installed_package_list_obj)
     package_version_obj = double(stdout: package_version_stdout)
@@ -151,9 +151,9 @@ describe Chef::Provider::Package::Cab do
       allow(Chef::FileCache).to receive(:create_cache_path).and_return(ENV["TEMP"])
       path = provider.default_download_cache_path
       if windows?
-        expect(path).to be == File.join("#{ENV['TEMP']}", "\\", "Test6.1-KB2664825-v3-x64.cab")
+        expect(path).to be == File.join((ENV['TEMP']).to_s, "\\", "Test6.1-KB2664825-v3-x64.cab")
       else
-        expect(path).to be == File.join("#{ENV['TEMP']}", "Test6.1-KB2664825-v3-x64.cab")
+        expect(path).to be == File.join((ENV['TEMP']).to_s, "Test6.1-KB2664825-v3-x64.cab")
       end
     end
   end
@@ -161,12 +161,12 @@ describe Chef::Provider::Package::Cab do
   describe "#cab_file_source" do
     context "when local file path is set" do
       it "returns local cab file source path" do
-        new_resource.source = File.join("#{ENV['TEMP']}", "test6.1-kb2664825-v3-x64.cab")
+        new_resource.source = File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab")
         path = provider.cab_file_source
         if windows?
-          expect(path).to be == File.join("#{ENV['TEMP'].downcase}", "\\", "test6.1-kb2664825-v3-x64.cab")
+          expect(path).to be == File.join((ENV['TEMP'].downcase).to_s, "\\", "test6.1-kb2664825-v3-x64.cab")
         else
-          expect(path).to be == File.join("#{ENV['TEMP']}", "test6.1-kb2664825-v3-x64.cab")
+          expect(path).to be == File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab")
         end
       end
     end
@@ -174,9 +174,9 @@ describe Chef::Provider::Package::Cab do
       it "calls download_source_file method" do
         new_resource.source = "https://www.something.com/test6.1-kb2664825-v3-x64.cab"
         if windows?
-          expect(provider).to receive(:download_source_file).and_return(File.join("#{ENV['TEMP'].downcase}", "\\", "test6.1-kb2664825-v3-x64.cab"))
+          expect(provider).to receive(:download_source_file).and_return(File.join((ENV['TEMP'].downcase).to_s, "\\", "test6.1-kb2664825-v3-x64.cab"))
         else
-          expect(provider).to receive(:download_source_file).and_return(File.join("#{ENV['TEMP']}", "test6.1-kb2664825-v3-x64.cab"))
+          expect(provider).to receive(:download_source_file).and_return(File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab"))
         end
         provider.cab_file_source
       end
-- 
cgit v1.2.1


From f2232a71362244747949efe9ac30a7bb410626e4 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 2 Jul 2018 10:33:43 -0700
Subject: fix some Style/StringLiterals introduced by the UnneededInterpolation
 cop

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 spec/unit/provider/package/cab_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'spec/unit/provider/package')

diff --git a/spec/unit/provider/package/cab_spec.rb b/spec/unit/provider/package/cab_spec.rb
index 619240de23..2ed40566f4 100644
--- a/spec/unit/provider/package/cab_spec.rb
+++ b/spec/unit/provider/package/cab_spec.rb
@@ -49,7 +49,7 @@ describe Chef::Provider::Package::Cab do
   end
 
   before do
-    new_resource.source = File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab")
+    new_resource.source = File.join((ENV["TEMP"]).to_s, "test6.1-kb2664825-v3-x64.cab")
     installed_package_list_obj = double(stdout: installed_package_list_stdout)
     allow(provider).to receive(:dism_command).with("/Get-Packages").and_return(installed_package_list_obj)
     package_version_obj = double(stdout: package_version_stdout)
@@ -151,9 +151,9 @@ describe Chef::Provider::Package::Cab do
       allow(Chef::FileCache).to receive(:create_cache_path).and_return(ENV["TEMP"])
       path = provider.default_download_cache_path
       if windows?
-        expect(path).to be == File.join((ENV['TEMP']).to_s, "\\", "Test6.1-KB2664825-v3-x64.cab")
+        expect(path).to be == File.join((ENV["TEMP"]).to_s, "\\", "Test6.1-KB2664825-v3-x64.cab")
       else
-        expect(path).to be == File.join((ENV['TEMP']).to_s, "Test6.1-KB2664825-v3-x64.cab")
+        expect(path).to be == File.join((ENV["TEMP"]).to_s, "Test6.1-KB2664825-v3-x64.cab")
       end
     end
   end
@@ -161,12 +161,12 @@ describe Chef::Provider::Package::Cab do
   describe "#cab_file_source" do
     context "when local file path is set" do
       it "returns local cab file source path" do
-        new_resource.source = File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab")
+        new_resource.source = File.join((ENV["TEMP"]).to_s, "test6.1-kb2664825-v3-x64.cab")
         path = provider.cab_file_source
         if windows?
-          expect(path).to be == File.join((ENV['TEMP'].downcase).to_s, "\\", "test6.1-kb2664825-v3-x64.cab")
+          expect(path).to be == File.join((ENV["TEMP"].downcase).to_s, "\\", "test6.1-kb2664825-v3-x64.cab")
         else
-          expect(path).to be == File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab")
+          expect(path).to be == File.join((ENV["TEMP"]).to_s, "test6.1-kb2664825-v3-x64.cab")
         end
       end
     end
@@ -174,9 +174,9 @@ describe Chef::Provider::Package::Cab do
       it "calls download_source_file method" do
         new_resource.source = "https://www.something.com/test6.1-kb2664825-v3-x64.cab"
         if windows?
-          expect(provider).to receive(:download_source_file).and_return(File.join((ENV['TEMP'].downcase).to_s, "\\", "test6.1-kb2664825-v3-x64.cab"))
+          expect(provider).to receive(:download_source_file).and_return(File.join((ENV["TEMP"].downcase).to_s, "\\", "test6.1-kb2664825-v3-x64.cab"))
         else
-          expect(provider).to receive(:download_source_file).and_return(File.join((ENV['TEMP']).to_s, "test6.1-kb2664825-v3-x64.cab"))
+          expect(provider).to receive(:download_source_file).and_return(File.join((ENV["TEMP"]).to_s, "test6.1-kb2664825-v3-x64.cab"))
         end
         provider.cab_file_source
       end
-- 
cgit v1.2.1