kondate 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d31589ca629f60bafbae2b69c18b2624727f61bf
-  data.tar.gz: bf1aab50985881df2d3992a52450f5c7b1bbd2c7
+  metadata.gz: 54deb24b15782ee8fbbba818d19c6d493d0a5b2e
+  data.tar.gz: 492519e0f1d06fc38af99e5e576a4c7ded06451b
 SHA512:
-  metadata.gz: ede72933e1fe30fa55497986daaaa849e8e0afc1c67ae78ebc267595b441fb02f129b874752303eac3d490f66cabc6ce9ee366f8294ac4968326ce1fda82adb8
-  data.tar.gz: 7c0ae9c00177ec96fb7fe967d56d90106163b29ede13caf2b8af9ece4726df90eac0a02f933ce662661afc097533a0c6571bd74f91399958edb5697db3573adb
+  metadata.gz: c3f87cc6ccf660587da86c2ef04b724623251cb0a6c3ddbf1d56106923609a2ea11c8419fa56e74dbe50b8112147236be93fd8f1a83600300d9d8d976d46d4ba
+  data.tar.gz: 6efaf410472520861cfe17e234e1d3ece626594ed4ba80fd6469c9afaaa1176d0405b2b2efb23d11aca2bd24899368b1bf0a637bf5fc42eec1d3eeba832407ba

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.4 (2016-12-02)
+
+Changes:
+
+* Prepare `Kondate::ItamaeBootstrap.bootstrap(context)`. Now, bootstrap.rb should just call it.
+
 # 0.4.3 (2016-12-02)
 
 Fixes:

data/README.md

@@ -85,7 +85,8 @@ $ bundle exec kondate serverspec-role <role>
 │   │   └── roles
 │   └── spec
 │       ├── middleware
-│       └── roles```
+│       └── roles
+```
 
 ### .kondate.conf
 

data/lib/kondate/itamae_bootstrap.rb

@@ -0,0 +1,48 @@
+module Kondate
+  class ItamaeBootstrap
+    # @param [Itamae::Recipe::EvalContext] context itamae context
+    def self.bootstrap(context)
+      self.new(context).bootstrap
+    end
+
+    # @param [Itamae::Recipe::EvalContext] context itamae context
+    def initialize(context)
+      @context = context
+    end
+
+    def bootstrap
+      bootstrap_middleware_recipes
+      bootstrap_role_recipes
+    end
+
+    private
+
+    def node
+      @context.node
+    end
+
+    def include_recipe(recipe)
+      @context.include_recipe(recipe)
+    end
+
+    def bootstrap_middleware_recipes
+      recipes = node['attributes'].keys
+      recipes.each do |recipe|
+        secret_recipe_file = File.join(Config.secret_middleware_recipes_dir, recipe, "default.rb")
+        recipe_file = File.join(Config.middleware_recipes_dir, recipe, "default.rb")
+        File.exist?(secret_recipe_file) ? include_recipe(secret_recipe_file) : include_recipe(recipe_file)
+      end
+    end
+
+    def bootstrap_role_recipes
+      sep = File::SEPARATOR
+      secret_role_recipe_file = RoleFile.explore(Config.secret_roles_recipes_dir, node[:role], "#{sep}default.rb")
+      role_recipe_file = RoleFile.explore(Config.roles_recipes_dir, node[:role], "#{sep}default.rb")
+      if File.exist?(secret_role_recipe_file)
+        include_recipe(secret_role_recipe_file)
+      elsif File.exist?(role_recipe_file)
+        include_recipe(role_recipe_file)
+      end
+    end
+  end
+end

data/lib/kondate/templates/bootstrap.rb

@@ -1,17 +1,3 @@
-require 'yaml'
 require 'kondate'
 
-recipes = node['attributes'].keys
-recipes.each do |recipe|
-  secret_recipe_file = File.join(Kondate::Config.secret_middleware_recipes_dir, recipe, "default.rb")
-  recipe_file = File.join(Kondate::Config.middleware_recipes_dir, recipe, "default.rb")
-  File.exist?(secret_recipe_file) ? include_recipe(secret_recipe_file) : include_recipe(recipe_file)
-end
-sep = File::SEPARATOR
-secret_role_recipe_file = Kondate::RoleFile.explore(Kondate::Config.secret_roles_recipes_dir, node[:role], "#{sep}default.rb")
-role_recipe_file = Kondate::RoleFile.explore(Kondate::Config.roles_recipes_dir, node[:role], "#{sep}default.rb")
-if File.exist?(secret_role_recipe_file)
-  include_recipe(secret_role_recipe_file)
-elsif File.exist?(role_recipe_file)
-  include_recipe(role_recipe_file)
-end
+Kondate::ItamaeBootstrap.bootstrap(self)

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/kondate.rb

@@ -11,3 +11,4 @@ require "kondate/hash_ext"
 require "kondate/string_util"
 require "kondate/error"
 require "kondate/host_plugin/base"
+require "kondate/itamae_bootstrap"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -176,6 +176,7 @@ files:
 - lib/kondate/hash_ext.rb
 - lib/kondate/host_plugin/base.rb
 - lib/kondate/host_plugin/file.rb
+- lib/kondate/itamae_bootstrap.rb
 - lib/kondate/property_builder.rb
 - lib/kondate/property_file.rb
 - lib/kondate/role_file.rb