sparkle_formation 3.0.20 → 3.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96961825cddd3633fa2f084c89a69c5d7150705f
-  data.tar.gz: c6243723957d182493b5d74ac1068933a15e22e2
+  metadata.gz: 5859104b23538649891d59cfbb13e0074559def6
+  data.tar.gz: 8cd95968b6fe6a2d959ad896675dd88d32700574
 SHA512:
-  metadata.gz: fcddb4dca36acba3b067fe45428270977c3482828f30f6f0374ee8b4ddf2df2a25a71e753f7cfe15c011cdac3a55d6d449246c6c2c68694f72f5ed26f8745e1d
-  data.tar.gz: aef48b6ab4669fa685f44de8aca587c1912b3a986544e7fe3ae2ca07fe5f5a4d5f0440230690e12bf4afea1f4c151e671b598cff390cfaae92e28d656e3daee1
+  metadata.gz: 8ed5c62ff322bb1ca0234c6d46953f8150ff93f22227b3f93ecb35597bdb65908877c441252847f0204c9e5fb6f082731ae39fe2d60b674de7e68642bd16ddf6
+  data.tar.gz: b2faee5e3a49d2148798a75763281a134b3a7382e57196576e5a4721b0fa2975e439b21727c746e15469f29c686592531f3efb95930416f6fba8f809dc8e99ae

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v3.0.22
+* Add support for non-string like data keys (#217)
+* Customize compile time parameter setting (#218)
+* Add aliasing for Heat and Rackspace to OpenStack
+
 # v3.0.20
 * Fix nested stack processing. Use value set in place of type check.
 

data/lib/sparkle_formation/error.rb

@@ -8,6 +8,9 @@ class SparkleFormation
     # Inheritance error
     class CircularInheritance < Error; end
 
+    # Found resource improperly constructed
+    class InvalidResource < Error; end
+
     # File not found error
     class NotFound < KeyError
       attr_reader :name

data/lib/sparkle_formation/function_struct.rb

@@ -29,6 +29,32 @@ class SparkleFormation
       end
     end
 
+    # # Create a clone of this instance
+    def _clone(*_)
+      _klass.new(_fn_name, *_fn_args)
+    end
+
+    # @return [Numeric] hash value for instance
+    def hash
+      _dump.hash
+    end
+
+    # @return [TrueClass, FalseClass]
+    def eql?(_other)
+      if(_other.respond_to?(:_dump) && _other.respond_to?(:_parent))
+        ::MultiJson.dump(_dump).hash ==
+          ::MultiJson.dump(_other._dump).hash &&
+          _parent == _other._parent
+      else
+        false
+      end
+    end
+
+    # @return [TrueClass, FalseClass]
+    def ==(_other)
+      eql?(_other)
+    end
+
     # @return [False] functions are never nil
     def nil?
       false

data/lib/sparkle_formation/provider.rb

@@ -8,6 +8,7 @@ class SparkleFormation
     autoload :Azure, 'sparkle_formation/provider/azure'
     autoload :Google, 'sparkle_formation/provider/google'
     autoload :Heat, 'sparkle_formation/provider/heat'
+    autoload :OpenStack, 'sparkle_formation/provider/heat'
     autoload :Terraform, 'sparkle_formation/provider/terraform'
 
   end

data/lib/sparkle_formation/provider/azure.rb

@@ -17,6 +17,17 @@ class SparkleFormation
         {}
       end
 
+      # Set the current compile_state into the
+      # compiled result
+      #
+      # @param compiled [AttributeStruct]
+      # @return [AttributeStruct]
+      def set_compiled_state(compiled)
+        super
+        compiled.outputs.compile_state.type 'String'
+        compiled
+      end
+
       # Apply deeply nested stacks. This is the new nesting approach and
       # does not bubble parameters up to the root stack. Parameters are
       # isolated to the stack resource itself and output mapping is

data/lib/sparkle_formation/provider/heat.rb

@@ -159,5 +159,6 @@ class SparkleFormation
       end
 
     end
+    OpenStack = Heat
   end
 end

data/lib/sparkle_formation/sparkle_attribute.rb

@@ -9,6 +9,7 @@ class SparkleFormation
     autoload :Azure, 'sparkle_formation/sparkle_attribute/azure'
     autoload :Google, 'sparkle_formation/sparkle_attribute/google'
     autoload :Heat, 'sparkle_formation/sparkle_attribute/heat'
+    autoload :OpenStack, 'sparkle_formation/sparkle_attribute/heat'
     autoload :Rackspace, 'sparkle_formation/sparkle_attribute/rackspace'
     autoload :Terraform, 'sparkle_formation/sparkle_attribute/terraform'
 
@@ -30,6 +31,9 @@ class SparkleFormation
       unless(result)
         ::Kernel.raise NameError.new 'Failed to determine current resource name! (Check call location)'
       end
+      if(result.is_a?(::SparkleFormation::FunctionStruct))
+        result = result._clone
+      end
       result
     end
     alias_method :resource_name!, :_resource_name

data/lib/sparkle_formation/sparkle_attribute/azure.rb

@@ -126,6 +126,10 @@ class SparkleFormation
           resource = _root.resources.set!(r_name)
           if(resource.nil?)
             ::Kernel.raise ::SparkleFormation::Error::NotFound::Resource.new(:name => r_name)
+          elsif(resource.type.nil?)
+            ::Kernel.raise ::SparkleFormation::Error::InvalidResource.new(
+              "Resource `#{r_name}` provides no type information."
+            )
           else
             ::SparkleFormation::FunctionStruct.new(
               'resourceId',

data/lib/sparkle_formation/sparkle_attribute/heat.rb

@@ -10,6 +10,9 @@ class SparkleFormation
 
       # Set customized struct behavior
       def self.included(klass)
+        if(klass.const_defined?(:CAMEL_KEYS))
+          klass.send(:remove_const, :CAMEL_KEYS)
+        end
         klass.const_set(:CAMEL_KEYS, false)
       end
 
@@ -191,6 +194,6 @@ class SparkleFormation
       alias_method :stack_output!, :_stack_output
 
     end
-
+    OpenStack = Heat
   end
 end

data/lib/sparkle_formation/sparkle_formation.rb

@@ -309,12 +309,16 @@ class SparkleFormation
       if(struct._self.provider_resources && lookup_key = struct._self.provider_resources.registry_key(dynamic_name))
         _name, _config = *args
         _config ||= {}
-        __t_stringish(_name)
         __t_hashish(_config)
-        resource_name = [
-          _name,
-          _config.fetch(:resource_name_suffix, dynamic_name)
-        ].compact.join('_').to_sym
+        unless(_name.is_a?(SparkleFormation::FunctionStruct))
+          __t_stringish(_name)
+          resource_name = [
+            _name,
+            _config.fetch(:resource_name_suffix, dynamic_name)
+          ].compact.join('_').to_sym
+        else
+          resource_name = _name._root
+        end
         _config.delete(:resource_name_suffix)
         new_resource = struct.resources.set!(resource_name)
         new_resource.type lookup_key
@@ -736,12 +740,22 @@ class SparkleFormation
         end
       end
       if(compile_state && !compile_state.empty?)
-        compiled.outputs.compile_state.value MultiJson.dump(compile_state)
+        set_compiled_state(compiled)
       end
       compiled
     end
   end
 
+  # Set the current compile_state into the
+  # compiled result
+  #
+  # @param compiled [AttributeStruct]
+  # @return [AttributeStruct]
+  def set_compiled_state(compiled)
+    compiled.outputs.compile_state.value MultiJson.dump(compile_state)
+    compiled
+  end
+
   # Clear compiled stack if cached and perform compilation again
   #
   # @return [SparkleStruct]
@@ -916,7 +930,8 @@ class SparkleFormation
         outputs = Smash.new
       end
       nested_stacks.each do |nested_stack|
-        outputs = nested_stack.collect_outputs(:force).merge(outputs)
+        n_stack = nested_stack.is_a?(self.class) ? nested_stack : nested_stack._self
+        outputs = n_stack.collect_outputs(:force).merge(outputs)
       end
       outputs
     else

data/lib/sparkle_formation/sparkle_struct.rb

@@ -26,6 +26,8 @@ class SparkleFormation
       include SparkleAttribute
       include SparkleAttribute::Heat
     end
+    OpenStack = Heat
+    Rackspace = Heat
     # Rackspace specific struct
     class Rackspace < SparkleStruct
       include SparkleAttribute
@@ -106,16 +108,26 @@ class SparkleFormation
     # Override to inspect result value and fetch root if value is a
     # FunctionStruct
     def method_missing(sym, *args, &block)
-      if(sym.to_s.start_with?('_') || sym.to_s.end_with?('!'))
-        ::Kernel.raise ::NoMethodError.new "Undefined method `#{sym}` for #{_klass.name}"
+      if(sym.is_a?(::String) || sym.is_a?(::Symbol))
+        if(sym.to_s.start_with?('_') || sym.to_s.end_with?('!'))
+          ::Kernel.raise ::NoMethodError.new "Undefined method `#{sym}` for #{_klass.name}"
+        end
       end
       super(*[sym, *args], &block)
-      if((s = sym.to_s).end_with?('='))
-        s.slice!(-1, s.length)
-        sym = s
+      if(sym.is_a?(::String) || sym.is_a?(::Symbol))
+        if((s = sym.to_s).end_with?('='))
+          s.slice!(-1, s.length)
+          sym = s
+        end
+        sym = _process_key(sym)
+      else
+        sym = function_bubbler(sym)
       end
-      sym = _process_key(sym)
       @table[sym] = function_bubbler(@table[sym])
+      # Always reset parent in case this is a clone
+      if(@table[sym].is_a?(::AttributeStruct))
+        @table[sym]._parent(self)
+      end
       @table[sym]
     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.20')
+  VERSION = Gem::Version.new('3.0.22')
 end

data/sparkle_formation.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license = 'Apache-2.0'
   s.require_path = 'lib'
   s.required_ruby_version = '>= 2.1'
-  s.add_runtime_dependency 'attribute_struct', '>= 0.3.0', '< 0.5'
+  s.add_runtime_dependency 'attribute_struct', '>= 0.3.5', '< 0.5'
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'bogo'
   s.add_development_dependency 'minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.0.22
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.5'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.5'