chef-dk 3.3.23 → 3.4.38

data/lib/chef-dk/skeletons/code_generator/recipes/recipe.rb

@@ -10,12 +10,12 @@ inspec_dir = File.join(cookbook_dir, 'test', 'integration', 'default')
 inspec_path = File.join(inspec_dir, "#{context.new_file_basename}_test.rb")
 
 if File.directory?(File.join(cookbook_dir, 'test', 'recipes'))
-  Chef::Log.deprecation <<-EOH
-It appears that you have Inspec tests located at "test/recipes". This location can
-cause issues with Foodcritic and has been deprecated in favor of "test/integration/default".
-Please move your existing Inspec tests to the newly created "test/integration/default"
-directory, and update the 'inspec_tests' value in your .kitchen.yml file(s) to
-point to "test/integration/default".
+  Chef::Log.deprecation <<~EOH
+    It appears that you have Inspec tests located at "test/recipes". This location can
+    cause issues with Foodcritic and has been deprecated in favor of "test/integration/default".
+    Please move your existing Inspec tests to the newly created "test/integration/default"
+    directory, and update the 'inspec_tests' value in your .kitchen.yml file(s) to
+    point to "test/integration/default".
   EOH
 end
 

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "3.3.23"
+  VERSION = "3.4.38".freeze
 end

data/lib/kitchen/provisioner/policyfile_zero.rb

@@ -68,14 +68,14 @@ module Kitchen
       default_config :policyfile, "Policyfile.rb"
 
       default_config :chef_client_path do |provisioner|
