sparkle_formation 3.0.28 → 3.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b9bff2dd1817a3ea403221d40cdcd9b6f8b8f999670f3a1baa37a36cd0ab9c
-  data.tar.gz: 5c0627a7fcc3cb91c68a7576276d8c6431632111cd1b7a0a4135fe68fea1d346
+  metadata.gz: a29d3a6620a8273f91482119da653d55604be48e69c1e635efb439acb677fb3a
+  data.tar.gz: 707f5d92f16fe7209a2e95822b40e9fa289cbe438516bc22ed894bc9e0b88b55
 SHA512:
-  metadata.gz: 382e8fbc12ed460abedd332e734902dff596a2a86b52606a4950c6c7bd64cf8ea591ad3e4a6baa23c12ef65171f62cdafa6d89901710bc04ad7fd6181dd57421
-  data.tar.gz: 3cac5a75ec2fe95ad0a67284a0db2bc7cd1b7679a0a117ce6c10f6c41998ed4e247883bfc441519501f6be71b4810e4022c488c229d1ed85d840cf21f81bc235
+  metadata.gz: ac01ee39bf5e43271bc658ca754c74d7667eebb739b305b9c335e5b203c9009504a6b9313d946d3b7a06abb45fd1ad5c520c83e7931c37d4c538d6eefd2646c5
+  data.tar.gz: aa7f5880c6c41d4a854f95023e0ee7e39a55bbb83f7050709d1abb0ce5daef7932b8284b8f61f9ecf2d5f709a3967c24ecdb20c4d384106627cf82fd96d6f6dc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v3.0.30
+* Fix race condition in pack loading (#241)
+
 # v3.0.28
 * Fix sub! when no hash is provided (#236)
 * Only run template extraction when required

data/lib/sparkle_formation/sparkle.rb

@@ -4,128 +4,6 @@ require 'sparkle_formation'
 class SparkleFormation
   # Independent collection of SparkleFormation items
   class Sparkle
-
-    # Evaluation context wrapper for loading SparkleFormation files
-    class EvalWrapper < BasicObject
-
-      # @!visibility private
-      def require(*args)
-        ::Kernel.require(*args)
-      end
-
-      # @!visibility private
-      class SparkleFormation
-        attr_accessor :sparkle_path
-
-        class << self
-          def insert(*args, &block)
-            ::SparkleFormation.insert(*args, &block)
-          end
-
-          def part_data(data = nil)
-            if data
-              @data = data
-            else
-              @data
-            end
-          end
-
-          def dynamic(name, args = {}, &block)
-            part_data[:dynamic].push(
-              ::Smash.new(
-                :name => name,
-                :block => block,
-                :args => ::Smash[
-                  args.map(&:to_a)
-                ],
-                :type => :dynamic,
-              )
-            ).last
-          end
-
-          def build(&block)
-            part_data[:component].push(
-              ::Smash.new(
-                :block => block,
-                :type => :component,
-              )
-            ).last
-          end
-
-          def component(name, args = {}, &block)
-            part_data[:component].push(
-              ::Smash.new(
-                :name => name,
-                :block => block,
-                :args => ::Smash[
-                  args.map(&:to_a)
-                ],
-                :type => :component,
-              )
-            ).last
-          end
-
-          def dynamic_info(*args)
-            ::Smash.new(:metadata => {}, :args => {})
-          end
-        end
-
-        def initialize(*args)
-          opts = args.detect { |a| a.is_a?(Hash) } || {}
-          SparkleFormation.part_data[:template].push(
-            ::Smash.new(
-              :name => args.first,
-              :args => opts,
-            )
-          )
-          raise ::TypeError
-        end
-
-        # @!visibility private
-        class Registry
-          def self.register(name, args = {}, &block)
-            SparkleFormation.part_data[:registry].push(
-              ::Smash.new(
-                :name => name,
-                :block => block,
-                :args => ::Smash[
-                  args.map(&:to_a)
-                ],
-                :type => :registry,
-              )
-            ).last
-          end
-        end
-      end
-
-      # @!visibility private
-      SfnRegistry = SparkleFormation::Registry
-
-      # NOTE: Enable access to top level constants but do not
-      # include deprecated constants to prevent warning outputs
-      deprecated_constants = [
-        :Data,
-        :Config,
-        :TimeoutError,
-        :Fixnum,
-        :Bignum,
-        :NIL,
-        :TRUE,
-        :FALSE,
-      ]
-      ::Object.constants.each do |const|
-        unless (self.const_defined?(const)) # rubocop:disable Style/RedundantSelf
-          next if deprecated_constants.include?(const)
-          self.const_set(const, ::Object.const_get(const)) # rubocop:disable Style/RedundantSelf
-        end
-      end
-
-      # @!visibility private
-      def part_data(arg)
-        SparkleFormation.part_data(arg)
-      end
-    end
-
     class << self
       @@_pack_registry = Smash.new
 
@@ -184,7 +62,134 @@ class SparkleFormation
     # Wrapper for evaluating sfn files to store within sparkle
     # container
     def eval_wrapper
-      Class.new(EvalWrapper)
+      # Evaluation context wrapper for loading SparkleFormation files
+      Class.new(BasicObject).new.instance_exec do
+        wrapper = ::Class.new(BasicObject)
+        wrapper.class_eval '
+        class SparkleFormation
+          attr_accessor :sparkle_path
+
+          class << self
+            def insert(*args, &block)
+              ::SparkleFormation.insert(*args, &block)
+            end
+
+            def part_data(data = nil)
+              if data
+                @data = data
+              else
+                @data
+              end
+            end
+
+            def dynamic(name, args = {}, &block)
+              part_data[:dynamic].push(
+                ::Smash.new(
+                  :name => name,
+                  :block => block,
+                  :args => ::Smash[
+                    args.map(&:to_a)
+                  ],
+                  :type => :dynamic,
+                )
+              ).last
+            end
+
+            def build(&block)
+              part_data[:component].push(
+                ::Smash.new(
+                  :block => block,
+                  :type => :component,
+                )
+              ).last
+            end
+
+            def component(name, args = {}, &block)
+              part_data[:component].push(
+                ::Smash.new(
+                  :name => name,
+                  :block => block,
+                  :args => ::Smash[
+                    args.map(&:to_a)
+                  ],
+                  :type => :component,
+                )
+              ).last
+            end
+
+            def dynamic_info(*args)
+              ::Smash.new(:metadata => {}, :args => {})
+            end
+          end
+
+          def initialize(*args)
+            opts = args.detect { |a| a.is_a?(Hash) } || {}
+            SparkleFormation.part_data[:template].push(
+              ::Smash.new(
+                :name => args.first,
+                :args => opts,
+              )
+            )
+            raise ::TypeError
+          end
+
+          class Registry
+            def self.register(name, args = {}, &block)
+              SparkleFormation.part_data[:registry].push(
+                ::Smash.new(
+                  :name => name,
+                  :block => block,
+                  :args => ::Smash[
+                    args.map(&:to_a)
+                  ],
+                  :type => :registry,
+                )
+              ).last
+            end
+          end
+        end
+
+        SfnRegistry = SparkleFormation::Registry
+
+        # @!visibility private
+        def require(*args)
+          ::Kernel.require(*args)
+        end
+
+        # NOTE: Enable access to top level constants but do not
+        # include deprecated constants to prevent warning outputs
+        deprecated_constants = [
+          :Data,
+          :Config,
+          :TimeoutError,
+          :Fixnum,
+          :Bignum,
+          :NIL,
+          :TRUE,
+          :FALSE,
+        ]
+        ::Object.constants.each do |const|
+          unless self.const_defined?(const) # rubocop:disable Style/RedundantSelf
+            next if deprecated_constants.include?(const)
+            self.const_set(const, ::Object.const_get(const)) # rubocop:disable Style/RedundantSelf
+          end
+        end
+
+        # @!visibility private
+        def part_data(arg)
+          SparkleFormation.part_data(arg)
+        end
+
+        def __sparkle_formation_id
+          SparkleFormation.object_id
+        end
+
+        def __sfn_registry_id
+          SfnRegistry.object_id
+        end
+        '
+        wrapper.new
+      end
     end
 
     include Bogo::Memoization
@@ -243,7 +248,7 @@ class SparkleFormation
         :template => [],
       )
       @provider = Bogo::Utility.snake(args.fetch(:provider, 'aws').to_s).to_sym
-      @wrapper = eval_wrapper.new
+      @wrapper = eval_wrapper
       wrapper.part_data(raw_data)
       load_parts! unless @root == :none
     end

data/lib/sparkle_formation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 3.0.28
+  version: 3.0.30
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct