kitchen-chef_zero_berks_env 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTk4NjZlOTk3NjM4YWQ1YmI4MTk1ZmJiNmI2YTk0YWU3NWExZWRjOA==
+    MjdiYmRkMTYzZTEzY2FkZGVmMTEyNjJmZGQyYzBmYzZhM2E1MjIwMg==
   data.tar.gz: !binary |-
-    MWM4M2RmYWRiN2M3NmYyMTZhMmMwNzYyMjIzMTU5NzEwOTRjNzc3Mg==
+    MjI5OWU3MGU0MDM3NjZjZmMwNjhiOGY4MWQxNmVhMDBjOGI4OTk2YQ==
 SHA512:
   metadata.gz: !binary |-
-    NjExMzg4Y2IyNjBkMDUyMmRjMWY5ZDZiZDg1NjRjYzk1N2M1ZGIyYjdiMmUw
-    YzgzYmJiMmRiYzhiYWQ0OTcxYjRlOTEyZjI1MjAzMWZlYTRmNzBjZjE5MGM3
-    YWNkMTFmZGM3NWNhMzU3MjRiOTgzNWIzYmI2ZGM5NjZhNThhM2M=
+    MjllYjQwZTM4ODFiYTAyZDY5NGE1YzFjZjAzOGM1NDM0YTEzNDI0ZjdjMTEy
+    YWE1ZDY1NjFlNmI1NGVlMGQ1Y2I1ODJkMjllODcxMWNlYTE1NDY0ZGQ4MTJj
+    NGNjMDhlZTFlMDJmODM5YTJhZGQyYWIxZDhmYzFmMjc1NGEyNzE=
   data.tar.gz: !binary |-
-    MGE4NmQxMDg3NWNhZDc3MTg1MjczYzMyMjhkYThhYTZmYThiOGNlODcwNjlk
-    NzJmMGQxYmE2OTkyZDRlYWE3ZjUwYTk1MDc0ZGYwNzU4NGZlMDg4ZWNlNDRm
-    OTgxYTgxMjM5ZTYwODI5MDhhMWM0NTdmMzY3MTE5YTIwNWE0OTM=
+    MGM5Mjk5ZTI0MWVkOGYyOWZhYzQ0Y2U1YTgwMGExOTI1MjdmNDI5YjMwZWIz
+    MDhhODhhYTMxMzM1NDI0MWE4MGZjMWY3MDc4MzNlYTdlMTk3NDdkNWViZDcx
+    YTU2Y2NkMmM3YTI1N2EyYWIxM2ZhMWUyZDI0ZjZmYjk5NzhmMTM=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # kitchen-chef_zero_berks_env
 
+## v1.1.1 (2015-09-21)
+
+Bugfixes.
+
 ## v1.1.0 (2015-09-21)
 
 New feature: Added config option `environments_repo`.

data/lib/kitchen/provisioner/chef_zero_berks_env.rb

@@ -1,94 +1,23 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 
 require 'kitchen/provisioner/chef_zero'
-require 'git'
+require 'kitchen/provisioner/sandbox_berks_env'
 
 module Kitchen
   module Provisioner
-    # Tweaked Chef Zero provisioner that enables Berkshelf to load
-    # cookbook restrictions from Chef environments.
+    # Chef Zero Berkshelf Environment provisioner.
     #
     # @author Mario Santos <mario.rf.santos@gmail.com>
     class ChefZeroBerksEnv < ChefZero
-      # Performs a Berkshelf cookbook resolution inside a common mutex.
-      #
-      # @api private
-      def resolve_with_berkshelf
-        # Load Berksfile
-        berks = ::Berkshelf::Berksfile.from_file(berksfile)
-
-        chef_environment = config[:client_rb][:environment]
-
-        # skip if the environment was not specified
-        unless chef_environment.nil?
-          unless config[:environments_repo].nil?
-            config[:environments_path] = environments_path_from_git(config[:environments_repo])
-          end
-          info("Loading chef environment '#{chef_environment}'...")
-          lock_berksfile(berks, cookbook_versions("#{config[:environments_path]}/#{chef_environment}.json"))
-        end
-        Kitchen.mutex.synchronize do
-          info("Resolving cookbook dependencies with Berkshelf #{::Berkshelf::VERSION}...")
-          debug("Using Berksfile from #{berksfile}")
-
-          ::Berkshelf.ui.mute do
-            if ::Berkshelf::Berksfile.method_defined?(:vendor)
-              # Berkshelf 3.0 requires the directory to not exist
-              FileUtils.rm_rf(tmpbooks_dir)
-              berks.vendor(tmpbooks_dir)
-            else
-              berks.install(path => tmpbooks_dir)
-            end
-          end
-        end
-      end
-
-      # Fetches a git repo to a temporary directory
-      #
-      # @param args [String] git repo
-      # @return [String] the environments_path directory
-      # @api private
-      def environments_path_from_git(repo)
-        info("Fetching chef environments from repo '#{repo}'...")
-        tmpenv_dir = Dir.mktmpdir('environments-')
-        Git.clone(repo, 'chef_env', path: tmpenv_dir, depth: 1)
-        "#{tmpenv_dir}/chef_env"
-      end
-
-      # Gets the cookbook version restrictions from a chef environment
-      #
-      # @param [String] chef environment path
-      # @return [Hash] cookbook versions
-      # @api private
-      def cookbook_versions(json_path)
-        info("Using environment from '#{json_path}'")
-        JSON.parse(File.read("#{json_path}"))['cookbook_versions']
-      end
-
-      # Locks the cookbook versions into Berksfile.lock
-      #
-      # @param [Berksfile] berksfile to lock
-      # @param [Hash] cookbook versions
-      # @api private
-      def lock_berksfile(berksfile, cookbook_versions)
-        ::Berkshelf.ui.mute do
-          info("Resolving dependency graph with Berkshelf #{::Berkshelf::VERSION}...")
-          berksfile.install
-          unless cookbook_versions.nil?
-            berksfile.lockfile.graph.each do |graphitem|
-              version = cookbook_versions[graphitem.name]
-              unless version.nil? || berksfile.has_dependency?(graphitem.name)
-                info("Adding Berkshelf dependency: #{graphitem.name} (#{version})")
-                berksfile.add_dependency(graphitem.name, version)
-              end
-            end
-            # update the lockfile
-            berksfile.update
-            berksfile.lockfile.graph.update(berksfile.install)
-            berksfile.lockfile.update(berksfile.dependencies)
-            berksfile.lockfile.save
-          end
-        end
+      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}")
+        SandboxBerksEnv.new(config, sandbox_path, instance).populate
+        prepare_chef_client_zero_rb
+        prepare_validation_pem
+        prepare_client_rb
       end
     end
   end

data/lib/kitchen/provisioner/sandbox_berks_env.rb

@@ -0,0 +1,96 @@
+# -*- encoding: utf-8 -*-
+
+require 'kitchen/provisioner/chef/common_sandbox'
+require 'git'
+
+module Kitchen
+  module Provisioner
+    # Internal object to manage sandbox preparation for
+    # Chef Zero Berkshelf Environment.
+    #
+    # @author Mario Santos <mario.rf.santos@gmail.com>
+    # @api private
+    class SandboxBerksEnv < Chef::CommonSandbox
+      # Performs a Berkshelf cookbook resolution inside a common mutex.
+      #
+      # @api private
+      def resolve_with_berkshelf
+        # Load Berksfile
+        berks = ::Berkshelf::Berksfile.from_file(berksfile)
+
+        chef_environment = config[:client_rb][:environment]
+
+        # skip if the environment was not specified
+        unless chef_environment.nil?
+          unless config[:environments_repo].nil?
+            config[:environments_path] = environments_path_from_git(config[:environments_repo])
+          end
+          info("Loading chef environment '#{chef_environment}'...")
+          lock_berksfile(berks, cookbook_versions("#{config[:environments_path]}/#{chef_environment}.json"))
+        end
+        Kitchen.mutex.synchronize do
+          info("Resolving cookbook dependencies with Berkshelf #{::Berkshelf::VERSION}...")
+          debug("Using Berksfile from #{berksfile}")
+
+          ::Berkshelf.ui.mute do
+            if ::Berkshelf::Berksfile.method_defined?(:vendor)
+              # Berkshelf 3.0 requires the directory to not exist
+              FileUtils.rm_rf(tmpbooks_dir)
+              berks.vendor(tmpbooks_dir)
+            else
+              berks.install(path => tmpbooks_dir)
+            end
+          end
+        end
+      end
+
+      # Fetches a git repo to a temporary directory
+      #
+      # @param args [String] git repo
+      # @return [String] the environments_path directory
+      # @api private
+      def environments_path_from_git(repo)
+        info("Fetching chef environments from repo '#{repo}'...")
+        tmpenv_dir = Dir.mktmpdir('environments-')
+        Git.clone(repo, 'chef_env', path: tmpenv_dir, depth: 1)
+        "#{tmpenv_dir}/chef_env"
+      end
+
+      # Gets the cookbook version restrictions from a chef environment
+      #
+      # @param [String] chef environment path
+      # @return [Hash] cookbook versions
+      # @api private
+      def cookbook_versions(json_path)
+        info("Using environment from '#{json_path}'")
+        JSON.parse(File.read("#{json_path}"))['cookbook_versions']
+      end
+
+      # Locks the cookbook versions into Berksfile.lock
+      #
+      # @param [Berksfile] berksfile to lock
+      # @param [Hash] cookbook versions
+      # @api private
+      def lock_berksfile(berksfile, cookbook_versions)
+        ::Berkshelf.ui.mute do
+          info("Resolving dependency graph with Berkshelf #{::Berkshelf::VERSION}...")
+          berksfile.install
+          unless cookbook_versions.nil?
+            berksfile.lockfile.graph.each do |graphitem|
+              version = cookbook_versions[graphitem.name]
+              unless version.nil? || berksfile.has_dependency?(graphitem.name)
+                info("Adding Berkshelf dependency: #{graphitem.name} (#{version})")
+                berksfile.add_dependency(graphitem.name, version)
+              end
+            end
+            # update the lockfile
+            berksfile.update
+            berksfile.lockfile.graph.update(berksfile.install)
+            berksfile.lockfile.update(berksfile.dependencies)
+            berksfile.lockfile.save
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-chef_zero_berks_env
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mário Santos
@@ -80,6 +80,7 @@ files:
 - LICENSE
 - README.md
 - lib/kitchen/provisioner/chef_zero_berks_env.rb
+- lib/kitchen/provisioner/sandbox_berks_env.rb
 - lib/kitchen_chef_zero_berks_env.rb
 homepage: https://github.com/ruizink/kitchen-chef_zero_berks_env
 licenses: