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

data/spec/unit/policy_builder/policyfile_spec.rb

@@ -221,9 +221,9 @@ describe Chef::PolicyBuilder::Policyfile do
         let(:error404) { Net::HTTPServerException.new("404 message", :body) }
 
         before do
-          expect(api_service).to receive(:get).
-            with("data/policyfiles/example-policy-stage").
-            and_raise(error404)
+          expect(api_service).to receive(:get)
+            .with("data/policyfiles/example-policy-stage")
+            .and_raise(error404)
         end
 
         it "raises an error" do
@@ -393,10 +393,10 @@ describe Chef::PolicyBuilder::Policyfile do
 
           let(:run_list_for_data_collector) do
             {
-              :id => "_policy_node",
-              :run_list => [
-               { :type => "recipe", :name => "test::default", :skipped => false, :version => nil },
-               { :type => "recipe", :name => "test::other", :skipped => false, :version => nil },
+              id: "_policy_node",
+              run_list: [
+               { type: "recipe", name: "test::default", skipped: false, version: nil },
+               { type: "recipe", name: "test::other", skipped: false, version: nil },
               ],
             }
           end
@@ -744,8 +744,8 @@ describe Chef::PolicyBuilder::Policyfile do
               policy_builder.finish_load_node(node)
               policy_builder.build_node
 
-              expect(api_service).to receive(:get).with(cookbook1_url).
-                and_raise(error404)
+              expect(api_service).to receive(:get).with(cookbook1_url)
+                .and_raise(error404)
             end
 
             it "raises an error indicating which cookbook is missing" do
@@ -763,9 +763,9 @@ describe Chef::PolicyBuilder::Policyfile do
               policy_builder.finish_load_node(node)
               policy_builder.build_node
 
-              allow(Chef::CookbookSynchronizer).to receive(:new).
-                with(expected_cookbook_hash, events).
-                and_return(cookbook_synchronizer)
+              allow(Chef::CookbookSynchronizer).to receive(:new)
+                .with(expected_cookbook_hash, events)
+                .and_return(cookbook_synchronizer)
             end
 
             after do
@@ -814,15 +814,15 @@ describe Chef::PolicyBuilder::Policyfile do
           context "when the cookbooks exist on the server" do
 
             before do
-              expect(api_service).to receive(:get).with(cookbook1_url).
-                and_return(example1_cookbook_data)
-              expect(api_service).to receive(:get).with(cookbook2_url).
-                and_return(example2_cookbook_data)
+              expect(api_service).to receive(:get).with(cookbook1_url)
+                .and_return(example1_cookbook_data)
+              expect(api_service).to receive(:get).with(cookbook2_url)
+                .and_return(example2_cookbook_data)
 
-              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example1_cookbook_data).
-                and_return(example1_cookbook_object)
-              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example2_cookbook_data).
-                and_return(example2_cookbook_object)
+              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example1_cookbook_data)
+                .and_return(example1_cookbook_object)
+              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example2_cookbook_data)
+                .and_return(example2_cookbook_object)
             end
 
             include_examples "fetching cookbooks when they exist"
@@ -847,15 +847,15 @@ describe Chef::PolicyBuilder::Policyfile do
           context "when the cookbooks exist on the server" do
 
             before do
-              expect(api_service).to receive(:get).with(cookbook1_url).
-                and_return(example1_cookbook_data)
-              expect(api_service).to receive(:get).with(cookbook2_url).
-                and_return(example2_cookbook_data)
-
-              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example1_cookbook_data).
-                and_return(example1_cookbook_object)
-              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example2_cookbook_data).
-                and_return(example2_cookbook_object)
+              expect(api_service).to receive(:get).with(cookbook1_url)
+                .and_return(example1_cookbook_data)
+              expect(api_service).to receive(:get).with(cookbook2_url)
+                .and_return(example2_cookbook_data)
+
+              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example1_cookbook_data)
+                .and_return(example1_cookbook_object)
+              expect(Chef::CookbookVersion).to receive(:from_cb_artifact_data).with(example2_cookbook_data)
+                .and_return(example2_cookbook_object)
             end
 
             include_examples "fetching cookbooks when they exist"

data/spec/unit/property_spec.rb

@@ -64,7 +64,7 @@ describe "Chef::Resource.property" do
     if properties.size == 1
       description = "With property #{properties.first}"
     else
-      description = "With properties #{english_join(properties.map { |property| "#{property.inspect}" })}"
+      description = "With properties #{english_join(properties.map { |property| (property.inspect).to_s })}"
     end
     context description, *tags do
       before do
@@ -1070,13 +1070,13 @@ describe "Chef::Resource.property" do
   end
 
   it "raises an error if both name_property and name_attribute are specified" do
-    expect { resource_class.property :x, :name_property => false, :name_attribute => 1 }.to raise_error ArgumentError,
+    expect { resource_class.property :x, name_property: false, name_attribute: 1 }.to raise_error ArgumentError,
       /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
-    expect { resource_class.property :x, :name_property => false, :name_attribute => nil }.to raise_error ArgumentError,
+    expect { resource_class.property :x, name_property: false, name_attribute: nil }.to raise_error ArgumentError,
       /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
-    expect { resource_class.property :x, :name_property => false, :name_attribute => false }.to raise_error ArgumentError,
+    expect { resource_class.property :x, name_property: false, name_attribute: false }.to raise_error ArgumentError,
       /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
-    expect { resource_class.property :x, :name_property => true, :name_attribute => true }.to raise_error ArgumentError,
+    expect { resource_class.property :x, name_property: true, name_attribute: true }.to raise_error ArgumentError,
       /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
   end
 

data/spec/unit/provider/apt_repository_spec.rb

@@ -23,25 +23,25 @@ require "spec_helper"
 #
 # Output of the command:
 # => apt-key adv --list-public-keys --with-fingerprint --with-colons
-APT_KEY_FINGER = <<-EOF
-tru:t:1:1488924856:0:3:1:5
-pub:-:1024:17:40976EAF437D05B5:2004-09-12:::-:Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>::scESC:
-fpr:::::::::630239CC130E1A7FD81A27B140976EAF437D05B5:
-sub:-:2048:16:251BEFF479164387:2004-09-12::::::e:
-pub:-:1024:17:46181433FBB75451:2004-12-30:::-:Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>::scSC:
-fpr:::::::::C5986B4F1257FFA86632CBA746181433FBB75451:
-pub:-:4096:1:3B4FE6ACC0B21F32:2012-05-11:::-:Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>::scSC:
-fpr:::::::::790BC7277767219C42C86F933B4FE6ACC0B21F32:
-pub:-:4096:1:D94AA3F0EFE21092:2012-05-11:::-:Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>::scSC:
-fpr:::::::::843938DF228D22F7B3742BC0D94AA3F0EFE21092:
+APT_KEY_FINGER = <<~EOF.freeze
+  tru:t:1:1488924856:0:3:1:5
+  pub:-:1024:17:40976EAF437D05B5:2004-09-12:::-:Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>::scESC:
+  fpr:::::::::630239CC130E1A7FD81A27B140976EAF437D05B5:
+  sub:-:2048:16:251BEFF479164387:2004-09-12::::::e:
+  pub:-:1024:17:46181433FBB75451:2004-12-30:::-:Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>::scSC:
+  fpr:::::::::C5986B4F1257FFA86632CBA746181433FBB75451:
+  pub:-:4096:1:3B4FE6ACC0B21F32:2012-05-11:::-:Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>::scSC:
+  fpr:::::::::790BC7277767219C42C86F933B4FE6ACC0B21F32:
+  pub:-:4096:1:D94AA3F0EFE21092:2012-05-11:::-:Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>::scSC:
+  fpr:::::::::843938DF228D22F7B3742BC0D94AA3F0EFE21092:
 EOF
 
 # Output of the command:
 # => gpg --with-fingerprint --with-colons [FILE]
-GPG_FINGER = <<-EOF
-pub:-:1024:17:327574EE02A818DD:2009-04-22:::-:Cloudera Apt Repository:
-fpr:::::::::F36A89E33CC1BD0F71079007327574EE02A818DD:
-sub:-:2048:16:84080586D1CA74A1:2009-04-22::::
+GPG_FINGER = <<~EOF.freeze
+  pub:-:1024:17:327574EE02A818DD:2009-04-22:::-:Cloudera Apt Repository:
+  fpr:::::::::F36A89E33CC1BD0F71079007327574EE02A818DD:
+  sub:-:2048:16:84080586D1CA74A1:2009-04-22::::
 EOF
 
 describe Chef::Provider::AptRepository do
@@ -67,14 +67,14 @@ describe Chef::Provider::AptRepository do
   end
 
   let(:gpg_shell_out_success) do
-    double("shell_out", :stdout => "pub  2048R/7BD9BF62 2011-08-19 nginx signing key <signing-key@nginx.com>",
-                        :exitstatus => 0, :error? => false)
+    double("shell_out", stdout: "pub  2048R/7BD9BF62 2011-08-19 nginx signing key <signing-key@nginx.com>",
+                        exitstatus: 0, error?: false)
   end
 
   let(:gpg_shell_out_failure) do
-    double("shell_out", :stderr => "gpg: no valid OpenPGP data found.\n
+    double("shell_out", stderr: "gpg: no valid OpenPGP data found.\n
                                     gpg: processing message failed: eof",
-                        :exitstatus => 1, :error? => true)
+                        exitstatus: 1, error?: true)
   end
 
   let(:apt_fingerprints) do

data/spec/unit/provider/cookbook_file/content_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Provider::CookbookFile::Content do
 
-  let(:new_resource) { double("Chef::Resource::CookbookFile (new)", :cookbook_name => "apache2", :cookbook => "apache2") }
+  let(:new_resource) { double("Chef::Resource::CookbookFile (new)", cookbook_name: "apache2", cookbook: "apache2") }
   let(:content) do
     @run_context = double("Chef::RunContext")
     @current_resource = double("Chef::Resource::CookbookFile (current)")

data/spec/unit/provider/cookbook_file_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Provider::CookbookFile do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
   let(:logger) { double("Mixlib::Log::Child").as_null_object }
-  let(:run_context) { double("Chef::RunContext", :node => node, :events => events, :logger => logger) }
+  let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end

data/spec/unit/provider/cron/unix_spec.rb

@@ -37,9 +37,9 @@ describe Chef::Provider::Cron::Unix do
     end
   end
 
-  let(:status) { double("Process::Status", :exitstatus => exitstatus) }
+  let(:status) { double("Process::Status", exitstatus: exitstatus) }
   let(:exitstatus) { 0 }
-  let(:shell_out) { double("Mixlib::ShellOut", :status => status, :stdout => stdout, :stderr => stderr) }
+  let(:shell_out) { double("Mixlib::ShellOut", status: status, stdout: stdout, stderr: stderr) }
 
   let(:logger) { double("Mixlib::Log::Child").as_null_object }
 
@@ -53,25 +53,25 @@ describe Chef::Provider::Cron::Unix do
   describe "read_crontab" do
     let(:stderr) { "" }
     let(:stdout) do
-      String.new(<<-CRONTAB)
-0 2 * * * /some/other/command
+      String.new(<<~CRONTAB)
+        0 2 * * * /some/other/command
 
-# Chef Name: something else
-* 5 * * * /bin/true
+        # Chef Name: something else
+        * 5 * * * /bin/true
 
-# Another comment
+        # Another comment
       CRONTAB
     end
 
     before do
       allow(logger).to receive(:trace)
       allow(shell_out).to receive(:format_for_exception).and_return("formatted command output")
-      allow(provider).to receive(:shell_out).with("/usr/bin/crontab -l", :user => username).and_return(shell_out)
+      allow(provider).to receive(:shell_out).with("/usr/bin/crontab -l", user: username).and_return(shell_out)
     end
 
     it "should call crontab -l with the user" do
       provider.send(:read_crontab)
-      expect(provider).to have_received(:shell_out).with("/usr/bin/crontab -l", :user => username)
+      expect(provider).to have_received(:shell_out).with("/usr/bin/crontab -l", user: username)
     end
 
     it "should return the contents of the crontab" do
@@ -111,7 +111,7 @@ describe Chef::Provider::Cron::Unix do
   describe "write_crontab" do
     let(:stdout) { "" }
     let(:stderr) { "" }
-    let(:tempfile) { double("foo", :path => "/tmp/foo", :close => true) }
+    let(:tempfile) { double("foo", path: "/tmp/foo", close: true) }
 
     before do
       expect(Tempfile).to receive(:new).and_return(tempfile)
@@ -119,12 +119,12 @@ describe Chef::Provider::Cron::Unix do
       expect(tempfile).to receive(:chmod).with(420)
       expect(tempfile).to receive(:close!)
       allow(tempfile).to receive(:<<)
-      allow(provider).to receive(:shell_out).with("/usr/bin/crontab #{tempfile.path}", :user => username).and_return(shell_out)
+      allow(provider).to receive(:shell_out).with("/usr/bin/crontab #{tempfile.path}", user: username).and_return(shell_out)
     end
 
     it "should call crontab for the user" do
       provider.send(:write_crontab, "Foo")
-      expect(provider).to have_received(:shell_out).with("/usr/bin/crontab #{tempfile.path}", :user => username)
+      expect(provider).to have_received(:shell_out).with("/usr/bin/crontab #{tempfile.path}", user: username)
     end
 
     it "should call crontab with a file containing the crontab" do

data/spec/unit/provider/cron_spec.rb

@@ -42,15 +42,15 @@ describe Chef::Provider::Cron do
 
     context "with a matching entry in the user's crontab" do
       before :each do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-@reboot /bin/true param1 param2
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          @reboot /bin/true param1 param2
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
 CRONTAB
       end
 
@@ -67,19 +67,19 @@ CRONTAB
       end
 
       it "should pull env vars out" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
-
-# Chef Name: cronhole some stuff
-MAILTO=foo@example.com
-SHELL=/bin/foosh
-PATH=/bin:/foo
-HOME=/home/foo
-@reboot /bin/true param1 param2
-# Chef Name: something else
-2 * 1 * * /bin/false
-
-# Another comment
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
+
+          # Chef Name: cronhole some stuff
+          MAILTO=foo@example.com
+          SHELL=/bin/foosh
+          PATH=/bin:/foo
+          HOME=/home/foo
+          @reboot /bin/true param1 param2
+          # Chef Name: something else
+          2 * 1 * * /bin/false
+
+          # Another comment
 CRONTAB
         cron = @provider.load_current_resource
         expect(cron.mailto).to eq("foo@example.com")
@@ -91,12 +91,12 @@ CRONTAB
       end
 
       it "should parse and load generic and standard environment variables from cron entry" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-# Chef Name: cronhole some stuff
-MAILTO=warn@example.com
-TEST=lol
-FLAG=1
-@reboot /bin/true
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          # Chef Name: cronhole some stuff
+          MAILTO=warn@example.com
+          TEST=lol
+          FLAG=1
+          @reboot /bin/true
 CRONTAB
         cron = @provider.load_current_resource
 
@@ -105,13 +105,13 @@ CRONTAB
       end
 
       it "should not break with variables that match the cron resource internals" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-# Chef Name: cronhole some stuff
-MINUTE=40
-REBOOT=midnight
-TEST=lol
-ENVIRONMENT=production
-@reboot /bin/true
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          # Chef Name: cronhole some stuff
+          MINUTE=40
+          REBOOT=midnight
+          TEST=lol
+          ENVIRONMENT=production
+          @reboot /bin/true
 CRONTAB
         cron = @provider.load_current_resource
 
@@ -137,9 +137,9 @@ CRONTAB
           end
 
           it "should create a crontab with the entry" do
-            expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-# Chef Name: cronhole some stuff
-@reboot /bin/true
+            expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+              # Chef Name: cronhole some stuff
+              @reboot /bin/true
             ENDCRON
             @provider.run_action(:create)
           end
@@ -168,13 +168,13 @@ CRONTAB
 
     context "with no matching entry in the user's crontab" do
       before :each do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: something else
-* 5 * * * /bin/true
+          # Chef Name: something else
+          * 5 * * * /bin/true
 
-# Another comment
+          # Another comment
 CRONTAB
       end
 
@@ -190,9 +190,9 @@ CRONTAB
       end
 
       it "should not fail if there's an existing cron with a numerical argument" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-# Chef Name: foo[bar] (baz)
-21 */4 * * * some_prog 1234567
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          # Chef Name: foo[bar] (baz)
+          21 */4 * * * some_prog 1234567
 CRONTAB
         expect do
           @provider.load_current_resource
@@ -202,15 +202,15 @@ CRONTAB
 
     context "with a matching entry in the user's crontab" do
       before :each do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-* 5 * 1 * /bin/true param1 param2
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          * 5 * 1 * /bin/true param1 param2
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
 CRONTAB
       end
 
@@ -232,19 +232,19 @@ CRONTAB
       end
 
       it "should pull env vars out" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
-
-# Chef Name: cronhole some stuff
-MAILTO=foo@example.com
-SHELL=/bin/foosh
-PATH=/bin:/foo
-HOME=/home/foo
-* 5 * 1 * /bin/true param1 param2
-# Chef Name: something else
-2 * 1 * * /bin/false
-
-# Another comment
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
+
+          # Chef Name: cronhole some stuff
+          MAILTO=foo@example.com
+          SHELL=/bin/foosh
+          PATH=/bin:/foo
+          HOME=/home/foo
+          * 5 * 1 * /bin/true param1 param2
+          # Chef Name: something else
+          2 * 1 * * /bin/false
+
+          # Another comment
 CRONTAB
         cron = @provider.load_current_resource
         expect(cron.mailto).to eq("foo@example.com")
@@ -261,12 +261,12 @@ CRONTAB
       end
 
       it "should parse and load generic and standard environment variables from cron entry" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-# Chef Name: cronhole some stuff
-MAILTO=warn@example.com
-TEST=lol
-FLAG=1
-* 5 * * * /bin/true
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          # Chef Name: cronhole some stuff
+          MAILTO=warn@example.com
+          TEST=lol
+          FLAG=1
+          * 5 * * * /bin/true
 CRONTAB
         cron = @provider.load_current_resource
 
@@ -275,13 +275,13 @@ CRONTAB
       end
 
       it "should not break with variabels that match the cron resource internals" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-# Chef Name: cronhole some stuff
-MINUTE=40
-HOUR=midnight
-TEST=lol
-ENVIRONMENT=production
-* 5 * * * /bin/true
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          # Chef Name: cronhole some stuff
+          MINUTE=40
+          HOUR=midnight
+          TEST=lol
+          ENVIRONMENT=production
+          * 5 * * * /bin/true
 CRONTAB
         cron = @provider.load_current_resource
 
@@ -298,15 +298,15 @@ CRONTAB
 
     context "with a matching entry in the user's crontab using month names and weekday names (#CHEF-3178)" do
       before :each do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-* 5 * Jan Mon /bin/true param1 param2
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          * 5 * Jan Mon /bin/true param1 param2
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
 CRONTAB
       end
 
@@ -334,10 +334,10 @@ CRONTAB
 
     context "with a matching entry without a crontab line" do
       it "should set cron_exists and leave current_resource values at defaults" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
+          # Chef Name: cronhole some stuff
 CRONTAB
         cron = @provider.load_current_resource
         expect(@provider.cron_exists).to eq(true)
@@ -351,11 +351,11 @@ CRONTAB
       end
 
       it "should not pick up a commented out crontab line" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-#* 5 * 1 * /bin/true param1 param2
+          # Chef Name: cronhole some stuff
+          #* 5 * 1 * /bin/true param1 param2
 CRONTAB
         cron = @provider.load_current_resource
         expect(@provider.cron_exists).to eq(true)
@@ -369,15 +369,15 @@ CRONTAB
       end
 
       it "should not pick up a later crontab entry" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-#* 5 * 1 * /bin/true param1 param2
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          #* 5 * 1 * /bin/true param1 param2
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
 CRONTAB
         cron = @provider.load_current_resource
         expect(@provider.cron_exists).to eq(true)
@@ -442,9 +442,9 @@ CRONTAB
       end
 
       it "should create a crontab with the entry" do
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-# Chef Name: cronhole some stuff
-30 * * * * /bin/true
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          # Chef Name: cronhole some stuff
+          30 * * * * /bin/true
         ENDCRON
         @provider.run_action(:create)
       end
@@ -455,14 +455,14 @@ CRONTAB
         @new_resource.shell "/bin/foosh"
         @new_resource.home "/home/foo"
         @new_resource.environment "TEST" => "LOL"
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-# Chef Name: cronhole some stuff
-MAILTO="foo@example.com"
-PATH="/usr/bin:/my/custom/path"
-SHELL="/bin/foosh"
-HOME="/home/foo"
-TEST=LOL
-30 * * * * /bin/true
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          # Chef Name: cronhole some stuff
+          MAILTO="foo@example.com"
+          PATH="/usr/bin:/my/custom/path"
+          SHELL="/bin/foosh"
+          HOME="/home/foo"
+          TEST=LOL
+          30 * * * * /bin/true
         ENDCRON
         @provider.run_action(:create)
       end
@@ -481,26 +481,26 @@ TEST=LOL
     context "when there is a crontab with no matching section" do
       before :each do
         @provider.cron_exists = false
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
       end
 
       it "should add the entry to the crontab" do
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
-# Chef Name: cronhole some stuff
-30 * * * * /bin/true
+          # Another comment
+          # Chef Name: cronhole some stuff
+          30 * * * * /bin/true
         ENDCRON
         @provider.run_action(:create)
       end
@@ -511,20 +511,20 @@ TEST=LOL
         @new_resource.shell "/bin/foosh"
         @new_resource.home "/home/foo"
         @new_resource.environment "TEST" => "LOL"
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
-
-# Chef Name: something else
-2 * 1 * * /bin/false
-
-# Another comment
-# Chef Name: cronhole some stuff
-MAILTO="foo@example.com"
-PATH="/usr/bin:/my/custom/path"
-SHELL="/bin/foosh"
-HOME="/home/foo"
-TEST=LOL
-30 * * * * /bin/true
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
+
+          # Chef Name: something else
+          2 * 1 * * /bin/false
+
+          # Another comment
+          # Chef Name: cronhole some stuff
+          MAILTO="foo@example.com"
+          PATH="/usr/bin:/my/custom/path"
+          SHELL="/bin/foosh"
+          HOME="/home/foo"
+          TEST=LOL
+          30 * * * * /bin/true
         ENDCRON
         @provider.run_action(:create)
       end
@@ -544,28 +544,28 @@ TEST=LOL
       before :each do
         @provider.cron_exists = true
         allow(@provider).to receive(:cron_different?).and_return(true)
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
       end
 
       it "should update the crontab entry" do
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-30 * * * * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          30 * * * * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:create)
       end
@@ -576,20 +576,20 @@ TEST=LOL
         @new_resource.shell "/bin/foosh"
         @new_resource.home "/home/foo"
         @new_resource.environment "TEST" => "LOL"
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
-
-# Chef Name: cronhole some stuff
-MAILTO="foo@example.com"
-PATH="/usr/bin:/my/custom/path"
-SHELL="/bin/foosh"
-HOME="/home/foo"
-TEST=LOL
-30 * * * * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
-
-# Another comment
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
+
+          # Chef Name: cronhole some stuff
+          MAILTO="foo@example.com"
+          PATH="/usr/bin:/my/custom/path"
+          SHELL="/bin/foosh"
+          HOME="/home/foo"
+          TEST=LOL
+          30 * * * * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
+
+          # Another comment
         ENDCRON
         @provider.run_action(:create)
       end
@@ -612,78 +612,78 @@ TEST=LOL
       end
 
       it "should add the crontab to the entry" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
+          # Chef Name: cronhole some stuff
         CRONTAB
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-30 * * * * /bin/true
+          # Chef Name: cronhole some stuff
+          30 * * * * /bin/true
         ENDCRON
         @provider.run_action(:create)
       end
 
       it "should not blat any following entries" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-#30 * * * * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          #30 * * * * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-30 * * * * /bin/true
-#30 * * * * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          30 * * * * /bin/true
+          #30 * * * * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:create)
       end
 
       it "should handle env vars with no crontab" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-MAILTO=bar@example.com
-PATH=/usr/bin:/my/custom/path
-SHELL=/bin/barsh
-HOME=/home/foo
+          # Chef Name: cronhole some stuff
+          MAILTO=bar@example.com
+          PATH=/usr/bin:/my/custom/path
+          SHELL=/bin/barsh
+          HOME=/home/foo
 
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
         @new_resource.mailto "foo@example.com"
         @new_resource.path "/usr/bin:/my/custom/path"
         @new_resource.shell "/bin/foosh"
         @new_resource.home "/home/foo"
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-MAILTO="foo@example.com"
-PATH="/usr/bin:/my/custom/path"
-SHELL="/bin/foosh"
-HOME="/home/foo"
-30 * * * * /bin/true
+          # Chef Name: cronhole some stuff
+          MAILTO="foo@example.com"
+          PATH="/usr/bin:/my/custom/path"
+          SHELL="/bin/foosh"
+          HOME="/home/foo"
+          30 * * * * /bin/true
 
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:create)
       end
@@ -693,13 +693,13 @@ HOME="/home/foo"
       before :each do
         @provider.cron_exists = true
         allow(@provider).to receive(:cron_different?).and_return(false)
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-* 5 * * * /bin/true
+          # Chef Name: cronhole some stuff
+          * 5 * * * /bin/true
 
-# Another comment
+          # Another comment
 CRONTAB
       end
 
@@ -747,50 +747,50 @@ CRONTAB
     context "when the user has a crontab with a matching section" do
       before :each do
         @provider.cron_exists = true
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
       end
 
       it "should remove the entry" do
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:delete)
       end
 
       it "should remove any env vars with the entry" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-MAILTO=foo@example.com
-FOO=test
-30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          MAILTO=foo@example.com
+          FOO=test
+          30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:delete)
       end
@@ -812,61 +812,61 @@ FOO=test
       end
 
       it "should remove the section" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
+          # Chef Name: cronhole some stuff
         CRONTAB
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
         ENDCRON
         @provider.run_action(:delete)
       end
 
       it "should not blat following sections" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-#30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          #30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-#30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          #30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:delete)
       end
 
       it "should remove any envvars with the section" do
-        allow(@provider).to receive(:read_crontab).and_return(<<-CRONTAB)
-0 2 * * * /some/other/command
+        allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+          0 2 * * * /some/other/command
 
-# Chef Name: cronhole some stuff
-MAILTO=foo@example.com
-#30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          # Chef Name: cronhole some stuff
+          MAILTO=foo@example.com
+          #30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         CRONTAB
-        expect(@provider).to receive(:write_crontab).with(<<-ENDCRON)
-0 2 * * * /some/other/command
+        expect(@provider).to receive(:write_crontab).with(<<~ENDCRON)
+          0 2 * * * /some/other/command
 
-#30 * * 3 * /bin/true
-# Chef Name: something else
-2 * 1 * * /bin/false
+          #30 * * 3 * /bin/true
+          # Chef Name: something else
+          2 * 1 * * /bin/false
 
-# Another comment
+          # Another comment
         ENDCRON
         @provider.run_action(:delete)
       end
@@ -875,13 +875,13 @@ MAILTO=foo@example.com
 
   describe "read_crontab" do
     before :each do
-      @stdout = <<-CRONTAB
-0 2 * * * /some/other/command
+      @stdout = <<~CRONTAB
+        0 2 * * * /some/other/command
 
-# Chef Name: something else
-* 5 * * * /bin/true
+        # Chef Name: something else
+        * 5 * * * /bin/true
 
-# Another comment
+        # Another comment
       CRONTAB
       @status = double("Status", exitstatus: 0, stdout: @stdout)
       allow(@provider).to receive(:shell_out!).and_return(@status)
@@ -894,13 +894,13 @@ MAILTO=foo@example.com
 
     it "should return the contents of the crontab" do
       crontab = @provider.send(:read_crontab)
-      expect(crontab).to eq <<-CRONTAB
-0 2 * * * /some/other/command
+      expect(crontab).to eq <<~CRONTAB
+        0 2 * * * /some/other/command
 
-# Chef Name: something else
-* 5 * * * /bin/true
+        # Chef Name: something else
+        * 5 * * * /bin/true
 
-# Another comment
+        # Another comment
       CRONTAB
     end