kafo 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b6ffa265250c49b12e016bc63f962c8bb79f81c
-  data.tar.gz: 4b32a26582cfd6b257f91b27bbd8a5ef53a80410
+  metadata.gz: d356aabda9fad9af796d3871dd9c8bd96b14b757
+  data.tar.gz: 294fa5e00481474a926c7fa2ce15f04135636150
 SHA512:
-  metadata.gz: f0d000c16759db40e7b7b414a842ad1a3c553bb34e0d49f2733a884012caf3a118c3515b27eafff652050d4f1c4db0587bb241d251d59df3e301e27ed3961f9d
-  data.tar.gz: 4a6f363efca30b67a8db7aa080376dfdcf43d123b944e1b0bb4005561c2161f0120dbe470f0cdca68e5a08425e72579a29af16556557c6106b9f0bc0e40fc1ed
+  metadata.gz: fdf82c1c6d3ceb029d8ec780b0d31dfbf377bacb2e394924e474eeee297415d4364d87a4a93654122c8f4355913dd4ddd34a41d3551f5cf0c693ed5d63adfd1f
+  data.tar.gz: 46ed06896fe0ded9f893792c9056d5cc5da8830debb9ca14f4a806546662def8b6bd7d7a2f0fb5bdc0ae6f586c7f35a2712d99a4331d41c9e483bfe4460aa7c0

data/README.md

@@ -259,7 +259,7 @@ in the puppet manifest documentation like this
                   type:boolean
 ```
 
-Supported types are: string, boolean, integer, array, password
+Supported types are: string, boolean, integer, array, password, hash
 
 Note that all arguments that are nil (have no value in answers.yaml or you
 set them UNDEF (see below)) are translated to ```undef``` in puppet.
@@ -522,7 +522,8 @@ We currently support the following hooks.
 * init - just after hooking is initialized and kafo is configured, parameters have no values yet
 * pre_values - just before value from CLI is set to parameters (they already have default values)
 * pre_validations - just after system checks and before validations are executed (and before interactive wizard is started), at this point all parameter values are already set but not yet stored in answer file
-* pre  - just before puppet is executed to converge system
+* pre_commit - after validations or interactive wizard have completed, all parameter values are set but not yet stored in the answer file
+* pre  - just before puppet is executed to converge system, after parameter values are stored in the answer file
 * post  - just after puppet is executed to converge system
 
 Let's assume we want to add the ```--reset-foreman-db``` option to our

data/lib/kafo/hooking.rb

@@ -6,9 +6,10 @@ module Kafo
     # init - just after hooking is initialized and kafo is configured, parameters have no values yet
     # pre_values - just before value from CLI is set to parameters (they already have default values)
     # pre_validations - just after system checks and before validations are executed (and before interactive wizard is started), at this point all parameter values are already set but not yet stored in answer file
+    # pre_commit - after validations or interactive wizard have completed, all parameter values are set but not yet stored in the answer file
     # pre - just before puppet is executed to converge system
     # post - just after puppet is executed to converge system
-    TYPES = [:boot, :init, :pre, :post, :pre_values, :pre_validations]
+    TYPES = [:boot, :init, :pre, :post, :pre_values, :pre_validations, :pre_commit]
 
     attr_accessor :hooks, :kafo
 
@@ -68,6 +69,10 @@ module Kafo
       register(:pre_validations, name, &block)
     end
 
+    def register_pre_commit(name, &block)
+      register(:pre_commit, name, &block)
+    end
+
     def register_pre(name, &block)
       register(:pre, name, &block)
     end

data/lib/kafo/kafo_configure.rb

@@ -102,6 +102,7 @@ module Kafo
         end
       end
 
+      self.class.hooking.execute(:pre_commit)
       if dont_save_answers? || noop?
         self.class.temp_config_file = temp_config_file
         store_params(temp_config_file)

data/lib/kafo/param.rb

@@ -89,13 +89,7 @@ module Kafo
       end
 
       validator = Validator.new([self])
-      validations.map! do |v|
-        result = v.evaluate(validator)
-        # validate_re returns nil if succeeds
-        result = true if v.name == 'validate_re' && result.nil?
-        result
-      end
-
+      validations.map! { |v| v.evaluate(validator) }
       validations.all?
     end
 

data/lib/kafo/validator.rb

@@ -51,6 +51,7 @@ module Kafo
       if engine.respond_to? method
         @logger.debug "calling #{method.inspect} with #{args.inspect}"
         engine.send(method, *args)
+        true
       else
         raise Puppet::DevError, "Function #{$1} not defined despite being loaded!"
       end

data/lib/kafo/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Kafo
-  VERSION = "0.6.10"
+  VERSION = "0.6.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler