kitchen-chef_zero_berks_env 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f606d23cba1fa31d168cbccf375d367e7443fd04
-  data.tar.gz: b297ce4e8f2a5a707fab565a5bf89eb63bac4422
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTk4NjZlOTk3NjM4YWQ1YmI4MTk1ZmJiNmI2YTk0YWU3NWExZWRjOA==
+  data.tar.gz: !binary |-
+    MWM4M2RmYWRiN2M3NmYyMTZhMmMwNzYyMjIzMTU5NzEwOTRjNzc3Mg==
 SHA512:
-  metadata.gz: 12ca5700a66cb6244b9ffddb8887ab1ca75308a918ae9857bf8a697ddba40009aea3d7c6a2eab521837524291815f5762f00c07edc586a1f460749c59710faa9
-  data.tar.gz: a0fd9421e62f51ca709c82ddf87f049d1525e832f2a2af863e76c9ef937f31419251538396b9abee0cf969a9062ddb576676e8dac7139979dcbb149244d03f9e
+  metadata.gz: !binary |-
+    NjExMzg4Y2IyNjBkMDUyMmRjMWY5ZDZiZDg1NjRjYzk1N2M1ZGIyYjdiMmUw
+    YzgzYmJiMmRiYzhiYWQ0OTcxYjRlOTEyZjI1MjAzMWZlYTRmNzBjZjE5MGM3
+    YWNkMTFmZGM3NWNhMzU3MjRiOTgzNWIzYmI2ZGM5NjZhNThhM2M=
+  data.tar.gz: !binary |-
+    MGE4NmQxMDg3NWNhZDc3MTg1MjczYzMyMjhkYThhYTZmYThiOGNlODcwNjlk
+    NzJmMGQxYmE2OTkyZDRlYWE3ZjUwYTk1MDc0ZGYwNzU4NGZlMDg4ZWNlNDRm
+    OTgxYTgxMjM5ZTYwODI5MDhhMWM0NTdmMzY3MTE5YTIwNWE0OTM=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # kitchen-chef_zero_berks_env
 
-## v0.0.1 (2015-09-20)
+## v1.1.0 (2015-09-21)
+
+New feature: Added config option `environments_repo`.
+Enhancement: Better structured (less monolithic).
+
+## v1.0.0 (2015-09-20)
 
 Initial release

data/README.md

@@ -20,6 +20,9 @@ Hopefuly this provider will do the trick!
 Simply replace the provider from `chef_zero` to `chef_zero_berks_env`.
 The provider will look for the `environments_path` and `environment` configs from the provider.
 
+You can specify the `environments_repo` config, that overrides the `environments_path`. That allows you to fetch the chef environments
+from a remote repository.
+
 ## Example
 
 ```yaml
@@ -33,3 +36,16 @@ suites:
       client_rb:
         environment: 'my_chef_environment'
 ```
+or
+
+```yaml
+provisioner:
+  name: chef_zero_berks_env
+  environments_repo: 'git@github.com:ruizink/my_awesome_chef_environments.git'
+
+suites:
+  - name: default
+    provisioner:
+      client_rb:
+        environment: 'my_chef_environment'
+```

data/lib/kitchen/provisioner/chef_zero_berks_env.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'kitchen/provisioner/chef_zero'
+require 'git'
 
 module Kitchen
   module Provisioner
@@ -20,30 +21,11 @@ module Kitchen
 
         # skip if the environment was not specified
         unless chef_environment.nil?
-          info("Loading chef environment '#{chef_environment}'...")
-          debug("Using environment from '#{config[:environments_path]}/#{chef_environment}.json'")
-
-          environment_json = JSON.parse(File.read("#{config[:environments_path]}/#{chef_environment}.json"))
-
-          ::Berkshelf.ui.mute do
-            info("Resolving dependency graph with Berkshelf #{::Berkshelf::VERSION}...")
-            berks.install
-            info("Locking the versions fetched from the chef environment '#{chef_environment}'...")
-            unless environment_json['cookbook_versions'].nil?
-              berks.lockfile.graph.each do |graphitem|
-                version = environment_json['cookbook_versions'][graphitem.name]
-                unless version.nil? || berks.has_dependency?(graphitem.name)
-                  info("Adding Berkshelf dependency: #{graphitem.name} (#{version})")
-                  berks.add_dependency(graphitem.name, version)
-                end
-              end
-              # update the lockfile
-              berks.update
-              berks.lockfile.graph.update(berks.install)
-              berks.lockfile.update(berks.dependencies)
-              berks.lockfile.save
-            end
+          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}...")
@@ -60,6 +42,54 @@ module Kitchen
           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,62 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-chef_zero_berks_env
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mário Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-description: |2
-    Plugin for test-kitchen that extends the chef_zero provisioner allowing
-    berkshelf to use cookbook restrictions loaded from chef environment files.
-    This way, Berkshelf will allways vendor the cookbook versions specified
-    in the chef environment.
+description: ! "  Plugin for test-kitchen that extends the chef_zero provisioner allowing\n
+  \ berkshelf to use cookbook restrictions loaded from chef environment files.\n  This
+  way, Berkshelf will allways vendor the cookbook versions specified\n  in the chef
+  environment.\n"
 email:
 - mario.rf.santos@gmail.com
 executables: []
@@ -78,12 +91,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []