chef 14.2.0 → 14.3.37

data/spec/unit/provider/ifconfig_spec.rb

@@ -41,16 +41,16 @@ describe Chef::Provider::Ifconfig do
   end
 
   describe Chef::Provider::Ifconfig, "load_current_resource" do
-    let(:net_tools_version) { StringIO.new <<-EOS }
-net-tools 1.60
-ifconfig 1.42 (2001-04-13)
+    let(:net_tools_version) { StringIO.new <<~EOS }
+      net-tools 1.60
+      ifconfig 1.42 (2001-04-13)
 EOS
 
     before do
       ifconfig = double(stdout: "", exitstatus: 1)
-      allow(@provider).to receive(:shell_out).and_return(ifconfig)
+      allow(@provider).to receive(:shell_out_compacted).and_return(ifconfig)
       ifconfig_version = double(stdout: "", stderr: net_tools_version, exitstatus: 4)
-      allow(@provider).to receive(:shell_out).with("ifconfig --version").and_return(ifconfig_version)
+      allow(@provider).to receive(:shell_out_compacted).with("ifconfig --version").and_return(ifconfig_version)
       @provider.load_current_resource
     end
     it "should track state of ifconfig failure" do
@@ -67,7 +67,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @current_resource.inet_addr nil
       command = "ifconfig eth0 10.0.0.1 netmask 255.255.254.0 metric 1 mtu 1500"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
       expect(@provider).to receive(:generate_config)
 
       @provider.run_action(:add)
@@ -78,7 +78,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @new_resource.target "172.16.32.2"
       command = "ifconfig eth0 172.16.32.2 netmask 255.255.254.0 metric 1 mtu 1500"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
 
       @provider.run_action(:add)
       expect(@new_resource).to be_updated
@@ -86,7 +86,7 @@ EOS
 
     it "should not add an interface if it already exists" do
       allow(@provider).to receive(:load_current_resource)
-      expect(@provider).not_to receive(:shell_out!)
+      expect(@provider).not_to receive(:shell_out_compacted!)
       @current_resource.inet_addr "10.0.0.1"
       expect(@provider).to receive(:generate_config)
 
@@ -105,7 +105,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @current_resource.inet_addr nil
       command = "ifconfig eth0 10.0.0.1 netmask 255.255.254.0 metric 1 mtu 1500"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
       expect(@provider).not_to receive(:generate_config)
 
       @provider.run_action(:enable)
@@ -116,7 +116,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @new_resource.target "172.16.32.2"
       command = "ifconfig eth0 172.16.32.2 netmask 255.255.254.0 metric 1 mtu 1500"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
 
       @provider.run_action(:enable)
       expect(@new_resource).to be_updated
@@ -139,7 +139,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @current_resource.device "eth0"
       command = "ifconfig #{@new_resource.device} down"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
       expect(@provider).to receive(:delete_config)
 
       @provider.run_action(:delete)
@@ -148,7 +148,7 @@ EOS
 
     it "should not delete interface if it does not exist" do
       allow(@provider).to receive(:load_current_resource)
-      expect(@provider).not_to receive(:shell_out!)
+      expect(@provider).not_to receive(:shell_out_compacted!)
       expect(@provider).to receive(:delete_config)
 
       @provider.run_action(:delete)
@@ -162,7 +162,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @current_resource.device "eth0"
       command = "ifconfig #{@new_resource.device} down"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
       expect(@provider).not_to receive(:delete_config)
 
       @provider.run_action(:disable)
@@ -171,7 +171,7 @@ EOS
 
     it "should not delete interface if it does not exist" do
       allow(@provider).to receive(:load_current_resource)
-      expect(@provider).not_to receive(:shell_out!)
+      expect(@provider).not_to receive(:shell_out_compacted!)
       expect(@provider).not_to receive(:delete_config)
 
       @provider.run_action(:disable)
@@ -185,7 +185,7 @@ EOS
       allow(@provider).to receive(:load_current_resource)
       @current_resource.device "eth0"
       command = "ifconfig #{@new_resource.device} down"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
       expect(@provider).to receive(:delete_config)
 
       @provider.run_action(:delete)
@@ -196,7 +196,7 @@ EOS
       # This is so that our fake values do not get overwritten
       allow(@provider).to receive(:load_current_resource)
       # This is so that nothing actually runs
-      expect(@provider).not_to receive(:shell_out!)
+      expect(@provider).not_to receive(:shell_out_compacted!)
       expect(@provider).to receive(:delete_config)
 
       @provider.run_action(:delete)

data/spec/unit/provider/launchd_spec.rb

@@ -29,55 +29,55 @@ describe Chef::Provider::Launchd do
     let(:label) { "call.mom.weekly" }
     let(:new_resource) { Chef::Resource::Launchd.new(label) }
     let!(:current_resource) { Chef::Resource::Launchd.new(label) }
-    let(:test_plist) { String.new <<-XML }
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-\t<key>Label</key>
-\t<string>call.mom.weekly</string>
-\t<key>Program</key>
-\t<string>/Library/scripts/call_mom.sh</string>
-\t<key>StartCalendarInterval</key>
-\t<dict>
-\t\t<key>Hour</key>
-\t\t<integer>10</integer>
-\t\t<key>Weekday</key>
-\t\t<integer>7</integer>
-\t</dict>
-\t<key>TimeOut</key>
-\t<integer>300</integer>
-</dict>
-</plist>
+    let(:test_plist) { String.new <<~XML }
+      <?xml version="1.0" encoding="UTF-8"?>
+      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+      <plist version="1.0">
+      <dict>
+      \t<key>Label</key>
+      \t<string>call.mom.weekly</string>
+      \t<key>Program</key>
+      \t<string>/Library/scripts/call_mom.sh</string>
+      \t<key>StartCalendarInterval</key>
+      \t<dict>
+      \t\t<key>Hour</key>
+      \t\t<integer>10</integer>
+      \t\t<key>Weekday</key>
+      \t\t<integer>7</integer>
+      \t</dict>
+      \t<key>TimeOut</key>
+      \t<integer>300</integer>
+      </dict>
+      </plist>
 XML
-    let(:test_plist_multiple_intervals) { String.new <<-XML }
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-\t<key>Label</key>
-\t<string>call.mom.weekly</string>
-\t<key>Program</key>
-\t<string>/Library/scripts/call_mom.sh</string>
-\t<key>StartCalendarInterval</key>
-\t<array>
-\t\t<dict>
-\t\t\t<key>Hour</key>
-\t\t\t<integer>11</integer>
-\t\t\t<key>Weekday</key>
-\t\t\t<integer>1</integer>
-\t\t</dict>
-\t\t<dict>
-\t\t\t<key>Hour</key>
-\t\t\t<integer>12</integer>
-\t\t\t<key>Weekday</key>
-\t\t\t<integer>2</integer>
-\t\t</dict>
-\t</array>
-\t<key>TimeOut</key>
-\t<integer>300</integer>
-</dict>
-</plist>
+    let(:test_plist_multiple_intervals) { String.new <<~XML }
+      <?xml version="1.0" encoding="UTF-8"?>
+      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+      <plist version="1.0">
+      <dict>
+      \t<key>Label</key>
+      \t<string>call.mom.weekly</string>
+      \t<key>Program</key>
+      \t<string>/Library/scripts/call_mom.sh</string>
+      \t<key>StartCalendarInterval</key>
+      \t<array>
+      \t\t<dict>
+      \t\t\t<key>Hour</key>
+      \t\t\t<integer>11</integer>
+      \t\t\t<key>Weekday</key>
+      \t\t\t<integer>1</integer>
+      \t\t</dict>
+      \t\t<dict>
+      \t\t\t<key>Hour</key>
+      \t\t\t<integer>12</integer>
+      \t\t\t<key>Weekday</key>
+      \t\t\t<integer>2</integer>
+      \t\t</dict>
+      \t</array>
+      \t<key>TimeOut</key>
+      \t<integer>300</integer>
+      </dict>
+      </plist>
 XML
 
     let(:test_hash) do
@@ -112,14 +112,14 @@ XML
       describe "agent" do
         it "path should be /Library/LaunchAgents/call.mom.weekly.plist" do
           new_resource.type "agent"
-          expect(provider.gen_path_from_type).
-            to eq("/Library/LaunchAgents/call.mom.weekly.plist")
+          expect(provider.gen_path_from_type)
+            .to eq("/Library/LaunchAgents/call.mom.weekly.plist")
         end
       end
       describe "daemon" do
         it "path should be /Library/LaunchDaemons/call.mom.weekly.plist" do
-          expect(provider.gen_path_from_type).
-            to eq("/Library/LaunchDaemons/call.mom.weekly.plist")
+          expect(provider.gen_path_from_type)
+            .to eq("/Library/LaunchDaemons/call.mom.weekly.plist")
         end
       end
     end

data/spec/unit/provider/link_spec.rb

@@ -22,7 +22,7 @@ require "ostruct"
 require "spec_helper"
 
 if Chef::Platform.windows?
-  require "chef/win32/file" #probably need this in spec_helper
+  require "chef/win32/file" # probably need this in spec_helper
 end
 
 describe Chef::Resource::Link do
@@ -46,7 +46,7 @@ describe Chef::Resource::Link do
 
   describe "when the target is a symlink" do
     before(:each) do
-      lstat = double("stats", :ino => 5)
+      lstat = double("stats", ino: 5)
       allow(lstat).to receive(:uid).and_return(501)
       allow(lstat).to receive(:gid).and_return(501)
       allow(lstat).to receive(:mode).and_return(0777)
@@ -146,7 +146,7 @@ describe Chef::Resource::Link do
 
   describe "when the target is a regular old file" do
     before do
-      stat = double("stats", :ino => 5)
+      stat = double("stats", ino: 5)
       allow(stat).to receive(:uid).and_return(501)
       allow(stat).to receive(:gid).and_return(501)
       allow(stat).to receive(:mode).and_return(0755)
@@ -178,7 +178,7 @@ describe Chef::Resource::Link do
 
     describe "and the source exists" do
       before do
-        stat = double("stats", :ino => 6)
+        stat = double("stats", ino: 6)
         allow(stat).to receive(:uid).and_return(502)
         allow(stat).to receive(:gid).and_return(502)
         allow(stat).to receive(:mode).and_return(0644)
@@ -205,7 +205,7 @@ describe Chef::Resource::Link do
 
     describe "and is hardlinked to the source" do
       before do
-        stat = double("stats", :ino => 5)
+        stat = double("stats", ino: 5)
         allow(stat).to receive(:uid).and_return(502)
         allow(stat).to receive(:gid).and_return(502)
         allow(stat).to receive(:mode).and_return(0644)
@@ -254,7 +254,7 @@ describe Chef::Resource::Link do
 
   describe "action_delete" do
     before(:each) do
-      stat = double("stats", :ino => 5)
+      stat = double("stats", ino: 5)
       allow(stat).to receive(:uid).and_return(501)
       allow(stat).to receive(:gid).and_return(501)
       allow(stat).to receive(:mode).and_return(0755)
@@ -321,7 +321,7 @@ describe Chef::Resource::Link do
       end
 
       before(:each) do
-        stat = double("stats", :ino => 5)
+        stat = double("stats", ino: 5)
         allow(stat).to receive(:uid).and_return(502)
         allow(stat).to receive(:gid).and_return(502)
         allow(stat).to receive(:mode).and_return(0644)

data/spec/unit/provider/mdadm_spec.rb

@@ -32,20 +32,20 @@ describe Chef::Provider::Mdadm do
 
   describe "when determining the current metadevice status" do
     it "should set the current resources mount point to the new resources mount point" do
-      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:status => 0))
+      allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(status: 0))
       @provider.load_current_resource
       expect(@provider.current_resource.name).to eq("/dev/md1")
       expect(@provider.current_resource.raid_device).to eq("/dev/md1")
     end
 
     it "determines that the metadevice exists when mdadm exit code is zero" do
-      allow(@provider).to receive(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0, 4]).and_return(OpenStruct.new(:status => 0))
+      allow(@provider).to receive(:shell_out!).with("mdadm --detail --test /dev/md1", returns: [0, 4]).and_return(OpenStruct.new(status: 0))
       @provider.load_current_resource
       expect(@provider.current_resource.exists).to be_truthy
     end
 
     it "determines that the metadevice does not exist when mdadm exit code is 4" do
-      allow(@provider).to receive(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0, 4]).and_return(OpenStruct.new(:status => 4))
+      allow(@provider).to receive(:shell_out!).with("mdadm --detail --test /dev/md1", returns: [0, 4]).and_return(OpenStruct.new(status: 4))
       @provider.load_current_resource
       expect(@provider.current_resource.exists).to be_falsey
     end

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

@@ -22,32 +22,32 @@ require "ostruct"
 describe Chef::Provider::Mount::Aix do
 
   before(:all) do
-    @mounted_output = <<-MOUNT
-  node       mounted        mounted over    vfs       date        options
--------- ---------------  ---------------  ------ ------------ ---------------
-         /dev/sdz1         /tmp/foo         jfs2   Jul 17 13:22 rw,log=/dev/hd8
+    @mounted_output = <<~MOUNT
+        node       mounted        mounted over    vfs       date        options
+      -------- ---------------  ---------------  ------ ------------ ---------------
+               /dev/sdz1         /tmp/foo         jfs2   Jul 17 13:22 rw,log=/dev/hd8
 MOUNT
 
-    @unmounted_output = <<-UNMOUNTED
-  node       mounted        mounted over    vfs       date        options
--------- ---------------  ---------------  ------ ------------ ---------------
-         /dev/sdz2         /                jfs2   Jul 17 13:22 rw,log=/dev/hd8
+    @unmounted_output = <<~UNMOUNTED
+        node       mounted        mounted over    vfs       date        options
+      -------- ---------------  ---------------  ------ ------------ ---------------
+               /dev/sdz2         /                jfs2   Jul 17 13:22 rw,log=/dev/hd8
 UNMOUNTED
 
-    @conflict_mounted_output = <<-MOUNT
-  node       mounted        mounted over    vfs       date        options
--------- ---------------  ---------------  ------ ------------ ---------------
-         /dev/sdz3         /tmp/foo         jfs2   Jul 17 13:22 rw,log=/dev/hd8
+    @conflict_mounted_output = <<~MOUNT
+        node       mounted        mounted over    vfs       date        options
+      -------- ---------------  ---------------  ------ ------------ ---------------
+               /dev/sdz3         /tmp/foo         jfs2   Jul 17 13:22 rw,log=/dev/hd8
 MOUNT
 
-    @enabled_output = <<-ENABLED
-#MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
-/tmp/foo:/dev/sdz1:jfs2::bootfs:10485760:rw:yes:no
+    @enabled_output = <<~ENABLED
+      #MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
+      /tmp/foo:/dev/sdz1:jfs2::bootfs:10485760:rw:yes:no
 ENABLED
 
-    @test_wrong_output = <<-WRONG
-#MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
-/tmp/foo::/dev/sdz1:jfs2:bootfs:10485760:rw:yes:no
+    @test_wrong_output = <<~WRONG
+      #MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
+      /tmp/foo::/dev/sdz1:jfs2:bootfs:10485760:rw:yes:no
 WRONG
   end
 
@@ -61,7 +61,7 @@ WRONG
     @new_resource.device_type :device
     @new_resource.fstype      "jfs2"
 
-    @new_resource.supports :remount => false
+    @new_resource.supports remount: false
 
     @provider = Chef::Provider::Mount::Aix.new(@new_resource, @run_context)
 
@@ -70,12 +70,12 @@ WRONG
   end
 
   def stub_mounted(provider, mounted_output)
-    response = double("Mixlib::ShellOut command", :exitstatus => 0, :stdout => mounted_output, :stderr => "")
+    response = double("Mixlib::ShellOut command", exitstatus: 0, stdout: mounted_output, stderr: "")
     expect(provider).to receive(:shell_out!).with("mount").and_return(response)
   end
 
   def stub_enabled(provider, enabled_output)
-    response = double("Mixlib::ShellOut command", :exitstatus => 0, :stdout => enabled_output, :stderr => "")
+    response = double("Mixlib::ShellOut command", exitstatus: 0, stdout: enabled_output, stderr: "")
     expect(provider).to receive(:shell_out).with("lsfs -c #{@new_resource.mount_point}").and_return(response)
   end
 
@@ -179,7 +179,7 @@ WRONG
 
   describe "remount_fs" do
     it "should remount resource if it is already mounted and it supports remounting" do
-      @new_resource.supports({ :remount => true })
+      @new_resource.supports({ remount: true })
       stub_mounted_enabled(@provider, @mounted_output, "")
 
       expect(@provider).to receive(:shell_out!).with("mount -o remount #{@new_resource.device} #{@new_resource.mount_point}")
@@ -188,7 +188,7 @@ WRONG
     end
 
     it "should remount with new mount options if it is already mounted and it supports remounting" do
-      @new_resource.supports({ :remount => true })
+      @new_resource.supports({ remount: true })
       @new_resource.options("nodev,rw")
       stub_mounted_enabled(@provider, @mounted_output, "")
 
@@ -232,22 +232,22 @@ WRONG
     it "should disable mount if it is mounted and enabled" do
       stub_mounted_enabled(@provider, @mounted_output, @enabled_output)
 
-      allow(::File).to receive(:open).with("/etc/filesystems", "r").and_return(<<-ETCFILESYSTEMS)
-/tmp/foo:
-  dev   = /dev/sdz1
-  vfs   = jfs2
-  log   = /dev/hd8
-  mount   = true
-  check   = true
-  vol   = /opt
-  free    = false
-  quota   = no
-
-/tmp/abc:
-  dev   = /dev/sdz2
-  vfs   = jfs2
-  mount   = true
-  options   = rw
+      allow(::File).to receive(:open).with("/etc/filesystems", "r").and_return(<<~ETCFILESYSTEMS)
+        /tmp/foo:
+          dev   = /dev/sdz1
+          vfs   = jfs2
+          log   = /dev/hd8
+          mount   = true
+          check   = true
+          vol   = /opt
+          free    = false
+          quota   = no
+
+        /tmp/abc:
+          dev   = /dev/sdz2
+          vfs   = jfs2
+          mount   = true
+          options   = rw
 ETCFILESYSTEMS
 
       filesystems = StringIO.new