sparkle_formation 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed2f1e3bec855db611f4a8fcd7c3e3c509aa209
-  data.tar.gz: d6dc132ef582d52c55080c4a4e80d60fbb28c702
+  metadata.gz: 79efaae651919d5ed404a9738852cb86b41c2057
+  data.tar.gz: 339d1d3eb57ef4e35c29ccd475f66b7d8942e9f1
 SHA512:
-  metadata.gz: 09bd692653d5f7816a332fc2d7f772760bac7e13e34e8314518f99ec48604146a5c8bdf5ce3a321a4599307dcbf6b5673800979a9497c75e708722772882c4c0
-  data.tar.gz: e4958183360a572b03aff5ebeab2a9c2ea6db984f8db91bb146b0d26b59665290096a43a0d05e425ecdcfd6c096bb080205a25c3e44f0ce798f34632a9affe4e
+  metadata.gz: c555423571e62575d59b4eb5022b0ff616a681b2b6a30419c3b0124f3a9f2ea5ee6063ef42d6479a7ed05d8b722338ef5db99016ee1ae025a0ab6e2dd8a2b2ae
+  data.tar.gz: f0bde668d2cc2e972e59f08369176dfaf1a84af468af72e0879dbb2e8e1475a16e06252ecd063a67877188fad556044385cff0415d7fa1592b1d65952f7efdc4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v2.1.2
+* Add helper for copying SparkleFormation::Collection settings
+* Use collections helper to ensure expected pack ordering
+* Add support for template location via path within SparkleFormation::Collection
+
 # v2.1.0
 * Add template inheritance support (#145)
 * Add layer merging support for templates, components, and dynamics (#145)

data/lib/sparkle_formation/sparkle_collection.rb

@@ -16,6 +16,17 @@ class SparkleFormation
       @sparkles = []
     end
 
+    # Apply collection settings to this collection
+    #
+    # @param collection [SparkleFormation::Collection]
+    # @return [self]
+    # @note will overwrite existing set packs
+    def apply(collection)
+      @root = collection.sparkles.last
+      @sparkles = collection.sparkles.slice(0, collection.sparkles.length - 1) || []
+      self
+    end
+
     # Set the root sparkle which forces highest precedence
     #
     # @param sparkle [Sparkle]
@@ -132,6 +143,17 @@ class SparkleFormation
       result = nil
       error = nil
       result = send(type_name)[name]
+      if(result.nil? && type_name == 'templates')
+        t_direct = sparkles.map do |pack|
+          begin
+            pack.get(:template, name)
+          rescue Error::NotFound
+          end
+        end.compact.last
+        if(t_direct)
+          result = send(type_name)[t_direct[:name]]
+        end
+      end
       unless(result)
         error_klass = Error::NotFound.const_get(
           Bogo::Utility.camel(type)

data/lib/sparkle_formation/sparkle_formation.rb

@@ -286,11 +286,7 @@ class SparkleFormation
         type struct._self.stack_resource_type
       end
       unless(struct._self.sparkle.empty?)
-        struct._self.sparkle.size.times do |idx|
-          nested_template.sparkle.add_sparkle(
-            struct._self.sparkle.sparkle_at(idx)
-          )
-        end
+        nested_template.sparkle.apply(struct._self.sparkle)
       end
       struct.resources[resource_name].properties.stack nested_template
       if(block_given?)
@@ -501,9 +497,7 @@ class SparkleFormation
     if(provider != template.provider)
       raise TypeError.new "This template `#{name}` cannot inherit template `#{template.name}`! Provider mismatch: `#{provider}` != `#{template.provider}`" # rubocop:disable Metrics/LineLength
     end
-    sparkle.size.times do |idx|
-      template.sparkle.add_sparkle(sparkle.sparkle_at(idx))
-    end
+    template.sparkle.apply(sparkle)
     template.seed_self
     blacklisted_templates.replace(
       (blacklisted_templates + template.blacklisted_templates).map(&:to_s).uniq

data/lib/sparkle_formation/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Chris Roberts