test-kitchen 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6c58820622fdc3aac554e5fe00a8485561076e493d82ccc3d5cc53a13901e99
-  data.tar.gz: a146d43a890701b4bfe5b8043a02fe4a30c6a237565189e55b58c50653ee442a
+  metadata.gz: 593f1178fc6a9c800b644a994b85a91917de9fb8cd1277b97559ede5aa4c2038
+  data.tar.gz: eeb7433c7a726aaddc7db8c4916c4cd26767190e281322ff5ee4d3620719f09b
 SHA512:
-  metadata.gz: 4c4fe3d155163a35ad473f6ba155a9a04b83fcfe585423accfe856db66341964e43be94553322eec2c989cfc95ee0b78cf7b55d73b5fd02baabc1fd7553d0fc9
-  data.tar.gz: 5ba0906fe1817c4c7cde1f08753c14d6c390824e8d50adf1b2cc5403630959ae8d5b85d1e0abde7a024bc5abff3a1bcf107688d5ea620336e18e2d471dde719d
+  metadata.gz: a4f14a4b335c956fac8a0d3963e1023c5cd581e5387fafa4bd360c612904b131ab2885648b60a19af4bb75bff3cfb85bc24fecaa1e376af32c085d47cf4eec5a
+  data.tar.gz: 0e6d4204f8c5742809df0564eee55ce114f65a066c94a31809ed5ca4896442b8b224b319d1b3a479697e26823efce999d3d48285ac84d752aafa0f6bcb9b97bb

data/lib/kitchen/provisioner/chef_base.rb

@@ -271,11 +271,11 @@ module Kitchen
         acceptor = LicenseAcceptance::Acceptor.new(logger: Kitchen.logger, provided: config[:chef_license])
         if acceptor.license_required?(name, version)
           debug("License acceptance required for #{name} version: #{version}. Prompting")
-          license_name = acceptor.name_from_mixlib(name)
+          license_id = acceptor.id_from_mixlib(name)
           begin
-            acceptor.check_and_persist(license_name, version.to_s)
-          rescue LicenseAcceptance::LicenseNotAcceptedError
-            error("Cannot converge without accepting the Chef License. Set it in your kitchen.yml or using the CHEF_LICENSE environment variable")
+            acceptor.check_and_persist(license_id, version.to_s)
+          rescue LicenseAcceptance::LicenseNotAcceptedError => e
+            error("Cannot converge without accepting the #{e.product.pretty_name} License. Set it in your kitchen.yml or using the CHEF_LICENSE environment variable")
             raise
           end
           config[:chef_license] ||= acceptor.acceptance_value

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "2.2.2".freeze
+  VERSION = "2.2.3".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", ">= 0.2.16", "< 2.0"
+  gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
 
   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.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -192,22 +192,22 @@ dependencies:
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.16
-    - - "<"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.16
-    - - "<"
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement