test-kitchen 1.6.0 → 1.7.0

data/lib/kitchen/provisioner/dummy.rb

@@ -1,79 +1,79 @@
-# -*- 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"
-
-module Kitchen
-
-  module Provisioner
-
-    # Dummy provisioner for Kitchen. This driver does nothing but report what
-    # would happen if this provisioner did anything of consequence. As a result
-    # it may be a useful provisioner to use when debugging or developing new
-    # features or plugins.
-    #
-    # @author Fletcher Nichol <fnichol@nichol.ca>
-    class Dummy < Kitchen::Provisioner::Base
-
-      kitchen_provisioner_api_version 2
-
-      plugin_version Kitchen::VERSION
-
-      default_config :sleep, 0
-      default_config :random_failure, false
-
-      # (see Base#call)
-      def call(state)
-        info("[#{name}] Converge on instance=#{instance} with state=#{state}")
-        sleep_if_set
-        failure_if_set
-        debug("[#{name}] Converge 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 Provisioner #{name}.")
-          raise ActionFailed, "Action #converge failed for #{instance.to_str}."
-        elsif config[:random_failure] && randomly_fail?
-          debug("Random failure for Provisioner #{name}.")
-          raise ActionFailed, "Action #converge 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) 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"
+
+module Kitchen
+
+  module Provisioner
+
+    # Dummy provisioner for Kitchen. This driver does nothing but report what
+    # would happen if this provisioner did anything of consequence. As a result
+    # it may be a useful provisioner to use when debugging or developing new
+    # features or plugins.
+    #
+    # @author Fletcher Nichol <fnichol@nichol.ca>
+    class Dummy < Kitchen::Provisioner::Base
+
+      kitchen_provisioner_api_version 2
+
+      plugin_version Kitchen::VERSION
+
+      default_config :sleep, 0
+      default_config :random_failure, false
+
+      # (see Base#call)
+      def call(state)
+        info("[#{name}] Converge on instance=#{instance} with state=#{state}")
+        sleep_if_set
+        failure_if_set
+        debug("[#{name}] Converge 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 Provisioner #{name}.")
+          raise ActionFailed, "Action #converge failed for #{instance.to_str}."
+        elsif config[:random_failure] && randomly_fail?
+          debug("Random failure for Provisioner #{name}.")
+          raise ActionFailed, "Action #converge 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/provisioner/shell.rb

@@ -1,138 +1,138 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Chris Lundquist (<chris.lundquist@github.com>)
-#
-# Copyright (C) 2013, Chris Lundquist
-#
-# 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/provisioner/base"
-require "kitchen/version"
-
-module Kitchen
-
-  module Provisioner
-
-    # Basic shell provisioner.
-    #
-    # @author Chris Lundquist (<chris.ludnquist@github.com>)
-    class Shell < Base
-
-      kitchen_provisioner_api_version 2
-
-      plugin_version Kitchen::VERSION
-
-      default_config :script do |provisioner|
-        src = provisioner.powershell_shell? ? "bootstrap.ps1" : "bootstrap.sh"
-        provisioner.calculate_path(src, :type => :file)
-      end
-      expand_path_for :script
-
-      default_config :data_path do |provisioner|
-        provisioner.calculate_path("data")
-      end
-      expand_path_for :data_path
-
-      # (see Base#create_sandbox)
-      def create_sandbox
-        super
-        prepare_data
-        prepare_script
-      end
-
-      # (see Base#init_command)
-      def init_command
-        root = config[:root_path]
-        data = remote_path_join(root, "data")
-
-        code = if powershell_shell?
-          Util.outdent!(<<-POWERSHELL)
-            if (Test-Path "#{data}") {
-              Remove-Item "#{data}" -Recurse -Force
-            }
-            if (-Not (Test-Path "#{root}")) {
-              New-Item "#{root}" -ItemType directory | Out-Null
-            }
-          POWERSHELL
-        else
-          "#{sudo("rm")} -rf #{data} ; mkdir -p #{root}"
-        end
-
-        wrap_shell_code(code)
-      end
-
-      # (see Base#run_command)
-      def run_command
-        script = remote_path_join(
-          config[:root_path],
-          File.basename(config[:script])
-        )
-        code = powershell_shell? ? %{& "#{script}"} : sudo(script)
-
-        wrap_shell_code(code)
-      end
-
-      private
-
-      # Creates a data directory in the sandbox directory, if a data directory
-      # can be found and copies in the tree.
-      #
-      # @api private
-      def prepare_data
-        return unless config[:data_path]
-
-        info("Preparing data")
-        debug("Using data from #{config[:data_path]}")
-
-        tmpdata_dir = File.join(sandbox_path, "data")
-        FileUtils.mkdir_p(tmpdata_dir)
-        FileUtils.cp_r(Dir.glob("#{config[:data_path]}/*"), tmpdata_dir)
-      end
-
-      # Copies the executable script to the sandbox directory or creates a
-      # stub script if one cannot be found.
-      #
-      # @api private
-      def prepare_script
-        info("Preparing script")
-
-        if config[:script]
-          debug("Using script from #{config[:script]}")
-          FileUtils.cp_r(config[:script], sandbox_path)
-        else
-          prepare_stubbed_script
-        end
-
-        FileUtils.chmod(0755,
-          File.join(sandbox_path, File.basename(config[:script])))
-      end
-
-      # Creates a minimal, no-op script in the sandbox path.
-      #
-      # @api private
-      def prepare_stubbed_script
-        base = powershell_shell? ? "bootstrap.ps1" : "bootstrap.sh"
-        config[:script] = File.join(sandbox_path, base)
-        info("#{File.basename(config[:script])} not found " \
-          "so Kitchen will run a stubbed script. Is this intended?")
-        File.open(config[:script], "wb") do |file|
-          if powershell_shell?
-            file.write(%{Write-Host "NO BOOTSTRAP SCRIPT PRESENT`n"\n})
-          else
-            file.write(%{#!/bin/sh\necho "NO BOOTSTRAP SCRIPT PRESENT"\n})
-          end
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Chris Lundquist (<chris.lundquist@github.com>)
+#
+# Copyright (C) 2013, Chris Lundquist
+#
+# 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/provisioner/base"
+require "kitchen/version"
+
+module Kitchen
+
+  module Provisioner
+
+    # Basic shell provisioner.
+    #
+    # @author Chris Lundquist (<chris.ludnquist@github.com>)
+    class Shell < Base
+
+      kitchen_provisioner_api_version 2
+
+      plugin_version Kitchen::VERSION
+
+      default_config :script do |provisioner|
+        src = provisioner.powershell_shell? ? "bootstrap.ps1" : "bootstrap.sh"
+        provisioner.calculate_path(src, :type => :file)
+      end
+      expand_path_for :script
+
+      default_config :data_path do |provisioner|
+        provisioner.calculate_path("data")
+      end
+      expand_path_for :data_path
+
+      # (see Base#create_sandbox)
+      def create_sandbox
+        super
+        prepare_data
+        prepare_script
+      end
+
+      # (see Base#init_command)
+      def init_command
+        root = config[:root_path]
+        data = remote_path_join(root, "data")
+
+        code = if powershell_shell?
+          Util.outdent!(<<-POWERSHELL)
+            if (Test-Path "#{data}") {
+              Remove-Item "#{data}" -Recurse -Force
+            }
+            if (-Not (Test-Path "#{root}")) {
+              New-Item "#{root}" -ItemType directory | Out-Null
+            }
+          POWERSHELL
+        else
+          "#{sudo("rm")} -rf #{data} ; mkdir -p #{root}"
+        end
+
+        wrap_shell_code(code)
+      end
+
+      # (see Base#run_command)
+      def run_command
+        script = remote_path_join(
+          config[:root_path],
+          File.basename(config[:script])
+        )
+        code = powershell_shell? ? %{& "#{script}"} : sudo(script)
+
+        wrap_shell_code(code)
+      end
+
+      private
+
+      # Creates a data directory in the sandbox directory, if a data directory
+      # can be found and copies in the tree.
+      #
+      # @api private
+      def prepare_data
+        return unless config[:data_path]
+
+        info("Preparing data")
+        debug("Using data from #{config[:data_path]}")
+
+        tmpdata_dir = File.join(sandbox_path, "data")
+        FileUtils.mkdir_p(tmpdata_dir)
+        FileUtils.cp_r(Dir.glob("#{config[:data_path]}/*"), tmpdata_dir)
+      end
+
+      # Copies the executable script to the sandbox directory or creates a
+      # stub script if one cannot be found.
+      #
+      # @api private
+      def prepare_script
+        info("Preparing script")
+
+        if config[:script]
+          debug("Using script from #{config[:script]}")
+          FileUtils.cp_r(config[:script], sandbox_path)
+        else
+          prepare_stubbed_script
+        end
+
+        FileUtils.chmod(0755,
+          File.join(sandbox_path, File.basename(config[:script])))
+      end
+
+      # Creates a minimal, no-op script in the sandbox path.
+      #
+      # @api private
+      def prepare_stubbed_script
+        base = powershell_shell? ? "bootstrap.ps1" : "bootstrap.sh"
+        config[:script] = File.join(sandbox_path, base)
+        info("#{File.basename(config[:script])} not found " \
+          "so Kitchen will run a stubbed script. Is this intended?")
+        File.open(config[:script], "wb") do |file|
+          if powershell_shell?
+            file.write(%{Write-Host "NO BOOTSTRAP SCRIPT PRESENT`n"\n})
+          else
+            file.write(%{#!/bin/sh\necho "NO BOOTSTRAP SCRIPT PRESENT"\n})
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/rake_tasks.rb

@@ -1,63 +1,63 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2012, 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 "rake/tasklib"
-
-require "kitchen"
-
-module Kitchen
-
-  # Kitchen Rake task generator.
-  #
-  # @author Fletcher Nichol <fnichol@nichol.ca>
-  class RakeTasks < ::Rake::TaskLib
-
-    # Creates Kitchen Rake tasks and allows the callee to configure it.
-    #
-    # @yield [self] gives itself to the block
-    def initialize
-      @config = Kitchen::Config.new
-      Kitchen.logger = Kitchen.default_file_logger(nil, false)
-      yield self if block_given?
-      define
-    end
-
-    private
-
-    # @return [Config] a Kitchen::Config
-    attr_reader :config
-
-    # Generates a test Rake task for each instance and one to test all
-    # instances in serial.
-    #
-    # @api private
-    def define
-      namespace "kitchen" do
-        config.instances.each do |instance|
-          desc "Run #{instance.name} test instance"
-          task instance.name do
-            instance.test(:always)
-          end
-        end
-
-        desc "Run all test instances"
-        task "all" => config.instances.map(&:name)
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2012, 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 "rake/tasklib"
+
+require "kitchen"
+
+module Kitchen
+
+  # Kitchen Rake task generator.
+  #
+  # @author Fletcher Nichol <fnichol@nichol.ca>
+  class RakeTasks < ::Rake::TaskLib
+
+    # Creates Kitchen Rake tasks and allows the callee to configure it.
+    #
+    # @yield [self] gives itself to the block
+    def initialize
+      @config = Kitchen::Config.new
+      Kitchen.logger = Kitchen.default_file_logger(nil, false)
+      yield self if block_given?
+      define
+    end
+
+    private
+
+    # @return [Config] a Kitchen::Config
+    attr_reader :config
+
+    # Generates a test Rake task for each instance and one to test all
+    # instances in serial.
+    #
+    # @api private
+    def define
+      namespace "kitchen" do
+        config.instances.each do |instance|
+          desc "Run #{instance.name} test instance"
+          task instance.name do
+            instance.test(:always)
+          end
+        end
+
+        desc "Run all test instances"
+        task "all" => config.instances.map(&:name)
+      end
+    end
+  end
+end