chef-validation 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43bb3f5ee8406de411d11b31cc4b148aa4899118
-  data.tar.gz: 5ec4d711b379051bf9f5987669c204d7f1e3eab3
+  metadata.gz: 9d0e9b458060b1ff05e0351dd1d96917b6f3d5a8
+  data.tar.gz: 4806e2f4670ad28454893828cc904c5610074c10
 SHA512:
-  metadata.gz: cd65caeecaa338033f74e94e1406068eac8ee4c8c9d1f5a63aa3a242b1451074db4c2534162f5c6d8909a223b22497f59af6171ff5a49613dc472a11314e7cdd
-  data.tar.gz: 06e603af388bd7cd1574f026d64aeda8270b2d4d85336c3b8b00566e7b492fcf387851468c72d191687226a36d20b362094bf11598c3505710a223deffefe8d7
+  metadata.gz: 261ea5766065f68152e7b11a7975b2b0a6f4b2c644ddf449198bed3a93607c6961d6865046d315256ddc7e81a1392ea779bba38817a30efeae30c49a2f95fb15
+  data.tar.gz: 453e514792b2f9b588779881a1e9441307664027abe811ebf8672a48647296bbce91b0dba9ac500b55a5c7288e58a695fe59b1cd9ecd94d9133a67038e1b36bd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.3
+
+* Bug Fixes
+  * Fix issue on some versions of Chef where metadata would not be properly loaded at different points of the Chef run
+  * Fix crash when a value is `nil` and checking for it's presence
+
 # 0.1.2
 
 * Enhancements

data/lib/chef/validation.rb

@@ -39,9 +39,17 @@ module Chef::Validation
 
     private
 
+      # It's quite sad, but metadata is not guaranteed to be 100% loaded depending on the
+      # version of Chef you are using and at which point of the Chef Client run you are at.
+      def reload_metadata(cookbook)
+        file = cookbook.root_filenames.find { |x| File.basename(x) == "metadata.json" }
+        cookbook.metadata.from_json(IO.read(file))
+      end
+
       def validate_all(node)
         total_errors = {}
         ContextExt.cookbooks(node.run_context).each do |cookbook|
+          reload_metadata(cookbook)
           unless (errors = Validator.run(node, cookbook.metadata)).empty?
             total_errors[cookbook.name] = errors
           end
@@ -54,6 +62,7 @@ module Chef::Validation
         unless cookbook = ContextExt.cookbook(node.run_context, name)
           raise "Cookbook not found: #{cookbook}"
         end
+        reload_metadata(cookbook)
         unless (errors = Validator.run(node, cookbook.metadata)).empty?
           total_errors[cookbook.name] = errors
         end

data/lib/chef/validation/validator.rb

@@ -60,22 +60,25 @@ module Chef::Validation
         BOOLEAN        = "boolean".freeze
         NUMERIC        = "numeric".freeze
 
-        def validate_choice(value, choices, name, errors = [])
+        def validate_choice(value, choices, name)
+          errors = []
           unless choices.include?(value)
             errors << "Must be one of the following choices: #{choices.join(", ")}."
           end
           errors
         end
 
-        def validate_required(value, name, errors = [])
-          if value.empty? || value.nil?
+        def validate_required(value, name)
+          errors = []
+          if value.nil? || value.empty?
             errors << "Required attribute but was not present."
           end
           errors
         end
 
-        def validate_type(value, type, name, errors = [])
-          state = nil
+        def validate_type(value, type, name)
+          errors = []
+          state  = nil
           case type.downcase
           when STRING
             state = :error unless value.is_a?(String)

data/lib/chef/validation/version.rb

@@ -1,4 +1,4 @@
 class Chef; end;
 module Chef::Validation
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-validation
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef