test-kitchen 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b57d5ccdfe054fcd290b2a6f4490f92e626d93d3b7c7bdc8704b3029e723392
-  data.tar.gz: 4d20fdf60ea362f63918232cf57bcbaebc8cc61d5732d71a80cbbf20961a057e
+  metadata.gz: c0f0f59e09f9a2d65a94c33e6c0e833b7fc86958d88d42ef71f4934196cd809f
+  data.tar.gz: aa0bcc30665a7628da122d74354f113965dbdc86e0b68faa1b275fd30cdbbeb5
 SHA512:
-  metadata.gz: adc9ea69942bc0938b8da3340ae0abe1ce78f409170c9d3e1d081179121db9508d072fb18232982e16e377d8f5bddbee9b90b887c22cc9039729b3cdc5daf494
-  data.tar.gz: eb8caaaf52882d104ff01f46283325f5455cfaf4f0e8a8a4cfa4792430dac560c2fb556727f8cc9f0fc6af877ba06fee687f763b58c0f3f17cac77841526f968
+  metadata.gz: 726d1016370af32c8a40f8877a51a9ff5c3bc4e7f57952318bdfdb3cd8356c0fe3b326ea67596299447cdbd9c5cf915f1c3f2ec41ea0b88b4427526ff0c99a32
+  data.tar.gz: 40d835a7607f6de437bbdb8cd03c720891bc6d8e9417c986f2e9ef5abeded7c7c4957ef0fff727d16152d0e4a967cfe76e9507b02bfff9489498d02d31c6447a

data/Gemfile

@@ -17,5 +17,5 @@ group :debug do
 end
 
 group :chefstyle do
-  gem "chefstyle", "2.1.0"
+  gem "chefstyle", "2.2.2"
 end

data/lib/kitchen/driver/ssh_base.rb

@@ -70,7 +70,7 @@ module Kitchen
       def converge(state) # rubocop:disable Metrics/AbcSize
         provisioner = instance.provisioner
         provisioner.create_sandbox
-        sandbox_dirs = Util.list_directory(provisioner.sandbox_path)
+        sandbox_dirs = provisioner.sandbox_dirs
 
         instance.transport.connection(backcompat_merged_state(state)) do |conn|
           conn.execute(env_cmd(provisioner.install_command))

data/lib/kitchen/provisioner/base.rb

@@ -70,7 +70,6 @@ module Kitchen
       # rubocop:disable Metrics/AbcSize
       def call(state)
         create_sandbox
-        sandbox_dirs = Util.list_directory(sandbox_path)
 
         instance.transport.connection(state) do |conn|
           config[:uploads].to_h.each do |locals, remote|
@@ -182,6 +181,13 @@ module Kitchen
           "trying to access the path."
       end
 
+      # Returns the list of items in the sandbox directory
+      #
+      # @return [String] path of items in the sandbox directory
+      def sandbox_dirs
+        Util.list_directory(sandbox_path)
+      end
+
       # Deletes the sandbox path. Without calling this method, the sandbox path
       # will persist after the process terminates. In other words, cleanup is
       # explicit. This method is safe to call multiple times.

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

@@ -289,7 +289,8 @@ module Kitchen
             policyfile, sandbox_path,
             logger: logger,
             always_update: config[:always_update_cookbooks],
-            policy_group: policy_group
+            policy_group: policy_group,
+            license: config[:chef_license]
           )
           Kitchen.mutex.synchronize do
             policy.compile
@@ -308,7 +309,8 @@ module Kitchen
               policyfile, sandbox_path,
               logger: logger,
               always_update: config[:always_update_cookbooks],
-              policy_group: config[:policy_group]
+              policy_group: config[:policy_group],
+              license: config[:chef_license]
             ).resolve
           end
         end

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

@@ -41,12 +41,13 @@ module Kitchen
         #   cookbooks
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
         #   to `Kitchen.logger`
-        def initialize(policyfile, path, logger: Kitchen.logger, always_update: false, policy_group: nil)
+        def initialize(policyfile, path, license: nil, logger: Kitchen.logger, always_update: false, policy_group: nil)
           @policyfile    = policyfile
           @path          = path
           @logger        = logger
           @always_update = always_update
           @policy_group  = policy_group
+          @license       = license
         end
 
         # Loads the library code required to use the resolver.
@@ -62,10 +63,10 @@ module Kitchen
         def resolve
           if policy_group
             info("Exporting cookbook dependencies from Policyfile #{path} with policy_group #{policy_group} using `#{cli_path} export`...")
-            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --policy_group #{policy_group} --force")
+            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --policy_group #{policy_group} --force --chef-license #{license}")
           else
             info("Exporting cookbook dependencies from Policyfile #{path} using `#{cli_path} export`...")
-            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --force")
+            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --force --chef-license #{license}")
           end
         end
 
@@ -77,11 +78,11 @@ module Kitchen
           else
             info("Policy lock file doesn't exist, running `#{cli_path} install` for Policyfile #{policyfile}...")
           end
-          run_command("#{cli_path} install #{escape_path(policyfile)}")
+          run_command("#{cli_path} install #{escape_path(policyfile)} --chef-license #{license}")
 
           if always_update
             info("Updating policy lock using `#{cli_path} update`")
-            run_command("#{cli_path} update #{escape_path(policyfile)}")
+            run_command("#{cli_path} update #{escape_path(policyfile)} --chef-license #{license}")
           end
         end
 
@@ -114,6 +115,10 @@ module Kitchen
         # @api private
         attr_reader :policy_group
 
+        # @return [String] name of the chef_license
+        # @api private
+        attr_reader :license
+
         # Escape spaces in a path in way that works with both Sh (Unix) and
         # Windows.
         #
@@ -152,7 +157,7 @@ module Kitchen
         def no_cli_found_error
           @logger.fatal("The `chef` or `chef-cli` executables cannot be found in your " \
                         "PATH. Ensure you have installed Chef Workstation " \
-                        "from https://downloads.chef.io and that your PATH " \
+                        "from https://www.chef.io/downloads/ and that your PATH " \
                         "setting includes the path to the `chef` or `chef-cli` commands.")
           raise UserError, "Could not find the chef or chef-cli executables in your PATH."
         end

data/lib/kitchen/transport/base.rb

@@ -128,8 +128,8 @@ module Kitchen
             tries += 1
             debug("Attempting to execute command - try #{tries} of #{max_retries}.")
             execute(command)
-          rescue Kitchen::Transport::TransportFailed => e
-            if retry?(tries, max_retries, retryable_exit_codes, e.exit_code)
+          rescue Exception => e
+            if retry?(tries, max_retries, retryable_exit_codes, e)
               close
               sleep wait_time
               retry
@@ -139,10 +139,14 @@ module Kitchen
           end
         end
 
-        def retry?(current_try, max_retries, retryable_exit_codes, exit_code)
-          current_try <= max_retries &&
-            !retryable_exit_codes.nil? &&
-            retryable_exit_codes.flatten.include?(exit_code)
+        def retry?(current_try, max_retries, retryable_exit_codes, exception)
+          if exception.is_a?(Kitchen::Transport::TransportFailed)
+            return current_try <= max_retries &&
+                !retryable_exit_codes.nil? &&
+                retryable_exit_codes.flatten.include?(exception.exit_code)
+          end
+
+          false
         end
 
         # Builds a LoginCommand which can be used to open an interactive

data/lib/kitchen/transport/winrm.rb

@@ -21,6 +21,7 @@ require "rbconfig" unless defined?(RbConfig)
 require "uri" unless defined?(URI)
 require_relative "../../kitchen"
 require "winrm" unless defined?(WinRM::Connection)
+require "winrm/exceptions" unless defined?(WinRM::WinRMHTTPTransportError)
 
 module Kitchen
   module Transport
@@ -118,6 +119,22 @@ module Kitchen
           end
         end
 
+        def retry?(current_try, max_retries, retryable_exit_codes, exception)
+          # Avoid duplicating Kitchen::Transport::Base#retry?
+          result = super
+          return result if result == true
+
+          case exception
+          when WinRM::WinRMHTTPTransportError
+            return current_try <= max_retries &&
+                [400, 500].include?(exception.status_code)
+          when WinRM::WinRMWSManFault
+            return current_try <= max_retries
+          end
+
+          false
+        end
+
         # (see Base::Connection#login_command)
         def login_command
           case RbConfig::CONFIG["host_os"]

data/lib/kitchen/verifier/base.rb

@@ -65,7 +65,6 @@ module Kitchen
       # @raise [ActionFailed] if the action could not be completed
       def call(state)
         create_sandbox
-        sandbox_dirs = Util.list_directory(sandbox_path)
 
         instance.transport.connection(state) do |conn|
           conn.execute(install_command)
@@ -174,6 +173,13 @@ module Kitchen
            "trying to access the path."
       end
 
+      # Returns the list of items in the sandbox directory
+      #
+      # @return [String] the absolute path of sandbox directory files
+      def sandbox_dirs
+        Util.list_directory(sandbox_path)
+      end
+
       # Sets the API version for this verifier. If the verifier does not set
       # this value, then `nil` will be used and reported.
       #

data/lib/kitchen/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "3.2.2".freeze
+  VERSION = "3.3.0".freeze
 end

data/templates/driver/README.md.erb

@@ -58,7 +58,7 @@ Created and maintained by [<%= config[:author] %>][author] (<<%= config[:email]
 
 [author]:           https://github.com/enter-github-user
 [issues]:           https://github.com/enter-github-user/<%= config[:gem_name] %>/issues
-[license]:          https://github.com/enter-github-user/<%= config[:gem_name] %>/blob/master/LICENSE
+[license]:          https://github.com/enter-github-user/<%= config[:gem_name] %>/blob/main/LICENSE
 [repo]:             https://github.com/enter-github-user/<%= config[:gem_name] %>
-[driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
+[driver_usage]:     https://kitchen.ci/docs/drivers/
 [chef_omnibus_dl]:  http://www.chef.io/chef/install/

data/test-kitchen.gemspec

@@ -42,9 +42,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
 
-  gem.add_development_dependency "aruba",     "~> 0.11", "< 1.0"
+  gem.add_development_dependency "aruba",     ">= 0.11", "< 3.0"
   gem.add_development_dependency "fakefs",    "~> 1.0"
-  gem.add_development_dependency "minitest",  "~> 5.3", "< 5.15"
+  gem.add_development_dependency "minitest",  "~> 5.3", "< 5.16"
   gem.add_development_dependency "mocha",     "~> 1.1"
   gem.add_development_dependency "cucumber",  ">= 2.1", "< 8.0"
   gem.add_development_dependency "countloc",  "~> 0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -274,22 +274,22 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +313,7 @@ dependencies:
         version: '5.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '5.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -323,7 +323,7 @@ dependencies:
         version: '5.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -520,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure