bbc-cosmos-tools 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2b9e2dd15ad2345d36171607515618f1f46f3a
-  data.tar.gz: 773bab960e3b232518140a7dd16a9d7ec6bbc95b
+  metadata.gz: 3d4c810f1415d6faa45be575a50b0be4eb5381f2
+  data.tar.gz: a4b9162f01af57a7ff5f3d2191385baa69e4a78b
 SHA512:
-  metadata.gz: 1593ed3e95785317ca7b2626b8c80c006301be9bd77a67f802a49ebbbc39d93b90099f7fcf90be76af12bf8ddcb08256e4c05a958b831e3cc9e67351ddf264c0
-  data.tar.gz: e6d5038ac4673d2df28a2adb9c5e1b2b49cc8af32dcd840de56919f06e0e41b7bead000fbdd67607e265aa085fbf9cc95ee66bfcdd068cadf142cd8e33d9bab3
+  metadata.gz: 7750576f43f3001de7547631009b464e45c8412e98b73072376eb8e7de23c442471154fa0963379b3c9ada016199e702630e8764d8d2526d37d549348c6f3c2e
+  data.tar.gz: fa98dd2558e6058132ddc16f8af286b1fd2b13a1a407b8b2415625b2354b4214f641177cd658f158f4bdc4869a91e496fac654891cfbdbd7ebd21e36ccda3fcb

data/lib/bbc/cosmos/tools/cloudformation/generator.rb

@@ -25,6 +25,7 @@ module BBC
               self.raise_error template
             else
               hash = JSON.parse(template.to_json)
+              hash['Parameters'] ||= {}
 
               if component_exists?(component, config) && stack_exists?(component, config, options[:stack])
                 component_parameters(config.resources, options, component).each do |key, value|
@@ -32,6 +33,8 @@ module BBC
                 end
               end
 
+              hash.delete_if { |k, v| k == 'Parameters' && v == {} }
+
               to_json ? JSON.pretty_generate(hash) : hash
             end
           end
@@ -70,7 +73,7 @@ module BBC
           end
 
           def self.variants(component_meta, variant = nil)
-            component_meta.has_key?('variants') ? component_meta['variants'][variant] : component_meta['parameters']
+            component_meta.has_key?('variants') ? component_meta['variants'][variant] : component_meta.fetch('parameters', {})
           end
 
           def self.component_parameters(resources, options, component)

data/lib/bbc/cosmos/tools/commands/stack.rb

@@ -130,16 +130,18 @@ module BBC
 
               stack_meta = stack_data(component, stack_name, options[:env])
 
-              data['Parameters'] = deep_merge(
-                stack_parameters(stack_meta['parameters']),
-                data['Parameters']
-              )
+              if data['Parameters']
+                data['Parameters'] = deep_merge(
+                  stack_parameters(stack_meta['parameters']),
+                  data['Parameters']
+                )
 
-              params = Tools::Cloudformation::Generator.parameters(data, false)
+                params = Tools::Cloudformation::Generator.parameters(data, false)
+              end
 
               post_data = {
                 'template'    => data,
-                'parameters'  => params
+                'parameters'  => params || {}
               }
 
               response = api.post sprintf(config.app['stack_update_endpoint'], options[:env], id, stack_name), JSON.pretty_generate(post_data)

data/lib/bbc/cosmos/tools/version.rb

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.5.0"
+        VERSION = "0.5.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Tool for pusing config to cosmos and controlling cloudformation templates