kafo 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4febb461aa6503caff954eb79a85bfb7e9fd2872
-  data.tar.gz: 6e60596106b93a4a89183e149d7ab7d5a4a528af
+  metadata.gz: 50b4317c6753f887ed5f82958ccddb7c7231b0c6
+  data.tar.gz: 80e53f9fc0c40a7898beb5cd1df07e4f2159d2bb
 SHA512:
-  metadata.gz: 804aeb0e1504ac6bd13dbf6c6a92b55f790bb13c12aa012363cf23434c05d254156550d53a83fa6fcc551d5ac5c0b8c858c77d1bfa87ec23d63603bcfc698c11
-  data.tar.gz: efa517c78ba534fd5fc1ae260ce528e474ccd3e6f288db6cfa3d83c4a5108ccd96ccf1549956a67fa4a5256961a97461058847e53e7134f020d2c06023a57078
+  metadata.gz: 1d6874b159789e97761e7ac8cb1f86595a5d167d23cd1720f582914dea450408fb37c3c03269451f5ce38723e3e1d4b88abbd5cdedda284600d8976bfc0fd434
+  data.tar.gz: 6c9fb42c37dd21084cd32a0895eb3b284a918acbe8d37727d64953b928fbf511e7ffd23803d9b6e13310f5dbf28a44518ddbeebcd17cefa0d7a74aa33a739d97

data/lib/kafo/param.rb

@@ -45,13 +45,25 @@ class Param
     # also we want to clone validations so we don't interfere
     validations.map! do |v|
       v = v.clone
-      args = v.arguments.select { |a| a.to_s == "$#{self.name}" }
+      if v.name == 'validate_re'
+        # validate_re does not take more variables as arguments, instead we need to pass all arguments
+        args = v.arguments
+      else
+        args = v.arguments.select { |a| a.to_s == "$#{self.name}" }
+      end
       v.arguments = Puppet::Parser::AST::ASTArray.new :children => args
       v
     end
 
     validator = Validator.new([self])
-    validations.map { |v| v.evaluate(validator) }.all?
+    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.all?
   end
 
   # To be overwritten in children

data/lib/kafo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler