test-kitchen 1.20.0 → 1.21.0

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

@@ -103,24 +103,6 @@ module Kitchen
         # @api private
         attr_reader :always_update
 
-        # Ensure the `chef` command is in the path.
-        #
-        # @param logger [Kitchen::Logger] the logger to use
-        # @raise [UserError] if the `chef` command is not in the PATH
-        # @api private
-        def self.detect_chef_command!(logger)
-          unless ENV["PATH"].split(File::PATH_SEPARATOR).any? do |p|
-            File.exist?(File.join(p, "chef"))
-          end
-            logger.fatal("The `chef` executable cannot be found in your " \
-                         "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."
-          end
-        end
-
         # Escape spaces in a path in way that works with both Sh (Unix) and
         # Windows.
         #
@@ -143,6 +125,29 @@ module Kitchen
             Shellwords.escape(path)
           end
         end
+
+        class << self
+          private
+
+          # Ensure the `chef` command is in the path.
+          #
+          # @param logger [Kitchen::Logger] the logger to use
+          # @raise [UserError] if the `chef` command is not in the PATH
+          # @api private
+          def detect_chef_command!(logger)
+            unless ENV["PATH"].split(File::PATH_SEPARATOR).any? do |p|
+              File.exist?(File.join(p, "chef"))
+            end
+              logger.fatal("The `chef` executable cannot be found in your " \
+                          "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."
+            end
+          end
+        end
+
       end
     end
   end

data/lib/kitchen/provisioner/chef_apply.rb

@@ -30,8 +30,8 @@
 #   name: chef_apply
 #
 # platforms:
-#   - name: ubuntu-12.04
-#   - name: centos-6.4
+#   - name: ubuntu-16.04
+#   - name: centos-7
 #
 # suites:
 #   - name: default

data/lib/kitchen/provisioner/chef_base.rb

@@ -503,8 +503,9 @@ module Kitchen
       end
 
       def install_from_file(command)
-        install_file = "/tmp/chef-installer.sh"
-        script = ["cat > #{install_file} <<\"EOL\""]
+        install_file = "#{config[:root_path]}/chef-installer.sh"
+        script = ["mkdir -p #{config[:root_path]}"]
+        script << "cat > #{install_file} <<\"EOL\""
         script << command
         script << "EOL"
         script << "chmod +x #{install_file}"

data/lib/kitchen/provisioner/chef_solo.rb

@@ -64,7 +64,7 @@ module Kitchen
 
       # (see Base#run_command)
       def run_command
-        config[:log_level] = "info" if !modern? && config[:log_level] = "auto"
+        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? }
 

data/lib/kitchen/transport/winrm.rb

@@ -48,13 +48,12 @@ module Kitchen
       default_config :connection_retry_sleep, 1
       default_config :max_wait_until_ready, 600
       default_config :winrm_transport, :negotiate
+      default_config :scheme do |transport|
+        transport[:winrm_transport] == :ssl ? "https" : "http"
+      end
       default_config :port do |transport|
         transport[:winrm_transport] == :ssl ? 5986 : 5985
       end
-      default_config :endpoint_template do |transport|
-        scheme = transport[:winrm_transport] == :ssl ? "https" : "http"
-        "#{scheme}://%{hostname}:%{port}/wsman"
-      end
 
       def finalize_config!(instance)
         super
@@ -388,6 +387,13 @@ module Kitchen
       # @return [Hash] hash of connection options
       # @api private
       def connection_options(data)
+        endpoint = URI::Generic.build(
+          scheme: data.fetch(:scheme),
+          host: data.fetch(:hostname),
+          port: data.fetch(:port),
+          path: "/wsman"
+        ).to_s
+
         elevated_password = data[:password]
         elevated_password = data[:elevated_password] if data.key?(:elevated_password)
 
@@ -395,7 +401,7 @@ module Kitchen
           instance_name: instance.name,
           kitchen_root: data[:kitchen_root],
           logger: logger,
-          endpoint: data[:endpoint_template] % data,
+          endpoint: endpoint,
           user: data[:username],
           password: data[:password],
           rdp_port: data[:rdp_port],

data/lib/kitchen/version.rb

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

data/spec/kitchen/loader/yaml_spec.rb

@@ -43,6 +43,14 @@ describe Kitchen::Loader::YAML do
 
   describe ".initialize" do
     it "sets project_config based on Dir.pwd by default" do
+      stub_file(File.join(Dir.pwd, "kitchen.yml"), {})
+      loader = Kitchen::Loader::YAML.new
+
+      loader.diagnose[:project_config][:filename]
+        .must_equal File.expand_path(File.join(Dir.pwd, "kitchen.yml"))
+    end
+
+    it "when kitchen.yml not present, falls back to .kitchen.yml" do
       stub_file(File.join(Dir.pwd, ".kitchen.yml"), {})
       loader = Kitchen::Loader::YAML.new
 
@@ -50,6 +58,20 @@ describe Kitchen::Loader::YAML do
         .must_equal File.expand_path(File.join(Dir.pwd, ".kitchen.yml"))
     end
 
+    it "prefers kitchen.yml to .kitchen.yml" do
+      stub_file(File.join(Dir.pwd, "kitchen.yml"), {})
+      loader = Kitchen::Loader::YAML.new
+
+      loader.diagnose[:project_config][:filename]
+        .must_equal File.expand_path(File.join(Dir.pwd, "kitchen.yml"))
+    end
+
+    it "errors when kitchen.yml and .kitchen.yml are both present" do
+      stub_file(File.join(Dir.pwd, "kitchen.yml"), {})
+      stub_file(File.join(Dir.pwd, ".kitchen.yml"), {})
+      proc { Kitchen::Loader::YAML.new }.must_raise Kitchen::UserError
+    end
+
     it "sets project_config from parameter, if given" do
       stub_file("/tmp/crazyfunkytown.file", {})
       loader = Kitchen::Loader::YAML.new(
@@ -76,6 +98,13 @@ describe Kitchen::Loader::YAML do
         .must_match %r{/tmp/.kitchen.local.yml$}
     end
 
+    it "errors if both visible and hidden copies of default local_config exist" do
+      stub_file("/tmp/kitchen.local.yml", {})
+      stub_file("/tmp/.kitchen.local.yml", {})
+      proc { Kitchen::Loader::YAML.new(project_config: "/tmp/.kitchen.yml") }
+        .must_raise Kitchen::UserError
+    end
+
     it "sets local_config from parameter, if given" do
       stub_file("/tmp/crazyfunkytown.file", {})
       loader = Kitchen::Loader::YAML.new(
@@ -405,6 +434,20 @@ describe Kitchen::Loader::YAML do
       loader.read.must_equal(name: "ahhchoo")
     end
 
+    it "accepts kitchen.yml with alias" do
+      FileUtils.mkdir_p "/tmp"
+      File.open("/tmp/.kitchen.yml", "wb") do |f|
+        f.write <<-'YAML'.gsub(/^ {10}/, "")
+          ---
+          xxx: &k
+            foo: bar
+          yyy: *k
+        YAML
+      end
+
+      loader.read[:yyy].must_equal(foo: "bar")
+    end
+
     it "raises a UserError if there is an ERB processing error" do
       FileUtils.mkdir_p "/tmp"
       File.open("/tmp/.kitchen.yml", "wb") do |f|

data/spec/kitchen/logger_spec.rb

@@ -34,6 +34,11 @@ describe Kitchen::Logger do
     Kitchen::Color.colorize(*args)
   end
 
+  def log_tmpname
+    t = Time.now.strftime("%Y%m%d")
+    "kitchen-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}.log"
+  end
+
   let(:opts) do
     { color: :red, colorize: true }
   end
@@ -356,7 +361,7 @@ describe Kitchen::Logger do
   end
 
   describe "file IO logdev-based logger" do
-    let(:logfile) { Dir::Tmpname.make_tmpname(%w{kitchen .log}, nil) }
+    let(:logfile) { File.join Dir.tmpdir, log_tmpname }
 
     before do
       opts[:logdev] = logfile

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -768,13 +768,13 @@ describe Kitchen::Provisioner::ChefBase do
 
       it "sets chef component dirs for deletion" do
         config[:root_path] = '\\route'
-        dirs = %w{
-          "\\route\\clients" "\\route\\cookbooks" "\\route\\data"
-          "\\route\\data_bags" "\\route\\encrypted_data_bag_secret"
-          "\\route\\environments" "\\route\\roles"
-        }.join(", ")
+        dirs = %w{ clients cookbooks data data_bags encrypted_data_bag_secret
+                   environments roles
+                 }.map do |dir|
+          "\\route\\#{dir}"
+        end.join(", ")
 
-        cmd.must_match regexify(%{$dirs = @(#{dirs})})
+        cmd.include? "$dirs = @(#{dirs})"
       end
 
       it "sets the root_path from :root_path" do

data/spec/kitchen/transport/winrm_spec.rb

@@ -68,6 +68,10 @@ describe Kitchen::Transport::Winrm do
   end
 
   describe "default_config" do
+    it "sets :scheme to http by default" do
+      transport[:scheme].must_equal "http"
+    end
+
     it "sets :port to 5985 by default" do
       transport[:port].must_equal 5985
     end
@@ -80,11 +84,6 @@ describe Kitchen::Transport::Winrm do
       transport[:password].must_be_nil
     end
 
-    it "sets a default :endpoint_template value" do
-      transport[:endpoint_template]
-        .must_equal "http://%{hostname}:%{port}/wsman"
-    end
-
     it "sets :rdp_port to 3389 by default" do
       transport[:rdp_port].must_equal 3389
     end
@@ -164,27 +163,37 @@ describe Kitchen::Transport::Winrm do
         make_connection
       end
 
+      it "sets :endpoint when hostname is an IPv6 address" do
+        config[:hostname] = "caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78"
+
+        klass.expects(:new).with do |hash|
+          hash[:endpoint] == "http://[caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78]:5985/wsman"
+        end
+
+        make_connection
+      end
+
       it "sets :endpoint from data in config" do
-        config[:hostname] = "host_from_config"
-        config[:port] = "port_from_config"
+        config[:hostname] = "host-from-config"
+        config[:port] = "42"
         config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:endpoint] == "https://host_from_config:port_from_config/wsman"
+          hash[:endpoint] == "https://host-from-config:42/wsman"
         end
 
         make_connection
       end
 
       it "sets :endpoint from data in state over config data" do
-        state[:hostname] = "host_from_state"
-        config[:hostname] = "host_from_config"
-        state[:port] = "port_from_state"
-        config[:port] = "port_from_config"
+        state[:hostname] = "host-from-state"
+        config[:hostname] = "host-from-config"
+        state[:port] = "42"
+        config[:port] = "43"
         config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:endpoint] == "https://host_from_state:port_from_state/wsman"
+          hash[:endpoint] == "https://host-from-state:42/wsman"
         end
 
         make_connection