cfnpp 0.3.5 → 0.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 282590738c98b0f4020beb8e220242cb6cf2d454
+  data.tar.gz: 6b1f5f60c35ff5b18c54acea9ea25d4a3176167d
+SHA512:
+  metadata.gz: 07b00e377c48b8c15f4fc0ebb1c351a0148b0d099373e7c6f4bd7bc2b7705aae6088e44447bfdac7cb118b0cc0fc3430ead750903834b66aba07c715cac2f2a7
+  data.tar.gz: 546f2cd43ff7e66164ac3835198db6a9749fb3f551b219760f90c0335c093d3464c6408c3e8d71892041cc176465a89c62c2468621395259eb604377c85af68e

data/bin/cfnpp

@@ -52,6 +52,9 @@ eot
     opts.on('-c', '--conf PATH', 'use PATH instead of $basepath/conf/$environment_type for conf file') do |confpath|
       cli_opts[:confpath] = confpath
     end
+    opts.on('--git-revision-check', "skip update when the stack's current revision matches the new revision") do |revision|
+      cli_opts[:git_revision_check] = revision
+    end
   end
   optparse.parse!
 
@@ -146,10 +149,25 @@ eot
   opts['EnvironmentName'] = environment_name
   opts['EnvironmentType'] = environment_type
 
+  opts['Force'] = 'false'
   if cli_opts[:force]
     opts['Force'] = 'true'
-  else
-    opts['Force'] = 'true'
+  end
+
+  if cli_opts[:git_revision_check]
+    needs_update = false
+    if action == 'update' && stack.exists?
+      current_revision = stack.parameters['TemplateGitRevision']
+      #puts "Checking current stack git revision (#{current_revision}) against desired revision (#{opts['TemplateGitRevision']})"
+      if current_revision != opts['TemplateGitRevision']
+        needs_update = true
+      end
+    end
+
+    unless needs_update
+      puts "Skipping update for stack (#{stack_name}) because the stack's current revision (#{current_revision}) matches the new revision"
+      exit
+    end
   end
  
   uploader = CfnPP::Uploader.new('manta-cloudformation', stack_name)

data/lib/cfnpp/transform.rb

@@ -174,7 +174,7 @@ module CfnPP
             inline = rec["inline"]
             name = rec["name"]
             rec.delete("inline")
-            sub_params = rec["params"]
+            sub_params = rec["params"] || {}
             rec["result"] = self.class.new(inline, @filebase, sub_params.merge(@opts), name, @stack_url_base).as_template_result
             rec["Resources"] = {} if not rec["Resources"]
             rec["Resources"][name] = {

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfnpp
 version: !ruby/object:Gem::Version
-  version: 0.3.5
-  prerelease: 
+  version: 0.3.6
 platform: ruby
 authors:
 - Michael Bruce
@@ -10,141 +9,125 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dogapi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ploy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '["cfnpp", ["Michael Bruce", "Stephen J. Smith"]]'
+description: '["cfnpp", ["Michael Bruce", "Stephen J. Smith"]]'
 email: mbruce@manta.com
 executables:
 - cfnpp
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/cfnpp
 - lib/cfnpp/replacer.rb
 - lib/cfnpp/templateresult.rb
 - lib/cfnpp/transform.rb
 - lib/cfnpp/uploader.rb
-- bin/cfnpp
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 439810095925029723
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: cfnpp
 test_files: []