chef-dk 1.2.22 → 1.3.40

data/omnibus_overrides.rb

@@ -1,9 +1,9 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.10"
+override :rubygems, version: "2.6.11"
 override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"
-override "liblzma", version: "5.2.2"
+override "liblzma", version: "5.2.3"
 override "libtool", version: "2.4.2"
 override "libxml2", version: "2.9.4"
 override "libxslt", version: "1.1.29"
@@ -17,4 +17,4 @@ override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.8"
 override "libzmq", version: "4.0.5"
-override "kitchen-dokken", version: "1.1.0"
+override "openssl", version: "1.0.2j"

data/spec/shared/a_file_generator.rb

@@ -73,9 +73,9 @@ shared_examples_for "a file generator" do
         recipe_generator.run
       end
 
-        generated_files.each do |expected_file|
-          expect(File).to exist(File.join(cookbook_path, expected_file))
-        end
+      generated_files.each do |expected_file|
+        expect(File).to exist(File.join(cookbook_path, expected_file))
+      end
     end
 
   end

data/spec/shared/custom_generator_cookbook.rb

@@ -7,12 +7,12 @@ shared_examples_for "custom generator cookbook" do
 
   context "when given a generator-cookbook path" do
 
-    let(:default_generator_cookbook_path) { File.expand_path('lib/chef-dk/skeletons/code_generator', project_root) }
+    let(:default_generator_cookbook_path) { File.expand_path("lib/chef-dk/skeletons/code_generator", project_root) }
 
-    let(:generator_cookbook_path) { File.join(tempdir, 'a_generator_cookbook') }
-    let(:generator_copyright_holder) { 'Chef' }
-    let(:generator_email) { 'mail@chef.io' }
-    let(:generator_license) { 'Free as in Beer'}
+    let(:generator_cookbook_path) { File.join(tempdir, "a_generator_cookbook") }
+    let(:generator_copyright_holder) { "Chef" }
+    let(:generator_email) { "mail@chef.io" }
+    let(:generator_license) { "Free as in Beer" }
 
     let(:argv) { [generator_arg, "--generator-cookbook", generator_cookbook_path] }
 
@@ -76,7 +76,7 @@ shared_examples_for "custom generator cookbook" do
         end
 
         cookbook_path = File.dirname(generator_cookbook_path)
-        expected_msg = %Q(ERROR: Could not find cookbook(s) to satisfy run list ["recipe[a_generator_cookbook::#{generator_name}]"] in #{cookbook_path})
+        expected_msg = %Q{ERROR: Could not find cookbook(s) to satisfy run list ["recipe[a_generator_cookbook::#{generator_name}]"] in #{cookbook_path}}
 
         expect(stderr_io.string).to include(expected_msg)
       end

data/spec/shared/fixture_cookbook_checksums.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/helpers'
+require "chef-dk/helpers"
 
 RSpec.shared_context "fixture cookbooks checksums" do
 
@@ -23,7 +23,7 @@ RSpec.shared_context "fixture cookbooks checksums" do
     major = sha1_id[0...14]
     minor = sha1_id[14...28]
     patch = sha1_id[28..40]
-    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
+    decimal_integers = [major, minor, patch].map { |hex| hex.to_i(16) }
     decimal_integers.join(".")
   end
 
@@ -44,4 +44,3 @@ RSpec.shared_context "fixture cookbooks checksums" do
   let(:cookbook_dep_of_bar_cksum_dotted) { id_to_dotted(cookbook_dep_of_bar_cksum) }
 
 end
-

data/spec/shared/setup_git_committer_config.rb

@@ -20,7 +20,7 @@ require "mixlib/shellout"
 RSpec.shared_context("setup_git_committer_config") do
 
   def _have_git_config_key?(key)
-    cmd = Mixlib::ShellOut.new("git config --global #{key}", returns: [0,1])
+    cmd = Mixlib::ShellOut.new("git config --global #{key}", returns: [0, 1])
     cmd.run_command
     cmd.error!
     cmd.status.success?

data/spec/shared/setup_git_cookbooks.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/helpers'
+require "chef-dk/helpers"
 
 RSpec.shared_context "setup git cookbooks" do
 
@@ -27,7 +27,7 @@ RSpec.shared_context "setup git cookbooks" do
 
   let(:cookbook_path) { File.join(tempdir, "bar") }
 
-  let(:current_rev) { 'dfc68070c47cbf4267be14ea87f80680cb5dafb3' }
+  let(:current_rev) { "dfc68070c47cbf4267be14ea87f80680cb5dafb3" }
 
   before do
     reset_tempdir

data/spec/spec_helper.rb

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'rubygems'
-require 'rspec/mocks'
-require 'test_helpers'
+require "rubygems"
+require "rspec/mocks"
+require "test_helpers"
 
 # needed since we stub it for every test
-require 'chef/workstation_config_loader'
-require 'chef/config'
+require "chef/workstation_config_loader"
+require "chef/config"
 
 RSpec.configure do |c|
   running_on_windows = (RUBY_PLATFORM =~ /mswin|mingw|windows/)

data/spec/test_helpers.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'fileutils'
-require 'tmpdir'
+require "fileutils"
+require "tmpdir"
 
 module TestHelpers
 

data/spec/unit/chef_runner_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'stringio'
-require 'chef-dk/chef_runner'
+require "spec_helper"
+require "stringio"
+require "chef-dk/chef_runner"
 
 describe ChefDK::ChefRunner do
 
@@ -79,8 +79,8 @@ describe ChefDK::ChefRunner do
 
   it "runs a chef converge" do
     chef_runner.converge
-    expect(test_state[:loaded_recipes]).to eq([ "recipe_one", "recipe_two" ])
-    expect(test_state[:converged_recipes]).to eq([ "recipe_one", "recipe_two" ])
+    expect(test_state[:loaded_recipes]).to eq(%w{recipe_one recipe_two})
+    expect(test_state[:converged_recipes]).to eq(%w{recipe_one recipe_two})
   end
 
   context "when policyfile options are set in the workstation config" do
@@ -137,5 +137,3 @@ describe ChefDK::ChefRunner do
   end
 
 end
-
-

data/spec/unit/cli_spec.rb

@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'stringio'
-require 'chef-dk/cli'
-require 'unit/fixtures/command/cli_test_command'
+require "spec_helper"
+require "stringio"
+require "chef-dk/cli"
+require "unit/fixtures/command/cli_test_command"
 
 describe ChefDK::CLI do
 
@@ -70,7 +70,7 @@ E
   def run_cli_and_validate_tool_versions
     full_version_message = version_message
     tools.each do |name, version|
-      expect(cli).to receive(:shell_out).with("#{name} --version").and_return(mock_shell_out(0, "#{version["version_output"]}", ''))
+      expect(cli).to receive(:shell_out).with("#{name} --version").and_return(mock_shell_out(0, "#{version["version_output"]}", ""))
       full_version_message += "#{name} version: #{version["expected_version"]}\n"
     end
     run_cli(0)
@@ -97,10 +97,10 @@ E
     commands_map.builtin "verify", :Verify, desc: "Test the embedded ChefDK applications"
 
     commands_map.builtin "gem", :GemForwarder, require_path: "chef-dk/command/gem",
-      desc: "Runs the `gem` command in context of the embedded ruby"
+                                               desc: "Runs the `gem` command in context of the embedded ruby"
 
     commands_map.builtin "example", :TestCommand, require_path: "unit/fixtures/command/cli_test_command",
-      desc: "Example subcommand for testing"
+                                                  desc: "Example subcommand for testing"
   end
 
   context "given no arguments or options" do
@@ -113,7 +113,7 @@ E
   end
 
   context "given -h" do
-    let(:argv) { %w[-h] }
+    let(:argv) { %w{-h} }
 
     it "prints the help output" do
       run_cli(0)
@@ -122,27 +122,27 @@ E
   end
 
   context "given -v" do
-    let(:argv) { %w[-v] }
+    let(:argv) { %w{-v} }
     let(:delivery_version) { "master (454c3f37819ed508a49c971f38e42267ce8a47de)" }
 
     let(:tools) {
       {
         "chef-client" => {
           "version_output" => "Chef: 12.0.3",
-          "expected_version" => "12.0.3"
+          "expected_version" => "12.0.3",
         },
         "delivery" => {
           "version_output" => "delivery #{delivery_version}",
-          "expected_version" => delivery_version
+          "expected_version" => delivery_version,
         },
         "berks" => {
           "version_output" => "3.2.3",
-          "expected_version" => "3.2.3"
+          "expected_version" => "3.2.3",
         },
         "kitchen" => {
           "version_output" => "Test Kitchen version 1.3.1",
-          "expected_version" => "1.3.1"
-        }
+          "expected_version" => "1.3.1",
+        },
       }
     }
 
@@ -150,10 +150,10 @@ E
       full_version_message = version_message
       tools.each do |name, version|
         if name == "berks"
-          expect(cli).to receive(:shell_out).with("#{name} --version").and_return(mock_shell_out(1, "#{version["version_output"]}", ''))
+          expect(cli).to receive(:shell_out).with("#{name} --version").and_return(mock_shell_out(1, "#{version["version_output"]}", ""))
           full_version_message += "#{name} version: ERROR\n"
         else
-          expect(cli).to receive(:shell_out).with("#{name} --version").and_return(mock_shell_out(0, "#{version["version_output"]}", ''))
+          expect(cli).to receive(:shell_out).with("#{name} --version").and_return(mock_shell_out(0, "#{version["version_output"]}", ""))
           full_version_message += "#{name} version: #{version["expected_version"]}\n"
         end
       end
@@ -174,10 +174,9 @@ E
     end
   end
 
-
   context "given an invalid option" do
 
-    let(:argv) { %w[-nope] }
+    let(:argv) { %w{-nope} }
 
     it "prints an 'invalid option message and the help output, then exits non-zero" do
       run_cli(1)
@@ -188,7 +187,7 @@ E
   end
 
   context "given an invalid/unknown subcommand" do
-    let(:argv) { %w[ancient-aliens] }
+    let(:argv) { %w{ancient-aliens} }
 
     it "prints an 'unknown command' message and the help output" do
       expected_err = "Unknown command `ancient-aliens'.\n"
@@ -202,7 +201,7 @@ E
   end
 
   context "given a valid subcommand" do
-    let(:argv) { %w[example with some args --and-an-option] }
+    let(:argv) { %w{example with some args --and-an-option} }
 
     def test_result
       ChefDK::Command::TestCommand.test_result
@@ -222,7 +221,7 @@ E
     end
 
     it "passes arguments and options to the subcommand" do
-      params = %w[with some args --and-an-option]
+      params = %w{with some args --and-an-option}
       run_cli(23)
       expect(test_result[:params]).to eq(params)
     end
@@ -240,18 +239,18 @@ E
 
       context "on unix" do
 
-        let(:ruby_path) { '/opt/chefdk/embedded/bin/ruby' }
-        let(:chefdk_embedded_path) { '/opt/chefdk/embedded/apps/chef-dk' }
+        let(:ruby_path) { "/opt/chefdk/embedded/bin/ruby" }
+        let(:chefdk_embedded_path) { "/opt/chefdk/embedded/apps/chef-dk" }
 
         before do
-          stub_const("File::PATH_SEPARATOR", ':')
+          stub_const("File::PATH_SEPARATOR", ":")
           allow(Chef::Util::PathHelper).to receive(:cleanpath) do |path|
             path
           end
         end
 
         it "complains if embedded is first" do
-          allow(cli).to receive(:env).and_return({'PATH' => '/opt/chefdk/embedded/bin:/opt/chefdk/bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => "/opt/chefdk/embedded/bin:/opt/chefdk/bin" })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("/opt/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -261,7 +260,7 @@ E
         end
 
         it "complains if only embedded is present" do
-          allow(cli).to receive(:env).and_return({'PATH' => '/opt/chefdk/embedded/bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => "/opt/chefdk/embedded/bin" })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("/opt/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -271,7 +270,7 @@ E
         end
 
         it "passes when both are present in the correct order" do
-          allow(cli).to receive(:env).and_return({'PATH' => '/opt/chefdk/bin:/opt/chefdk/embedded/bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => "/opt/chefdk/bin:/opt/chefdk/embedded/bin" })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("/opt/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -279,7 +278,7 @@ E
         end
 
         it "passes when only the omnibus bin dir is present" do
-          allow(cli).to receive(:env).and_return({'PATH' => '/opt/chefdk/bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => "/opt/chefdk/bin" })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("/opt/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -303,14 +302,14 @@ E
           allow(cli).to receive(:omnibus_chefdk_location).and_return(chefdk_embedded_path)
 
           allow(Chef::Platform).to receive(:windows?).and_return(true)
-          stub_const("File::PATH_SEPARATOR", ';')
+          stub_const("File::PATH_SEPARATOR", ";")
           allow(Chef::Util::PathHelper).to receive(:cleanpath) do |path|
-            path.gsub "/", "\\"
+            path.tr "/", "\\"
           end
         end
 
         it "complains if embedded is first" do
-          allow(cli).to receive(:env).and_return({'PATH' => 'C:\opscode\chefdk\embedded\bin;C:\opscode\chefdk\bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => 'C:\opscode\chefdk\embedded\bin;C:\opscode\chefdk\bin' })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("c:/opscode/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -320,7 +319,7 @@ E
         end
 
         it "complains if only embedded is present" do
-          allow(cli).to receive(:env).and_return({'PATH' => 'C:\opscode\chefdk\embedded\bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => 'C:\opscode\chefdk\embedded\bin' })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("c:/opscode/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -330,7 +329,7 @@ E
         end
 
         it "passes when both are present in the correct order" do
-          allow(cli).to receive(:env).and_return({'PATH' => 'C:\opscode\chefdk\bin;C:\opscode\chefdk\embedded\bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => 'C:\opscode\chefdk\bin;C:\opscode\chefdk\embedded\bin' })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("c:/opscode/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -338,7 +337,7 @@ E
         end
 
         it "passes when only the omnibus bin dir is present" do
-          allow(cli).to receive(:env).and_return({'PATH' => 'C:\opscode\chefdk\bin' })
+          allow(cli).to receive(:env).and_return({ "PATH" => 'C:\opscode\chefdk\bin' })
           allow(cli).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chefdk/embedded/bin")
           allow(cli).to receive(:omnibus_bin_dir).and_return("c:/opscode/chefdk/bin")
           run_cli_with_sanity_check(0)
@@ -349,8 +348,8 @@ E
 
     context "when not installed via omnibus" do
 
-      let(:ruby_path) { '/Users/bog/.lots_o_rubies/2.1.2/bin/ruby' }
-      let(:chefdk_embedded_path) { '/Users/bog/.lots_o_rubies/embedded/apps/chef-dk' }
+      let(:ruby_path) { "/Users/bog/.lots_o_rubies/2.1.2/bin/ruby" }
+      let(:chefdk_embedded_path) { "/Users/bog/.lots_o_rubies/embedded/apps/chef-dk" }
 
       before do
         allow(File).to receive(:exist?).with(chefdk_embedded_path).and_return(false)
@@ -359,7 +358,7 @@ E
           :omnibus_root,
           :omnibus_apps_dir,
           :omnibus_bin_dir,
-          :omnibus_embedded_bin_dir
+          :omnibus_embedded_bin_dir,
         ].each do |method_name|
           allow(cli).to receive(method_name).and_raise(ChefDK::OmnibusInstallNotFound.new)
         end

data/spec/unit/command/base_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/command/verify'
+require "spec_helper"
+require "chef-dk/command/verify"
 
 describe ChefDK::Command::Base do
   class TestCommand < ChefDK::Command::Base
@@ -56,7 +56,6 @@ describe ChefDK::Command::Base do
     allow(command_instance).to receive(:stderr).and_return(stderr_io)
   end
 
-
   def run_command(options)
     command_instance.run_with_default_options(options)
   end
@@ -99,7 +98,7 @@ describe ChefDK::Command::Base do
   describe "when given invalid options" do
 
     it "prints the help banner and exits gracefully" do
-      expect(run_command(%w[-foo])).to eq(1)
+      expect(run_command(%w{-foo})).to eq(1)
 
       expect(stderr).to eq("ERROR: invalid option: -foo\n\n")
 
@@ -119,7 +118,7 @@ E
   describe "when given an option that requires an argument with no argument" do
 
     it "prints the help banner and exits gracefully" do
-      expect(run_command(%w[-a])).to eq(1)
+      expect(run_command(%w{-a})).to eq(1)
 
       expect(stderr).to eq("ERROR: missing argument: -a\n\n")
 

data/spec/unit/command/clean_policy_cookbooks_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/clean_policy_cookbooks'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/clean_policy_cookbooks"
 
 describe ChefDK::Command::CleanPolicyCookbooks do
 
@@ -50,7 +50,7 @@ describe ChefDK::Command::CleanPolicyCookbooks do
 
     context "when given a path to the config" do
 
-      let(:params) { %w[ -c ~/otherstuff/config.rb ] }
+      let(:params) { %w{ -c ~/otherstuff/config.rb } }
 
       let(:config_arg) { "~/otherstuff/config.rb" }
 
@@ -105,7 +105,7 @@ describe ChefDK::Command::CleanPolicyCookbooks do
 
     context "when given too many arguments" do
 
-      let(:params) { %w[ wut-is-this ] }
+      let(:params) { %w{ wut-is-this } }
 
       it "shows usage and exits" do
         expect(command.run(params)).to eq(1)
@@ -134,7 +134,7 @@ describe ChefDK::Command::CleanPolicyCookbooks do
       it "prints a debugging message and exits non-zero" do
         expect(command.run([])).to eq(1)
 
-        expected_output=<<-E
+        expected_output = <<-E
 Error: Failed to delete some policy revisions.
 Reason: (StandardError) some operation failed
 
@@ -147,9 +147,9 @@ E
 
         it "includes the backtrace in the error" do
 
-          command.run(%w[ -D ])
+          command.run(%w{ -D })
 
-          expected_output=<<-E
+          expected_output = <<-E
 Error: Failed to delete some policy revisions.
 Reason: (StandardError) some operation failed
 
@@ -178,4 +178,3 @@ E
 
   end
 end
-