test-kitchen 1.6.0 → 1.7.0

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

@@ -1,112 +1,112 @@
-# -*- 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/errors"
-require "kitchen/logging"
-
-module Kitchen
-
-  module Provisioner
-
-    module Chef
-
-      # Chef cookbook resolver that uses Librarian-Chef and a Cheffile to
-      # calculate dependencies.
-      #
-      # @author Fletcher Nichol <fnichol@nichol.ca>
-      class Librarian
-
-        include Logging
-
-        # Creates a new cookbook resolver.
-        #
-        # @param cheffile [String] path to a Cheffile
-        # @param path [String] path in which to vendor the resulting
-        #   cookbooks
-        # @param logger [Kitchen::Logger] a logger to use for output, defaults
-        #   to `Kitchen.logger`
-        def initialize(cheffile, path, logger = Kitchen.logger)
-          @cheffile   = cheffile
-          @path       = path
-          @logger     = logger
-        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)
-          load_librarian!(logger)
-        end
-
-        # Performs the cookbook resolution and vendors the resulting cookbooks
-        # in the desired path.
-        def resolve
-          version = ::Librarian::Chef::VERSION
-          info("Resolving cookbook dependencies with Librarian-Chef #{version}...")
-          debug("Using Cheffile from #{cheffile}")
-
-          env = ::Librarian::Chef::Environment.new(
-            :project_path => File.dirname(cheffile))
-          env.config_db.local["path"] = path
-          ::Librarian::Action::Resolve.new(env).run
-          ::Librarian::Action::Install.new(env).run
-        end
-
-        private
-
-        # @return [String] path to a Cheffile
-        # @api private
-        attr_reader :cheffile
-
-        # @return [String] path in which to vendor the resulting cookbooks
-        # @api private
-        attr_reader :path
-
-        # @return [Kitchen::Logger] a logger to use for output
-        # @api private
-        attr_reader :logger
-
-        # Load the Librarian-specific libary code.
-        #
-        # @param logger [Kitchen::Logger] the logger to use
-        # @raise [UserError] if the library couldn't be loaded
-        # @api private
-        def self.load_librarian!(logger)
-          first_load = require "librarian/chef/environment"
-          require "librarian/action/resolve"
-          require "librarian/action/install"
-
-          version = ::Librarian::Chef::VERSION
-          if first_load
-            logger.debug("Librarian-Chef #{version} library loaded")
-          else
-            logger.debug("Librarian-Chef #{version} previously loaded")
-          end
-        rescue LoadError => e
-          logger.fatal("The `librarian-chef' gem is missing and must be installed" \
-            " or cannot be properly activated. Run" \
-            " `gem install librarian-chef` or add the following to your" \
-            " Gemfile if you are using Bundler: `gem 'librarian-chef'`.")
-          raise UserError,
-            "Could not load or activate Librarian-Chef (#{e.message})"
-        end
-      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/errors"
+require "kitchen/logging"
+
+module Kitchen
+
+  module Provisioner
+
+    module Chef
+
+      # Chef cookbook resolver that uses Librarian-Chef and a Cheffile to
+      # calculate dependencies.
+      #
+      # @author Fletcher Nichol <fnichol@nichol.ca>
+      class Librarian
+
+        include Logging
+
+        # Creates a new cookbook resolver.
+        #
+        # @param cheffile [String] path to a Cheffile
+        # @param path [String] path in which to vendor the resulting
+        #   cookbooks
+        # @param logger [Kitchen::Logger] a logger to use for output, defaults
+        #   to `Kitchen.logger`
+        def initialize(cheffile, path, logger = Kitchen.logger)
+          @cheffile   = cheffile
+          @path       = path
+          @logger     = logger
+        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)
+          load_librarian!(logger)
+        end
+
+        # Performs the cookbook resolution and vendors the resulting cookbooks
+        # in the desired path.
+        def resolve
+          version = ::Librarian::Chef::VERSION
+          info("Resolving cookbook dependencies with Librarian-Chef #{version}...")
+          debug("Using Cheffile from #{cheffile}")
+
+          env = ::Librarian::Chef::Environment.new(
+            :project_path => File.dirname(cheffile))
+          env.config_db.local["path"] = path
+          ::Librarian::Action::Resolve.new(env).run
+          ::Librarian::Action::Install.new(env).run
+        end
+
+        private
+
+        # @return [String] path to a Cheffile
+        # @api private
+        attr_reader :cheffile
+
+        # @return [String] path in which to vendor the resulting cookbooks
+        # @api private
+        attr_reader :path
+
+        # @return [Kitchen::Logger] a logger to use for output
+        # @api private
+        attr_reader :logger
+
+        # Load the Librarian-specific libary code.
+        #
+        # @param logger [Kitchen::Logger] the logger to use
+        # @raise [UserError] if the library couldn't be loaded
+        # @api private
+        def self.load_librarian!(logger)
+          first_load = require "librarian/chef/environment"
+          require "librarian/action/resolve"
+          require "librarian/action/install"
+
+          version = ::Librarian::Chef::VERSION
+          if first_load
+            logger.debug("Librarian-Chef #{version} library loaded")
+          else
+            logger.debug("Librarian-Chef #{version} previously loaded")
+          end
+        rescue LoadError => e
+          logger.fatal("The `librarian-chef' gem is missing and must be installed" \
+            " or cannot be properly activated. Run" \
+            " `gem install librarian-chef` or add the following to your" \
+            " Gemfile if you are using Bundler: `gem 'librarian-chef'`.")
+          raise UserError,
+            "Could not load or activate Librarian-Chef (#{e.message})"
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/chef_apply.rb

@@ -1,125 +1,124 @@
-# -*- 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.
-
-# Usage:
-#
-# puts your recipes to` apply/` directory.
-#
-# An example of .kitchen.yml.
-#
-# ---
-# driver:
-#   name: vagrant
-#
-# provisioner:
-#   name: chef_apply
-#
-# platforms:
-#   - name: ubuntu-12.04
-#   - name: centos-6.4
-#
-# suites:
-#   - name: default
-#     run_list:
-#       - recipe1
-#       - recipe2
-#
-#
-# The chef-apply runs twice below.
-#
-# chef-apply apply/recipe1.rb
-# chef-apply apply/recipe2.rb
-
-require "kitchen/provisioner/chef_base"
-
-module Kitchen
-
-  module Provisioner
-
-    # Chef Apply provisioner.
-    #
-    # @author SAWANOBORI Yukihiko <sawanoboriyu@higanworks.com>)
-    class ChefApply < ChefBase
-
-      kitchen_provisioner_api_version 2
-
-      plugin_version Kitchen::VERSION
-
-      default_config :chef_apply_path do |provisioner|
-        provisioner.
-          remote_path_join(%W[#{provisioner[:chef_omnibus_root]} bin chef-apply]).
-          tap { |path| path.concat(".bat") if provisioner.windows_os? }
-      end
-
-      default_config :apply_path do |provisioner|
-        provisioner.calculate_path("apply")
-      end
-      expand_path_for :apply_path
-
-      # (see ChefBase#create_sandbox)
-      def create_sandbox
-        @sandbox_path = Dir.mktmpdir("#{instance.name}-sandbox-")
-        File.chmod(0755, sandbox_path)
-        info("Preparing files for transfer")
-        debug("Creating local sandbox in #{sandbox_path}")
-
-        prepare_json
-        prepare(:apply)
-      end
-
-      # (see ChefBase#init_command)
-      def init_command
-        dirs = %w[
-          apply
-        ].sort.map { |dir| remote_path_join(config[:root_path], dir) }
-
-        vars = if powershell_shell?
-          init_command_vars_for_powershell(dirs)
-        else
-          init_command_vars_for_bourne(dirs)
-        end
-
-        prefix_command(shell_code_from_file(vars, "chef_base_init_command"))
-      end
-
-      # (see ChefSolo#run_command)
-      def run_command
-        level = config[:log_level] == :info ? :auto : config[:log_level]
-
-        lines = []
-        config[:run_list].map do |recipe|
-          cmd = sudo(config[:chef_apply_path]).dup.
-            tap { |str| str.insert(0, "& ") if powershell_shell? }
-          args = [
-            "apply/#{recipe}.rb",
-            "--log_level #{level}",
-            "--no-color"
-          ]
-          args << "--logfile #{config[:log_file]}" if config[:log_file]
-
-          lines << wrap_shell_code(
-            [cmd, *args].join(" ").
-            tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-          )
-        end
-
-        prefix_command(lines.join("\n"))
-      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.
+
+# Usage:
+#
+# puts your recipes to` apply/` directory.
+#
+# An example of .kitchen.yml.
+#
+# ---
+# driver:
+#   name: vagrant
+#
+# provisioner:
+#   name: chef_apply
+#
+# platforms:
+#   - name: ubuntu-12.04
+#   - name: centos-6.4
+#
+# suites:
+#   - name: default
+#     run_list:
+#       - recipe1
+#       - recipe2
+#
+#
+# The chef-apply runs twice below.
+#
+# chef-apply apply/recipe1.rb
+# chef-apply apply/recipe2.rb
+
+require "kitchen/provisioner/chef_base"
+
+module Kitchen
+
+  module Provisioner
+
+    # Chef Apply provisioner.
+    #
+    # @author SAWANOBORI Yukihiko <sawanoboriyu@higanworks.com>)
+    class ChefApply < ChefBase
+
+      kitchen_provisioner_api_version 2
+
+      plugin_version Kitchen::VERSION
+
+      default_config :chef_apply_path do |provisioner|
+        provisioner.
+          remote_path_join(%W[#{provisioner[:chef_omnibus_root]} bin chef-apply]).
+          tap { |path| path.concat(".bat") if provisioner.windows_os? }
+      end
+
+      default_config :apply_path do |provisioner|
+        provisioner.calculate_path("apply")
+      end
+      expand_path_for :apply_path
+
+      # (see ChefBase#create_sandbox)
+      def create_sandbox
+        @sandbox_path = Dir.mktmpdir("#{instance.name}-sandbox-")
+        File.chmod(0755, sandbox_path)
+        info("Preparing files for transfer")
+        debug("Creating local sandbox in #{sandbox_path}")
+
+        prepare_json
+        prepare(:apply)
+      end
+
+      # (see ChefBase#init_command)
+      def init_command
+        dirs = %w[
+          apply
+        ].sort.map { |dir| remote_path_join(config[:root_path], dir) }
+
+        vars = if powershell_shell?
+          init_command_vars_for_powershell(dirs)
+        else
+          init_command_vars_for_bourne(dirs)
+        end
+
+        prefix_command(shell_code_from_file(vars, "chef_base_init_command"))
+      end
+
+      # (see ChefSolo#run_command)
+      def run_command
+        level = config[:log_level]
+        lines = []
+        config[:run_list].map do |recipe|
+          cmd = sudo(config[:chef_apply_path]).dup.
+            tap { |str| str.insert(0, "& ") if powershell_shell? }
+          args = [
+            "apply/#{recipe}.rb",
+            "--log_level #{level}",
+            "--no-color"
+          ]
+          args << "--logfile #{config[:log_file]}" if config[:log_file]
+
+          lines << wrap_shell_code(
+            [cmd, *args].join(" ").
+            tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
+          )
+        end
+
+        prefix_command(lines.join("\n"))
+      end
+    end
+  end
+end