cfnpp 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a0912d91ace3af90b743ad94befb92ff3a58cf
-  data.tar.gz: ebef71d68111a3fde3f23127177c415c775cc581
+  metadata.gz: fc33bf38fe5963d84f59af0c4594ad3dd94134e8
+  data.tar.gz: aa7fbda79bc80f45ffbf8e51c6c271063cecd3f2
 SHA512:
-  metadata.gz: f601f55468948a4992025ff6f226407051cd60e6f0d27ca3ad59925751d74e210c35551e92e00834f8a584efe61eb7f28498309c61cd2038b3bc95e80d6dc336
-  data.tar.gz: 883149010e8ad57f7845207ba7274257cf75ad4debceb14662866cd3bd8dfb931e5cd3d8062effce4ef9bceb4df83b49e30549dbeb1842f96bd84488e5300058
+  metadata.gz: 74d3c94bf5b700c211b4c049391a1d885b828f247dd9814e6a0d9e682f1a931d8e506b44e26a819538a6e7058bfebc5793487c7501fcaf6db209464981e70f55
+  data.tar.gz: 8d474998c20402957de8eae6a8368f3526bf0dc84f1d28ff50b73596a17533a1defc34129c108ba496ad3a6610f3b1f92092fa99a09892e87693fa084a4e5f7d

data/bin/cfnpp

@@ -158,14 +158,19 @@ eot
     needs_update = false
     if action == 'update' && stack.exists?
       current_revision = stack.parameters['TemplateGitRevision']
+      new_revision = opts['TemplateGitRevision']
       #puts "Checking current stack git revision (#{current_revision}) against desired revision (#{opts['TemplateGitRevision']})"
-      if current_revision != opts['TemplateGitRevision']
-        needs_update = true
+      if !current_revision.nil? && current_revision.size > 0
+        if !new_revision.nil? && new_revision.size > 0
+          if current_revision != new_revision
+            needs_update = true
+          end
+        end
       end
     end
 
     unless needs_update
-      puts "Skipping update for stack (#{stack_name}) because the stack's current revision (#{current_revision}) matches the new revision"
+      puts "skipping update for stack (#{stack_name}) because the stack's current revision (#{current_revision}) and new revision (#{new_revision}) don't indicate that an update is necessary"
       exit
     end
   end
@@ -375,8 +380,9 @@ def get_template_info()
 
   # Try from ploy package.
   package = `dpkg -S #{pwd} 2>/dev/null`
-  if package && package =~ /^cloudformation-tools:/
-    gitrev = `dpkg-query -W -f='${gitrev}' cloudformation-tools`
+  if package && package =~ /^cloudformation-tools/
+    package.sub!(/:.*/, '')
+    gitrev = `dpkg-query -W -f='${gitrev}' #{package}`
   end
 
   #If stin and stdout or tty then someone is running this from command line.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfnpp
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Michael Bruce