-        provisioner.
-          remote_path_join(%W{#{provisioner[:chef_omnibus_root]} bin chef-client}).
-          tap { |path| path.concat(".bat") if provisioner.windows_os? }
+        provisioner
+          .remote_path_join(%W{#{provisioner[:chef_omnibus_root]} bin chef-client})
+          .tap { |path| path.concat(".bat") if provisioner.windows_os? }
       end
 
       default_config :ruby_bindir do |provisioner|
-        provisioner.
-          remote_path_join(%W{#{provisioner[:chef_omnibus_root]} embedded bin})
+        provisioner
+          .remote_path_join(%W{#{provisioner[:chef_omnibus_root]} embedded bin})
       end
 
       # (see Base#finalize_config!)
@@ -97,8 +97,8 @@ module Kitchen
       def run_command
         level = config[:log_level] == :info ? :auto : config[:log_level]
 
-        cmd = "#{sudo(config[:chef_client_path])} --local-mode".
-          tap { |str| str.insert(0, "& ") if powershell_shell? }
+        cmd = "#{sudo(config[:chef_client_path])} --local-mode"
+          .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         args = [
           "--config #{config[:root_path]}/client.rb",
@@ -118,8 +118,8 @@ module Kitchen
         end
 
         wrap_shell_code(
-          [cmd, *args].join(" ").
-          tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
+          [cmd, *args].join(" ")
+          .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
         )
       end
 

data/omnibus_overrides.rb

@@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.5.1"
+override "ruby", version: "2.5.3"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"

data/spec/spec_helper.rb

@@ -38,11 +38,11 @@ RSpec.configure do |c|
 
   c.after(:all) { clear_tempdir }
 
-  c.filter_run :focus => true
+  c.filter_run focus: true
   c.run_all_when_everything_filtered = true
   # Tests that randomly fail, but may have value.
-  c.filter_run_excluding :volatile => true
-  c.filter_run_excluding :skip_on_windows => true if running_on_windows
+  c.filter_run_excluding volatile: true
+  c.filter_run_excluding skip_on_windows: true if running_on_windows
 
   c.mock_with(:rspec) do |mocks|
     mocks.verify_partial_doubles = true

data/spec/unit/cli_spec.rb

@@ -40,17 +40,17 @@ describe ChefDK::CLI do
   end
 
   let(:base_help_message) do
-    <<-E
-Usage:
-    chef -h/--help
-    chef -v/--version
-    chef command [arguments...] [options...]
+    <<~E
+      Usage:
+          chef -h/--help
+          chef -v/--version
+          chef command [arguments...] [options...]
 
 
-Available Commands:
-    verify   Test the embedded ChefDK applications
-    gem      Runs the `gem` command in context of the embedded ruby
-    example  Example subcommand for testing
+      Available Commands:
+          verify   Test the embedded ChefDK applications
+          gem      Runs the `gem` command in context of the embedded ruby
+          example  Example subcommand for testing
 E
   end
 

data/spec/unit/command/base_spec.rb

@@ -28,10 +28,10 @@ describe ChefDK::Command::Base do
       description: "An option with a required argument"
 
     option :user,
-      :short        => "-u",
-      :long         => "--user",
-      :description  => "If the user exists",
-      :boolean      => true
+      short: "-u",
+      long: "--user",
+      description: "If the user exists",
+      boolean: true
 
     def run(params)
       parse_options(params)
@@ -102,12 +102,12 @@ describe ChefDK::Command::Base do
 
       expect(stderr).to eq("ERROR: invalid option: -foo\n\n")
 
-      expected = <<-E
-use me please
-    -a, --arg ARG                    An option with a required argument
-    -h, --help                       Show this message
-    -u, --user                       If the user exists
-    -v, --version                    Show chef version
+      expected = <<~E
+        use me please
+            -a, --arg ARG                    An option with a required argument
+            -h, --help                       Show this message
+            -u, --user                       If the user exists
+            -v, --version                    Show chef version
 
 E
       expect(stdout).to eq(expected)
@@ -122,12 +122,12 @@ E
 
       expect(stderr).to eq("ERROR: missing argument: -a\n\n")
 
-      expected = <<-E
-use me please
-    -a, --arg ARG                    An option with a required argument
-    -h, --help                       Show this message
-    -u, --user                       If the user exists
-    -v, --version                    Show chef version
+      expected = <<~E
+        use me please
+            -a, --arg ARG                    An option with a required argument
+            -h, --help                       Show this message
+            -u, --user                       If the user exists
+            -v, --version                    Show chef version
 
 E
       expect(stdout).to eq(expected)
@@ -139,15 +139,15 @@ E
   describe "when parsing Chef's configuration fails" do
 
     let(:exception_message) do
-      <<-MESSAGE
-You have an error in your config file /Users/ddeleo/.chef/config.rb (Chef::Exceptions::ConfigurationError)
-
-Mixlib::Config::UnknownConfigOptionError: Cannot set unsupported config value foo.
-  /Users/person/.chef/config.rb:50:in `from_string'
-Relevant file content:
- 49: chefdk.generator_cookbook "~/.chef/code_generator"
- 50: chefdk.foo "bar"
- 51:
+      <<~MESSAGE
+        You have an error in your config file /Users/ddeleo/.chef/config.rb (Chef::Exceptions::ConfigurationError)
+
+        Mixlib::Config::UnknownConfigOptionError: Cannot set unsupported config value foo.
+          /Users/person/.chef/config.rb:50:in `from_string'
+        Relevant file content:
+         49: chefdk.generator_cookbook "~/.chef/code_generator"
+         50: chefdk.foo "bar"
+         51:
 
 MESSAGE
     end

data/spec/unit/command/clean_policy_cookbooks_spec.rb

@@ -134,9 +134,9 @@ describe ChefDK::Command::CleanPolicyCookbooks do
       it "prints a debugging message and exits non-zero" do
         expect(command.run([])).to eq(1)
 
-        expected_output = <<-E
-Error: Failed to delete some policy revisions.
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: Failed to delete some policy revisions.
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -149,9 +149,9 @@ E
 
           command.run(%w{ -D })
 
-          expected_output = <<-E
-Error: Failed to delete some policy revisions.
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: Failed to delete some policy revisions.
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/clean_policy_revisions_spec.rb

@@ -134,9 +134,9 @@ describe ChefDK::Command::CleanPolicyRevisions do
       it "prints a debugging message and exits non-zero" do
         expect(command.run([])).to eq(1)
 
-        expected_output = <<-E
-Error: Failed to delete some policy revisions.
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: Failed to delete some policy revisions.
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -149,9 +149,9 @@ E
 
           command.run(%w{ -D })
 
-          expected_output = <<-E
-Error: Failed to delete some policy revisions.
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: Failed to delete some policy revisions.
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/delete_policy_group_spec.rb

@@ -161,9 +161,9 @@ describe ChefDK::Command::DeletePolicyGroup do
       it "prints a debugging message and exits non-zero" do
         expect(command.run(%w{example-policy-group})).to eq(1)
 
-        expected_output = <<-E
-Error: Failed to delete policy group
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: Failed to delete policy group
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -175,9 +175,9 @@ E
         it "includes the backtrace in the error" do
           command.run(%w{ example-policy-group -D })
 
-          expected_output = <<-E
-Error: Failed to delete policy group
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: Failed to delete policy group
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/delete_policy_spec.rb

@@ -161,9 +161,9 @@ describe ChefDK::Command::DeletePolicy do
       it "prints a debugging message and exits non-zero" do
         expect(command.run(%w{example-policy})).to eq(1)
 
-        expected_output = <<-E
-Error: Failed to delete policy.
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: Failed to delete policy.
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -175,9 +175,9 @@ E
         it "includes the backtrace in the error" do
           command.run(%w{ example-policy -D })
 
-          expected_output = <<-E
-Error: Failed to delete policy.
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: Failed to delete policy.
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/export_spec.rb

@@ -132,10 +132,10 @@ describe ChefDK::Command::Export do
       it "prints instructions for running chef-client in the repo" do
         command.run(params)
 
-        expected_message = <<-MESSAGE
-To converge this system with the exported policy, run:
-  cd /path/to/export
-  chef-client -z
+        expected_message = <<~MESSAGE
+          To converge this system with the exported policy, run:
+            cd /path/to/export
+            chef-client -z
 MESSAGE
         expect(ui.output).to include(expected_message)
       end
@@ -164,9 +164,9 @@ MESSAGE
       end
 
       it "displays the exception and cause" do
-        expected_error_text = <<-E
-Error: export failed
-Reason: (StandardError) some operation failed
+        expected_error_text = <<~E
+          Error: export failed
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -179,9 +179,9 @@ E
         let(:params) { [ "path/to/export", "-D"] }
 
         it "displays the exception and cause with backtrace" do
-          expected_error_text = <<-E
-Error: export failed
-Reason: (StandardError) some operation failed
+          expected_error_text = <<~E
+            Error: export failed
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/generate_spec.rb

@@ -41,7 +41,7 @@ class ChefDK::Command::GeneratorCommands::Example < ChefDK::Command::GeneratorCo
 
   def run
     parse_options(@argv)
-    { :argv => @argv, :ran_cmd => "example" }
+    { argv: @argv, ran_cmd: "example" }
   end
 end
 
@@ -74,11 +74,11 @@ describe ChefDK::Command::Generate do
 
   context "with a generator defined" do
     let(:expected_help_message) do
-      <<-E
-Usage: chef generate GENERATOR [options]
+      <<~E
+        Usage: chef generate GENERATOR [options]
 
-Available generators:
-  example  this is a test
+        Available generators:
+          example  this is a test
 E
     end
 

data/spec/unit/command/generator_commands/build_cookbook_spec.rb

@@ -192,15 +192,15 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
         include_examples "a generated file", :cookbook_name do
           let(:line) do
-            <<-METADATA
-name 'build_cookbook'
-maintainer 'The Authors'
-maintainer_email 'you@example.com'
-license 'all_rights'
-version '0.1.0'
-chef_version '>= 13.0'
-
-depends 'delivery-truck'
+            <<~METADATA
+              name 'build_cookbook'
+              maintainer 'The Authors'
+              maintainer_email 'you@example.com'
+              license 'all_rights'
+              version '0.1.0'
+              chef_version '>= 13.0'
+
+              depends 'delivery-truck'
 METADATA
           end
         end
@@ -252,12 +252,12 @@ METADATA
 
         include_examples "a generated file", :cookbook_name do
           let(:line) do
-            <<-METADATA
-name 'build_cookbook'
-maintainer 'The Authors'
-maintainer_email 'you@example.com'
-license 'all_rights'
-version '0.1.0'
+            <<~METADATA
+              name 'build_cookbook'
+              maintainer 'The Authors'
+              maintainer_email 'you@example.com'
+              license 'all_rights'
+              version '0.1.0'
 METADATA
           end
         end

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -59,19 +59,19 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
   end
 
   let(:non_delivery_breadcrumb) do
-    <<-EOF
-Your cookbook is ready. Type `cd new_cookbook` to enter it.
+    <<~EOF
+      Your cookbook is ready. Type `cd new_cookbook` to enter it.
 
-There are several commands you can run to get started locally developing and testing your cookbook.
-Type `delivery local --help` to see a full list.
+      There are several commands you can run to get started locally developing and testing your cookbook.
+      Type `delivery local --help` to see a full list.
 
-Why not start by writing a test? Tests for the default recipe are stored at:
+      Why not start by writing a test? Tests for the default recipe are stored at:
 
-test/integration/default/default_test.rb
+      test/integration/default/default_test.rb
 
-If you'd prefer to dive right in, the default recipe can be found at:
+      If you'd prefer to dive right in, the default recipe can be found at:
 
-recipes/default.rb
+      recipes/default.rb
 EOF
   end
 
@@ -179,43 +179,43 @@ EOF
         let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "project.toml") }
 
         let(:expected_content) do
-          <<-PROJECT_DOT_TOML
-# Delivery Prototype for Local Phases Execution
-#
-# The purpose of this file is to prototype a new way to execute
-# phases locally on your workstation. The delivery-cli will read
-# this file and execute the command(s) that are configured for
-# each phase. You can customize them by just modifying the phase
-# key on this file.
-#
-# By default these phases are configured for Cookbook Workflow only
-#
-# As this is still a prototype we are not modifying the current
-# config.json file and it will continue working as usual.
-
-[local_phases]
-unit = "chef exec rspec spec/"
-lint = "chef exec cookstyle"
-# Foodcritic includes rules only appropriate for community cookbooks
-# uploaded to Supermarket. We turn off any rules tagged "supermarket"
-# by default. If you plan to share this cookbook you should remove
-# '-t ~supermarket' below to enable supermarket rules.
-syntax = "chef exec foodcritic . -t ~supermarket"
-provision = "chef exec kitchen create"
-deploy = "chef exec kitchen converge"
-smoke = "chef exec kitchen verify"
-# The functional phase is optional, you can define it by uncommenting
-# the line below and running the command: `delivery local functional`
-# functional = ""
-cleanup = "chef exec kitchen destroy"
-
-# Remote project.toml file
-#
-# Specify a remote URI location for the `project.toml` file.
-# This is useful for teams that wish to centrally manage the behavior
-# of the `delivery local` command across many different projects.
-#
-# remote_file = "https://url/project.toml"
+          <<~PROJECT_DOT_TOML
+            # Delivery Prototype for Local Phases Execution
+            #
+            # The purpose of this file is to prototype a new way to execute
+            # phases locally on your workstation. The delivery-cli will read
+            # this file and execute the command(s) that are configured for
+            # each phase. You can customize them by just modifying the phase
+            # key on this file.
+            #
+            # By default these phases are configured for Cookbook Workflow only
+            #
+            # As this is still a prototype we are not modifying the current
+            # config.json file and it will continue working as usual.
+
+            [local_phases]
+            unit = "chef exec rspec spec/"
+            lint = "chef exec cookstyle"
+            # Foodcritic includes rules only appropriate for community cookbooks
+            # uploaded to Supermarket. We turn off any rules tagged "supermarket"
+            # by default. If you plan to share this cookbook you should remove
+            # '-t ~supermarket' below to enable supermarket rules.
+            syntax = "chef exec foodcritic . -t ~supermarket"
+            provision = "chef exec kitchen create"
+            deploy = "chef exec kitchen converge"
+            smoke = "chef exec kitchen verify"
+            # The functional phase is optional, you can define it by uncommenting
+            # the line below and running the command: `delivery local functional`
+            # functional = ""
+            cleanup = "chef exec kitchen destroy"
+
+            # Remote project.toml file
+            #
+            # Specify a remote URI location for the `project.toml` file.
+            # This is useful for teams that wish to centrally manage the behavior
+            # of the `delivery local` command across many different projects.
+            #
+            # remote_file = "https://url/project.toml"
 PROJECT_DOT_TOML
         end
 
@@ -230,24 +230,24 @@ PROJECT_DOT_TOML
         let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "config.json") }
 
         let(:expected_content) do
-          <<-CONFIG_DOT_JSON
-{
-  "version": "2",
-  "build_cookbook": {
-    "name": "build_cookbook",
-    "path": ".delivery/build_cookbook"
-  },
-  "delivery-truck": {
-    "lint": {
-      "enable_cookstyle": true
-    }
-  },
-  "skip_phases": [],
-  "job_dispatch": {
-    "version": "v2"
-  },
-  "dependencies": []
-}
+          <<~CONFIG_DOT_JSON
+            {
+              "version": "2",
+              "build_cookbook": {
+                "name": "build_cookbook",
+                "path": ".delivery/build_cookbook"
+              },
+              "delivery-truck": {
+                "lint": {
+                  "enable_cookstyle": true
+                }
+              },
+              "skip_phases": [],
+              "job_dispatch": {
+                "version": "v2"
+              },
+              "dependencies": []
+            }
   CONFIG_DOT_JSON
         end
 
@@ -264,13 +264,13 @@ PROJECT_DOT_TOML
         end
 
         let(:expected_content) do
-          <<-CONFIG_DOT_JSON
-#
-# Cookbook:: build_cookbook
-# Recipe:: publish
-#
-# Copyright:: 2018, The Authors, All Rights Reserved.
-include_recipe 'delivery-truck::publish'
+          <<~CONFIG_DOT_JSON
+            #
+            # Cookbook:: build_cookbook
+            # Recipe:: publish
+            #
+            # Copyright:: 2018, The Authors, All Rights Reserved.
+            include_recipe 'delivery-truck::publish'
   CONFIG_DOT_JSON
         end
 
@@ -287,14 +287,14 @@ include_recipe 'delivery-truck::publish'
         end
 
         let(:expected_content) do
-          <<-CONFIG_DOT_JSON
-source 'https://supermarket.chef.io'
+          <<~CONFIG_DOT_JSON
+            source 'https://supermarket.chef.io'
 
-metadata
+            metadata
 
-group :delivery do
-  cookbook 'test', path: './test/fixtures/cookbooks/test'
-end
+            group :delivery do
+              cookbook 'test', path: './test/fixtures/cookbooks/test'
+            end
   CONFIG_DOT_JSON
         end
 
@@ -358,17 +358,17 @@ end
           expect(cookbook_generator.run).to eq(0)
         end
 
-        expected = <<-OUTPUT
-Generating cookbook new_cookbook
-- Ensuring correct cookbook file content
-- Committing cookbook files to git
-- Ensuring delivery configuration
-- Ensuring correct delivery build cookbook content
-- Adding delivery configuration to feature branch
-- Adding build cookbook to feature branch
-- Merging delivery content feature branch to master
+        expected = <<~OUTPUT
+          Generating cookbook new_cookbook
+          - Ensuring correct cookbook file content
+          - Committing cookbook files to git
+          - Ensuring delivery configuration
+          - Ensuring correct delivery build cookbook content
+          - Adding delivery configuration to feature branch
+          - Adding build cookbook to feature branch
+          - Merging delivery content feature branch to master
 
-#{non_delivery_breadcrumb}
+          #{non_delivery_breadcrumb}
 OUTPUT
 
         actual = stdout_io.string
@@ -410,17 +410,17 @@ OUTPUT
           expect(cookbook_generator.run).to eq(0)
         end
 
-        expected = <<-OUTPUT
-Generating cookbook new_cookbook
-- Ensuring correct cookbook file content
-- Committing cookbook files to git
-- Ensuring delivery configuration
-- Ensuring correct delivery build cookbook content
-- Adding delivery configuration to feature branch
-- Adding build cookbook to feature branch
-- Merging delivery content feature branch to master
+        expected = <<~OUTPUT
+          Generating cookbook new_cookbook
+          - Ensuring correct cookbook file content
+          - Committing cookbook files to git
+          - Ensuring delivery configuration
+          - Ensuring correct delivery build cookbook content
+          - Adding delivery configuration to feature branch
+          - Adding build cookbook to feature branch
+          - Merging delivery content feature branch to master
 
-Your cookbook is ready. To setup the pipeline, type `cd new_cookbook`, then run `delivery init`
+          Your cookbook is ready. To setup the pipeline, type `cd new_cookbook`, then run `delivery init`
 OUTPUT
 
         actual = stdout_io.string
@@ -525,23 +525,23 @@ OUTPUT
         let(:file) { File.join(tempdir, "new_cookbook", "Policyfile.rb") }
 
         let(:expected_content) do
-          <<-POLICYFILE_RB
-# Policyfile.rb - Describe how you want Chef to build your system.
-#
-# For more information on the Policyfile feature, visit
-# https://docs.chef.io/policyfile.html
+          <<~POLICYFILE_RB
+            # Policyfile.rb - Describe how you want Chef to build your system.
+            #
+            # For more information on the Policyfile feature, visit
+            # https://docs.chef.io/policyfile.html
 
-# A name that describes what the system you're building with Chef does.
-name 'new_cookbook'
+            # A name that describes what the system you're building with Chef does.
+            name 'new_cookbook'
 
-# Where to find external cookbooks:
-default_source :supermarket
+            # Where to find external cookbooks:
+            default_source :supermarket
 
-# run_list: chef-client will run these recipes in the order specified.
-run_list 'new_cookbook::default'
+            # run_list: chef-client will run these recipes in the order specified.
+            run_list 'new_cookbook::default'
 
-# Specify a custom source for a single cookbook:
-cookbook 'new_cookbook', path: '.'
+            # Specify a custom source for a single cookbook:
+            cookbook 'new_cookbook', path: '.'
 POLICYFILE_RB
         end
 
@@ -561,40 +561,40 @@ POLICYFILE_RB
       include_examples "kitchen_yml_and_integration_tests" do
 
         let(:expected_kitchen_yml_content) do
-          <<-KITCHEN_YML
----
-driver:
-  name: vagrant
+          <<~KITCHEN_YML
+            ---
+            driver:
+              name: vagrant
 
-## The forwarded_port port feature lets you connect to ports on the VM guest via
-## localhost on the host.
-## see also: https://docs.vagrantup.com/v2/networking/forwarded_ports.html
+            ## The forwarded_port port feature lets you connect to ports on the VM guest via
+            ## localhost on the host.
+            ## see also: https://docs.vagrantup.com/v2/networking/forwarded_ports.html
 
-#  network:
-#    - ["forwarded_port", {guest: 80, host: 8080}]
+            #  network:
+            #    - ["forwarded_port", {guest: 80, host: 8080}]
 
-provisioner:
-  name: chef_zero
+            provisioner:
+              name: chef_zero
 
-## require_chef_omnibus specifies a specific chef version to install. You can
-## also set this to `true` to always use the latest version.
-## see also: https://docs.chef.io/config_yml_kitchen.html
+            ## require_chef_omnibus specifies a specific chef version to install. You can
+            ## also set this to `true` to always use the latest version.
+            ## see also: https://docs.chef.io/config_yml_kitchen.html
 
-#  require_chef_omnibus: 12.8.1
+            #  require_chef_omnibus: 12.8.1
 
-verifier:
-  name: inspec
+            verifier:
+              name: inspec
 
-platforms:
-  - name: ubuntu-16.04
-  - name: centos-7
+            platforms:
+              - name: ubuntu-16.04
+              - name: centos-7
 
-suites:
-  - name: default
-    verifier:
-      inspec_tests:
-        - test/integration/default
-    attributes:
+            suites:
+              - name: default
+                verifier:
+                  inspec_tests:
+                    - test/integration/default
+                attributes:
 KITCHEN_YML
         end
 
@@ -603,10 +603,10 @@ KITCHEN_YML
       include_examples "chefspec_spec_helper_file" do
 
         let(:expected_chefspec_spec_helper_content) do
-          <<-SPEC_HELPER
-# frozen_string_literal: true
-require 'chefspec'
-require 'chefspec/policyfile'
+          <<~SPEC_HELPER
+            # frozen_string_literal: true
+            require 'chefspec'
+            require 'chefspec/policyfile'
 SPEC_HELPER
         end
 
@@ -623,11 +623,11 @@ SPEC_HELPER
         let(:file) { File.join(tempdir, "new_cookbook", "Berksfile") }
 
         let(:expected_content) do
-          <<-POLICYFILE_RB
-# frozen_string_literal: true
-source 'https://supermarket.chef.io'
+          <<~POLICYFILE_RB
+            # frozen_string_literal: true
+            source 'https://supermarket.chef.io'
 
-metadata
+            metadata
 POLICYFILE_RB
         end
 
@@ -647,33 +647,33 @@ POLICYFILE_RB
       include_examples "kitchen_yml_and_integration_tests" do
 
         let(:expected_kitchen_yml_content) do
-          <<-KITCHEN_YML
----
-driver:
-  name: vagrant
-
-provisioner:
-  name: chef_zero
-  # You may wish to disable always updating cookbooks in CI or other testing environments.
-  # For example:
-  #   always_update_cookbooks: <%= !ENV['CI'] %>
-  always_update_cookbooks: true
-
-verifier:
-  name: inspec
-
-platforms:
-  - name: ubuntu-16.04
-  - name: centos-7
-
-suites:
-  - name: default
-    run_list:
-      - recipe[new_cookbook::default]
-    verifier:
-      inspec_tests:
-        - test/integration/default
-    attributes:
+          <<~KITCHEN_YML
+            ---
+            driver:
+              name: vagrant
+
+            provisioner:
+              name: chef_zero
+              # You may wish to disable always updating cookbooks in CI or other testing environments.
+              # For example:
+              #   always_update_cookbooks: <%= !ENV['CI'] %>
+              always_update_cookbooks: true
+
+            verifier:
+              name: inspec
+
+            platforms:
+              - name: ubuntu-16.04
+              - name: centos-7
+
+            suites:
+              - name: default
+                run_list:
+                  - recipe[new_cookbook::default]
+                verifier:
+                  inspec_tests:
+                    - test/integration/default
+                attributes:
 KITCHEN_YML
         end
 
@@ -682,10 +682,10 @@ KITCHEN_YML
       include_examples "chefspec_spec_helper_file" do
 
         let(:expected_chefspec_spec_helper_content) do
-          <<-SPEC_HELPER
-# frozen_string_literal: true
-require 'chefspec'
-require 'chefspec/berkshelf'
+          <<~SPEC_HELPER
+            # frozen_string_literal: true
+            require 'chefspec'
+            require 'chefspec/berkshelf'
 SPEC_HELPER
         end