chef-dk 3.3.23 → 3.4.38

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

@@ -180,11 +180,11 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
 
         metadata_path = File.join(target_dir, "metadata.rb")
         metadata_content = IO.read(metadata_path)
-        expected_metadata = <<-METADATA
-name             'my_cool_generator'
-description      'Custom code generator cookbook for use with ChefDK'
-long_description 'Custom code generator cookbook for use with ChefDK'
-version          '0.1.0'
+        expected_metadata = <<~METADATA
+          name             'my_cool_generator'
+          description      'Custom code generator cookbook for use with ChefDK'
+          long_description 'Custom code generator cookbook for use with ChefDK'
+          version          '0.1.0'
 
 METADATA
         expect(metadata_content).to eq(expected_metadata)

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

@@ -114,26 +114,26 @@ describe ChefDK::Command::GeneratorCommands::Policyfile do
     let(:policies_dir) { File.join(tempdir, "policyfiles") }
 
     let(:expected_policyfile_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 'my-app-frontend'
+        # A name that describes what the system you're building with Chef does.
+        name 'my-app-frontend'
 
-# This lets you source cookbooks from your chef-repo.
-default_source :chef_repo, '../'
+        # This lets you source cookbooks from your chef-repo.
+        default_source :chef_repo, '../'
 
-# 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 'my-app-frontend::default'
+        # run_list: chef-client will run these recipes in the order specified.
+        run_list 'my-app-frontend::default'
 
-# Specify a custom source for a single cookbook:
-# cookbook 'example_cookbook', path: '../cookbooks/example_cookbook'
+        # Specify a custom source for a single cookbook:
+        # cookbook 'example_cookbook', path: '../cookbooks/example_cookbook'
 POLICYFILE_RB
     end
 

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

@@ -296,10 +296,10 @@ describe ChefDK::Command::GeneratorCommands::Repo do
             let(:file) { "policyfiles/README.md" }
 
             let(:expected_content) do
-              <<-README
-Create policyfiles here. When using a chef-repo, give your policyfiles
-the same filename as the name set in the policyfile itself, and use the
-`.rb` file extension.
+              <<~README
+                Create policyfiles here. When using a chef-repo, give your policyfiles
+                the same filename as the name set in the policyfile itself, and use the
+                `.rb` file extension.
 README
             end
 
@@ -324,16 +324,16 @@ README
             let(:file) { "roles/README.md" }
 
             let(:expected_content) do
-              <<-README
-Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
+              <<~README
+                Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
 
-For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
+                For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
 
-    knife role from file roles/example.json
+                    knife role from file roles/example.json
 
-For more information on roles, see the Chef wiki page:
+                For more information on roles, see the Chef wiki page:
 
-https://docs.chef.io/roles.html
+                https://docs.chef.io/roles.html
 README
             end
 
@@ -348,16 +348,16 @@ README
             let(:file) { "environments/README.md" }
 
             let(:expected_content) do
-              <<-README
-Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
+              <<~README
+                Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
 
-For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
+                For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
 
-    knife environment from file environments/example.json
+                    knife environment from file environments/example.json
 
-For more information on environments, see the Chef wiki page:
+                For more information on environments, see the Chef wiki page:
 
-https://docs.chef.io/environments.html
+                https://docs.chef.io/environments.html
 README
             end
 

data/spec/unit/command/install_spec.rb

@@ -61,9 +61,9 @@ describe ChefDK::Command::Install do
     end
 
     it "loads the config from the given path" do
-      expect(Chef::WorkstationConfigLoader).to receive(:new).
-        with("~/.chef/alternate_config.rb").
-        and_return(chef_config_loader)
+      expect(Chef::WorkstationConfigLoader).to receive(:new)
+        .with("~/.chef/alternate_config.rb")
+        .and_return(chef_config_loader)
       expect(chef_config_loader).to receive(:load)
       expect(command.chef_config).to eq(Chef::Config)
     end
@@ -77,9 +77,9 @@ describe ChefDK::Command::Install do
     end
 
     it "creates the installer service with a `nil` policyfile path" do
-      expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(hash_including(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, config: Chef::Config)).
-        and_return(install_service)
+      expect(ChefDK::PolicyfileServices::Install).to receive(:new)
+        .with(hash_including(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, config: Chef::Config))
+        .and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
 
@@ -94,9 +94,9 @@ describe ChefDK::Command::Install do
     end
 
     it "creates the installer service with the specified policyfile path" do
-      expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(hash_including(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, config: Chef::Config)).
-        and_return(install_service)
+      expect(ChefDK::PolicyfileServices::Install).to receive(:new)
+        .with(hash_including(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd, config: Chef::Config))
+        .and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
 
@@ -144,9 +144,9 @@ describe ChefDK::Command::Install do
       end
 
       it "displays the exception and cause" do
-        expected_error_text = <<-E
-Error: install failed
-Reason: (StandardError) some operation failed
+        expected_error_text = <<~E
+          Error: install failed
+          Reason: (StandardError) some operation failed
 
 E
 
@@ -159,9 +159,9 @@ E
         let(:params) { ["-D"] }
 
         it "displays the exception and cause with backtrace" do
-          expected_error_text = <<-E
-Error: install failed
-Reason: (StandardError) some operation failed
+          expected_error_text = <<~E
+            Error: install failed
+            Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/provision_spec.rb

@@ -284,9 +284,9 @@ describe ChefDK::Command::Provision do
         end
 
         it "generates chef config with no policyfile options" do
-          expected_config = <<-CONFIG
-# SSL Settings:
-ssl_verify_mode :verify_peer
+          expected_config = <<~CONFIG
+            # SSL Settings:
+            ssl_verify_mode :verify_peer
 
 CONFIG
           expect(context.chef_config).to eq(expected_config)
@@ -303,9 +303,9 @@ CONFIG
         before do
           allow(chef_config_loader).to receive(:load)
 
-          allow(ChefDK::PolicyfileServices::Push).to receive(:new).
-            with(policyfile: given_policyfile_path, ui: ui, policy_group: given_policy_group, config: chef_config, root_dir: Dir.pwd).
-            and_return(push_service)
+          allow(ChefDK::PolicyfileServices::Push).to receive(:new)
+            .with(policyfile: given_policyfile_path, ui: ui, policy_group: given_policy_group, config: chef_config, root_dir: Dir.pwd)
+            .and_return(push_service)
 
           allow(push_service).to receive(:policy_data).and_return(policy_data)
 
@@ -358,16 +358,16 @@ CONFIG
           end
 
           it "generates chef config with policyfile options" do
-            expected_config = <<-CONFIG
-# SSL Settings:
-ssl_verify_mode :verify_peer
+            expected_config = <<~CONFIG
+              # SSL Settings:
+              ssl_verify_mode :verify_peer
 
-# Policyfile Settings:
-use_policyfile true
-policy_document_native_api true
+              # Policyfile Settings:
+              use_policyfile true
+              policy_document_native_api true
 
-policy_group "some-policy-group"
-policy_name "myapp"
+              policy_group "some-policy-group"
+              policy_name "myapp"
 
 CONFIG
             expect(context.chef_config).to eq(expected_config)
@@ -405,16 +405,16 @@ CONFIG
         end
 
         it "generates chef config with policyfile options" do
-          expected_config = <<-CONFIG
-# SSL Settings:
-ssl_verify_mode :verify_peer
+          expected_config = <<~CONFIG
+            # SSL Settings:
+            ssl_verify_mode :verify_peer
 
-# Policyfile Settings:
-use_policyfile true
-policy_document_native_api true
+            # Policyfile Settings:
+            use_policyfile true
+            policy_document_native_api true
 
-policy_group "some-policy-group"
-policy_name "myapp"
+            policy_group "some-policy-group"
+            policy_name "myapp"
 
 CONFIG
           expect(context.chef_config).to eq(expected_config)
@@ -493,9 +493,9 @@ CONFIG
       end
 
       it "prints an error and exits non-zero" do
-        expected_output = <<-E
-Error: push failed
-Reason: (StandardError) some operation failed
+        expected_output = <<~E
+          Error: push failed
+          Reason: (StandardError) some operation failed
 
 E
         expect(command.run(params)).to eq(1)

data/spec/unit/command/push_spec.rb

@@ -65,9 +65,9 @@ describe ChefDK::Command::Push do
       end
 
       it "configures the Push service" do
-        expect(ChefDK::PolicyfileServices::Push).to receive(:new).
-          with(policyfile: nil, ui: command.ui, policy_group: policy_group, config: chef_config, root_dir: Dir.pwd).
-          and_return(push_service)
+        expect(ChefDK::PolicyfileServices::Push).to receive(:new)
+          .with(policyfile: nil, ui: command.ui, policy_group: policy_group, config: chef_config, root_dir: Dir.pwd)
+          .and_return(push_service)
         expect(command.push).to eq(push_service)
       end
 
@@ -76,9 +76,9 @@ describe ChefDK::Command::Push do
         let(:params) { [policy_group, "MyPolicy.rb"] }
 
         it "configures the Push service with the given Policyfile" do
-          expect(ChefDK::PolicyfileServices::Push).to receive(:new).
-            with(policyfile: "MyPolicy.rb", ui: command.ui, policy_group: policy_group, config: chef_config, root_dir: Dir.pwd).
-            and_return(push_service)
+          expect(ChefDK::PolicyfileServices::Push).to receive(:new)
+            .with(policyfile: "MyPolicy.rb", ui: command.ui, policy_group: policy_group, config: chef_config, root_dir: Dir.pwd)
+            .and_return(push_service)
           expect(command.push).to eq(push_service)
         end
 
@@ -158,9 +158,9 @@ describe ChefDK::Command::Push do
         it "describes the error" do
           command.run(params)
 
-          expected_output = <<-E
-Error: push failed
-Reason: (StandardError) some operation failed
+          expected_output = <<~E
+            Error: push failed
+            Reason: (StandardError) some operation failed
 
 E
 
@@ -177,9 +177,9 @@ E
 
             command.run(params)
 
-            expected_output = <<-E
-Error: push failed
-Reason: (StandardError) some operation failed
+            expected_output = <<~E
+              Error: push failed
+              Reason: (StandardError) some operation failed
 
 
 E

data/spec/unit/command/shell_init_spec.rb

@@ -60,7 +60,7 @@ describe ChefDK::Command::ShellInit do
         expect(stdout_io.string).to include(expected_environment_commands)
       end
 
-      it "does not emit any empty lines", :if => %w{powershell posh}.include?(shell) do
+      it "does not emit any empty lines", if: %w{powershell posh}.include?(shell) do
         command_instance.run(argv)
         stdout_io.string.each_line do |s|
           expect(s.strip).not_to be_empty
@@ -86,7 +86,7 @@ describe ChefDK::Command::ShellInit do
         expect(stdout_io.string).to include(expected_environment_commands)
       end
 
-      it "does not emit any empty lines", :if => %w{powershell posh}.include?(shell) do
+      it "does not emit any empty lines", if: %w{powershell posh}.include?(shell) do
         command_instance.run(argv)
         stdout_io.string.each_line do |s|
           expect(s.strip).not_to be_empty
@@ -101,11 +101,11 @@ describe ChefDK::Command::ShellInit do
     end
 
     let(:expected_environment_commands) do
-      <<-EOH
-export PATH="#{expected_path}"
-export GEM_ROOT="#{expected_gem_root}"
-export GEM_HOME="#{expected_gem_home}"
-export GEM_PATH="#{expected_gem_path}"
+      <<~EOH
+        export PATH="#{expected_path}"
+        export GEM_ROOT="#{expected_gem_root}"
+        export GEM_HOME="#{expected_gem_home}"
+        export GEM_PATH="#{expected_gem_path}"
 EOH
     end
     include_context "shell init script", shell
@@ -117,11 +117,11 @@ EOH
     end
 
     let(:expected_environment_commands) do
-      <<-EOH
-$env:PATH="#{expected_path}"
-$env:GEM_ROOT="#{expected_gem_root}"
-$env:GEM_HOME="#{expected_gem_home}"
-$env:GEM_PATH="#{expected_gem_path}"
+      <<~EOH
+        $env:PATH="#{expected_path}"
+        $env:GEM_ROOT="#{expected_gem_root}"
+        $env:GEM_HOME="#{expected_gem_home}"
+        $env:GEM_PATH="#{expected_gem_path}"
 EOH
     end
     include_context "shell init script", shell
@@ -151,20 +151,20 @@ EOH
       let(:argv) { [ "bash" ] }
 
       let(:expected_completion_function) do
-        <<-END_COMPLETION
-_chef_comp() {
-    local COMMANDS="exec env gem generate"
-    COMPREPLY=($(compgen -W "$COMMANDS" -- ${COMP_WORDS[COMP_CWORD]} ))
-}
-complete -F _chef_comp chef
+        <<~END_COMPLETION
+          _chef_comp() {
+              local COMMANDS="exec env gem generate"
+              COMPREPLY=($(compgen -W "$COMMANDS" -- ${COMP_WORDS[COMP_CWORD]} ))
+          }
+          complete -F _chef_comp chef
 END_COMPLETION
       end
 
       before do
         # Stub this or else we'd have to update the test every time a new command
         # is added.
-        allow(command_instance.shell_completion_template_context).to receive(:commands).
-          and_return(command_descriptions)
+        allow(command_instance.shell_completion_template_context).to receive(:commands)
+          .and_return(command_descriptions)
 
         allow(command_instance).to receive(:omnibus_embedded_bin_dir).and_return(omnibus_embedded_bin_dir)
         allow(command_instance).to receive(:omnibus_bin_dir).and_return(omnibus_bin_dir)
@@ -199,28 +199,28 @@ END_COMPLETION
       let(:argv) { [ "zsh" ] }
 
       let(:expected_completion_function) do
-        <<-END_COMPLETION
-function _chef() {
+        <<~END_COMPLETION
+          function _chef() {
 
-  local -a _1st_arguments
-  _1st_arguments=(
-      'exec:Runs the command in context of the embedded ruby'
-      'env:Prints environment variables used by ChefDK'
-      'gem:Runs the `gem` command in context of the embedded ruby'
-      'generate:Generate a new app, cookbook, or component'
-    )
+            local -a _1st_arguments
+            _1st_arguments=(
+                'exec:Runs the command in context of the embedded ruby'
+                'env:Prints environment variables used by ChefDK'
+                'gem:Runs the `gem` command in context of the embedded ruby'
+                'generate:Generate a new app, cookbook, or component'
+              )
 
-  _arguments \\
-    '(-v --version)'{-v,--version}'[version information]' \\
-    '*:: :->subcmds' && return 0
+            _arguments \\
+              '(-v --version)'{-v,--version}'[version information]' \\
+              '*:: :->subcmds' && return 0
 
-  if (( CURRENT == 1 )); then
-    _describe -t commands "chef subcommand" _1st_arguments
-    return
-  fi
-}
+            if (( CURRENT == 1 )); then
+              _describe -t commands "chef subcommand" _1st_arguments
+              return
+            fi
+          }
 
-compdef _chef chef
+          compdef _chef chef
 
         END_COMPLETION
       end
@@ -228,8 +228,8 @@ compdef _chef chef
       before do
         # Stub this or else we'd have to update the test every time a new command
         # is added.
-        allow(command_instance.shell_completion_template_context).to receive(:commands).
-          and_return(command_descriptions)
+        allow(command_instance.shell_completion_template_context).to receive(:commands)
+          .and_return(command_descriptions)
 
         allow(command_instance).to receive(:omnibus_embedded_bin_dir).and_return(omnibus_embedded_bin_dir)
         allow(command_instance).to receive(:omnibus_bin_dir).and_return(omnibus_bin_dir)
@@ -248,11 +248,11 @@ compdef _chef chef
     end
     let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"], git_bin_dir].join(":").split(":").join('" "') }
     let(:expected_environment_commands) do
-      <<-EOH
-set -gx PATH "#{expected_path}" 2>/dev/null;
-set -gx GEM_ROOT "#{expected_gem_root}";
-set -gx GEM_HOME "#{expected_gem_home}";
-set -gx GEM_PATH "#{expected_gem_path}";
+      <<~EOH
+        set -gx PATH "#{expected_path}" 2>/dev/null;
+        set -gx GEM_ROOT "#{expected_gem_root}";
+        set -gx GEM_HOME "#{expected_gem_home}";
+        set -gx GEM_PATH "#{expected_gem_path}";
 EOH
     end
 
@@ -275,26 +275,26 @@ EOH
       let(:argv) { [ "fish" ] }
 
       let(:expected_completion_function) do
-        <<-END_COMPLETION
-# Fish Shell command-line completions for ChefDK
-
-function __fish_chef_no_command --description 'Test if chef has yet to be given the main command'
-  set -l cmd (commandline -opc)
-  test (count $cmd) -eq 1
-end
-
-complete -c chef -f -n '__fish_chef_no_command' -a exec -d "Runs the command in context of the embedded ruby"
-complete -c chef -f -n '__fish_chef_no_command' -a env -d "Prints environment variables used by ChefDK"
-complete -c chef -f -n '__fish_chef_no_command' -a gem -d "Runs the `gem` command in context of the embedded ruby"
-complete -c chef -f -n '__fish_chef_no_command' -a generate -d "Generate a new app, cookbook, or component"
+        <<~END_COMPLETION
+          # Fish Shell command-line completions for ChefDK
+
+          function __fish_chef_no_command --description 'Test if chef has yet to be given the main command'
+            set -l cmd (commandline -opc)
+            test (count $cmd) -eq 1
+          end
+
+          complete -c chef -f -n '__fish_chef_no_command' -a exec -d "Runs the command in context of the embedded ruby"
+          complete -c chef -f -n '__fish_chef_no_command' -a env -d "Prints environment variables used by ChefDK"
+          complete -c chef -f -n '__fish_chef_no_command' -a gem -d "Runs the `gem` command in context of the embedded ruby"
+          complete -c chef -f -n '__fish_chef_no_command' -a generate -d "Generate a new app, cookbook, or component"
 END_COMPLETION
       end
 
       before do
         # Stub this or else we'd have to update the test every time a new command
         # is added.
-        allow(command_instance.shell_completion_template_context).to receive(:commands).
-          and_return(command_descriptions)
+        allow(command_instance.shell_completion_template_context).to receive(:commands)
+          .and_return(command_descriptions)
 
         allow(command_instance).to receive(:omnibus_embedded_bin_dir).and_return(omnibus_embedded_bin_dir)
         allow(command_instance).to receive(:omnibus_bin_dir).and_return(omnibus_bin_dir)