cfnpp 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a63ff367359310106abca93f1dc1291991f000a
-  data.tar.gz: 0e0d025363c329ebcd9889f0336dd1d46e726454
+  metadata.gz: af60c0387ee33a9677531c37ed708f92d2812adb
+  data.tar.gz: 698ce4ab50f8b32bc863ed43b79e4fe6e40fd147
 SHA512:
-  metadata.gz: a4ae5bf3f0cea33e2f7f1d28382867f4e54b98e46ca7fc467ad759985e0272ed1bbd5810b9c6045b8ce2f41ec77acec21d31d2f58f70620644e0dcc1010e7a27
-  data.tar.gz: 19c89740105bc26715ce1e18b9acceb10e942675bfba474be7ba5acc9050ca3904bfba10516a9c01ee3241ea2dc108e9caf386befce51e23565cf6465cf220b2
+  metadata.gz: 8899a3325476f21357ad225f404038219e7b557e09f5ec5162a54f0aace49a778fa3bba14b3a7a9df680b43d5b4bfafda2be1d730f8d062f43eb6b78603d2ef5
+  data.tar.gz: 336491a80dcc6d5f8de0769ca27ace7b62847a2a2bca9aa3fd0f609d7c3528e80f6446a160bce0aef8dc0533a76989a0a36b0ea79f2ecbdb91f96b7419f2fa79

data/bin/cfnpp

@@ -55,14 +55,19 @@ eot
   optparse.parse!
 
   if cli_opts[:deployconfig]
-    yr = Ploy::YamlReader.new
-    conf = yr.from_http(cli_opts[:deployconfig])
-    if (conf['locked'])
-      puts "skipping autoupdate: deployconfig is locked"
-      exit
-    end
-    unless (conf['stack_autoupdate'])
-      puts "skipping autoupdate: autoupdate is false"
+    begin
+      yr = Ploy::YamlReader.new
+      conf = yr.from_http(cli_opts[:deployconfig])
+      if (conf['locked'])
+        puts "skipping autoupdate: deployconfig is locked"
+        exit
+      end
+      unless (conf['stack_autoupdate'])
+        puts "skipping autoupdate: autoupdate is false"
+        exit
+      end
+    rescue
+      puts "failed to get deployconfig"
       exit
     end
   end
@@ -207,13 +212,12 @@ def do_upload(uploader, template_result, opts)
 
   upload_res = uploader.upload_template(template_result, opts)
 
-  if upload_res[:error]
-    puts "error for #{upload_res[:url]}"
-    if upload_res[:error] == 'validation_error'
+  if upload_res[:err]
+    if upload_res[:err] == 'validation_error'
       vs = upload_res[:validation_status]
       puts "validation error code: #{vs[:code]}"
       puts "validation error message: #{vs[:message]}"
-    elsif upload_res[:error] == 'already_updated'
+    elsif upload_res[:err] == 'already_updated'
       prev_opts = upload_res[:prev_opts]
       last_update_timestamp = prev_opts['LastUpdateTimestamp']
       template_git_revision = prev_opts['TemplateGitRevision']
@@ -230,7 +234,6 @@ def do_upload(uploader, template_result, opts)
 end
 
 def after_update(stack, timestamp)
-  stack_name = stack.name
   #cmd = "watch -n 10 cfn-describe-stack-events #{stack_name}"
   #cmd = "watch -n 10 bin/get_stack_events.rb #{stack_name}"
   #puts cmd
@@ -245,8 +248,8 @@ def after_update(stack, timestamp)
             puts event
           end
         end
-        get_sub_stacks( stack.name).each do |stack|
-          get_stack_events( stack).reverse.each do |event|
+        get_sub_stacks( stack.name).each do |substack|
+          get_stack_events( substack).reverse.each do |event|
             if stackEvents.add?(event)
               puts "NESTED: #{event}"
             end
@@ -257,6 +260,8 @@ def after_update(stack, timestamp)
     rescue SystemExit, Interrupt
       exit 0
     end
+  else
+    puts "done updating"
   end
   
   # This is all working, tested code, just not sure it belongs here. --stsmith
@@ -387,7 +392,7 @@ def get_template_info()
   instanceid = `/bin/netcat 169.254.169.254 80 -w 1 -q 0 </dev/null && /usr/bin/ec2metadata --instance-id`
   instanceid.chomp!
 
-  template = {
+  return {
     :gitrev => gitrev,
     :gitstatus => gitstatus,
     :source => source,

metadata

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