test-kitchen 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f760d057e0cf90d483e03c622c08ea54a17064
-  data.tar.gz: b2a22c93d0be6c6cb8c623ae61fdf395a48b83a1
+  metadata.gz: 81b8adb0709ab4a153dcc6a0eba1c51e871d7dde
+  data.tar.gz: 97fbf58b65c2696f67dfae8c70ba089f14ef0ba9
 SHA512:
-  metadata.gz: f323c65e242a8de0fdeef2626ed5a6b397f116fed2587e35f7add1902c7c1a9ca601a2b781b0abe55e4bc69c0f452c158976c9d025db5320425d76478e87cbc5
-  data.tar.gz: 279c722139b269f198c2a4abd6e17520ec342809d2c1300e9fb787700f0e2b04adfb2c912733b0a4733ac76dd416503fc6d1915956df6ea254b971e1c86caaee
+  metadata.gz: 1d21fba7803bdf1592b7d1554cf4897f98817470d7559422f72f6fb8fbba38257484acf12dc89ee4f20cf7a0146053016a5f7c7b517ef7d8bf2591366e268a31
+  data.tar.gz: 32d72aac0d92f2c8dc12e0d1a4e66589d126c90f3c6f937230d28ef591a33e4e722a91613c6b316183360634457858f9f4e0c7bdc76f1afc88e024b49514600d

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.2.4
-  - 2.1.8
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
   - ruby-head
 
 env:
@@ -32,7 +33,7 @@ branches:
 
 matrix:
   include:
-    - rvm: 2.2.4
+    - rvm: 2.2.5
       # To run the proxy tests we need additional gems than what Test Kitchen normally uses
       # for testing
       gemfile: Gemfile.proxy_tests

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [v1.12.0](https://github.com/test-kitchen/test-kitchen/tree/v1.12.0) (2016-09-02)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.11.1...v1.12.0)
+
+**Implemented enhancements:**
+
+- Use winrm v2 release gems [\#1061](https://github.com/test-kitchen/test-kitchen/pull/1061) ([mwrock](https://github.com/mwrock))
+- Add a new config option always\_update\_cookbooks [\#1107](https://github.com/test-kitchen/test-kitchen/pull/1107) ([coderanger](https://github.com/coderanger))
+- Always run `chef install` even if the lock file exists. [\#1103](https://github.com/test-kitchen/test-kitchen/pull/1103) ([coderanger](https://github.com/coderanger))
+- support passing Kitchen::Config Hash keys to Kitchen::RakeTasks.new [\#1102](https://github.com/test-kitchen/test-kitchen/pull/1102) ([theckman](https://github.com/theckman))
+
 ## [v1.11.1](https://github.com/test-kitchen/test-kitchen/tree/v1.11.1) (2016-08-13)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.11.0...v1.11.1)
 

data/Gemfile

@@ -3,9 +3,11 @@ source "https://rubygems.org"
 gemspec
 gem "rack", "< 2.0"
 
+gem "train", :github => "chef/train", :branch => "winrm-v2"
+
 group :integration do
   gem "berkshelf", "~> 4.3"
-  gem "kitchen-inspec", "~> 0.12.5"
+  gem "kitchen-inspec", :git => "https://github.com/mwrock/kitchen-inspec", :branch => "winrm-v2"
 end
 
 group :test do

data/features/step_definitions/gem_steps.rb

@@ -3,34 +3,34 @@
 require "tmpdir"
 require "pathname"
 
-Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
-  backup_envvar("GEM_HOME")
-  backup_envvar("GEM_PATH")
+# Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
+#   backup_envvar("GEM_HOME")
+#   backup_envvar("GEM_PATH")
 
-  @aruba_timeout_seconds = 30
+#   @aruba_timeout_seconds = 30
 
-  gem_home = Pathname.new(Dir.mktmpdir(name))
-  aruba.environment["GEM_HOME"] = gem_home.to_s
-  aruba.environment["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
-  @cleanup_dirs << gem_home
-end
+#   gem_home = Pathname.new(Dir.mktmpdir(name))
+#   aruba.environment["GEM_HOME"] = gem_home.to_s
+#   aruba.environment["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
+#   @cleanup_dirs << gem_home
+# end
 
-Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, version|
-  unbundlerize do
-    run_simple(
-      sanitize_text("gem list #{name} --version #{version} -i"),
-      :fail_on_error => true,
-      :exit_timeout => nil
-     )
-  end
-end
+# Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, version|
+#   unbundlerize do
+#     run_simple(
+#       sanitize_text("gem list #{name} --version #{version} -i"),
+#       :fail_on_error => true,
+#       :exit_timeout => nil
+#      )
+#   end
+# end
 
-Then(/^a gem named "(.*?)" is installed$/) do |name|
-  unbundlerize do
-    run_simple(
-      sanitize_text("gem list #{name} -i"),
-      :fail_on_error => true,
-      :exit_timeout => nil
-     )
-  end
-end
+# Then(/^a gem named "(.*?)" is installed$/) do |name|
+#   unbundlerize do
+#     run_simple(
+#       sanitize_text("gem list #{name} -i"),
+#       :fail_on_error => true,
+#       :exit_timeout => nil
+#      )
+#   end
+# end

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

@@ -40,17 +40,18 @@ module Kitchen
         #   cookbooks
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
         #   to `Kitchen.logger`
-        def initialize(berksfile, path, logger = Kitchen.logger)
+        def initialize(berksfile, path, logger: Kitchen.logger, always_update: false)
           @berksfile  = berksfile
           @path       = path
           @logger     = logger
+          @always_update = always_update
         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)
+        def self.load!(logger: Kitchen.logger)
           load_berkshelf!(logger)
         end
 
@@ -62,13 +63,11 @@ module Kitchen
           debug("Using Berksfile from #{berksfile}")
 
           ::Berkshelf.ui.mute do
-            if ::Berkshelf::Berksfile.method_defined?(:vendor)
-              # Berkshelf 3.0 requires the directory to not exist
-              FileUtils.rm_rf(path)
-              ::Berkshelf::Berksfile.from_file(berksfile).vendor(path)
-            else
-              ::Berkshelf::Berksfile.from_file(berksfile).install(:path => path)
-            end
+            berksfile_obj = ::Berkshelf::Berksfile.from_file(berksfile)
+            berksfile_obj.update if always_update
+            # Berkshelf requires the directory to not exist
+            FileUtils.rm_rf(path)
+            berksfile_obj.vendor(path)
           end
         end
 
@@ -86,6 +85,10 @@ module Kitchen
         # @api private
         attr_reader :logger
 
+        # @return [Boolean] If true, always update cookbooks in Berkshelf.
+        # @api private
+        attr_reader :always_update
+
         # Load the Berkshelf-specific libary code.
         #
         # @param logger [Kitchen::Logger] the logger to use

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

@@ -301,13 +301,13 @@ module Kitchen
                  "kitchen config. The run_list in your config will be ignored.")
             warn("Ignored run_list: #{config[:run_list].inspect}")
           end
-          policylock = policyfile.gsub(/\.rb\Z/, ".lock.json")
-          unless File.exist?(policylock)
-            Kitchen.mutex.synchronize do
-              Chef::Policyfile.new(policyfile, sandbox_path, logger).compile
-            end
+          policy = Chef::Policyfile.new(policyfile, sandbox_path,
+            :logger => logger,
+            :always_update => config[:always_update_cookbooks])
+          Kitchen.mutex.synchronize do
+            policy.compile
           end
-          policy_name = JSON.parse(IO.read(policylock))["name"]
+          policy_name = JSON.parse(IO.read(policy.lockfile))["name"]
           policy_group = "local"
           config[:attributes].merge(:policy_name => policy_name, :policy_group => policy_group)
         end
@@ -317,7 +317,9 @@ module Kitchen
         # @api private
         def resolve_with_policyfile
           Kitchen.mutex.synchronize do
-            Chef::Policyfile.new(policyfile, sandbox_path, logger).resolve
+            Chef::Policyfile.new(policyfile, sandbox_path,
+              :logger => logger,
+              :always_update => config[:always_update_cookbooks]).resolve
           end
         end
 
@@ -326,7 +328,9 @@ module Kitchen
         # @api private
         def resolve_with_berkshelf
           Kitchen.mutex.synchronize do
-            Chef::Berkshelf.new(berksfile, tmpbooks_dir, logger).resolve
+            Chef::Berkshelf.new(berksfile, tmpbooks_dir,
+              :logger => logger,
+              :always_update => config[:always_update_cookbooks]).resolve
           end
         end
 
@@ -335,7 +339,7 @@ module Kitchen
         # @api private
         def resolve_with_librarian
           Kitchen.mutex.synchronize do
-            Chef::Librarian.new(cheffile, tmpbooks_dir, logger).resolve
+            Chef::Librarian.new(cheffile, tmpbooks_dir, :logger => logger).resolve
           end
         end
 

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

@@ -40,7 +40,7 @@ module Kitchen
         #   cookbooks
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
         #   to `Kitchen.logger`
-        def initialize(cheffile, path, logger = Kitchen.logger)
+        def initialize(cheffile, path, logger: Kitchen.logger)
           @cheffile   = cheffile
           @path       = path
           @logger     = logger
@@ -50,7 +50,7 @@ module Kitchen
         #
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
         #   to `Kitchen.logger`
-        def self.load!(logger = Kitchen.logger)
+        def self.load!(logger: Kitchen.logger)
           load_librarian!(logger)
         end
 

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

@@ -44,17 +44,18 @@ module Kitchen
         #   cookbooks
         # @param logger [Kitchen::Logger] a logger to use for output, defaults
         #   to `Kitchen.logger`
-        def initialize(policyfile, path, logger = Kitchen.logger)
+        def initialize(policyfile, path, logger: Kitchen.logger, always_update: false)
           @policyfile = policyfile
           @path       = path
           @logger     = logger
+          @always_update = always_update
         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)
+        def self.load!(logger: Kitchen.logger)
           detect_chef_command!(logger)
         end
 
@@ -68,11 +69,26 @@ module Kitchen
         # Runs `chef install` to determine the correct cookbook set and
         # generate the policyfile lock.
         def compile
-          info("Policy lock file doesn't exist, running `chef install` for "\
-               "Policyfile #{policyfile}...")
+          if always_update
+            info("Updating policy lock using `chef update`")
+            run_command("chef update #{escape_path(policyfile)}")
+          end
+          if File.exist?(lockfile)
+            info("Installing cookbooks for Policyfile #{policyfile} using `chef install`")
+          else
+            info("Policy lock file doesn't exist, running `chef install` for "\
+                 "Policyfile #{policyfile}...")
+          end
           run_command("chef install #{escape_path(policyfile)}")
         end
 
+        # Return the path to the lockfile corresponding to this policyfile.
+        #
+        # @return [String]
+        def lockfile
+          policyfile.gsub(/\.rb\Z/, ".lock.json")
+        end
+
         private
 
         # @return [String] path to a Berksfile
@@ -87,6 +103,10 @@ module Kitchen
         # @api private
         attr_reader :logger
 
+        # @return [Boolean] If true, always update cookbooks in the policy.
+        # @api private
+        attr_reader :always_update
+
         # Ensure the `chef` command is in the path.
         #
         # @param logger [Kitchen::Logger] the logger to use

data/lib/kitchen/provisioner/chef_base.rb

@@ -59,6 +59,9 @@ 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
+      # 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
       default_config :cookbook_files_glob, %w[
         README.* metadata.{json,rb}
         attributes/**/* definitions/**/* files/**/* libraries/**/*
@@ -281,13 +284,13 @@ module Kitchen
         super
         if File.exist?(policyfile)
           debug("Policyfile found at #{policyfile}, using Policyfile to resolve dependencies")
-          Chef::Policyfile.load!(logger)
+          Chef::Policyfile.load!(:logger => logger)
         elsif File.exist?(berksfile)
           debug("Berksfile found at #{berksfile}, loading Berkshelf")
-          Chef::Berkshelf.load!(logger)
+          Chef::Berkshelf.load!(:logger => logger)
         elsif File.exist?(cheffile)
           debug("Cheffile found at #{cheffile}, loading Librarian-Chef")
-          Chef::Librarian.load!(logger)
+          Chef::Librarian.load!(:logger => logger)
         end
       end
 
@@ -344,6 +347,11 @@ module Kitchen
         installer.install_command
       end
 
+      # Hook used in subclasses to indicate support for policyfiles.
+      #
+      # @abstract
+      # @return [Boolean]
+      # @api private
       def supports_policyfile?
         false
       end

data/lib/kitchen/rake_tasks.rb

@@ -30,14 +30,14 @@ module Kitchen
     # Creates Kitchen Rake tasks and allows the callee to configure it.
     #
     # @yield [self] gives itself to the block
-    def initialize
+    def initialize(cfg = {})
       @loader = Kitchen::Loader::YAML.new(
         :project_config => ENV["KITCHEN_YAML"],
         :local_config => ENV["KITCHEN_LOCAL_YAML"],
         :global_config => ENV["KITCHEN_GLOBAL_YAML"]
       )
       @config = Kitchen::Config.new(
-        :loader => @loader
+        { :loader => @loader }.merge(cfg)
       )
       Kitchen.logger = Kitchen.default_file_logger(nil, false)
       yield self if block_given?

data/lib/kitchen/transport/winrm.rb

@@ -84,13 +84,12 @@ module Kitchen
       class Connection < Kitchen::Transport::Base::Connection
         # (see Base::Connection#close)
         def close
-          return if @session.nil?
-
-          session.close
+          @unelevated_session.close if @unelevated_session
+          @elevated_session.close if @elevated_session
         ensure
+          @unelevated_session = nil
+          @elevated_session = nil
           @file_transporter = nil
-          @session = nil
-          @elevated_runner = nil
         end
 
         # (see Base::Connection#execute)
@@ -98,9 +97,6 @@ module Kitchen
           return if command.nil?
           logger.debug("[WinRM] #{self} (#{command})")
 
-          if command.length > MAX_COMMAND_SIZE
-            command = run_from_file_command(command)
-          end
           exit_code, stderr = execute_with_exit_code(command)
 
           if logger.debug? && exit_code == 0
@@ -137,7 +133,7 @@ module Kitchen
         # (see Base::Connection#wait_until_ready)
         def wait_until_ready
           delay = 3
-          session(
+          unelevated_session(
             :retry_limit => max_wait_until_ready / delay,
             :retry_delay => delay
           )
@@ -148,11 +144,6 @@ module Kitchen
 
         PING_COMMAND = "Write-Host '[WinRM] Established\n'".freeze
 
-        # Maximum string to send to the transport to execute. WinRM has an 8000 character
-        # command line limit. The original command string is coverted to a base 64 encoded
-        # UTF-16 string which will double the string size.
-        MAX_COMMAND_SIZE = 3000
-
         # @return [Integer] how many times to retry when failing to execute
         #   a command or transfer files
         # @api private
@@ -163,10 +154,6 @@ module Kitchen
         # @api private
         attr_reader :connection_retry_sleep
 
-        # @return [String] the endpoint URL of the remote WinRM host
-        # @api private
-        attr_reader :endpoint
-
         # @return [String] display name for the associated instance
         # @api private
         attr_reader :instance_name
@@ -185,11 +172,6 @@ module Kitchen
         # @api private
         attr_reader :rdp_port
 
-        # @return [Symbol] the transport strategy to use when constructing a
-        #   `WinRM::WinRMWebService`
-        # @api private
-        attr_reader :winrm_transport
-
         # @return [Boolean] whether to use winrm-elevated for running commands
         # @api private
         attr_reader :elevated
@@ -202,7 +184,7 @@ module Kitchen
         # @api private
         def create_rdp_doc(opts = {})
           content = Util.outdent!(<<-RDP)
-            full address:s:#{URI.parse(endpoint).host}:#{rdp_port}
+            full address:s:#{URI.parse(options[:endpoint]).host}:#{rdp_port}
             prompt for credentials:i:1
             username:s:#{options[:user]}
           RDP
@@ -227,33 +209,26 @@ module Kitchen
         # @api private
         def execute_with_exit_code(command)
           if elevated
-            unless options[:elevated_username] == options[:user]
-              command = "$env:temp='#{unelevated_temp_dir}';#{command}"
-            end
-            response = elevated_runner.powershell_elevated(
-              command,
-              options[:elevated_username],
-              options[:elevated_password]
-            ) do |stdout, _|
-              logger << stdout if stdout
-            end
+            session = elevated_session
+            command = "$env:temp='#{unelevated_temp_dir}';#{command}"
           else
-            response = session.run_powershell_script(command) do |stdout, _|
-              logger << stdout if stdout
-            end
+            session = unelevated_session
           end
 
-          [response[:exitcode], response.stderr]
+          response = session.run(command) do |stdout, _|
+            logger << stdout if stdout
+          end
+          [response.exitcode, response.stderr]
         end
 
         def unelevated_temp_dir
-          @unelevated_temp_dir ||= session.run_powershell_script("$env:temp").stdout.chomp
+          @unelevated_temp_dir ||= unelevated_session.run("$env:temp").stdout.chomp
         end
 
         # @return [Winrm::FileTransporter] a file transporter
         # @api private
         def file_transporter
-          @file_transporter ||= WinRM::FS::Core::FileTransporter.new(session)
+          @file_transporter ||= WinRM::FS::Core::FileTransporter.new(unelevated_session)
         end
 
         # (see Base#init_options)
@@ -261,9 +236,7 @@ module Kitchen
           super
           @instance_name      = @options.delete(:instance_name)
           @kitchen_root       = @options.delete(:kitchen_root)
-          @endpoint           = @options.delete(:endpoint)
           @rdp_port           = @options.delete(:rdp_port)
-          @winrm_transport    = @options.delete(:winrm_transport)
           @connection_retries = @options.delete(:connection_retries)
           @connection_retry_sleep = @options.delete(:connection_retry_sleep)
           @max_wait_until_ready   = @options.delete(:max_wait_until_ready)
@@ -297,8 +270,8 @@ module Kitchen
         # @api private
         def login_command_for_linux
           args  = %W[-u #{options[:user]}]
-          args += %W[-p #{options[:pass]}] if options.key?(:pass)
-          args += %W[#{URI.parse(endpoint).host}:#{rdp_port}]
+          args += %W[-p #{options[:password]}] if options.key?(:password)
+          args += %W[#{URI.parse(options[:endpoint]).host}:#{rdp_port}]
 
           LoginCommand.new("rdesktop", args)
         end
@@ -333,36 +306,40 @@ module Kitchen
         # the first time.
         #
         # @param retry_options [Hash] retry options for the initial connection
-        # @return [Winrm::CommandExecutor] the command executor session
+        # @return [Winrm::Shells::Powershell] the command shell session
         # @api private
-        def session(retry_options = {})
-          @session ||= service(retry_options).create_executor
+        def unelevated_session(retry_options = {})
+          @unelevated_session ||= connection(retry_options).shell(:powershell)
         end
 
-        # Creates the elevated runner for running elevated commands
+        # Creates an elevated session for running commands via a scheduled task
         #
-        # @return [Winrm::Elevated::Runner] the elevated runner
+        # @return [Winrm::Shells::Elevated] the elevated shell
         # @api private
-        def elevated_runner
-          @elevated_runner ||= WinRM::Elevated::Runner.new(session)
+        def elevated_session(retry_options = {})
+          @elevated_session ||= begin
+            connection(retry_options).shell(:elevated).tap do |shell|
+              shell.username = options[:elevated_username]
+              shell.password = options[:elevated_password]
+            end
+          end
         end
 
-        # Creates a winrm web service instance
+        # Creates a winrm Connection instance
         #
         # @param retry_options [Hash] retry options for the initial connection
-        # @return [Winrm::WinRMWebService] the winrm web service
+        # @return [Winrm::Connection] the winrm connection
         # @api private
-        def service(retry_options = {})
-          @service ||= begin
+        def connection(retry_options = {})
+          @connection ||= begin
             opts = {
               :retry_limit => connection_retries.to_i,
               :retry_delay   => connection_retry_sleep.to_i
             }.merge(retry_options)
 
-            service_args = [endpoint, winrm_transport, options.merge(opts)]
-            svc = ::WinRM::WinRMWebService.new(*service_args)
-            svc.logger = logger
-            svc
+            ::WinRM::Connection.new(options.merge(opts)).tap do |conn|
+              conn.logger = logger
+            end
           end
         end
 
@@ -371,40 +348,15 @@ module Kitchen
         #
         # @api private
         def to_s
-          "#{winrm_transport}::#{endpoint}<#{options.inspect}>"
-        end
-
-        # takes a long (greater than 3000 characters) command and saves it to a
-        # file and uploads it to the test instance.
-        #
-        # @param command [String] a long command to be saved and uploaded
-        # @return [String] a command that executes the uploaded script
-        # @api private
-        def run_from_file_command(command)
-          temp_dir = Dir.mktmpdir("kitchen-long-script")
-          begin
-            script_name = "#{instance_name}-long_script.ps1"
-            script_path = File.join(temp_dir, script_name)
-
-            File.open(script_path, "wb") do |file|
-              file.write(command)
-            end
-
-            target_path = File.join("$env:TEMP", script_name)
-            upload(script_path, target_path)
-
-            %{powershell -ExecutionPolicy Bypass -File "#{target_path}"}
-          ensure
-            FileUtils.rmtree(temp_dir)
-          end
+          "<#{options.inspect}>"
         end
       end
 
       private
 
-      WINRM_SPEC_VERSION = ["~> 1.6"].freeze
-      WINRM_FS_SPEC_VERSION = ["~> 0.4.1"].freeze
-      WINRM_ELEVATED_SPEC_VERSION = ["~> 0.4.0"].freeze
+      WINRM_SPEC_VERSION = ["~> 2.0"].freeze
+      WINRM_FS_SPEC_VERSION = ["~> 1.0"].freeze
+      WINRM_ELEVATED_SPEC_VERSION = ["~> 1.0"].freeze
 
       # Builds the hash of options needed by the Connection object on
       # construction.
@@ -422,17 +374,17 @@ module Kitchen
           :logger => logger,
           :endpoint => data[:endpoint_template] % data,
           :user => data[:username],
-          :pass => data[:password],
+          :password => data[:password],
           :rdp_port => data[:rdp_port],
           :connection_retries => data[:connection_retries],
           :connection_retry_sleep => data[:connection_retry_sleep],
           :max_wait_until_ready => data[:max_wait_until_ready],
-          :winrm_transport => data[:winrm_transport],
+          :transport => data[:winrm_transport],
           :elevated => data[:elevated],
           :elevated_username => data[:elevated_username] || data[:username],
           :elevated_password => elevated_password
         }
-        opts.merge!(additional_transport_args(opts[:winrm_transport]))
+        opts.merge!(additional_transport_args(opts[:transport]))
         opts
       end
 

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.11.1"
+  VERSION = "1.12.0"
 end

data/spec/kitchen/provisioner/chef/policyfile_spec.rb

@@ -27,7 +27,7 @@ describe Kitchen::Provisioner::Chef::Policyfile do
          :debug => nil, :banner => nil)
   end
   let(:described_object) do
-    Kitchen::Provisioner::Chef::Policyfile.new(policyfile, path, null_logger)
+    Kitchen::Provisioner::Chef::Policyfile.new(policyfile, path, :logger => null_logger)
   end
   let(:os) { "" }
   before do

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -895,7 +895,11 @@ describe Kitchen::Provisioner::ChefBase do
 
       describe "with a Policyfile under kitchen_root" do
 
-        let(:resolver) { stub(:resolve => true) }
+        let(:policyfile_path) { "#{kitchen_root}/Policyfile.rb" }
+        let(:policyfile_lock_path) { "#{kitchen_root}/Policyfile.lock.json" }
+        let(:resolver) {
+          stub(:compile => true, :resolve => true, :lockfile => policyfile_lock_path)
+        }
 
         describe "with the default name `Policyfile.rb`" do
           before do
@@ -948,13 +952,14 @@ POLICYFILE
             end
 
             it "uses uses the policyfile to resolve dependencies" do
+              resolver.expects(:compile)
               resolver.expects(:resolve)
 
               provisioner.create_sandbox
             end
 
             it "uses Kitchen.mutex for resolving" do
-              Kitchen.mutex.expects(:synchronize)
+              Kitchen.mutex.expects(:synchronize).twice
 
               provisioner.create_sandbox
             end
@@ -1014,6 +1019,7 @@ POLICYFILE
 
             it "uses uses the policyfile to resolve dependencies" do
               Kitchen::Provisioner::Chef::Policyfile.stubs(:load!)
+              resolver.expects(:compile)
               resolver.expects(:resolve)
 
               provisioner.create_sandbox
@@ -1026,6 +1032,7 @@ POLICYFILE
                 returns(resolver)
 
               Kitchen::Provisioner::Chef::Policyfile.stubs(:load!)
+              resolver.expects(:compile)
               resolver.expects(:resolve)
 
               provisioner.create_sandbox
@@ -1095,6 +1102,7 @@ POLICYFILE
 
             it "uses uses the policyfile to resolve dependencies" do
               Kitchen::Provisioner::Chef::Policyfile.stubs(:load!)
+              resolver.expects(:compile)
               resolver.expects(:resolve)
 
               provisioner.create_sandbox
@@ -1107,6 +1115,7 @@ POLICYFILE
                 returns(resolver)
 
               Kitchen::Provisioner::Chef::Policyfile.stubs(:load!)
+              resolver.expects(:compile)
               resolver.expects(:resolve)
 
               provisioner.create_sandbox

data/spec/kitchen/transport/winrm_spec.rb

@@ -124,6 +124,7 @@ describe Kitchen::Transport::Winrm do
       before do
         config[:hostname] = "here"
         config[:kitchen_root] = "/i/am/root"
+        config[:password] = "password"
       end
 
       it "returns a Kitchen::Transport::Winrm::Connection object" do
@@ -155,7 +156,7 @@ describe Kitchen::Transport::Winrm do
 
       it "sets the :winrm_transport to :negotiate" do
         klass.expects(:new).with do |hash|
-          hash[:winrm_transport] == :negotiate
+          hash[:transport] == :negotiate
         end
 
         make_connection
@@ -220,7 +221,7 @@ describe Kitchen::Transport::Winrm do
         config[:password] = "pass_from_config"
 
         klass.expects(:new).with do |hash|
-          hash[:pass] == "pass_from_config"
+          hash[:password] == "pass_from_config"
         end
 
         make_connection
@@ -231,7 +232,7 @@ describe Kitchen::Transport::Winrm do
         config[:password] = "pass_from_config"
 
         klass.expects(:new).with do |hash|
-          hash[:pass] == "pass_from_state"
+          hash[:password] == "pass_from_state"
         end
 
         make_connection
@@ -325,7 +326,7 @@ describe Kitchen::Transport::Winrm do
         config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:winrm_transport] == :ssl
+          hash[:transport] == :ssl
         end
 
         make_connection
@@ -392,7 +393,7 @@ describe Kitchen::Transport::Winrm do
         it "sets :winrm_transport to negotiate" do
 
           klass.expects(:new).with do |hash|
-            hash[:winrm_transport] == :negotiate &&
+            hash[:transport] == :negotiate &&
               hash[:disable_sspi] == false &&
               hash[:basic_auth_only] == false
           end
@@ -629,26 +630,31 @@ describe Kitchen::Transport::Winrm::Connection do
   let(:logger)          { Logger.new(logged_output) }
 
   let(:options) do
-    { :logger => logger, :user => "me", :pass => "haha",
+    { :logger => logger, :user => "me", :password => "haha",
       :endpoint => "http://foo:5985/wsman", :winrm_transport => :plaintext,
       :kitchen_root => "/i/am/root", :instance_name => "coolbeans",
       :rdp_port => "rdpyeah" }
   end
 
   let(:info) do
-    copts = { :user => "me", :pass => "haha" }
-    "plaintext::http://foo:5985/wsman<#{copts}>"
+    copts = {
+      :user => "me",
+      :password => "haha",
+      :endpoint => "http://foo:5985/wsman",
+      :winrm_transport => :plaintext
+    }
+    "<#{copts}>"
   end
 
   let(:winrm_session) do
     s = mock("winrm_session")
-    s.responds_like_instance_of(::WinRM::WinRMWebService)
+    s.responds_like_instance_of(::WinRM::Connection)
     s
   end
 
   let(:executor) do
     s = mock("command_executor")
-    s.responds_like_instance_of(WinRM::CommandExecutor)
+    s.responds_like_instance_of(WinRM::Shells::Powershell)
     s
   end
 
@@ -660,7 +666,7 @@ describe Kitchen::Transport::Winrm::Connection do
 
   let(:elevated_runner) do
     r = mock("elevated_runner")
-    r.responds_like_instance_of(WinRM::Elevated::Runner)
+    r.responds_like_instance_of(WinRM::Shells::Elevated)
     r
   end
 
@@ -669,7 +675,7 @@ describe Kitchen::Transport::Winrm::Connection do
   end
 
   before do
-    WinRM::WinRMWebService.stubs(:new).returns(winrm_session)
+    WinRM::Connection.stubs(:new).returns(winrm_session)
     winrm_session.stubs(:logger=)
     logger.level = Logger::DEBUG
   end
@@ -678,18 +684,21 @@ describe Kitchen::Transport::Winrm::Connection do
 
     let(:response) do
       o = WinRM::Output.new
-      o[:exitcode] = 0
-      o[:data].concat([{ :stdout => "ok\r\n" }])
+      o.exitcode = 0
+      o << { :stdout => "ok\r\n" }
       o
     end
 
     before do
-      winrm_session.stubs(:create_executor).returns(executor)
       transporter.stubs(:upload)
-      elevated_runner.stubs(:powershell_elevated).returns(response)
+      elevated_runner.stubs(:run).returns(response)
+      winrm_session.stubs(:shell).with(:powershell).returns(executor)
       executor.stubs(:close)
-      executor.stubs(:run_powershell_script).
+      elevated_runner.stubs(:close)
+      executor.stubs(:run).
         with("doit").yields("ok\n", nil).returns(response)
+      executor.stubs(:run).
+        with("$env:temp").yields("ok\n", nil).returns(response)
     end
 
     it "only closes the shell once for multiple calls" do
@@ -711,9 +720,10 @@ describe Kitchen::Transport::Winrm::Connection do
 
     it "clears the elevated_runner executor" do
       options[:elevated] = true
-      options[:elevated_username] = options[:user]
-      options[:elevated_password] = options[:pass]
-      WinRM::Elevated::Runner.expects(:new).returns(elevated_runner).twice
+      elevated_runner.stubs(:username=)
+      elevated_runner.stubs(:password=)
+      elevated_runner.expects(:close).once
+      winrm_session.expects(:shell).with(:elevated).returns(elevated_runner).twice
 
       connection.execute("doit")
       connection.close
@@ -724,23 +734,21 @@ describe Kitchen::Transport::Winrm::Connection do
   describe "#execute" do
 
     before do
-      winrm_session.stubs(:create_executor).returns(executor)
+      winrm_session.stubs(:shell).with(:powershell).returns(executor)
     end
 
     describe "for a successful command" do
 
       let(:response) do
         o = WinRM::Output.new
-        o[:exitcode] = 0
-        o[:data].concat([
-          { :stdout => "ok\r\n" },
-          { :stderr => "congrats\r\n" }
-        ])
+        o.exitcode = 0
+        o << { :stdout => "ok\r\n" }
+        o << { :stderr => "congrats\r\n" }
         o
       end
 
       before do
-        executor.expects(:run_powershell_script).
+        executor.expects(:run).
           with("doit").yields("ok\n", nil).returns(response)
       end
 
@@ -775,39 +783,40 @@ describe Kitchen::Transport::Winrm::Connection do
     describe "elevated command" do
       let(:response) do
         o = WinRM::Output.new
-        o[:exitcode] = 0
-        o[:data].concat([
-          { :stdout => "ok\r\n" },
-          { :stderr => "congrats\r\n" }
-        ])
+        o.exitcode = 0
+        o << { :stdout => "ok\r\n" }
+        o << { :stderr => "congrats\r\n" }
         o
       end
       let(:env_temp_response) do
         o = WinRM::Output.new
-        o[:exitcode] = 0
-        o[:data].concat([
-          { :stdout => "temp_dir" }
-        ])
+        o.exitcode = 0
+        o << { :stdout => "temp_dir" }
         o
       end
+      let(:elevated_runner) do
+        r = mock("elevated_runner")
+        r.responds_like_instance_of(WinRM::Shells::Elevated)
+        r
+      end
 
       before do
         options[:elevated] = true
-        WinRM::Elevated::Runner.stubs(:new).with(executor).returns(elevated_runner)
+        winrm_session.stubs(:shell).with(:elevated).returns(elevated_runner)
       end
 
       describe "elevated user is not login user" do
         before do
           options[:elevated_username] = "username"
           options[:elevated_password] = "password"
-          executor.expects(:run_powershell_script).
+          executor.expects(:run).
             with("$env:temp").returns(env_temp_response)
-          elevated_runner.expects(:powershell_elevated).
+          elevated_runner.expects(:run).
             with(
-              "$env:temp='temp_dir';doit",
-              options[:elevated_username],
-              options[:elevated_password]
+              "$env:temp='temp_dir';doit"
             ).yields("ok\n", nil).returns(response)
+          elevated_runner.expects(:username=).with("username")
+          elevated_runner.expects(:password=).with("password")
         end
 
         it "logger captures stdout" do
@@ -817,16 +826,18 @@ describe Kitchen::Transport::Winrm::Connection do
         end
       end
 
-      describe "elevator user is login user" do
+      describe "elevated user is login user" do
         before do
           options[:elevated_username] = options[:user]
-          options[:elevated_password] = options[:pass]
-          elevated_runner.expects(:powershell_elevated).
+          options[:elevated_password] = options[:password]
+          executor.expects(:run).
+            with("$env:temp").returns(env_temp_response)
+          elevated_runner.expects(:run).
             with(
-              "doit",
-              options[:elevated_username],
-              options[:elevated_password]
+              "$env:temp='temp_dir';doit"
             ).yields("ok\n", nil).returns(response)
+          elevated_runner.expects(:username=).with(options[:user])
+          elevated_runner.expects(:password=).with(options[:password])
         end
 
         it "logger captures stdout" do
@@ -837,69 +848,35 @@ describe Kitchen::Transport::Winrm::Connection do
       end
     end
 
-    describe "long command" do
-      let(:command) { %{Write-Host "#{"a" * 4000}"} }
-
-      let(:connection) do
-        Kitchen::Transport::WinRMConnectionDummy.new(options)
-      end
-
-      let(:response) do
-        o = WinRM::Output.new
-        o[:exitcode] = 0
-        o[:data].concat([
-          { :stdout => "ok\r\n" },
-          { :stderr => "congrats\r\n" }
-        ])
-        o
-      end
-
-      before do
-        executor.expects(:run_powershell_script).with(
-          %{powershell -ExecutionPolicy Bypass -File "$env:TEMP/coolbeans-long_script.ps1"}
-        ).yields("ok\n", nil).returns(response)
-      end
-
-      it "uploads the long command" do
-        with_fake_fs do
-          connection.execute(command)
-
-          connection.saved_command.must_equal command
-        end
-      end
-    end
-
     describe "for a failed command" do
 
       let(:response) do
         o = WinRM::Output.new
-        o[:exitcode] = 1
-        o[:data].concat([
-          { :stderr => "#< CLIXML\r\n" },
-          { :stderr => "<Objs Version=\"1.1.0.1\" xmlns=\"http://schemas." },
-          { :stderr => "microsoft.com/powershell/2004/04\"><S S=\"Error\">" },
-          { :stderr => "doit : The term 'doit' is not recognized as the " },
-          { :stderr => "name of a cmdlet, function, _x000D__x000A_</S>" },
-          { :stderr => "<S S=\"Error\">script file, or operable program. " },
-          { :stderr => "Check the spelling of" },
-          { :stderr => "the name, or if a path _x000D__x000A_</S><S S=\"E" },
-          { :stderr => "rror\">was included, verify that the path is corr" },
-          { :stderr => "ect and try again._x000D__x000A_</S><S S=\"Error" },
-          { :stderr => "\">At line:1 char:1_x000D__x000A_</S><S S=\"Error" },
-          { :stderr => "\">+ doit_x000D__x000A_</S><S S=\"Error\">+ ~~~~_" },
-          { :stderr => "x000D__x000A_</S><S S=\"Error\">    + CategoryInf" },
-          { :stderr => "o          : ObjectNotFound: (doit:String) [], Co" },
-          { :stderr => "mmandNotFoun _x000D__x000A_</S><S S=\"Error\">   " },
-          { :stderr => "dException_x000D__x000A_</S><S S=\"Error\">    + " },
-          { :stderr => "FullyQualifiedErrorId : CommandNotFoundException_" },
-          { :stderr => "x000D__x000A_</S><S S=\"Error\"> _x000D__x000A_</" },
-          { :stderr => "S></Objs>" }
-        ])
+        o.exitcode = 1
+        o << { :stderr => "#< CLIXML\r\n" }
+        o << { :stderr => "<Objs Version=\"1.1.0.1\" xmlns=\"http://schemas." }
+        o << { :stderr => "microsoft.com/powershell/2004/04\"><S S=\"Error\">" }
+        o << { :stderr => "doit : The term 'doit' is not recognized as the " }
+        o << { :stderr => "name of a cmdlet, function, _x000D__x000A_</S>" }
+        o << { :stderr => "<S S=\"Error\">script file, or operable program. " }
+        o << { :stderr => "Check the spelling of" }
+        o << { :stderr => "the name, or if a path _x000D__x000A_</S><S S=\"E" }
+        o << { :stderr => "rror\">was included, verify that the path is corr" }
+        o << { :stderr => "ect and try again._x000D__x000A_</S><S S=\"Error" }
+        o << { :stderr => "\">At line:1 char:1_x000D__x000A_</S><S S=\"Error" }
+        o << { :stderr => "\">+ doit_x000D__x000A_</S><S S=\"Error\">+ ~~~~_" }
+        o << { :stderr => "x000D__x000A_</S><S S=\"Error\">    + CategoryInf" }
+        o << { :stderr => "o          : ObjectNotFound: (doit:String) [], Co" }
+        o << { :stderr => "mmandNotFoun _x000D__x000A_</S><S S=\"Error\">   " }
+        o << { :stderr => "dException_x000D__x000A_</S><S S=\"Error\">    + " }
+        o << { :stderr => "FullyQualifiedErrorId : CommandNotFoundException_" }
+        o << { :stderr => "x000D__x000A_</S><S S=\"Error\"> _x000D__x000A_</" }
+        o << { :stderr => "S></Objs>" }
         o
       end
 
       before do
-        executor.expects(:run_powershell_script).
+        executor.expects(:run).
           with("doit").yields("nope\n", nil).returns(response)
       end
 
@@ -1002,7 +979,7 @@ MSG
 
           options[:connection_retries] = 3
           options[:connection_retry_sleep] = 7
-          winrm_session.stubs(:create_executor).raises(k)
+          winrm_session.stubs(:shell).with(:powershell).raises(k)
         end
 
         it "reraises the #{klass} exception" do
@@ -1160,7 +1137,7 @@ MSG
       end
 
       it "won't set the pass if not given" do
-        options.delete(:pass)
+        options.delete(:password)
 
         args.wont_match regexify(" -p haha ")
       end
@@ -1183,7 +1160,7 @@ MSG
   describe "#upload" do
 
     before do
-      winrm_session.stubs(:create_executor).returns(executor)
+      winrm_session.stubs(:shell).with(:powershell).returns(executor)
 
       WinRM::FS::Core::FileTransporter.stubs(:new).
         with(executor).returns(transporter)
@@ -1234,7 +1211,7 @@ MSG
   describe "#wait_until_ready" do
 
     before do
-      winrm_session.stubs(:create_executor).returns(executor)
+      winrm_session.stubs(:shell).with(:powershell).returns(executor)
       options[:max_wait_until_ready] = 300
     end
 
@@ -1242,13 +1219,13 @@ MSG
 
       let(:response) do
         o = WinRM::Output.new
-        o[:exitcode] = 0
-        o[:data].concat([{ :stdout => "[WinRM] Established\r\n" }])
+        o.exitcode = 0
+        o << { :stdout => "[WinRM] Established\r\n" }
         o
       end
 
       before do
-        executor.expects(:run_powershell_script).
+        executor.expects(:run).
           with("Write-Host '[WinRM] Established\n'").returns(response)
       end
 
@@ -1261,13 +1238,13 @@ MSG
 
       let(:response) do
         o = WinRM::Output.new
-        o[:exitcode] = 42
-        o[:data].concat([{ :stderr => "Ah crap.\r\n" }])
+        o.exitcode = 42
+        o << { :stderr => "Ah crap.\r\n" }
         o
       end
 
       before do
-        executor.expects(:run_powershell_script).
+        executor.expects(:run).
           with("Write-Host '[WinRM] Established\n'").returns(response)
       end
 

data/test-kitchen.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry-stack_explorer"
   gem.add_development_dependency "rb-readline"
   gem.add_development_dependency "overcommit", "= 0.33.0"
-  gem.add_development_dependency "winrm", "~> 1.6"
-  gem.add_development_dependency "winrm-elevated", "~> 0.4.0"
-  gem.add_development_dependency "winrm-fs", "~> 0.4.1"
+  gem.add_development_dependency "winrm", "~> 2.0"
+  gem.add_development_dependency "winrm-elevated", "~> 1.0"
+  gem.add_development_dependency "winrm-fs", "~> 1.0"
 
   gem.add_development_dependency "bundler",   "~> 1.3"
   gem.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -202,42 +202,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: winrm-elevated
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: winrm-fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement