bora 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff4f553135f201ba7386c5b97464b2cf23931c85
-  data.tar.gz: 78c79cc5fd9755d085b6f28ea6c8233a967fc0c2
+  metadata.gz: f3b7fb07038e20354a749af9db174d21fca4a3ab
+  data.tar.gz: 923412c975c6d3c2454d7dd616ed7b2339bb7646
 SHA512:
-  metadata.gz: f95882cd11d3ee76306203b5a38c765c7ff525ff6e7633325593d5114afee6dee4ebf00f26dae6088628fb8a891ed1bfd488c8cb43d3d0175aa2b85e6837c874
-  data.tar.gz: ae7563ed6725c60cd623051a3f3cbd625aa1eff8bacce0a5e7c3931a92a7fac07b86a15efc26557b824c20927dbed2b5ee660f9d20b97ae42e29ae63a142cf86
+  metadata.gz: f89db4d0f3175157424d9ea86ddb3fa6ec8aacabac8a762d8a7ad1e8f08f217c489f92d8fe2a72dfc287dfb6c82cf88bee97d5674d4b6961b00ab01808f15272
+  data.tar.gz: 039661e930401f3ac1c59bf122fd7aa67b60aaf79a5d129ec269a6dcb125d54f2667fdb6c626f0a8c35f1c90584a1fc111b9759a72907184af1a76f8a700bcc6

data/bora.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "diffy", "~> 3.0"
   spec.add_dependency "rake", "~> 10.0"
   spec.add_dependency "thor", "~> 0.19"
+  spec.add_dependency "hashie", "~> 3.4.6"
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "hashie", "~> 3.4.6"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.12"
+  spec.add_development_dependency "pry"
 end

data/lib/bora/stack.rb

@@ -287,6 +287,7 @@ class Bora
           end
         end
       end
+      #binding.pry
       cfn_options
     end
 
@@ -316,8 +317,16 @@ class Bora
     end
 
     def cfn_options_from_stack_config
-      valid_options = ["capabilities"]
-      @stack_config.select { |k| valid_options.include?(k) }
+      valid_options = %w(capabilities tags disable_rollback on_failure)
+
+      cfn_options = @stack_config.select { |k| valid_options.include?(k) }
+      # Expand any Tags to "key" => key, "value" => value pairs
+      if cfn_options['tags']
+        cfn_options['tags'] = cfn_options['tags'].map do |k, v|
+          { key: k, value: v }
+        end
+      end
+      cfn_options
     end
 
     def get_new_template(cfn_options)

data/lib/bora/template.rb

@@ -1,12 +1,13 @@
 require 'bora/stack'
+require 'hashie'
 
 class Bora
   class Template
-    # These are properties that you can define on the template, but which can also be defined in the stack
-    INHERITABLE_PROPERTIES = ["capabilities", "default_region"]
+    # These are properties that you can define on the template, but which can also be defined and overriden in the stack
+    INHERITABLE_PROPERTIES = %w(capabilities default_region tags)
 
     # These are properties that can be passed in from the command line to override what's defined inthe stack
-    OVERRIDABLE_PROPERTIES = ["cfn_stack_name"]
+    OVERRIDABLE_PROPERTIES = %w(cfn_stack_name)
 
     def initialize(template_name, template_config, override_config = {})
       @template_name = template_name
@@ -31,11 +32,12 @@ class Bora
       @stacks.each { |_, s| s.rake_tasks }
     end
 
-
     private
 
     def resolve_stack_config(template_config, stack_config, override_config)
-      inheritable_properties(template_config).merge(stack_config).merge(overridable_properties(override_config))
+      Hashie::Mash.new(
+        inheritable_properties(template_config)
+      ).deep_merge(stack_config).merge(overridable_properties(override_config))
     end
 
     def inheritable_properties(config)
@@ -45,6 +47,5 @@ class Bora
     def overridable_properties(config)
       config.select { |k| INHERITABLE_PROPERTIES.include?(k) || OVERRIDABLE_PROPERTIES.include?(k) }
     end
-
   end
 end

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 class Bora
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
+        version: 3.4.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.4.6
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.6
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.6
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: 
 email:
 - charles.blaxland@gmail.com