sparkle_formation 2.1.8 → 3.0.0

data/lib/sparkle_formation/sparkle_formation.rb

@@ -95,7 +95,7 @@ class SparkleFormation
     def compile(path, *args)
       opts = args.detect{|i| i.is_a?(Hash) } || {}
       unless(path.is_a?(String) && File.file?(path.to_s))
-        if(spath = (opts.delete(:sparkle_path) || SparkleFormation.sparkle_path))
+        if(spath = (opts.delete(:sparkle_path) || SparkleFormation.custom_paths[:sparkle_path]))
           container = Sparkle.new(:root => spath)
           path = container.get(:template, path)[:path]
         end
@@ -200,7 +200,8 @@ class SparkleFormation
     # @return [SparkleStruct]
     def registry(registry_name, struct, *args)
       __t_stringish(registry_name)
-      reg = struct._self.sparkle.get(:registry, registry_name)
+      opts = args.detect{|item| item.is_a?(Hash)} || {}
+      reg = struct._self.sparkle.get(:registry, registry_name, opts[:provider])
       struct.instance_exec(*args, &reg[:block])
     end
 
@@ -214,7 +215,9 @@ class SparkleFormation
       __t_stringish(dynamic_name)
       result = false
       begin
-        dyn = struct._self.sparkle.get(:dynamic, dynamic_name)
+        opts = args.detect{|i| i.is_a?(Hash)} || {}
+        dyn = struct._self.sparkle.get(:dynamic, dynamic_name, opts[:provider])
+        opts = nil
         raise dyn if dyn.is_a?(Exception)
         dyn.monochrome.each do |dynamic_item|
           if(result)
@@ -234,7 +237,7 @@ class SparkleFormation
         result = builtin_insert(dynamic_name, struct, *args, &block)
         unless(result)
           message = "Failed to locate requested dynamic block for insertion: #{dynamic_name} " \
-          "(valid: #{struct._self.sparkle.dynamics.keys.sort.join(', ')})"
+            "(valid: #{struct._self.sparkle.dynamics.fetch(struct._self.sparkle.provider, {}).keys.sort.join(', ')})"
           if(struct._self.provider_resources && struct._self.provider_resources.registry.keys.size > 1)
             t_name = struct._self.provider_resources.registry.keys.first
             valid_t_name = Bogo::Utility.snake(
@@ -268,7 +271,7 @@ class SparkleFormation
       [template, *args].compact.each do |item|
         __t_stringish(item)
       end
-      to_nest = struct._self.sparkle.get(:template, template)
+      to_nest = struct._self.sparkle.get(:template, template, options[:provider])
       resource_name = template.to_s.gsub('__', '_')
       unless(args.empty?)
         resource_name = [
@@ -276,23 +279,24 @@ class SparkleFormation
           args.map{|a| Bogo::Utility.snake(a)}.join('_')
         ].flatten.compact.join('_').to_sym
       end
+      resource_name = struct._process_key(resource_name.to_sym)
       nested_template = compile(to_nest[:path], :sparkle)
       nested_template.parent = struct._self
-      nested_template.name = Bogo::Utility.camel(resource_name)
+      nested_template.name = resource_name
       if(options[:parameters])
         nested_template.compile_state = options[:parameters]
       end
-      struct.resources.set!(resource_name) do
-        type struct._self.stack_resource_type
-      end
       unless(struct._self.sparkle.empty?)
         nested_template.sparkle.apply(struct._self.sparkle)
       end
-      struct.resources[resource_name].properties.stack nested_template
-      if(block_given?)
-        struct.resources[resource_name].instance_exec(&block)
-      end
-      struct.resources[resource_name]
+      nested_resource = struct.dynamic!(
+        struct._self.stack_resource_type,
+        resource_name,
+        {:resource_name_suffix => nil},
+        &block
+      )
+      nested_resource.properties.stack nested_template
+      nested_resource
     end
 
     # Insert a builtin dynamic into a context
@@ -307,7 +311,11 @@ class SparkleFormation
         _config ||= {}
         __t_stringish(_name)
         __t_hashish(_config)
-        resource_name = "#{_name}_#{_config.delete(:resource_name_suffix) || dynamic_name}".to_sym
+        resource_name = [
+          _name,
+          _config.fetch(:resource_name_suffix, dynamic_name)
+        ].compact.join('_').to_sym
+        _config.delete(:resource_name_suffix)
         new_resource = struct.resources.set!(resource_name)
         new_resource.type lookup_key
         properties = new_resource.properties
@@ -402,6 +410,8 @@ class SparkleFormation
             )
             if(s_path)
               h[:root] = s_path
+            else
+              h[:root] = :none
             end
           }
         )
@@ -531,6 +541,7 @@ class SparkleFormation
       if(Provider.const_defined?(provider_klass))
         extend Provider.const_get(provider_klass)
       end
+      sparkle.provider = val
       @provider
     else
       @provider = nil
@@ -629,7 +640,7 @@ class SparkleFormation
   #
   # @param args [String, Symbol] Symbol component names or String paths
   # @return [self]
-  def load(*args)
+  def load(*args, &user_block)
     args.each do |thing|
       if(thing.is_a?(String))
         # NOTE: This needs to be deprecated and removed
@@ -640,6 +651,9 @@ class SparkleFormation
         composition.new_component(thing)
       end
     end
+    if(block_given?)
+      block(user_block)
+    end
     self
   end
 
@@ -791,7 +805,7 @@ class SparkleFormation
   # Apply nesting logic to stack
   #
   # @param nest_type [Symbol] values: :shallow, :deep (default: :deep)
-  # @return [Hash] dumped stack
+  # @return [SparkleFormation::SparkleStruct] compiled structure
   # @note see specific version for expected block parameters
   def apply_nesting(*args, &block)
     if(args.include?(:shallow))
@@ -810,9 +824,9 @@ class SparkleFormation
   # @yieldparam resource [AttributeStruct] the stack resource
   # @yieldparam s_name [String] stack resource name
   # @yieldreturn [Hash] key/values to be merged into resource properties
-  # @return [Hash] dumped stack
+  # @return [SparkleFormation::SparkleStruct] compiled structure
   def apply_deep_nesting(*args, &block)
-    compile.dump!
+    compile
   end
 
   # Check if parameter name matches an output name
@@ -855,7 +869,10 @@ class SparkleFormation
       unless(stack.nested_stacks.empty?)
         stack_template_extractor(stack.nested_stacks(:with_resource, :with_name), &block)
       end
-      resource.properties.set!(:stack, stack.compile.dump!)
+      resource.properties._delete(:stack)
+      s_parent = resource.properties.stack
+      stack.compile._parent(s_parent)
+      resource.properties.set!(:stack, stack.compile)
       block.call(s_name, stack, resource)
     end
   end
@@ -868,9 +885,9 @@ class SparkleFormation
   # @yieldparam resource_name [String] name of stack resource
   # @yieldparam stack [SparkleFormation] nested stack
   # @yieldreturn [String] Remote URL storage for template
-  # @return [Hash]
+  # @return [SparkleFormation::SparkleStruct] compiled structure
   def apply_shallow_nesting(*args, &block)
-    compile.dump!
+    compile
   end
 
   # @return [Smash<output_name:SparkleFormation>]
@@ -917,6 +934,15 @@ class SparkleFormation
     MultiJson.load(to_json)
   end
 
+  # @return [Hash] dumped hash
+  def sparkle_dump
+    MultiJson.load(
+      MultiJson.dump(
+        compile.sparkle_dump!
+      )
+    )
+  end
+
   # @return [String] dumped hash JSON
   def to_json(*args)
     # NOTE: Ported in from batali

data/lib/sparkle_formation/sparkle_struct.rb

@@ -130,5 +130,48 @@ class SparkleFormation
     end
     alias_method :state!, :_state
 
+    # TODO: Need to refactor attribute_struct dumping to allow hooking
+    # custom behavior instead of heavy copy/paste to modify a method call
+
+    # Process and unpack items for dumping within deeply nested
+    # enumerable types
+    #
+    # @param item [Object]
+    # @return [Object]
+    def _sparkle_dump_unpacker(item)
+      if(item.is_a?(::Enumerable))
+        if(item.respond_to?(:keys))
+          item.class[
+            *item.map do |entry|
+              _sparkle_dump_unpacker(entry)
+            end.flatten(1)
+          ]
+        else
+          item.class[
+            *item.map do |entry|
+              _sparkle_dump_unpacker(entry)
+            end
+          ]
+        end
+      elsif(item.is_a?(::AttributeStruct))
+        item.nil? ? UNSET_VALUE : item._sparkle_dump
+      elsif(item.is_a?(::SparkleFormation))
+        item.sparkle_dump
+      else
+        item
+      end
+    end
+
+    # @return [AttributeStruct::AttributeHash, Mash] dump struct to hashish
+    def _sparkle_dump
+      processed = @table.keys.map do |key|
+        value = @table[key]
+        val = _sparkle_dump_unpacker(value)
+        [_sparkle_dump_unpacker(key), val] unless val == UNSET_VALUE
+      end.compact
+      __hashish[*processed.flatten(1)]
+    end
+    alias_method :sparkle_dump!, :_sparkle_dump
+
   end
 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.8')
+  VERSION = Gem::Version.new('3.0.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 3.0.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -161,6 +161,7 @@ files:
 - docs/inheritance-merging.md
 - docs/nested-stacks.md
 - docs/overview.md
+- docs/provider-restrictions.md
 - docs/sparkle-packs.md
 - docs/sparkleformation-dsl.md
 - docs/stack-policies.md
@@ -180,12 +181,15 @@ files:
 - lib/sparkle_formation/provider.rb
 - lib/sparkle_formation/provider/aws.rb
 - lib/sparkle_formation/provider/azure.rb
+- lib/sparkle_formation/provider/google.rb
 - lib/sparkle_formation/provider/heat.rb
 - lib/sparkle_formation/resources.rb
 - lib/sparkle_formation/resources/aws.rb
 - lib/sparkle_formation/resources/aws_resources.json
 - lib/sparkle_formation/resources/azure.rb
 - lib/sparkle_formation/resources/azure_resources.json
+- lib/sparkle_formation/resources/google.rb
+- lib/sparkle_formation/resources/google_resources.json
 - lib/sparkle_formation/resources/heat.rb
 - lib/sparkle_formation/resources/heat_resources.json
 - lib/sparkle_formation/resources/rackspace.rb
@@ -194,6 +198,7 @@ files:
 - lib/sparkle_formation/sparkle_attribute.rb
 - lib/sparkle_formation/sparkle_attribute/aws.rb
 - lib/sparkle_formation/sparkle_attribute/azure.rb
+- lib/sparkle_formation/sparkle_attribute/google.rb
 - lib/sparkle_formation/sparkle_attribute/heat.rb
 - lib/sparkle_formation/sparkle_attribute/rackspace.rb
 - lib/sparkle_formation/sparkle_collection.rb