sparkle_formation 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e0be284545b28444bd22287a29aaf74a0aa25d
-  data.tar.gz: e18497e3c5b66af3e905cd0754e88eb5f1cded54
+  metadata.gz: 5a7ac537659ebf74662bbcfff4803d88c1dedfc8
+  data.tar.gz: f87846f1473c7b2557121b125243829dad134edd
 SHA512:
-  metadata.gz: 1ac1f84363eaa01a0f87eaac6932a4eb03b35170b2f0d1b286eb0c2b8632c8c8fef62b01fa928b14e808bb34b167c130306b09c70acb6e45bdbfa2874790cf44
-  data.tar.gz: aa39442b0e3690301b6db50cd7fadea4e3aee04fd687aa99b9da19aa396f6203c01e8eff50454224b036fe4a327a05215398e65afbf2418413c998d1e55bda14
+  metadata.gz: 8710305f6ca7f5e96e987c87c2896451641d3a9469f5c0d3c1bb1a283b6c7ed1a09759979d014fd447862c689eb815b870ac7462d4c10a106b1659623eb8e7b3
+  data.tar.gz: 903bbd84d290e38b3273858dd16260e866c95a62085d4d12441c6b6ff007b1412f18f421ccd03d12d22398f878a39527943458893db0ef1f7f24e33550a7a857

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.4
+* Fixes on testing (#66 #67 #68 thanks @matschaffer)
+* Properly handle JSON templates within packs (#72)
+
 ## v1.0.2
 * Support custom values for stack resource type matching
 

data/lib/sparkle_formation/sparkle.rb

@@ -247,18 +247,21 @@ class SparkleFormation
             data = Smash.new(:template => [])
             t_wrap = eval_wrapper.new
             t_wrap.part_data(data)
-            begin
-              t_wrap.instance_eval(IO.read(path), path, 1)
-            rescue TypeError
+            if(slim_path.end_with?('.rb'))
+              begin
+                t_wrap.instance_eval(IO.read(path), path, 1)
+              rescue TypeError
+              end
             end
-            data = data[:template].first
+            data = data[:template].first || Smash.new
             unless(data[:name])
-              data[:name] = slim_path.tr('/', '__')
+              data[:name] = slim_path.tr('/', '__').sub(/\.(rb|json)$/, '')
             end
             hash[data[:name]] = data.merge(
               Smash.new(
                 :type => :template,
-                :path => path
+                :path => path,
+                :serialized => !path.end_with?('.rb')
               )
             )
           end

data/lib/sparkle_formation/translation/heat.rb

@@ -366,6 +366,7 @@ class SparkleFormation
             :name => 'OS::Neutron::Net',
             :finalizer => :neutron_net_finalizer,
             :properties => {
+              'CidrBlock' => 'cidr'
             }
           },
           'AWS::EC2::Subnet' => {

data/lib/sparkle_formation/version.rb

@@ -1,4 +1,4 @@
 class SparkleFormation
   # Current library version
-  VERSION = Gem::Version.new('1.0.2')
+  VERSION = Gem::Version.new('1.0.4')
 end

data/sparkle_formation.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'attribute_struct', '~> 0.2.2'
   s.add_dependency 'multi_json'
   s.add_dependency 'bogo'
+  s.add_development_dependency 'minitest'
   s.executables << 'generate_sparkle_docs'
   s.files = Dir['lib/**/*'] + %w(sparkle_formation.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby DSL for programmatic orchestration API template generation
 email: chrisroberts.code@gmail.com
 executables: