kitchen-shopify-provisioner 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06def47fb4d58f6f8cfa8205998c93548e55087
-  data.tar.gz: c218f81e545d5de917fde485bce4d4c6653cfd99
+  metadata.gz: da1c921b079b138dfbd9c71d0ae83fdacadc1fb3
+  data.tar.gz: 866f35bb98f1515c2a5df128af9bfe868309d322
 SHA512:
-  metadata.gz: a936ba9d5720b015098103d4116aca1dfcfd9d0382ff66748ab4b4df9ca83fb58c19ead7191adece4a0f2ecedbab33725d22d6695ecad51bece8fd64e798444e
-  data.tar.gz: e33b72e96309362c64146eee23a48df51a3c2321714e51b5959c0d2b8acf1dc290911382e6643ac7922e263d62282e905e01a90ad26a5318446f7e947a5299a5
+  metadata.gz: fc5adf47ae3d103bcdf558d54649a86ccd94e1462bdca99f8cac2c220515dc614bc189b654f478bce4cc5084549081d225adf287a93750696450426b7783f03a
+  data.tar.gz: 5107dcf1a8363d390021a11eca386ece03f9f00033421bdabc3d7d4ae737d25c55ffd66ad05efbcb33df488780938ee11d05203ac4f0be3835262eaa2894b5b9

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-- 2.0.0
-- 1.9.3
+- 2.2.0
 install: bundle install
 script: rspec

data/LICENSE.txt

@@ -1,5 +1,3 @@
-Copyright (c) 2013 David Genord II
-
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining

data/lib/kitchen-shopify-provisioner/version.rb

@@ -1,3 +1,3 @@
 module KitchenShopifyProvisioner
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/kitchen/provisioner/chef_zero_shopify.rb

@@ -0,0 +1,31 @@
+require 'kitchen/provisioner/chef_zero'
+require 'chef-config/config'
+require 'chef/role'
+
+module Kitchen
+  module Provisioner
+
+    # This Provisioner combines the roles of the Apt, Ruby Roles, and ChefZero
+    # provisioners, to ensure a server is ready to run before ChefZero starts its magic
+    # Must be named "Chef..." otherwise TestKitchen won't understand that we intend to use chef
+    class ChefZeroShopify < ChefZero
+      def create_sandbox
+        tmpdir = Dir.mktmpdir
+
+        at_exit do
+          FileUtils.rm_rf(tmpdir)
+        end
+
+        Dir.glob(File.join(config[:roles_path], '**', '*.rb')).each do |rb_file|
+          obj = ::Chef::Role.new
+          obj.from_file(rb_file)
+          json_file = rb_file.sub(/\.rb$/, '.json').gsub(config[:roles_path], '').sub(/^\//, '').split('/').join('--')
+          File.write(File.join(tmpdir, json_file), ::Chef::JSONCompat.to_json_pretty(obj))
+        end
+
+        config[:roles_path] = tmpdir
+        super
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-shopify-provisioner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dale Hamel
@@ -81,7 +81,7 @@ files:
 - Rakefile
 - kitchen-shopify-provisioner.gemspec
 - lib/kitchen-shopify-provisioner/version.rb
-- lib/kitchen/provisioner/shopify_chef_zero.rb
+- lib/kitchen/provisioner/chef_zero_shopify.rb
 - spec/spec_helper.rb
 homepage: https://github.com/shopify/kitchen-shopify-provisioner
 licenses:

data/lib/kitchen/provisioner/shopify_chef_zero.rb

@@ -1,69 +0,0 @@
-require 'find'
-require 'tmpdir'
-require 'fileutils'
-
-require 'chef/role'
-require 'kitchen/provisioner/chef_zero'
-
-module Kitchen
-  module Provisioner
-
-    # We'll sneak some code in before the default chef zero provisioner runs
-    # This will allow us to convert our roles to JSON, and flatten at once
-    class ShopifyChefZero < ChefZero
-
-      # Wedge our 'inject_roles' logic in between the other create_sandbox logic in the inheritance hierarchy
-      # This kind of monkey patching isn't fool proof: if ChefBase or ChefZero change the logic of their
-      # create_sandbox functions, those changes must be reflected here. We cannot simply call them, as
-      # they will try to call super, which we can't tolerate.
-      def create_sandbox
-        base_sandbox
-        inject_roles
-        chefbase_sandbox
-        chefzero_sandbox
-      end
-
-    private
-
-      # If the implementation of Base#create_sandbox changes, copy and paste the code here
-      def base_sandbox
-        Kitchen::Provisioner::Base.instance_method(:create_sandbox).bind(self).call
-      end
-
-      # If the implementation of ChefBase#create_sandbox changes, copy and paste the code here
-      def chefbase_sandbox
-        sanity_check_sandbox_options!
-        Chef::CommonSandbox.new(config, sandbox_path, instance).populate
-      end
-
-      # If the implementation of ChefZero#create_sandbox changes, copy and paste the code here
-      def chefzero_sandbox
-        send(:prepare_chef_client_zero_rb)
-        send(:prepare_validation_pem)
-        send(:prepare_client_rb)
-      end
-
-      def inject_roles
-        tmpdir = Dir.mktmpdir('chef-flattened-roles')
-
-        at_exit do
-          FileUtils.rm_rf(tmpdir)
-        end
-
-        roles_path = config[:roles_path] || remote_path_join(config[:root_path], "roles")
-        roles = []
-        Find.find(roles_path) { |f| roles << f if f =~ /\.rb$/  }
-
-        roles.each do |rb_file|
-          obj = ::Chef::Role.new
-          obj.from_file(rb_file)
-          json_file = rb_file.sub(/\.rb$/, '.json').gsub(roles_path, '').split('/').select { |x| x unless x.empty? }.join('--')
-
-          File.write(File.join(tmpdir, json_file), ::Chef::JSONCompat.to_json_pretty(obj))
-        end
-
-        config[:roles_path] = tmpdir
-      end
-    end
-  end
-end