test-kitchen 1.18.0 → 1.19.0

data/spec/kitchen/ssh_spec.rb

@@ -22,35 +22,6 @@ require "kitchen/ssh"
 require "tmpdir"
 require "net/ssh/test"
 
-# Hack to sort results in `Dir.entries` only within the yielded block, to limit
-# the "behavior pollution" to other code. This was needed for Net::SCP, as
-# recursive directory upload doesn't sort the file and directory upload
-# candidates which leads to different results based on the underlying
-# filesystem (i.e. lexically sorted, inode insertion, mtime/atime, total
-# randomness, etc.)
-#
-# See: https://github.com/net-ssh/net-scp/blob/a24948/lib/net/scp/upload.rb#L52
-
-def with_sorted_dir_entries
-  Dir.class_exec do
-    class << self
-      alias_method :__entries__, :entries unless method_defined?(:__entries__)
-
-      def entries(*args) # rubocop:disable Lint/NestedMethodDefinition
-        send(:__entries__, *args).sort
-      end
-    end
-  end
-
-  yield
-
-  Dir.class_exec do
-    class << self
-      alias_method :entries, :__entries__
-    end
-  end
-end
-
 describe Kitchen::SSH do
   include Net::SSH::Test
 

data/spec/kitchen/transport/exec_spec.rb

@@ -0,0 +1,79 @@
+#
+# 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_relative "../../spec_helper"
+
+require "kitchen/transport/exec"
+
+describe Kitchen::Transport::Ssh do
+  let(:logged_output) { StringIO.new }
+  let(:logger)        { Logger.new(logged_output) }
+  let(:config)        { Hash.new }
+  let(:state)         { Hash.new }
+
+  let(:instance) do
+    stub(name: "coolbeans", logger: logger, to_str: "instance")
+  end
+
+  let(:transport) do
+    Kitchen::Transport::Exec.new(config).finalize_config!(instance)
+  end
+
+  it "provisioner api_version is 1" do
+    transport.diagnose_plugin[:api_version].must_equal 1
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    transport.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
+  describe "#connection" do
+    it "returns a Kitchen::Transport::Exec::Connection object" do
+      transport.connection(state).must_be_kind_of Kitchen::Transport::Exec::Connection
+    end
+  end
+end
+
+describe Kitchen::Transport::Exec::Connection do
+  let(:logged_output)   { StringIO.new }
+  let(:logger)          { Logger.new(logged_output) }
+
+  let(:options) do
+    { logger: logger }
+  end
+
+  let(:connection) do
+    Kitchen::Transport::Exec::Connection.new(options)
+  end
+
+  describe "#execute" do
+    it "runs the command" do
+      connection.expects(:run_command).with("do the thing")
+      connection.execute("do the thing")
+    end
+
+    it "ignores nil" do
+      connection.expects(:run_command).never
+      connection.execute(nil)
+    end
+  end
+
+  describe "#upload" do
+    it "copies files" do
+      FileUtils.expects(:mkdir_p).with("/tmp/kitchen")
+      FileUtils.expects(:cp_r).with("/tmp/sandbox/cookbooks", "/tmp/kitchen")
+      connection.upload(%w{/tmp/sandbox/cookbooks}, "/tmp/kitchen")
+    end
+  end
+end

data/spec/kitchen/transport/ssh_spec.rb

@@ -21,35 +21,6 @@ require_relative "../../spec_helper"
 require "kitchen/transport/ssh"
 require "net/ssh/test"
 
-# Hack to sort results in `Dir.entries` only within the yielded block, to limit
-# the "behavior pollution" to other code. This was needed for Net::SCP, as
-# recursive directory upload doesn't sort the file and directory upload
-# candidates which leads to different results based on the underlying
-# filesystem (i.e. lexically sorted, inode insertion, mtime/atime, total
-# randomness, etc.)
-#
-# See: https://github.com/net-ssh/net-scp/blob/a24948/lib/net/scp/upload.rb#L52
-
-def with_sorted_dir_entries
-  Dir.class_exec do
-    class << self
-      alias_method :__entries__, :entries unless method_defined?(:__entries__)
-
-      def entries(*args) # rubocop:disable Lint/NestedMethodDefinition
-        send(:__entries__, *args).sort
-      end
-    end
-  end
-
-  yield
-
-  Dir.class_exec do
-    class << self
-      alias_method :entries, :__entries__
-    end
-  end
-end
-
 describe Kitchen::Transport::Ssh do
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }

data/spec/spec_helper.rb

@@ -59,6 +59,32 @@ class IO
   end
 end
 
+# Hack to sort results in `Dir.entries` only within the yielded block, to limit
+# the "behavior pollution" to other code. This was needed for Net::SCP, as
+# recursive directory upload doesn't sort the file and directory upload
+# candidates which leads to different results based on the underlying
+# filesystem (i.e. lexically sorted, inode insertion, mtime/atime, total
+# randomness, etc.)
+#
+# See: https://github.com/net-ssh/net-scp/blob/a24948/lib/net/scp/upload.rb#L52
+
+$_sort_dir_entries = false
+Dir.singleton_class.prepend(Module.new do
+  def entries(*args)
+    super.tap do |rv|
+      rv.sort! if $_sort_dir_entries
+    end
+  end
+end)
+
+def with_sorted_dir_entries(&block)
+  old_sort_dir_entries = $_sort_dir_entries
+  $_sort_dir_entries = true
+  yield
+ensure
+  $_sort_dir_entries = old_sort_dir_entries
+end
+
 def with_fake_fs
   FakeFS.activate!
   FileUtils.mkdir_p("/tmp")

data/support/busser_install_command.sh

@@ -1,4 +1,4 @@
-$gem list busser -i 2>&1 >/dev/null
+$gem list --no-versions | grep "^busser" 2>&1 >/dev/null
 if test $? -ne 0; then
   echo "-----> Installing Busser ($version)"
   $gem install $gem_install_args
@@ -10,5 +10,12 @@ if test ! -f "$BUSSER_ROOT/bin/busser"; then
   $busser setup
 fi
 
-echo "       Installing Busser plugins: $plugins"
-$busser plugin install $plugins
+for plugin in $plugins; do
+  $gem list --no-versions | grep "^$plugin$" 2>&1 >/dev/null
+  if test $? -ne 0; then
+    echo "-----> Installing Busser plugin: $plugin"
+    $busser plugin install $plugin
+  else
+    echo "-----> Busser plugin detected: $plugin"
+  fi
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -358,8 +358,6 @@ files:
 - features/kitchen_console_command.feature
 - features/kitchen_defaults.feature
 - features/kitchen_diagnose_command.feature
-- features/kitchen_driver_create_command.feature
-- features/kitchen_driver_discover_command.feature
 - features/kitchen_help_command.feature
 - features/kitchen_init_command.feature
 - features/kitchen_list_command.feature
@@ -379,7 +377,7 @@ files:
 - lib/kitchen/command/action.rb
 - lib/kitchen/command/console.rb
 - lib/kitchen/command/diagnose.rb
-- lib/kitchen/command/driver_discover.rb
+- lib/kitchen/command/doctor.rb
 - lib/kitchen/command/exec.rb
 - lib/kitchen/command/list.rb
 - lib/kitchen/command/login.rb
@@ -393,10 +391,10 @@ files:
 - lib/kitchen/driver.rb
 - lib/kitchen/driver/base.rb
 - lib/kitchen/driver/dummy.rb
+- lib/kitchen/driver/exec.rb
 - lib/kitchen/driver/proxy.rb
 - lib/kitchen/driver/ssh_base.rb
 - lib/kitchen/errors.rb
-- lib/kitchen/generator/driver_create.rb
 - lib/kitchen/generator/init.rb
 - lib/kitchen/instance.rb
 - lib/kitchen/lazy_hash.rb
@@ -427,6 +425,7 @@ files:
 - lib/kitchen/transport.rb
 - lib/kitchen/transport/base.rb
 - lib/kitchen/transport/dummy.rb
+- lib/kitchen/transport/exec.rb
 - lib/kitchen/transport/ssh.rb
 - lib/kitchen/transport/winrm.rb
 - lib/kitchen/util.rb
@@ -447,6 +446,7 @@ files:
 - spec/kitchen/diagnostic_spec.rb
 - spec/kitchen/driver/base_spec.rb
 - spec/kitchen/driver/dummy_spec.rb
+- spec/kitchen/driver/exec_spec.rb
 - spec/kitchen/driver/proxy_spec.rb
 - spec/kitchen/driver/ssh_base_spec.rb
 - spec/kitchen/driver_spec.rb
@@ -473,6 +473,7 @@ files:
 - spec/kitchen/state_file_spec.rb
 - spec/kitchen/suite_spec.rb
 - spec/kitchen/transport/base_spec.rb
+- spec/kitchen/transport/exec_spec.rb
 - spec/kitchen/transport/ssh_spec.rb
 - spec/kitchen/transport/winrm_spec.rb
 - spec/kitchen/transport_spec.rb
@@ -549,8 +550,6 @@ test_files:
 - features/kitchen_console_command.feature
 - features/kitchen_defaults.feature
 - features/kitchen_diagnose_command.feature
-- features/kitchen_driver_create_command.feature
-- features/kitchen_driver_discover_command.feature
 - features/kitchen_help_command.feature
 - features/kitchen_init_command.feature
 - features/kitchen_list_command.feature
@@ -571,6 +570,7 @@ test_files:
 - spec/kitchen/diagnostic_spec.rb
 - spec/kitchen/driver/base_spec.rb
 - spec/kitchen/driver/dummy_spec.rb
+- spec/kitchen/driver/exec_spec.rb
 - spec/kitchen/driver/proxy_spec.rb
 - spec/kitchen/driver/ssh_base_spec.rb
 - spec/kitchen/driver_spec.rb
@@ -597,6 +597,7 @@ test_files:
 - spec/kitchen/state_file_spec.rb
 - spec/kitchen/suite_spec.rb
 - spec/kitchen/transport/base_spec.rb
+- spec/kitchen/transport/exec_spec.rb
 - spec/kitchen/transport/ssh_spec.rb
 - spec/kitchen/transport/winrm_spec.rb
 - spec/kitchen/transport_spec.rb

data/features/kitchen_driver_create_command.feature

@@ -1,64 +0,0 @@
-Feature: Create a new Test Kitchen Driver project
-  In order to make plugin development a snap
-  As a user of Test Kitchen
-  I want a command to run that will give me a driver gem project scaffold
-
-  @spawn
-  Scenario: Displaying help
-    When I run `kitchen help driver create`
-    Then the output should contain:
-    """
-    Usage:
-      kitchen driver create [NAME]
-    """
-    And the exit status should be 0
-
-  Scenario: Running with default values
-    When I run `kitchen driver create qemu`
-    Then a directory named "kitchen-qemu" should exist
-    And the file "kitchen-qemu/CHANGELOG.md" should contain:
-    """
-    ## 0.1.0 / Unreleased
-    """
-    And the file "kitchen-qemu/Gemfile" should contain "gemspec"
-    And the file "kitchen-qemu/Rakefile" should contain "task :stats"
-    And the file "kitchen-qemu/README.md" should contain:
-    """
-    Kitchen::Qemu
-    """
-    And the file "kitchen-qemu/kitchen-qemu.gemspec" should contain:
-    """
-    require 'kitchen/driver/qemu_version'
-    """
-    And the file "kitchen-qemu/LICENSE" should contain:
-    """
-    Licensed under the Apache License, Version 2.0
-    """
-    And the file "kitchen-qemu/.gitignore" should contain:
-    """
-    Gemfile.lock
-    """
-    And the file "kitchen-qemu/.tailor" should contain:
-    """
-    config.file_set 'lib/**/*.rb'
-    """
-    And the file "kitchen-qemu/.travis.yml" should contain:
-    """
-    language: ruby
-    """
-    And a file named "kitchen-qemu/.cane" should exist
-    And the file "kitchen-qemu/lib/kitchen/driver/qemu_version.rb" should contain:
-    """
-    QEMU_VERSION = "0.1.0.dev"
-    """
-    And the file "kitchen-qemu/lib/kitchen/driver/qemu.rb" should contain:
-    """
-    class Qemu < Kitchen::Driver::SSHBase
-    """
-
-  Scenario: Running with an alternate license
-    When I successfully run `kitchen driver create foo --license=reserved`
-    Then the file "kitchen-foo/LICENSE" should contain:
-    """
-    All rights reserved - Do Not Redistribute
-    """

data/features/kitchen_driver_discover_command.feature

@@ -1,25 +0,0 @@
-Feature: Search RubyGems to discover new Test Kitchen Driver gems
-  In order to periodically check for new/updated Kitchen drivers
-  As a Test Kitchen user
-  I want to run a command which returns candidate Kitchen drivers
-
-  @spawn
-  Scenario: Displaying help
-    When I run `kitchen help driver discover`
-    Then the output should contain:
-    """
-    Usage:
-      kitchen driver discover
-    """
-    And the exit status should be 0
-
-  Scenario: Running driver discover returns live results
-    When I run `kitchen driver discover`
-    Then the exit status should be 0
-    And the output should contain "kitchen-bluebox"
-
-  Scenario: Running driver discover with the --chef-config-path parameter loads the chef config
-    Given an empty file named "kitchen_client.rb"
-    When I run `kitchen driver discover --chef-config-path=kitchen_client.rb`
-    Then the exit status should be 0
-    And the output should contain "kitchen-bluebox"

data/lib/kitchen/command/driver_discover.rb

@@ -1,102 +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/command"
-
-require "rubygems/spec_fetcher"
-begin
-  require "chef-config/config"
-  require "chef-config/workstation_config_loader"
-rescue LoadError # rubocop:disable Lint/HandleExceptions
-  # This space left intentionally blank.
-end
-
-module Kitchen
-  module Command
-    # Command to discover drivers published on RubyGems.
-    #
-    # @author Fletcher Nichol <fnichol@nichol.ca>
-    class DriverDiscover < Kitchen::Command::Base
-      # Invoke the command.
-      def call
-        # We are introducing the idea of using the Chef configuration as a
-        # unified config for all the ChefDK tools.  The first practical
-        # implementation of this is 1 location to setup proxy configurations.
-        if defined?(ChefConfig::WorkstationConfigLoader)
-          ChefConfig::WorkstationConfigLoader.new(options[:chef_config_path]).load
-        end
-        ChefConfig::Config.export_proxies if defined?(ChefConfig::Config.export_proxies)
-
-        specs = fetch_gem_specs.sort_by { |spec| spec[0] }
-        specs = specs[0, 49].push(["...", "..."]) if specs.size > 49
-        specs = specs.unshift(["Gem Name", "Latest Stable Release"])
-        print_table(specs, indent: 4)
-      end
-
-      private
-
-      # Fetches Kitchen-related RubyGems and returns an array of name/version
-      # tuples.
-      #
-      # @return [Array<Array>] an array of name/version tuples
-      # @api private
-      def fetch_gem_specs
-        req = Gem::Requirement.default
-        dep = Gem::Deprecate.skip_during do
-          Gem::Dependency.new(/kitchen-/i, req)
-        end
-        fetcher = Gem::SpecFetcher.fetcher
-
-        if fetcher.respond_to?(:find_matching)
-          fetch_gem_specs_pre_rubygems_2(fetcher, dep)
-        else
-          fetch_gem_specs_post_rubygems_2(fetcher, dep)
-        end
-      end
-
-      # Fetches gem specs for RubyGems 2 and later.
-      #
-      # @param fetcher [Gem::SpecFetcher] a gemspec fetcher
-      # @param dep [Gem::Dependency] a gem dependency object
-      # @return [Array<Array>] an array of name/version tuples
-      # @api private
-      def fetch_gem_specs_post_rubygems_2(fetcher, dep)
-        specs = fetcher.spec_for_dependency(dep, false)
-        specs.first.map { |t| [t.first.name, t.first.version] }
-      end
-
-      # Fetches gem specs for pre-RubyGems 2.
-      #
-      # @param fetcher [Gem::SpecFetcher] a gemspec fetcher
-      # @param dep [Gem::Dependency] a gem dependency object
-      # @return [Array<Array>] an array of name/version tuples
-      # @api private
-      def fetch_gem_specs_pre_rubygems_2(fetcher, dep)
-        specs = fetcher.find_matching(dep, false, false, false)
-        specs.map(&:first).map { |t| t[0, 2] }
-      end
-
-      # Print out a display table.
-      #
-      # @api private
-      def print_table(*args)
-        shell.print_table(*args)
-      end
-    end
-  end
-end