sparkle_formation 2.1.6 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90504a372c30016cb3ac38668586571b7df605b
-  data.tar.gz: 5e2dddc009e43e3e107f884a75b02d0c9cd9c261
+  metadata.gz: 9afdab094c6cd47a509662f18ad290fc743d2ee9
+  data.tar.gz: 20e9e353dae5fa25db4b3415b33622bac16058f8
 SHA512:
-  metadata.gz: 222b26eb1dd56868023c9b9360dca1186825caa6450f3966019d9c0869e93f2ebde99924529e51cf48e8bf2f7f6ae6ee8e8681c99a1f09b55870d7be374e4766
-  data.tar.gz: 28f754b8b048d941ea844c5e3e5b605a0a2b5a8844ad9d915d16fd61ddd0007ca72203824ec50bcd721fe9ea4f8bf18bac2c294bef420016188bf73c6ef59152
+  metadata.gz: fe65169a0f63eca6043542891a2f44b90935cd243d2ec56d7fc5b04ca6ad9f18796aa9d11f2d47d8800e9253126121111b9741b38ec6d8885a1b1653e2914312
+  data.tar.gz: 3ad051b35500b4f0782f3e5d41a39b9b1c79fa1efaf76b70eaf4776ce1dd3d00d8c9c12b41aed4ebaada43dfa6bc368895e839b5a1bd4bd91f84140d8628d6aa

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v2.1.8
+* Add support for CFN list type with shallow nesting (#150)
+* Fix deprecation warnings on Ruby 2.3 caused by TimeoutError constant
+* Fix JSON dump behavior with pure ruby json library (#162)
+
 # v2.1.6
 * Update builtin resource lists (#156)
 * Refactor internal template composition (#158)

data/lib/sparkle_formation/provider/aws.rb

@@ -167,7 +167,7 @@ class SparkleFormation
               check_name = pname
             end
             if(parameters.keys.include?(check_name))
-              if(parameters[check_name]['Type'] == 'CommaDelimitedList')
+              if(list_type?(parameters[check_name]['Type']))
                 new_val = {'Fn::Join' => [',', {'Ref' => check_name}]}
               else
                 new_val = {'Ref' => check_name}
@@ -178,7 +178,7 @@ class SparkleFormation
                 pname, 'Fn::GetAtt' => output_map[check_name]
               )
             else
-              if(pval['Type'] == 'CommaDelimitedList')
+              if(list_type?(pval['Type']))
                 new_val = {'Fn::Join' => [',', {'Ref' => check_name}]}
               else
                 new_val = {'Ref' => check_name}
@@ -196,6 +196,14 @@ class SparkleFormation
         true
       end
 
+      # Check if type is a list type
+      #
+      # @param type [String]
+      # @return [TrueClass, FalseClass]
+      def list_type?(type)
+        type == 'CommaDelimitedList' || type.start_with?('List<')
+      end
+
     end
   end
 end

data/lib/sparkle_formation/sparkle.rb

@@ -157,7 +157,7 @@ class SparkleFormation
 
         ::Object.constants.each do |const|
           unless(self.const_defined?(const))
-            next if const == :Config # prevent warning output
+            next if const == :Config || const == :TimeoutError # prevent warning output
             self.const_set(const, ::Object.const_get(const))
           end
         end

data/lib/sparkle_formation/sparkle_collection.rb

@@ -73,7 +73,7 @@ class SparkleFormation
 
     # @return [TrueClass, FalseClass]
     def empty?
-      size == 0
+      size == 0 # rubocop:disable Style/ZeroLengthPredicate
     end
 
     # @return [Smash]

data/lib/sparkle_formation/sparkle_formation.rb

@@ -919,6 +919,12 @@ class SparkleFormation
 
   # @return [String] dumped hash JSON
   def to_json(*args)
+    # NOTE: Ported in from batali
+    # Prevent stupid conversion errors of
+    # JSON::Ext::Generator::State into Hash
+    args = args.map do |argument|
+      argument.respond_to?(:to_h) ? argument.to_h : argument
+    end
     MultiJson.dump(compile.dump!, *args)
   end
 

data/lib/sparkle_formation/version.rb

@@ -1,5 +1,5 @@
 # Unicorns and rainbows
 class SparkleFormation
   # Current library version
-  VERSION = Gem::Version.new('2.1.6')
+  VERSION = Gem::Version.new('2.1.8')
 end

data/sparkle_formation.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'bogo'
   s.add_development_dependency 'minitest'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rake', '~> 10'
+  s.add_development_dependency 'rubocop', '0.38.0'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'redcarpet', '~> 2.0'
   s.add_development_dependency 'github-markup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -76,30 +76,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement