test-kitchen 1.25.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c10ada5565a14188f81198ab603201f831f7b7237def1517b92695fb851d49
-  data.tar.gz: 232f4a053884a07eef2edff6415cf4582d76e685464943eebfb547494dd887c6
+  metadata.gz: 77640b7351ca31e3fb82454cc038bf093358b16f6a1d98275d28cf7ae8a91d65
+  data.tar.gz: fb58807514c09100fd70489fc7db56d305b505f0ee3d44c2a504ccc9cadab23a
 SHA512:
-  metadata.gz: 7594aa1002500ab9130b39293fdc795da406202e7438627b2f42fffc29b0d1c17f200ec79fd0c85b69a5a984a4b5062a889c9fdbd1ae685ba435e89e347d80d6
-  data.tar.gz: 4044d16718fa0b27425c4a0a91fc67ff50f0c77c2fab3266d8b88afaadec3259d67dfe51cb0db0f850410922d0901e081d9c9fcdc3ee5ea1094afd5a6d7fccdd
+  metadata.gz: b047ad7cab30721bb5f39921a70436938eda6359aa0e397b2598df284d53e175f87e9e25cf9fa589131ff474382013ea36a2e26736dd011405e23a86d3d16c6d
+  data.tar.gz: 0b64d308b0eec60811dff865b52f5f77f9403799e117e82d21c3f77e93ffe2cdefcb10fa49146afc6dc051d85cc452085752aec544ab552e89f1041db65d349d

data/lib/kitchen/cli.rb

@@ -186,11 +186,6 @@ module Kitchen
                       default: false,
                       desc: "Run the #{action} with debugging enabled."
       end
-      method_option :fail_fast,
-        aliases: "-f",
-        type: :boolean,
-        desc: "Fail immediately when errors occur in concurrency mode"
-
       test_base_path
       log_options
       define_method(action) do |*args|

data/lib/kitchen/command.rb

@@ -170,7 +170,6 @@ module Kitchen
             end
           end
         end
-        Thread.abort_on_exception = true if options[:fail_fast]
         threads.map(&:join)
         report_errors
       end

data/lib/kitchen/instance.rb

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

data/lib/kitchen/loader/yaml.rb

@@ -352,14 +352,7 @@ module Kitchen
       def parse_yaml_string(string, file_name)
         return {} if string.nil? || string.empty?
 
-        result =
-          if Gem::Requirement.new(">= 3.1.0").satisfied_by?(Gem::Version.new(Psych::VERSION))
-            # ruby >= 2.6.0
-            ::YAML.safe_load(string, permitted_classes: [Symbol], permitted_symbols: [], aliases: true) || {}
-          else
-            # ruby < 2.6.0
-            ::YAML.safe_load(string, [Symbol], [], true) || {}
-          end
+        result = ::YAML.safe_load(string, [Symbol], [], true) || {}
         unless result.is_a?(Hash)
           raise UserError, "Error parsing #{file_name} as YAML " \
             "(Result of parse was not a Hash, but was a #{result.class}).\n" \

data/lib/kitchen/provisioner/base.rb

@@ -105,12 +105,6 @@ module Kitchen
         false
       end
 
-      # Certain products that Test Kitchen uses to provision require accepting
-      # a license to use. Overwrite this method in the specific provisioner
-      # to implement this check.
-      def check_license
-      end
-
       # Generates a command string which will install and configure the
       # provisioner software on an instance. If no work is required, then `nil`
       # will be returned.

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

@@ -89,22 +89,14 @@ module Kitchen
         # @api private
         def policyfile
           basename = config[:policyfile_path] || config[:policyfile] || "Policyfile.rb"
-          File.expand_path(basename, config[:kitchen_root])
+          File.join(config[:kitchen_root], basename)
         end
 
         # @return [String] an absolute path to a Berksfile, relative to the
         #   kitchen root
         # @api private
         def berksfile
-          basename = config[:berksfile_path] || "Berksfile"
-          File.expand_path(basename, config[:kitchen_root])
-        end
-
-        # @return [String] an absolute path to a Cheffile, relative to the
-        #   kitchen root
-        # @api private
-        def cheffile
-          File.join(config[:kitchen_root], "Cheffile")
+          File.join(config[:kitchen_root], "Berksfile")
         end
 
         # @return [String] an absolute path to a cookbooks/ directory, relative
@@ -180,8 +172,8 @@ module Kitchen
         #
         # @api private
         def make_fake_cookbook
-          info("Policyfile, Berksfile, Cheffile, cookbooks/, or metadata.rb not found " \
-            "so Chef Infra Client will run, but do nothing. Is this intended?")
+          info("Berksfile, cookbooks/, or metadata.rb not found " \
+            "so Chef will run with effectively no cookbooks. Is this intended?")
           name = File.basename(config[:kitchen_root])
           fake_cb = File.join(tmpbooks_dir, name)
           FileUtils.mkdir_p(fake_cb)
@@ -258,9 +250,6 @@ module Kitchen
             resolve_with_policyfile
           elsif File.exist?(berksfile)
             resolve_with_berkshelf
-          elsif File.exist?(cheffile)
-            resolve_with_librarian
-            cp_site_cookbooks if File.directory?(site_cookbooks_dir)
           elsif File.directory?(cookbooks_dir)
             cp_cookbooks
           elsif File.exist?(metadata_rb)
@@ -293,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
@@ -330,15 +319,6 @@ module Kitchen
           end
         end
 
-        # Performs a Librarin-Chef cookbook resolution inside a common mutex.
-        #
-        # @api private
-        def resolve_with_librarian
-          Kitchen.mutex.synchronize do
-            Chef::Librarian.new(cheffile, tmpbooks_dir, logger: logger).resolve
-          end
-        end
-
         # @return [String] an absolute path to a site-cookbooks/ directory,
         #   relative to the kitchen root
         # @api private

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

@@ -87,7 +87,7 @@ module Kitchen
 
         private
 
-        # @return [String] path to a Policyfile
+        # @return [String] path to a Berksfile
         # @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 or Chef Workstation " \
-                          "from https://downloads.chef.io and that your PATH " \
+                          "PATH. Ensure you have installed ChefDK 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/provisioner/chef_apply.rb

@@ -107,7 +107,6 @@ module Kitchen
             "--no-color",
           ]
           args << "--logfile #{config[:log_file]}" if config[:log_file]
-          args << "--chef-license #{config[:chef_license]}" if config[:chef_license]
 
           lines << wrap_shell_code(
             [cmd, *args].join(" ")

data/lib/kitchen/provisioner/chef_base.rb

@@ -24,11 +24,9 @@ require "cgi"
 require "kitchen/provisioner/chef/policyfile"
 require "kitchen/provisioner/chef/berkshelf"
 require "kitchen/provisioner/chef/common_sandbox"
-require "kitchen/provisioner/chef/librarian"
 require "kitchen/util"
 require "mixlib/install"
 require "mixlib/install/script_generator"
-require "license_acceptance/acceptor"
 
 begin
   require "chef-config/config"
@@ -46,7 +44,6 @@ module Kitchen
       default_config :require_chef_omnibus, true
       default_config :chef_omnibus_url, "https://omnitruck.chef.io/install.sh"
       default_config :chef_omnibus_install_options, nil
-      default_config :chef_license, nil
       default_config :run_list, []
       default_config :attributes, {}
       default_config :config_path, nil
@@ -60,9 +57,6 @@ module Kitchen
       # Will try to autodetect by searching for `Policyfile.rb` if not set.
       # If set, will error if the file doesn't exist.
       default_config :policyfile_path, nil
-      # Will try to autodetect by searching for `Berksfile` if not set.
-      # If set, will error if the file doesn't exist.
-      default_config :berksfile_path, nil
       # If set to true (which is the default from `chef generate`), try to update
       # backend cookbook downloader on every kitchen run.
       default_config :always_update_cookbooks, false
@@ -249,43 +243,6 @@ module Kitchen
         end
       end
 
-      # gives us the product version from either require_chef_omnibus or product_version
-      # If the non-default (true) value of require_chef_omnibus is present use that
-      # otherwise use config[:product_version] which defaults to :latest and is the actual
-      # default for chef provisioners
-      #
-      # @return [String,Symbol,NilClass] version or nil if not applicable
-      def product_version
-        case config[:require_chef_omnibus]
-        when FalseClass
-          nil
-        when TrueClass
-          config[:product_version]
-        else
-          config[:require_chef_omnibus]
-        end
-      end
-
-      # (see Base#check_license)
-      def check_license
-        name = config[:product_name] || "chef"
-        version = product_version
-        debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}.")
-
-        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_id = acceptor.id_from_mixlib(name)
-          begin
-            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
-        end
-      end
-
       # (see Base#create_sandbox)
       def create_sandbox
         super
@@ -358,22 +315,14 @@ module Kitchen
       # @api private
       def policyfile
         policyfile_basename = config[:policyfile_path] || config[:policyfile] || "Policyfile.rb"
-        File.expand_path(policyfile_basename, config[:kitchen_root])
+        File.join(config[:kitchen_root], policyfile_basename)
       end
 
       # @return [String] an absolute path to a Berksfile, relative to the
       #   kitchen root
       # @api private
       def berksfile
-        berksfile_basename = config[:berksfile_path] || config[:berksfile] || "Berksfile"
-        File.expand_path(berksfile_basename, config[:kitchen_root])
-      end
-
-      # @return [String] an absolute path to a Cheffile, relative to the
-      #   kitchen root
-      # @api private
-      def cheffile
-        File.join(config[:kitchen_root], "Cheffile")
+        File.join(config[:kitchen_root], "Berksfile")
       end
 
       # Generates a Hash with default values for a solo.rb or client.rb Chef
@@ -384,7 +333,7 @@ module Kitchen
       def default_config_rb # rubocop:disable Metrics/MethodLength
         root = config[:root_path].gsub("$env:TEMP", "\#{ENV['TEMP']\}")
 
-        config_rb = {
+        {
           node_name: instance.name,
           checksum_path: remote_path_join(root, "checksums"),
           file_cache_path: remote_path_join(root, "cache"),
@@ -407,8 +356,6 @@ module Kitchen
           ),
           treat_deprecation_warnings_as_errors: config[:deprecations_as_errors],
         }
-        config_rb[:chef_license] = config[:chef_license] unless config[:chef_license].nil?
-        config_rb
       end
 
       # Generates a rendered client.rb/solo.rb/knife.rb formatted file as a
@@ -477,9 +424,6 @@ module Kitchen
         elsif File.exist?(berksfile)
           debug("Berksfile found at #{berksfile}, using Berkshelf to resolve cookbook dependencies")
           Chef::Berkshelf.load!(logger: logger)
-        elsif File.exist?(cheffile)
-          debug("Cheffile found at #{cheffile}, loading Librarian-Chef")
-          Chef::Librarian.load!(logger: logger)
         end
       end
 
@@ -582,18 +526,13 @@ module Kitchen
         if (config[:policyfile_path] || config[:policyfile]) && !File.exist?(policyfile)
           raise UserError, "policyfile_path set in config "\
             "(#{config[:policyfile_path]} could not be found. " \
-            "Expected to find it at full path #{policyfile}."
-        end
-        if config[:berksfile_path] && !File.exist?(berksfile)
-          raise UserError, "berksfile_path set in config "\
-            "(#{config[:berksfile_path]} could not be found. " \
-            "Expected to find it at full path #{berksfile}."
+            "Expected to find it at full path #{policyfile} " \
         end
         if File.exist?(policyfile) && !supports_policyfile?
           raise UserError, "policyfile detected, but provisioner " \
             "#{self.class.name} doesn't support Policyfiles. " \
             "Either use a different provisioner, or delete/rename " \
-            "#{policyfile}."
+            "#{policyfile}"
         end
       end
 

data/lib/kitchen/provisioner/chef_solo.rb

@@ -47,24 +47,8 @@ module Kitchen
         prepare_config_rb
       end
 
-      def modern?
-        version = config[:require_chef_omnibus]
-
-        case version
-        when nil, false, true, 11, "11", "latest"
-          true
-        else
-          if Gem::Version.correct?(version)
-            Gem::Version.new(version) >= Gem::Version.new("11.0") ? true : false
-          else
-            true
-          end
-        end
-      end
-
       # (see Base#run_command)
       def run_command
-        config[:log_level] = "info" if !modern? && config[:log_level] == "auto"
         cmd = sudo(config[:chef_solo_path]).dup
                                            .tap { |str| str.insert(0, "& ") if powershell_shell? }
 
@@ -81,13 +65,14 @@ module Kitchen
         args = [
           "--config #{remote_path_join(config[:root_path], solo_rb_filename)}",
           "--log_level #{config[:log_level]}",
+          "--force-formatter",
           "--no-color",
           "--json-attributes #{remote_path_join(config[:root_path], 'dna.json')}",
         ]
-        args << " --force-formatter" if modern?
         args << "--logfile #{config[:log_file]}" if config[:log_file]
         args << "--profile-ruby" if config[:profile_ruby]
         args << "--legacy-mode" if config[:legacy_mode]
+
         args
       end
     end

data/lib/kitchen/provisioner/chef_zero.rb

@@ -48,28 +48,12 @@ module Kitchen
       # (see Base#create_sandbox)
       def create_sandbox
         super
-        prepare_chef_client_zero_rb
         prepare_validation_pem
         prepare_config_rb
       end
 
-      # (see Base#prepare_command)
-      def prepare_command
-        return if modern?
-
-        gem_bin = remote_path_join(config[:ruby_bindir], "gem")
-                  .tap { |path| path.concat(".bat") if windows_os? }
-        vars = [
-          chef_client_zero_env,
-          shell_var("gem", sudo(gem_bin)),
-        ].join("\n").concat("\n")
-
-        prefix_command(shell_code_from_file(vars, "chef_zero_prepare_command_legacy"))
-      end
-
-      # (see Base#run_command)
       def run_command
-        cmd = modern? ? local_mode_command : shim_command
+        cmd = "#{sudo(config[:chef_client_path])} --local-mode".tap { |str| str.insert(0, "& ") if powershell_shell? }
 
         chef_cmd(cmd)
       end
@@ -88,9 +72,8 @@ module Kitchen
           args << "--json-attributes #{json}"
         end
         args << "--logfile #{config[:log_file]}" if config[:log_file]
-        return unless modern?
 
-        # these flags are modern/chef-client local most only and will not work
+        # these flags are chef-client local mode only and will not work
         # on older versions of chef-client
         if config[:chef_zero_host]
           args << "--chef-zero-host #{config[:chef_zero_host]}"
@@ -137,60 +120,6 @@ module Kitchen
         ].join("\n").concat("\n")
       end
 
-      # Returns the command that will run chef client in local mode (a.k.a.
-      # chef zero mode).
-      #
-      # @return [String] the command string
-      # @api private
-      def local_mode_command
-        "#{sudo(config[:chef_client_path])} --local-mode"
-          .tap { |str| str.insert(0, "& ") if powershell_shell? }
-      end
-
-      # Determines whether or not local mode (a.k.a chef zero mode) is
-      # supported in the version of Chef as determined by inspecting the
-      # require_chef_omnibus config variable.
-      #
-      # The only way this method returns false is if require_chef_omnibus has
-      # an explicit version set to less than 11.8.0, when chef zero mode was
-      # introduced. Otherwise a modern Chef installation is assumed.
-      #
-      # @return [true,false] whether or not the desired version of Chef
-      #   supports local mode
-      # @api private
-      def modern?
-        version = config[:require_chef_omnibus]
-
-        case version
-        when nil, false, true, 11, "11", "latest"
-          true
-        else
-          if Gem::Version.correct?(version)
-            Gem::Version.new(version) >= Gem::Version.new("11.8.0") ? true : false
-          else
-            # Build versions of chef, for example
-            # 12.5.0-current.0+20150721082808.git.14.c91b337-1
-            true
-          end
-        end
-      end
-
-      # Writes a chef-client local-mode shim script to the sandbox directory
-      # only if the desired version of Chef is old enough. The version of Chef
-      # is determined using the `config[:require_chef_omnibus]` value.
-      #
-      # @api private
-      def prepare_chef_client_zero_rb
-        return if modern?
-
-        info("Preparing chef-client-zero.rb")
-        debug("Using a vendored chef-client-zero.rb")
-
-        source = File.join(File.dirname(__FILE__),
-                           %w{.. .. .. support chef-client-zero.rb})
-        FileUtils.cp(source, File.join(sandbox_path, "chef-client-zero.rb"))
-      end
-
       # Writes a fake (but valid) validation.pem into the sandbox directory.
       #
       # @api private

data/lib/kitchen/transport/ssh.rb

@@ -232,7 +232,7 @@ module Kitchen
           Errno::EACCES, Errno::EALREADY, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
           Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH, Errno::EPIPE,
           Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout,
-          Net::SSH::Proxy::ConnectError, Timeout::Error
+          Timeout::Error
         ].freeze
 
         # @return [Integer] cap on number of parallel ssh sessions we can use
@@ -498,9 +498,9 @@ module Kitchen
         opts[:forward_agent] = data[:forward_agent] if data.key?(:forward_agent)
         opts[:verbose] = data[:verbose].to_sym      if data.key?(:verbose)
 
-        # disable host key verification. The hash key to use
-        # depends on the version of net-ssh in use.
-        opts[verify_host_key_option] = false
+        # disable host key verification. The hash key and value to use
+        # depend on the version of net-ssh in use
+        opts[verify_host_key_option] = verify_host_key_value
 
         opts
       end
@@ -524,6 +524,18 @@ module Kitchen
         current_net_ssh >= new_option_version ? :verify_host_key : :paranoid
       end
 
+      #
+      # Returns the correct host-key-verification option value to use depending
+      # on what version of net-ssh is in use. In net-ssh <= 5, the supported
+      # parameter is false but in 5.0, it became `:never`
+      #
+      def verify_host_key_value
+        current_net_ssh = Net::SSH::Version::CURRENT
+        new_option_version = Net::SSH::Version[5, 0, 0]
+
+        current_net_ssh >= new_option_version ? :never : false
+      end
+
       # Creates a new SSH Connection instance and save it for potential future
       # reuse.
       #

data/lib/kitchen/verifier/busser.rb

@@ -182,7 +182,7 @@ module Kitchen
         # to be under /tmp/verifier
         args = gem
         args += " --version #{version}" if version
-        args += " --no-document --no-format-executable -n #{gem_bin}"
+        args += " --no-rdoc --no-ri --no-format-executable -n #{gem_bin}"
         args += " --no-user-install"
         args
       end

data/lib/kitchen/version.rb

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

data/test-kitchen.gemspec

@@ -24,18 +24,14 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.3"
 
   gem.add_dependency "mixlib-shellout", ">= 1.2", "< 3.0"
-  gem.add_dependency "net-scp", ">= 1.1", "< 3.0" # pinning until we can confirm 3+ works
-  gem.add_dependency "net-ssh", ">= 2.9", "< 5.0"
+  gem.add_dependency "net-scp",         ">= 1.1", "< 3.0" # pinning until we can confirm 3+ works
+  gem.add_dependency "net-ssh",         ">= 2.9", "< 6.0" # pinning until we can confirm 6+ works
   gem.add_dependency "net-ssh-gateway", ">= 1.2", "< 3.0" # pinning until we can confirm 3+ works
   gem.add_dependency "thor",            "~> 0.19"
   gem.add_dependency "mixlib-install",  "~> 3.6"
-  gem.add_dependency "winrm", "~> 2.0"
-  gem.add_dependency "winrm-elevated", "~> 1.0"
-  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.11"
+  gem.add_dependency "winrm",           "~> 2.0"
+  gem.add_dependency "winrm-elevated",  "~> 1.0"
+  gem.add_dependency "winrm-fs",        "~> 1.1"
 
   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: 1.25.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -59,7 +59,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
@@ -160,26 +160,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: license-acceptance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -381,7 +361,6 @@ files:
 - lib/kitchen/provisioner/base.rb
 - lib/kitchen/provisioner/chef/berkshelf.rb
 - lib/kitchen/provisioner/chef/common_sandbox.rb
-- lib/kitchen/provisioner/chef/librarian.rb
 - lib/kitchen/provisioner/chef/policyfile.rb
 - lib/kitchen/provisioner/chef_apply.rb
 - lib/kitchen/provisioner/chef_base.rb
@@ -412,13 +391,10 @@ files:
 - support/busser_install_command.ps1
 - support/busser_install_command.sh
 - support/chef-client-fail-if-update-handler.rb
-- support/chef-client-zero.rb
 - support/chef_base_init_command.ps1
 - support/chef_base_init_command.sh
 - support/chef_base_install_command.ps1
 - support/chef_base_install_command.sh
-- support/chef_zero_prepare_command_legacy.ps1
-- support/chef_zero_prepare_command_legacy.sh
 - support/download_helpers.sh
 - support/dummy-validation.pem
 - templates/driver/CHANGELOG.md.erb

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

@@ -1,112 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2013, Fletcher Nichol
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "kitchen/errors"
-require "kitchen/logging"
-
-module Kitchen
-  module Provisioner
-    module Chef
-      # Chef cookbook resolver that uses Librarian-Chef and a Cheffile to
-      # calculate dependencies.
-      #
-      # @author Fletcher Nichol <fnichol@nichol.ca>
-      class Librarian
-        include Logging
-
-        # Creates a new cookbook resolver.
-        #
-        # @param cheffile [String] path to a Cheffile
-        # @param path [String] path in which to vendor the resulting
-        #   cookbooks
-        # @param logger [Kitchen::Logger] a logger to use for output, defaults
-        #   to `Kitchen.logger`
-        def initialize(cheffile, path, logger: Kitchen.logger)
-          @cheffile   = cheffile
-          @path       = path
-          @logger     = logger
-        end
-
-        # Loads the library code required to use the resolver.
-        #
-        # @param logger [Kitchen::Logger] a logger to use for output, defaults
-        #   to `Kitchen.logger`
-        def self.load!(logger: Kitchen.logger)
-          load_librarian!(logger)
-        end
-
-        # Performs the cookbook resolution and vendors the resulting cookbooks
-        # in the desired path.
-        def resolve
-          version = ::Librarian::Chef::VERSION
-          info("Resolving cookbook dependencies with Librarian-Chef #{version}...")
-          debug("Using Cheffile from #{cheffile}")
-
-          env = ::Librarian::Chef::Environment.new(
-            project_path: File.dirname(cheffile))
-          env.config_db.local["path"] = path
-          ::Librarian::Action::Resolve.new(env).run
-          ::Librarian::Action::Install.new(env).run
-        end
-
-        private
-
-        # @return [String] path to a Cheffile
-        # @api private
-        attr_reader :cheffile
-
-        # @return [String] path in which to vendor the resulting cookbooks
-        # @api private
-        attr_reader :path
-
-        # @return [Kitchen::Logger] a logger to use for output
-        # @api private
-        attr_reader :logger
-
-        class << self
-          private
-
-          # Load the Librarian-specific libary code.
-          #
-          # @param logger [Kitchen::Logger] the logger to use
-          # @raise [UserError] if the library couldn't be loaded
-          # @api private
-          def load_librarian!(logger)
-            first_load = require "librarian/chef/environment"
-            require "librarian/action/resolve"
-            require "librarian/action/install"
-
-            version = ::Librarian::Chef::VERSION
-            if first_load
-              logger.debug("Librarian-Chef #{version} library loaded")
-            else
-              logger.debug("Librarian-Chef #{version} previously loaded")
-            end
-          rescue LoadError => e
-            logger.fatal("The `librarian-chef' gem is missing and must be installed" \
-              " or cannot be properly activated. Run" \
-              " `gem install librarian-chef` or add the following to your" \
-              " Gemfile if you are using Bundler: `gem 'librarian-chef'`.")
-            raise UserError,
-                  "Could not load or activate Librarian-Chef (#{e.message})"
-          end
-        end
-      end
-    end
-  end
-end

data/support/chef-client-zero.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2013, Fletcher Nichol
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "rubygems"
-require "chef/config"
-require "chef_zero/server"
-require "chef/chef_fs/chef_fs_data_store"
-require "chef/chef_fs/config"
-require "English"
-require "fileutils"
-
-# Bust out of our self-imposed sandbox before running chef-client so
-# gems installed via gem_package land in Chef's GEM_HOME.
-#
-# https://github.com/chef/test-kitchen/issues/240
-#
-ENV["GEM_HOME"] = ENV["GEM_PATH"] = ENV["GEM_CACHE"] = nil
-
-class ChefClientZero
-  def self.start
-    new.run
-  end
-
-  def run
-    create_chef_zero_server
-    run_chef_client
-  end
-
-  private
-
-  def create_chef_zero_server
-    Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(repo_path)
-
-    chef_fs = Chef::ChefFS::Config.new.local_fs
-    chef_fs.write_pretty_json = true
-
-    @server = ChefZero::Server.new(
-      generate_real_keys: false,
-      data_store: Chef::ChefFS::ChefFSDataStore.new(chef_fs)
-    )
-    puts "-----> Starting Chef Zero server in #{chef_fs.fs_description}"
-    @server.start_background
-
-    at_exit do
-      puts "-----> Shutting down Chef Zero server"
-      @server.stop
-    end
-  end
-
-  def repo_path
-    ENV.fetch("CHEF_REPO_PATH", Dir.pwd)
-  end
-
-  def run_chef_client
-    system("chef-client", *ARGV)
-    raise if $CHILD_STATUS != 0
-  end
-end
-
-ChefClientZero.start

data/support/chef_zero_prepare_command_legacy.ps1

@@ -1,9 +0,0 @@
-# we are installing the first version of chef that bundled chef-zero in order
-# to get chef-zero and Chef::ChefFS only. The version of Chef that gets run
-# will be the installed omnibus package. Yep, this is funky :)
-
-if ((& "$gem" list chef-zero -i) -ne "true") {
-  Write-Host ">>>>>> Attempting to use chef-zero with old version of Chef`n"
-  Write-Host "-----> Installing chef zero dependencies`n"
-  & "$gem" install chef --version 11.8.0 --no-ri --no-rdoc --conservative
-}

data/support/chef_zero_prepare_command_legacy.sh

@@ -1,10 +0,0 @@
-# we are installing the first version of chef that bundled chef-zero in order
-# to get chef-zero and Chef::ChefFS only. The version of Chef that gets run
-# will be the installed omnibus package. Yep, this is funky :)
-
-$gem list chef-zero -i 2>&1 >/dev/null
-if test $? -ne 0 ; then
-  echo ">>>>>> Attempting to use chef-zero with old version of Chef"
-  echo "-----> Installing chef zero dependencies"
-  $gem install chef --version 11.8.0 --no-ri --no-rdoc --conservative
-fi