sfn 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbcb24c6a5bbf11f586b4f9d4cc7513bbaa01ee7
-  data.tar.gz: 16a2a3702fc4bfae5ae2028315e601d86f3db89d
+  metadata.gz: ccd51de01219d49eab04ff9c65a559496d12af4e
+  data.tar.gz: 54531dc80ac6f15fe3c712449533e74ea6c2706f
 SHA512:
-  metadata.gz: de461be2611e95176b612abc639353a1a0a5d3001fe73d9d2db5212631a17c6a9928a6115aef8a10b577d8cd23be01ec13bc2a982129fe8d05a9a59a70ce32c6
-  data.tar.gz: b2d224266a2eef7cdcbe6eec2291d0d9799b2e75ece20197fa126ca6435cbc6fb00b9eab0d5bdeeb8c1d4fef5de62dd949fdaf156dbf3904e5acb6001b8a7147
+  metadata.gz: e8fd31d72271d235c0e2a267cb0f978a95a61f0182cdebfed3e2e763efaa6a4222ab62c02d75e4544b8556f9a6dd5d941f120ffab01aa7b2743cc5996eb977f9
+  data.tar.gz: 4355c6cd7c2c75537c3c120bf5a961e1cd46e6483c3101ba144b12e2bcd0d273458300d8b2e3def53f10712fd93cdf5e67ec6907d04133eea6341da4790df3a0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.3.8
+* Fix result output from `update` command (#9)
+* Fix `inspect` command to properly support multiple attribute flags
+* Only output JSON when using `--print-only` flag with `create` command (#10)
+
 ## v0.3.6
 * Set options correctly on `sfn` executable (#7)
 * Update cli library dependency to provide better error messages (#6)

data/lib/sfn/command/create.rb

@@ -24,7 +24,11 @@ module Sfn
           file = load_template_file
           nested_stacks_unpack = file.delete('sfn_nested_stack')
         end
-        ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('create', :green)}"
+
+        unless(config[:print_only])
+          ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('create', :green)}"
+        end
+
         stack_info = "#{ui.color('Name:', :bold)} #{name}"
         if(config[:path])
           stack_info << " #{ui.color('Path:', :bold)} #{config[:file]}"
@@ -39,7 +43,7 @@ module Sfn
         else
 
           if(config[:print_only] && !config[:apply_stacks])
-            ui.info _format_json(
+            ui.puts _format_json(
               translate_template(
                 Sfn::Utils::StackParameterScrubber.scrub!(file)
               )
@@ -58,7 +62,7 @@ module Sfn
           stack.template = Sfn::Utils::StackParameterScrubber.scrub!(stack.template)
 
           if(config[:print_only])
-            ui.info _format_json(translate_template(stack.template))
+            ui.puts _format_json(translate_template(stack.template))
             return
           end
 

data/lib/sfn/command/inspect.rb

@@ -90,29 +90,31 @@ module Sfn
       end
 
       def display_attribute(stack)
-        attr = config[:attribute].split('.').inject(stack) do |memo, key|
-          args = key.scan(/\(([^)]*)\)/).flatten.first.to_s
-          if(args)
-            args = args.split(',').map{|a| a.to_i.to_s == a ? a.to_i : a}
-            key = key.split('(').first
-          end
-          if(memo.public_methods.include?(key.to_sym))
-            if(args.size == 1 && args.first.to_s.start_with?('&'))
-              memo.send(key, &args.first.slice(2, args.first.size).to_sym)
+        [config[:attribute]].flatten.compact.each do |stack_attribute|
+          attr = stack_attribute.split('.').inject(stack) do |memo, key|
+            args = key.scan(/\(([^)]*)\)/).flatten.first.to_s
+            if(args)
+              args = args.split(',').map{|a| a.to_i.to_s == a ? a.to_i : a}
+              key = key.split('(').first
+            end
+            if(memo.public_methods.include?(key.to_sym))
+              if(args.size == 1 && args.first.to_s.start_with?('&'))
+                memo.send(key, &args.first.slice(2, args.first.size).to_sym)
+              else
+                memo.send(*[key, args].flatten.compact)
+              end
             else
-              memo.send(*[key, args].flatten.compact)
+              raise NoMethodError.new "Invalid attribute requested! (#{memo.class}##{key})"
             end
-          else
-            raise NoMethodError.new "Invalid attribute requested! (#{memo.class}##{key})"
           end
+          ui.info "  Attribute Lookup -> #{config[:attribute]}:"
+          ui.puts MultiJson.dump(
+            MultiJson.load(
+              MultiJson.dump(attr)
+            ),
+            :pretty => true
+          )
         end
-        ui.info "  Attribute Lookup -> #{config[:attribute]}:"
-        ui.puts MultiJson.dump(
-          MultiJson.load(
-            MultiJson.dump(attr)
-          ),
-          :pretty => true
-        )
       end
 
       def display_nodes(stack)

data/lib/sfn/command/update.rb

@@ -69,7 +69,7 @@ module Sfn
 
             if(config[:poll])
               poll_stack(stack.name)
-              if(stack.success?)
+              if(stack.reload.state == :update_complete)
                 ui.info "Stack update complete: #{ui.color('SUCCESS', :green)}"
                 namespace.const_get(:Describe).new({:outputs => true}, [name]).execute!
               else

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('0.3.6')
+  VERSION = Gem::Version.new('0.3.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli