ridley 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362b667bff0340e4cba7d750a251c91003811218
-  data.tar.gz: 173dd3384ef80483faa2d7f4137e2ffca339a310
+  metadata.gz: 76add10f7d0cfee05331ae99481f011e868261db
+  data.tar.gz: 571ef4c873bbb8ab9697d87f008b0f6dfea9fdbb
 SHA512:
-  metadata.gz: 21d2e559ff5a3dc38a4dbae1fed6b33013aa8612771bac3199442ed7844eeea767fcc5a8affa920df3a2c48f2872b33709b81cab643655d4f9d683105325d215
-  data.tar.gz: 07af89b3508d66d6533ac7b8c7353ca015d461fd240a9942b6af6466b6457b85027fffa8067b4e18f4405abc98ef34e614284a5830c55fd8407455c56e934158
+  metadata.gz: a9e15f5a280702aa0b60f05dfddf10da424c0ab4c0c885cc92fe8e29bb47ba0b115fa015e26f605012c4809fca15af79b4557be197e1c75269f3b350b7d24fc1
+  data.tar.gz: 1b1daa08465102f140943cbc8f4209d15136f6c3006d25f4fb87b85e843ae0f9984cbd56476a19d4ed86bd3097a27261179512f50d390ee6516d2587ec5bdace

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.0.0-p353

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.4.3
+
+* [#245](https://github.com/RiotGames/ridley/pull/245) Fix for numeric and boolean attribute types
+
 # 2.4.2
 
 * [#244](https://github.com/RiotGames/ridley/pull/244) Fix a bug with deleting deeply nested environment attributes.

data/lib/ridley/chef/cookbook/metadata.rb

@@ -393,14 +393,14 @@ module Ridley::Chef
             :description => { :kind_of => String },
             :choice => { :kind_of => [ Array ], :default => [] },
             :calculated => { :equal_to => [ true, false ], :default => false },
-            :type => { :equal_to => [ "string", "array", "hash", "symbol" ], :default => "string" },
+            :type => { :equal_to => [ "string", "array", "hash", "symbol", "boolean", "numeric" ], :default => "string" },
             :required => { :equal_to => [ "required", "recommended", "optional", true, false ], :default => "optional" },
             :recipes => { :kind_of => [ Array ], :default => [] },
-            :default => { :kind_of => [ String, Array, Hash ] }
+            :default => { :kind_of => [ String, Array, Hash, Symbol, Numeric, TrueClass, FalseClass ] }
           }
         )
         options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil?
-        validate_string_array(options[:choice])
+        validate_choice_array(options)
         validate_calculated_default_rule(options)
         validate_choice_default_rule(options)
 
@@ -488,6 +488,34 @@ module Ridley::Chef
           end
         end
 
+        # Validate the choice of the options hash
+        #
+        # Raise an exception if the members of the array do not match the defaults
+        # === Parameters
+        # opts<Hash>:: The options hash
+        def validate_choice_array(opts)
+          if opts[:choice].kind_of?(Array)
+            case opts[:type]
+            when "string"
+              validator = [ String ]
+            when "array"
+              validator = [ Array ]
+            when "hash"
+              validator = [ Hash ]
+            when "symbol"
+              validator = [ Symbol ]
+            when "boolean"
+              validator = [ TrueClass, FalseClass ]
+            when "numeric"
+              validator = [ Numeric ]
+            end
+
+            opts[:choice].each do |choice|
+              validate( {:choice => choice}, {:choice => {:kind_of => validator}} )
+            end
+          end
+        end
+
         # For backwards compatibility, remap Boolean values to String
         #   true is mapped to "required"
         #   false is mapped to "optional"

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/spec/fixtures/example_cookbook/metadata.rb

@@ -5,3 +5,15 @@ license          "Apache 2.0"
 description      "Installs/Configures example_cookbook"
 long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version          "0.1.0"
+
+attribute "example_cookbook/test",
+  :display_name => "Test",
+  :description => "Test Attribute",
+  :choice => [
+    "test1",
+    "test2" ],
+  :type => "string",
+  :required => "recommended",
+  :recipes => [ 'example_cookbook::default' ],
+  :default => "test1"
+  

data/spec/unit/ridley/chef/cookbook/metadata_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Ridley::Chef::Cookbook::Metadata do
+
+  let(:metadata) do
+    described_class.new
+  end
+
+  before(:each) do
+     subject { metadata }
+  end
+
+  describe "#validate_choice_array" do
+    it "should limit the types allowed in the choice array." do
+      options = {
+        :type => "string",
+        :choice => [ "test1", "test2" ],
+        :default => "test1"
+      }
+      lambda {
+        subject.attribute("test_cookbook/test", options)
+      }.should_not raise_error
+  
+      options = {
+        :type => "boolean",
+        :choice => [ true, false ],
+        :default => true
+      }
+      lambda {
+        subject.attribute("test_cookbook/test", options)
+      }.should_not raise_error
+
+      options = {
+        :type => "numeric",
+        :choice => [ 1337, 420 ],
+        :default => 1337
+      }
+      lambda {
+        subject.attribute("test_cookbook/test", options)
+      }.should_not raise_error
+
+      options = {
+        :type => "numeric",
+        :choice => [ true, "false" ],
+        :default => false
+      }
+      lambda {
+        subject.attribute("test_cookbook/test", options)
+      }.should raise_error
+    end
+  end
+end

data/spec/unit/ridley/resources/cookbook_resource_spec.rb

@@ -130,17 +130,17 @@ describe Ridley::CookbookResource do
       # the ignored files weren't uploaded, so we just check that the
       # non-ignored files are the ONLY thing uploaded
       sandbox_resource.should_receive(:create).with([
-        "211a3a8798d4acd424af15ff8a2e28a5",
-        "75077ba33d2887cc1746d1ef716bf8b7",
-        "7b1ebd2ff580ca9dc46fb27ec1653bf2",
-        "83128904bdb43eeeef131535c4a2ce8e",
-        "a39eb80def9804f4b118099697cc2cd2",
-        "b70ba735f3af47e5d6fc71b91775b34c",
-        "cafb6869fca13f5c36f24a60de8fb982",
-        "dbf3a6c4ab68a86172be748aced9f46e",
-        "dc6461b5da25775f3ef6a9cc1f6cff9f",
-        "e77856b411b6dcbb2c76c281091ad922",
-        "e9a2e24281cfbd6be0a6b1af3b6d277e",
+        "211a3a8798d4acd424af15ff8a2e28a5", 
+        "4f9051c3ac8031bdaff10300fa92e817", 
+        "75077ba33d2887cc1746d1ef716bf8b7", 
+        "7b1ebd2ff580ca9dc46fb27ec1653bf2", 
+        "84e12365e6f4ebe7db6a0e6a92473b16", 
+        "a39eb80def9804f4b118099697cc2cd2", 
+        "b70ba735f3af47e5d6fc71b91775b34c", 
+        "cafb6869fca13f5c36f24a60de8fb982", 
+        "dbf3a6c4ab68a86172be748aced9f46e", 
+        "dc6461b5da25775f3ef6a9cc1f6cff9f", 
+        "e9a2e24281cfbd6be0a6b1af3b6d277e"
       ]).and_return(sandbox)
 
       subject.upload(cookbook_path, validate: false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -367,6 +367,7 @@ files:
 - spec/unit/ridley/bootstrap_context/windows_spec.rb
 - spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
+- spec/unit/ridley/chef/cookbook/metadata_spec.rb
 - spec/unit/ridley/chef/cookbook/syntax_check_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
@@ -466,6 +467,7 @@ test_files:
 - spec/unit/ridley/bootstrap_context/windows_spec.rb
 - spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
+- spec/unit/ridley/chef/cookbook/metadata_spec.rb
 - spec/unit/ridley/chef/cookbook/syntax_check_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb