serverkit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3236f3d4ad0dbab87e87f35c9afbdb165591f1c
-  data.tar.gz: 3374bf2a87f000bf63358af4b5e40dc0051d086a
+  metadata.gz: e5b26c6d22c758ec66cc5435e50d8289c591da71
+  data.tar.gz: 3324355b6866cbff2a99117b0643449617f54eb0
 SHA512:
-  metadata.gz: 163de635af19fdffa01010cf04c8bce58a5876789343a265aa0d641e60e1b04e8037840df5729c89ddf03dd57e34552a3a48a70379beefdec2782600b7a2a533
-  data.tar.gz: 8866a193ae71db7d4f97bf71e01258f8ff04f615a0392ba6177abcfd2bb85e876fb84e9d1e421d501d082c79339533aa9b63b70365d1e3793f619fa75aeeb536
+  metadata.gz: 5a7e75d9406ddfc9266015b7cf210bf25069bc5142747f06e99bb51ee72c3df1342ed644d099114fd9354c05e82a6ea3bc396a33d4d7d1c3deb11ab78a248052
+  data.tar.gz: 50816a5d8ad6bccadf3e1359edc4a3d4c0280cbcb72231be70bd6aa2dc6873c6d30692b134da1f146f8a97ad2ad35b72ac38ed58317b42b847722362440f19f9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3
+- Support multiple types on TypeValidator
+- Fix validation bug on missing type resource
+
 ## 0.2.2
 - Change action name: `serverkit diff` -> `serverkit check`
 - Load gems from Gemfile before running action

data/README.md

@@ -169,6 +169,8 @@ A resource must have a type property. Currently the following types are availabl
 - recipe
 - service
 - symlink
+- [defaults](https://github.com/r7kamura/serverkit-defaults)
+- [rbenv_ruby](https://github.com/r7kamura/serverkit-rbenv)
 
 ### Example
 An example package resource that has id, type, and name attributes.

data/lib/serverkit/errors/missing_action_name_argument_error.rb

@@ -5,7 +5,7 @@ module Serverkit
     class MissingActionNameArgumentError < Base
       # @return [String]
       def to_s
-        abort "Missing action name argument"
+        "Missing action name argument"
       end
     end
   end

data/lib/serverkit/errors/missing_recipe_path_argument_error.rb

@@ -5,7 +5,7 @@ module Serverkit
     class MissingRecipePathArgumentError < Base
       # @return [String]
       def to_s
-        abort "Missing recipe path argument"
+        "Missing recipe path argument"
       end
     end
   end

data/lib/serverkit/resource_builder.rb

@@ -39,7 +39,9 @@ module Serverkit
 
     # @return [String] (e.g. "File", "Symlink")
     def resource_class_name
-      type.camelize
+      if type.is_a?(String)
+        type.camelize
+      end
     end
 
     # @note Expected to return String in normal case

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/type_validator.rb

@@ -6,8 +6,9 @@ class TypeValidator < ActiveModel::EachValidator
   end
 
   def validate_each(record, attribute, value)
-    unless value.is_a?(options[:with])
-      record.errors.add(attribute, "must be a #{options[:with]}, not #{value.class}")
+    classes = options[:in] || [options[:with]]
+    if classes.all? { |klass| !value.is_a?(klass) }
+      record.errors.add(attribute, "must be a #{classes.join(' or ')}, not a #{value.class}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -251,4 +251,3 @@ signing_key:
 specification_version: 4
 summary: Configuration management toolkit for IT automation.
 test_files: []
-has_rdoc: