test-kitchen 1.6.0 → 1.7.0

data/lib/kitchen/verifier/dummy.rb

@@ -1,79 +1,79 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2015, 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/verifier/base"
-
-module Kitchen
-
-  module Verifier
-
-    # Dummy verifier for Kitchen. This verifier does nothing but report what
-    # would happen if this verifier did anything of consequence. As a result
-    # it may be a useful verifier to use when debugging or developing new
-    # features or plugins.
-    #
-    # @author Fletcher Nichol <fnichol@nichol.ca>
-    class Dummy < Kitchen::Verifier::Base
-
-      kitchen_verifier_api_version 1
-
-      plugin_version Kitchen::VERSION
-
-      default_config :sleep, 0
-      default_config :random_failure, false
-
-      # (see Base#call)
-      def call(state)
-        info("[#{name}] Verify on instance=#{instance} with state=#{state}")
-        sleep_if_set
-        failure_if_set
-        debug("[#{name}] Verify completed (#{config[:sleep]}s).")
-      end
-
-      private
-
-      # Sleep for a period of time, if a value is set in the config.
-      #
-      # @api private
-      def sleep_if_set
-        sleep(config[:sleep].to_f) if config[:sleep].to_f > 0.0
-      end
-
-      # Simulate a failure in an action, if set in the config.
-      #
-      # @api private
-      def failure_if_set
-        if config[:fail]
-          debug("Failure for Verifier #{name}.")
-          raise ActionFailed, "Action #verify failed for #{instance.to_str}."
-        elsif config[:random_failure] && randomly_fail?
-          debug("Random failure for Verifier #{name}.")
-          raise ActionFailed, "Action #verify failed for #{instance.to_str}."
-        end
-      end
-
-      # Determine whether or not to randomly fail.
-      #
-      # @return [true, false]
-      # @api private
-      def randomly_fail?
-        [true, false].sample
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2015, 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/verifier/base"
+
+module Kitchen
+
+  module Verifier
+
+    # Dummy verifier for Kitchen. This verifier does nothing but report what
+    # would happen if this verifier did anything of consequence. As a result
+    # it may be a useful verifier to use when debugging or developing new
+    # features or plugins.
+    #
+    # @author Fletcher Nichol <fnichol@nichol.ca>
+    class Dummy < Kitchen::Verifier::Base
+
+      kitchen_verifier_api_version 1
+
+      plugin_version Kitchen::VERSION
+
+      default_config :sleep, 0
+      default_config :random_failure, false
+
+      # (see Base#call)
+      def call(state)
+        info("[#{name}] Verify on instance=#{instance} with state=#{state}")
+        sleep_if_set
+        failure_if_set
+        debug("[#{name}] Verify completed (#{config[:sleep]}s).")
+      end
+
+      private
+
+      # Sleep for a period of time, if a value is set in the config.
+      #
+      # @api private
+      def sleep_if_set
+        sleep(config[:sleep].to_f) if config[:sleep].to_f > 0.0
+      end
+
+      # Simulate a failure in an action, if set in the config.
+      #
+      # @api private
+      def failure_if_set
+        if config[:fail]
+          debug("Failure for Verifier #{name}.")
+          raise ActionFailed, "Action #verify failed for #{instance.to_str}."
+        elsif config[:random_failure] && randomly_fail?
+          debug("Random failure for Verifier #{name}.")
+          raise ActionFailed, "Action #verify failed for #{instance.to_str}."
+        end
+      end
+
+      # Determine whether or not to randomly fail.
+      #
+      # @return [true, false]
+      # @api private
+      def randomly_fail?
+        [true, false].sample
+      end
+    end
+  end
+end

data/lib/kitchen/verifier/shell.rb

@@ -1,101 +1,101 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
-#
-# Copyright (C) 2015, HiganWorks LLC
-#
-# 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/verifier/base"
-
-module Kitchen
-
-  module Verifier
-
-    # Shell verifier for Kitchen. This verifier just execute shell command from local.
-    #
-    # @author SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
-    class Shell < Kitchen::Verifier::Base
-      require "mixlib/shellout"
-
-      kitchen_verifier_api_version 1
-
-      plugin_version Kitchen::VERSION
-
-      default_config :sleep, 0
-      default_config :command, "true"
-      default_config :shellout_opts, {}
-      default_config :live_stream, $stdout
-      default_config :remote_exec, false
-
-      # (see Base#call)
-      def call(state)
-        info("[#{name}] Verify on instance=#{instance} with state=#{state}")
-        sleep_if_set
-        merge_state_to_env(state)
-        if config[:remote_exec]
-          instance.transport.connection(state) do |conn|
-            conn.execute(config[:command])
-          end
-        else
-          shellout
-        end
-        debug("[#{name}] Verify completed.")
-      end
-
-      # for legacy drivers.
-      def run_command
-        if config[:remote_exec]
-          config[:command]
-        else
-          shellout
-          nil
-        end
-      end
-
-      private
-
-      # Sleep for a period of time, if a value is set in the config.
-      #
-      # @api private
-      def sleep_if_set
-        config[:sleep].to_i.times do
-          info(".")
-          sleep 1
-        end
-      end
-
-      def shellout
-        cmd = Mixlib::ShellOut.new(config[:command], config[:shellout_opts])
-        cmd.live_stream = config[:live_stream]
-        cmd.run_command
-        begin
-          cmd.error!
-        rescue Mixlib::ShellOut::ShellCommandFailed
-          raise ActionFailed, "Action #verify failed for #{instance.to_str}."
-        end
-      end
-
-      def merge_state_to_env(state)
-        env_state = { :environment => {} }
-        env_state[:environment]["KITCHEN_INSTANCE"] = instance.name
-        env_state[:environment]["KITCHEN_PLATFORM"] = instance.platform.name
-        env_state[:environment]["KITCHEN_SUITE"] = instance.suite.name
-        state.each_pair do |key, value|
-          env_state[:environment]["KITCHEN_" + key.to_s.upcase] = value
-        end
-        config[:shellout_opts].merge!(env_state)
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
+#
+# Copyright (C) 2015, HiganWorks LLC
+#
+# 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/verifier/base"
+
+module Kitchen
+
+  module Verifier
+
+    # Shell verifier for Kitchen. This verifier just execute shell command from local.
+    #
+    # @author SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
+    class Shell < Kitchen::Verifier::Base
+      require "mixlib/shellout"
+
+      kitchen_verifier_api_version 1
+
+      plugin_version Kitchen::VERSION
+
+      default_config :sleep, 0
+      default_config :command, "true"
+      default_config :shellout_opts, {}
+      default_config :live_stream, $stdout
+      default_config :remote_exec, false
+
+      # (see Base#call)
+      def call(state)
+        info("[#{name}] Verify on instance=#{instance} with state=#{state}")
+        sleep_if_set
+        merge_state_to_env(state)
+        if config[:remote_exec]
+          instance.transport.connection(state) do |conn|
+            conn.execute(config[:command])
+          end
+        else
+          shellout
+        end
+        debug("[#{name}] Verify completed.")
+      end
+
+      # for legacy drivers.
+      def run_command
+        if config[:remote_exec]
+          config[:command]
+        else
+          shellout
+          nil
+        end
+      end
+
+      private
+
+      # Sleep for a period of time, if a value is set in the config.
+      #
+      # @api private
+      def sleep_if_set
+        config[:sleep].to_i.times do
+          info(".")
+          sleep 1
+        end
+      end
+
+      def shellout
+        cmd = Mixlib::ShellOut.new(config[:command], config[:shellout_opts])
+        cmd.live_stream = config[:live_stream]
+        cmd.run_command
+        begin
+          cmd.error!
+        rescue Mixlib::ShellOut::ShellCommandFailed
+          raise ActionFailed, "Action #verify failed for #{instance.to_str}."
+        end
+      end
+
+      def merge_state_to_env(state)
+        env_state = { :environment => {} }
+        env_state[:environment]["KITCHEN_INSTANCE"] = instance.name
+        env_state[:environment]["KITCHEN_PLATFORM"] = instance.platform.name
+        env_state[:environment]["KITCHEN_SUITE"] = instance.suite.name
+        state.each_pair do |key, value|
+          env_state[:environment]["KITCHEN_" + key.to_s.upcase] = value.to_s
+        end
+        config[:shellout_opts].merge!(env_state)
+      end
+    end
+  end
+end

data/lib/kitchen/version.rb

@@ -1,21 +1,21 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2012, 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.
-
-module Kitchen
-  VERSION = "1.6.0"
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2012, 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.
+
+module Kitchen
+  VERSION = "1.7.0"
+end

data/lib/vendor/hash_recursive_merge.rb

@@ -1,82 +1,82 @@
-# -*- encoding: utf-8 -*-
-#
-# = Hash Recursive Merge
-#
-# Merges a Ruby Hash recursively, Also known as deep merge.
-# Recursive version of Hash#merge and Hash#merge!.
-#
-# Category::    Ruby
-# Package::     Hash
-# Author::      Simone Carletti <weppos@weppos.net>
-# Copyright::   2007-2008 The Authors
-# License::     MIT License
-# Link::        http://www.simonecarletti.com/
-# Source::      http://gist.github.com/gists/6391/
-#
-module HashRecursiveMerge
-
-  #
-  # Recursive version of Hash#merge!
-  #
-  # Adds the contents of +other_hash+ to +hsh+,
-  # merging entries in +hsh+ with duplicate keys with those from +other_hash+.
-  #
-  # Compared with Hash#merge!, this method supports nested hashes.
-  # When both +hsh+ and +other_hash+ contains an entry with the same key,
-  # it merges and returns the values from both arrays.
-  #
-  # @example
-  #
-  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-  #    h2 = {"b" => 254, "c" => {"c1" => 16, "c3" => 94}}
-  #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
-  #
-  # Simply using Hash#merge! would return
-  #
-  # @example
-  #
-  #    h1.merge!(h2)    #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
-  #
-  def rmerge!(other_hash)
-    merge!(other_hash) do |_key, oldval, newval|
-      oldval.class == self.class ? oldval.rmerge!(newval) : newval
-    end
-  end
-
-  #
-  # Recursive version of Hash#merge
-  #
-  # Compared with Hash#merge!, this method supports nested hashes.
-  # When both +hsh+ and +other_hash+ contains an entry with the same key,
-  # it merges and returns the values from both arrays.
-  #
-  # Compared with Hash#merge, this method provides a different approch
-  # for merging nasted hashes.
-  # If the value of a given key is an Hash and both +other_hash+ abd +hsh
-  # includes the same key, the value is merged instead replaced with
-  # +other_hash+ value.
-  #
-  # @example
-  #
-  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-  #    h2 = {"b" => 254, "c" => {"c1" => 16, "c3" => 94}}
-  #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
-  #
-  # Simply using Hash#merge would return
-  #
-  # @example
-  #
-  #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
-  #
-  def rmerge(other_hash)
-    r = {}
-    merge(other_hash) do |key, oldval, newval|
-      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
-    end
-  end
-
-end
-
-class Hash
-  include HashRecursiveMerge
-end
+# -*- encoding: utf-8 -*-
+#
+# = Hash Recursive Merge
+#
+# Merges a Ruby Hash recursively, Also known as deep merge.
+# Recursive version of Hash#merge and Hash#merge!.
+#
+# Category::    Ruby
+# Package::     Hash
+# Author::      Simone Carletti <weppos@weppos.net>
+# Copyright::   2007-2008 The Authors
+# License::     MIT License
+# Link::        http://www.simonecarletti.com/
+# Source::      http://gist.github.com/gists/6391/
+#
+module HashRecursiveMerge
+
+  #
+  # Recursive version of Hash#merge!
+  #
+  # Adds the contents of +other_hash+ to +hsh+,
+  # merging entries in +hsh+ with duplicate keys with those from +other_hash+.
+  #
+  # Compared with Hash#merge!, this method supports nested hashes.
+  # When both +hsh+ and +other_hash+ contains an entry with the same key,
+  # it merges and returns the values from both arrays.
+  #
+  # @example
+  #
+  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+  #    h2 = {"b" => 254, "c" => {"c1" => 16, "c3" => 94}}
+  #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+  #
+  # Simply using Hash#merge! would return
+  #
+  # @example
+  #
+  #    h1.merge!(h2)    #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
+  #
+  def rmerge!(other_hash)
+    merge!(other_hash) do |_key, oldval, newval|
+      oldval.class == self.class ? oldval.rmerge!(newval) : newval
+    end
+  end
+
+  #
+  # Recursive version of Hash#merge
+  #
+  # Compared with Hash#merge!, this method supports nested hashes.
+  # When both +hsh+ and +other_hash+ contains an entry with the same key,
+  # it merges and returns the values from both arrays.
+  #
+  # Compared with Hash#merge, this method provides a different approch
+  # for merging nasted hashes.
+  # If the value of a given key is an Hash and both +other_hash+ abd +hsh
+  # includes the same key, the value is merged instead replaced with
+  # +other_hash+ value.
+  #
+  # @example
+  #
+  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+  #    h2 = {"b" => 254, "c" => {"c1" => 16, "c3" => 94}}
+  #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+  #
+  # Simply using Hash#merge would return
+  #
+  # @example
+  #
+  #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
+  #
+  def rmerge(other_hash)
+    r = {}
+    merge(other_hash) do |key, oldval, newval|
+      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
+    end
+  end
+
+end
+
+class Hash
+  include HashRecursiveMerge
+end