chef-dk 4.0.60 → 4.1.7

data/lib/chef-dk/policyfile_services/update_attributes.rb

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require "chef-dk/helpers"
-require "chef-dk/policyfile/storage_config"
-require "chef-dk/policyfile/lock_applier"
-require "chef-dk/service_exceptions"
-require "chef-dk/policyfile_compiler"
+require_relative "../helpers"
+require_relative "../policyfile/storage_config"
+require_relative "../policyfile/lock_applier"
+require_relative "../service_exceptions"
+require_relative "../policyfile_compiler"
 
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/service_exception_inspectors.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "chef-dk/service_exception_inspectors/base"
-require "chef-dk/service_exception_inspectors/http"
+require_relative "service_exception_inspectors/base"
+require_relative "service_exception_inspectors/http"
 
 module ChefDK
   module ServiceExceptionInspectors

data/lib/chef-dk/service_exception_inspectors/http.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefDK
   module ServiceExceptionInspectors

data/lib/chef-dk/service_exceptions.rb

@@ -20,7 +20,7 @@
 # dependencies, so they are split into their own file here.
 ##
 
-require "chef-dk/service_exception_inspectors"
+require_relative "service_exception_inspectors"
 
 module ChefDK
 

data/lib/chef-dk/shell_out.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module ChefDK
 

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "4.0.60".freeze
+  VERSION = "4.1.7".freeze
 end

data/lib/kitchen/provisioner/policyfile_zero.rb

@@ -21,7 +21,7 @@ require "kitchen/provisioner/chef_base"
 # TODO: chef-dk and kitchen can only co-exist if kitchen and chef-dk agree on
 # the version of mixlib-shellout to use. Kitchen currently locked at 1.4,
 # chef-dk is on 2.x
-require "chef-dk/policyfile_services/export_repo"
+require_relative "../../chef-dk/policyfile_services/export_repo"
 
 module Kitchen
 

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,4 +48,8 @@ RSpec.configure do |c|
     mocks.verify_partial_doubles = true
   end
 
+  # better diffs when expects fail
+  c.expect_with :rspec do |r|
+    r.max_formatted_output_length = 400
+  end
 end

data/spec/unit/cli_spec.rb

@@ -54,7 +54,7 @@ describe ChefDK::CLI do
     E
   end
 
-  let(:version_message) { "Chef Development Kit Version: #{ChefDK::VERSION}\n" }
+  let(:version_message) { "ChefDK version: #{ChefDK::VERSION}\n" }
 
   def run_cli(expected_exit_code)
     expect(cli).to receive(:exit).with(expected_exit_code)
@@ -69,9 +69,9 @@ describe ChefDK::CLI do
 
   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"]}", ""))
-      full_version_message += "#{name} version: #{version["expected_version"]}\n"
+    tools.each do |name, details|
+      expect(cli).to receive(:shell_out).with("#{details["command"]} --version").and_return(mock_shell_out(0, "#{details["version_output"]}", ""))
+      full_version_message += "#{name} version: #{details["expected_version"]}\n"
     end
     run_cli(0)
     expect(stdout).to eq(full_version_message)
@@ -123,42 +123,46 @@ describe ChefDK::CLI do
 
   context "given -v" do
     let(:argv) { %w{-v} }
-    let(:delivery_version) { "master (454c3f37819ed508a49c971f38e42267ce8a47de)" }
 
     let(:tools) do
       {
-        "chef-client" => {
-          "version_output" => "Chef: 12.0.3",
-          "expected_version" => "12.0.3",
+        "Chef Infra Client" => {
+          "command" => "chef-client",
+          "version_output" => "Chef Infra Client: 15.0.300",
+          "expected_version" => "15.0.300",
         },
-        "delivery" => {
-          "version_output" => "delivery #{delivery_version}",
-          "expected_version" => delivery_version,
+        "Chef InSpec" => {
+          "command" => "inspec",
+          "version_output" => "4.6.2\n\nYour version of InSpec is out of date! The latest version is 4.6.4.",
+          "expected_version" => "4.6.2",
         },
-        "berks" => {
-          "version_output" => "3.2.3",
-          "expected_version" => "3.2.3",
+        "Test Kitchen" => {
+          "command" => "kitchen",
+          "version_output" => "Test Kitchen version 2.2.5",
+          "expected_version" => "2.2.5",
         },
-        "kitchen" => {
-          "version_output" => "Test Kitchen version 1.3.1",
-          "expected_version" => "1.3.1",
+        "Foodcritic" => {
+          "command" => "foodcritic",
+          "version_output" => "foodcritic 16.0.0",
+          "expected_version" => "16.0.0",
         },
-        "inspec" => {
-          "version_output" => "1.19.1\n\nYour version of InSpec is out of date! The latest version is 1.21.0.",
-          "expected_version" => "1.19.1",
+        "Cookstyle" => {
+          "command" => "cookstyle",
+          "version_output" => "Cookstyle 4.0.0\n  * RuboCop 0.62.0",
+          "expected_version" => "4.0.0",
         },
       }
     end
 
     it "does not print versions of tools with missing or errored tools" do
       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"]}", ""))
+      tools.each do |name, details|
+        if name == "inspec"
+          expect(cli).to receive(:shell_out).with("#{details["command"]} --version").and_return(mock_shell_out(1, "#{details["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"]}", ""))
-          full_version_message += "#{name} version: #{version["expected_version"]}\n"
+          expect(cli).to receive(:shell_out).with("#{details["command"]} --version").and_return(mock_shell_out(0, "#{details["version_output"]}", ""))
+          full_version_message += "#{name} version: #{details["expected_version"]}\n"
         end
       end
       run_cli(0)
@@ -168,14 +172,6 @@ describe ChefDK::CLI do
     it "prints the version and versions of chef-dk tools" do
       run_cli_and_validate_tool_versions
     end
-
-    context "alternate Delivery CLI version format" do
-      let(:delivery_version) { "0.0.15 (454c3f37819ed508a49c971f38e42267ce8a47de)" }
-
-      it "prints the expected version of Delivery CLI" do
-        run_cli_and_validate_tool_versions
-      end
-    end
   end
 
   context "given an invalid option" do

data/spec/unit/command/base_spec.rb

@@ -78,12 +78,12 @@ describe ChefDK::Command::Base do
 
   it "should print the version for -v" do
     run_command(["-v"])
-    expect(stdout).to eq("Chef Development Kit Version: #{ChefDK::VERSION}\n")
+    expect(stdout).to eq("ChefDK version: #{ChefDK::VERSION}\n")
   end
 
   it "should print the version for --version" do
     run_command(["--version"])
-    expect(stdout).to eq("Chef Development Kit Version: #{ChefDK::VERSION}\n")
+    expect(stdout).to eq("ChefDK version: #{ChefDK::VERSION}\n")
   end
 
   it "should run the command passing in the custom options for long custom options" do
@@ -129,7 +129,7 @@ describe ChefDK::Command::Base do
                 --chef-license ACCEPTANCE    Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
             -h, --help                       Show this message
             -u, --user                       If the user exists
-            -v, --version                    Show chef version
+            -v, --version                    Show ChefDK version
 
       E
       expect(stdout).to eq(expected)
@@ -150,7 +150,7 @@ describe ChefDK::Command::Base do
                 --chef-license ACCEPTANCE    Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
             -h, --help                       Show this message
             -u, --user                       If the user exists
-            -v, --version                    Show chef version
+            -v, --version                    Show ChefDK version
 
       E
       expect(stdout).to eq(expected)