test-kitchen 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca47f5a70c2ade9303de2718d6bb089dcad517b0b41769d764e1f066aae2876c
-  data.tar.gz: 1d8f5dfc07afb9b14e00d62f71f7cd401e240d6f4580bb941922316ef0bfa111
+  metadata.gz: 25783a8b110ce3743a0da21ee576b2a83dd9cc218bfba75e0f86e350d5a429cb
+  data.tar.gz: 8dc2c81284b6a7152b95155225078d8e85ccd0b3742e40a4b0c4daef3ecb1151
 SHA512:
-  metadata.gz: 12a827dd4ef194d3bdafdfa6fbc6bb0e45f65010865fd73f86d4999f6f8dc5c6d5cfba25b38d56f40c3fc9e3c3838974ce8126712d75ecd265fff7297b33549a
-  data.tar.gz: 2fdf1ad221bc74fb7e8b8cff6e760bf4493aaa3f59ea1580e18ab96a6e6663fa36b955757ffdf6cdf7648b961b1b66b0075f748d07eec4516208a8a14cb3b241
+  metadata.gz: 4d7270665bf6fbab9f7876a5347f97bb821a0bc9ece8a14378ce625fea305e3b7145de6f6409c9b7cf20f27ca481f368671a66c48ba694777056d80ce6fe11a9
+  data.tar.gz: 4d072e0b670d1b9b583f746b5850885bfa0484ece4f8b6826e33019110685e6be3daea984067801182fcdf75d45d93937e9a8b09103b83551f2374b6c4c37fd9

data/lib/kitchen/instance.rb

@@ -405,6 +405,7 @@ module Kitchen
         if legacy_ssh_base_driver?
           legacy_ssh_base_converge(state)
         else
+          provisioner.check_license
           provisioner.call(state)
         end
       end

data/lib/kitchen/provisioner/base.rb

@@ -68,7 +68,6 @@ module Kitchen
       # @raise [ActionFailed] if the action could not be completed
       # rubocop:disable Metrics/AbcSize
       def call(state)
-        check_license
         create_sandbox
         sandbox_dirs = Util.list_directory(sandbox_path)
 

data/lib/kitchen/provisioner/chef/common_sandbox.rb

@@ -172,8 +172,8 @@ module Kitchen
         #
         # @api private
         def make_fake_cookbook
-          info("Berksfile, cookbooks/, or metadata.rb not found " \
-            "so Chef will run with effectively no cookbooks. Is this intended?")
+          info("Policyfile, Berksfile, cookbooks/, or metadata.rb not found " \
+            "so Chef Infra Client will run, but do nothing. Is this intended?")
           name = File.basename(config[:kitchen_root])
           fake_cb = File.join(tmpbooks_dir, name)
           FileUtils.mkdir_p(fake_cb)
@@ -282,7 +282,7 @@ module Kitchen
 
         def update_dna_for_policyfile
           if !config[:run_list].nil? && !config[:run_list].empty?
-            warn("You must set your run_list in your policyfile instead of "\
+            warn("You must set your run_list in your Policyfile instead of "\
                  "kitchen config. The run_list in your config will be ignored.")
             warn("Ignored run_list: #{config[:run_list].inspect}")
           end

data/lib/kitchen/provisioner/chef/policyfile.rb

@@ -87,7 +87,7 @@ module Kitchen
 
         private
 
-        # @return [String] path to a Berksfile
+        # @return [String] path to a Policyfile
         # @api private
         attr_reader :policyfile
 
@@ -139,8 +139,8 @@ module Kitchen
               File.exist?(File.join(p, "chef"))
             end
               logger.fatal("The `chef` executable cannot be found in your " \
-                          "PATH. Ensure you have installed ChefDK from " \
-                          "https://downloads.chef.io and that your PATH " \
+                          "PATH. Ensure you have installed ChefDK or Chef Workstation " \
+                          "from https://downloads.chef.io and that your PATH " \
                           "setting includes the path to the `chef` comand.")
               raise UserError,
                     "Could not find the chef executable in your PATH."

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "2.2.4".freeze
+  VERSION = "2.2.5".freeze
 end

data/test-kitchen.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "winrm-fs",           "~> 1.1"
   # Required to run the Chef provisioner local license check for remote systems
   # TK is not under Chef EULA
-  gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
+  gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 
   gem.add_development_dependency "rb-readline"
   gem.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -197,7 +197,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement