kondate 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e4565a06cb67ddcdc68ec478f79eddcd62c79f
-  data.tar.gz: 113171ca31b07bf37a0251b900c11356a58779d0
+  metadata.gz: a431b57f1b6c036f09520ef851e7fd4b41a5329e
+  data.tar.gz: cb3ccc508f8f9ab2d7ef47e34291d4997578c5f6
 SHA512:
-  metadata.gz: 17512f064f3680d957ca684a094d76da7d72d2d09a9c430e8148151605f3a1b13409ae8a31fd8fd86a59e87e7623ed9472a1e5f8689fde0433580b5dfacbd1e3
-  data.tar.gz: f944aa126fab8f1f843375fbd1f930d783e0dca03c00cf5a414ee45b2419d5664354ee9a73402fbbf80a73aa861921becce564bb7a2a59e0e840224adc53e50d
+  metadata.gz: f6cf11acfe6ac73c2d53271a1c669a128c567e2d6a679ea931ab29e8f79c4aae713a3c48c3fb11686de7fe96d0cf09d167246f5d9c5a935a0cbc547ff8395abd
+  data.tar.gz: a1eeb1a1059e97cbc7150055c52414b70a9ffec2e70d957fb57eb3bc48a551957bf2ea7dc44afc1eeb580c535172525feb9c2eee8dfaa4d5a65e8a2781001b55

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.2 (2016-12-01)
+
+Enhancements:
+
+* Support secret recipes and spec files
+
 # 0.4.1 (2016-12-01)
 
 Fixes:

data/README.md

@@ -65,11 +65,6 @@ $ bundle exec kondate serverspec-role <role>
 │   ├── nodes         # host specific properties
 │   ├── roles         # role properties
 │   └── environments  # environment properties
-├── secrets           # manages secrets attributes such as passwords
-│   └── properties
-│       ├── nodes
-│       ├── roles
-│       └── environments
 ├── recipes           # itamae recipes
 │   ├── middleware    # middleware recipes
 │   │   └── base
@@ -80,7 +75,17 @@ $ bundle exec kondate serverspec-role <role>
     │   └── base_spec.rb
     ├─  roles         # role recipes specs
     └── spec_helper.rb
-```
+├── secrets           # manages secrets attributes such as passwords
+│   ├── properties
+│   │   ├── environments
+│   │   ├── nodes
+│   │   └── roles
+│   ├── recipes
+│   │   ├── middleware
+│   │   └── roles
+│   └── spec
+│       ├── middleware
+│       └── roles```
 
 ### .kondate.conf
 
@@ -94,6 +99,10 @@ roles_recipes_serverspec_dir: spec/roles
 nodes_properties_dir: properties/nodes
 roles_properties_dir: properties/roles
 environments_properties_dir: properties/environments
+secret_middlware_recipes_dir: secrets/recipes/middleware
+secret_roles_recipes_dir: secrets/recipes/roles
+secret_middleware_recipes_serverspec_dir: secrets/spec/middleware
+secret_roles_recipes_serverspec_dir: secrets/spec/roles
 secret_nodes_properties_dir: secrets/properties/nodes
 secret_roles_properties_dir: secrets/properties/roles
 secret_environments_properties_dir: secrets/properties/environments

data/lib/kondate/cli.rb

@@ -168,9 +168,13 @@ module Kondate
       property_files.each do |role, property_file|
         next if property_file.nil?
         spec_files = property_file.load['attributes'].keys.map {|recipe|
-          File.join(Config.middleware_recipes_serverspec_dir, "#{recipe}_spec.rb")
+          secret_spec_file = File.join(Config.secret_middleware_recipes_serverspec_dir, "#{recipe}_spec.rb")
+          spec_file = File.join(Config.middleware_recipes_serverspec_dir, "#{recipe}_spec.rb")
+          File.exist?(secret_spec_file) ? secret_spec_file : spec_file
         }.compact
-        spec_files << RoleFile.explore(Config.roles_recipes_serverspec_dir, role, "_spec.rb")
+        secret_role_spec_file = RoleFile.explore(Config.secret_roles_recipes_serverspec_dir, role, "_spec.rb")
+        role_spec_file = RoleFile.explore(Config.roles_recipes_serverspec_dir, role, "_spec.rb")
+        spec_files << (File.exist?(secret_role_spec_file) ? secret_role_spec_file : role_spec_file)
         spec_files.select! {|spec| File.exist?(spec) }
 
         env['TARGET_HOST'] = host

data/lib/kondate/config.rb

@@ -42,6 +42,10 @@ module Kondate
           'nodes_properties_dir' => nodes_properties_dir,
           'roles_properties_dir' => roles_properties_dir,
           'environments_properties_dir' => environments_properties_dir,
+          'secret_middleware_recipes_dir' => secret_middleware_recipes_dir,
+          'secret_roles_recipes_dir' => secret_roles_recipes_dir,
+          'secret_middleware_recipes_serverspec_dir' => secret_middleware_recipes_serverspec_dir,
+          'secret_roles_recipes_serverspec_dir' => secret_roles_recipes_serverspec_dir,
           'secret_nodes_properties_dir' => secret_nodes_properties_dir,
           'secret_roles_properties_dir' => secret_roles_properties_dir,
           'secret_environments_properties_dir' => secret_environments_properties_dir,
@@ -76,6 +80,22 @@ module Kondate
         config[:environments_properties_dir] || 'properties/environments'
       end
 
+      def secret_middleware_recipes_dir
+        config[:secret_middleware_recipes_dir] || 'secrets/recipes/middleware'
+      end
+
+      def secret_roles_recipes_dir
+        config[:secret_roles_recipes_dir] || 'secrets/recipes/roles'
+      end
+
+      def secret_middleware_recipes_serverspec_dir
+        config[:secret_middleware_recipes_serverspec_dir] || 'secrets/spec/middleware'
+      end
+
+      def secret_roles_recipes_serverspec_dir
+        config[:secret_roles_recipes_serverspec_dir] || 'secrets/spec/roles'
+      end
+
       def secret_nodes_properties_dir
         config[:secret_nodes_properties_dir] || 'secrets/properties/nodes'
       end

data/lib/kondate/templates/.kondate.conf

@@ -6,6 +6,10 @@ roles_recipes_serverspec_dir: spec/roles
 nodes_properties_dir: properties/nodes
 roles_properties_dir: properties/roles
 environments_properties_dir: properties/environments
+secret_middlware_recipes_dir: secrets/recipes/middleware
+secret_roles_recipes_dir: secrets/recipes/roles
+secret_middleware_recipes_serverspec_dir: secrets/spec/middleware
+secret_roles_recipes_serverspec_dir: secrets/spec/roles
 secret_nodes_properties_dir: secrets/properties/nodes
 secret_roles_properties_dir: secrets/properties/roles
 secret_environments_properties_dir: secrets/properties/environments

data/lib/kondate/templates/bootstrap.rb

@@ -3,9 +3,15 @@ require 'kondate'
 
 recipes = node['attributes'].keys
 recipes.each do |recipe|
-  include_recipe(File.join(Kondate::Config.middleware_recipes_dir, recipe, "default.rb"))
+  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
-role_recipe = Kondate::RoleFile.explore(Kondate::Config.roles_recipes_dir, node[:role], "#{File::SEPARATOR}default.rb")
-if File.exist?(role_recipe)
-  include_recipe(role_recipe)
+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

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - sonots