hygroscope 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6ed704c9f7b15170bc39f4162300946f7f690f
-  data.tar.gz: fd84d911d968cc9a883ded9bb45b4cbe417467db
+  metadata.gz: 6cf0c838143e22c457350f92b2464989b275af06
+  data.tar.gz: 16166f857257972e8ee90181d793a31bbebb9885
 SHA512:
-  metadata.gz: a45f21a18bee67f59a412a5115d3a193cf53df152b5441de6090d3aed062c3a25fcf2442720af0af77e6e09bbf8e972ab46f29d842a5d5c734613e80b23cc795
-  data.tar.gz: 813ac9c2ec94513bb791be5715efa8513bf25998a482b3df1a15d6ddac0e0df37660dfc00788037e2064a7da4bedc4e77bb454857f80d1bab58f87fd4d26d3d8
+  metadata.gz: 91e264b2ecca6188a62bb028388c3e51e7a21a426e6bc1a9370f44c83464beb82483f81a5cbc52edddd6f52ddcf2a989d32e317f4d87ce9634a13ead72b803be
+  data.tar.gz: d34c7c519cf094024ef5db03c5eed7e58be60bb330e2aad99f0adf037568961ce3965b78211ce7d4e7541c15731858f3c4dea19f5c2c03896290fdab7e69c5ba

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 1.1.0 (2015-02-03)
+
+- Support passing outputs from existing stacks into parameters.
+- Support numeric parameters and tags.
+
+## 1.0.0 (2015-02-02)
+
+- Initial functional release.

data/hygroscope.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hygroscope'
-  s.version     = '1.0.0'
+  s.version     = '1.1.0'
   s.summary     = 'CloudFormation launcher'
   s.description = 'A tool for managing the launch of complex CloudFormation stacks'
   s.authors     = ['Daniel Silverman']

data/lib/hygroscope/cli.rb

@@ -66,8 +66,6 @@ module Hygroscope
       # If the paramset exists load it, otherwise instantiate an empty one
       p = Hygroscope::ParamSet.new(options[:paramset])
 
-      # TODO: Load and merge outputs from previous invocations -- how???
-
       # User provided a paramset, so load it and determine which parameters
       # are set and which need to be prompted.
       if options[:paramset]
@@ -86,31 +84,55 @@ module Hygroscope
         missing = t.parameters.keys
       end
 
+      # If an existing stack was specified, load its outputs
+      if options[:existing]
+        e = Hygroscope::Stack.new(options[:existing])
+        say_status('info', "Populating parameters from #{options[:existing]} stack", :blue)
+
+        # Fill any template paramater that matches an output of existing stack,
+        # overriding parameters in the paramset. User can still change these if
+        # they were missing from paramset or --ask option is passed.
+        e.describe.outputs.each do |o|
+          p.set(o.output_key, o.output_value) if t.parameters.keys.include?(o.output_key)
+        end
+      end
+
       # Prompt for each missing param and save it to the paramset
       missing.each do |key|
         # Do not prompt for keys prefixed with "Hygroscope"
         next if key =~ /^Hygroscope/
 
-        say()
         type = t.parameters[key]['Type']
-        default = options[:ask] && pkeys.include?(key) ? p.get(key) : t.parameters[key]['Default'] || ''
+        default = p.get(key) ? p.get(key) : t.parameters[key]['Default'] || ''
         description = t.parameters[key]['Description'] || false
         values = t.parameters[key]['AllowedValues'] || false
         no_echo = t.parameters[key]['NoEcho'] || false
 
+        # Thor conveniently provides some nice logic for formatting,
+        # allowing defaults, and validating user input
         ask_opts = {}
-        ask_opts[:default] = default unless default.empty?
+        ask_opts[:default] = default unless default.to_s.empty?
         ask_opts[:limited_to] = values if values
         ask_opts[:echo] = false if no_echo
 
+        puts
         say("#{description} (#{type})") if description
-        answer = ''
+        # Make sure user enters a value
         # TODO: Better input validation
+        answer = ''
         answer = ask(key, :cyan, ask_opts) until answer != ''
+
+        # Save answer to paramset object
         p.set(key, answer)
+
+        # Add a line break
+        say if no_echo
       end
 
-      unless missing.empty?
+      # Offer to save paramset if it was modified
+      # Filter out keys beginning with "Hygroscope" since they are not visible
+      # to the user and may be modified on each invocation.
+      unless missing.reject {|k| k =~ /^Hygroscope/}.empty?
         if yes?('Save changes to paramset?')
           unless options[:paramset]
             p.name = ask('Paramset name', :cyan, default: options[:name])
@@ -135,7 +157,7 @@ module Hygroscope
       [t, p]
     end
 
-    desc 'create', "Create a new stack.\nUse the --name option to launch more than one stack from the same template.\nCommand prompts for parameters unless --paramset is specified."
+    desc 'create', "Create a new stack.\nUse the --name option to launch more than one stack from the same template.\nCommand prompts for parameters unless --paramset is specified.\nUse --existing to set parameters from an existing stack's outputs."
     method_option :name,
                   aliases: '-n',
                   default: File.basename(Dir.pwd),
@@ -144,6 +166,10 @@ module Hygroscope
                   aliases: '-p',
                   required: false,
                   desc: 'Name of saved paramset to use (optional)'
+    method_option :existing,
+                  aliases: '-e',
+                  required: false,
+                  desc: 'Name of an existing stack from which to retrieve outputs as parameters (optional)'
     method_option :ask,
                   aliases: '-a',
                   type: :boolean,
@@ -152,6 +178,8 @@ module Hygroscope
     def create
       check_path
       validate
+
+      # Prepare task takes care of shared logic between "create" and "update"
       template, paramset = prepare
 
       s = Hygroscope::Stack.new(options[:name])
@@ -159,6 +187,7 @@ module Hygroscope
       s.template = template.compress
       s.tags['X-Hygroscope-Template'] = File.basename(Dir.pwd)
       s.capabilities = ['CAPABILITY_IAM']
+
       s.create!
 
       status
@@ -184,6 +213,8 @@ module Hygroscope
       # whether to re-upload the payload, etc.)
       check_path
       validate
+
+      # Prepare task takes care of shared logic between "create" and "update"
       template, paramset = prepare
 
       s = Hygroscope::Stack.new(options[:name])
@@ -240,9 +271,12 @@ module Hygroscope
         print_table header
         puts
 
+        # Fancy acrobatics to fit output to terminal width. If the terminal
+        # window is too small, fallback to something appropriate for ~80 chars
         type_width   = terminal_width < 80 ? 30 : terminal_width - 50
         output_width = terminal_width < 80 ? 54 : terminal_width - 31
 
+        # Header row
         puts set_color(sprintf(' %-28s %-*s %-18s ', 'Resource', type_width, 'Type', 'Status'), :white, :on_blue)
         resources = stack.list_resources
         resources.each do |r|
@@ -250,6 +284,7 @@ module Hygroscope
         end
 
         if s.stack_status.downcase =~ /complete$/
+          # If the stack is complete display any available outputs and stop refreshing
           puts
           puts set_color(sprintf(' %-28s %-*s ', 'Output', output_width, 'Value'), :white, :on_yellow)
           s.outputs.each do |o|
@@ -259,6 +294,7 @@ module Hygroscope
           puts "\nMore information: https://console.aws.amazon.com/cloudformation/home"
           break
         elsif s.stack_status.downcase =~ /failed$/
+          # If the stack failed to create, stop refreshing
           puts "\nMore information: https://console.aws.amazon.com/cloudformation/home"
           break
         else

data/lib/hygroscope/stack.rb

@@ -22,7 +22,7 @@ module Hygroscope
       @parameters.each do |k, v|
         stack_parameters << {
           parameter_key: k,
-          parameter_value: v
+          parameter_value: v.to_s
         }
       end
 
@@ -30,7 +30,7 @@ module Hygroscope
       @tags.each do |k, v|
         stack_tags << {
           key: k,
-          value: v
+          value: v.to_s
         }
       end
 
@@ -59,7 +59,7 @@ module Hygroscope
       @parameters.each do |k, v|
         stack_parameters << {
           parameter_key: k,
-          parameter_value: v
+          parameter_value: v.to_s
         }
       end
 

data/lib/hygroscope/template.rb

@@ -26,12 +26,13 @@ module Hygroscope
         cfoo.process(*files)
       end
 
-      if err.string.empty?
-        @template = out.string
-        @template
-      else
-        fail TemplateYamlParseError, err.string
-      end
+      fail(TemplateYamlParseError, err.string) unless err.string.empty?
+
+      # Substitute
+      # APP_CONFIG = YAML.load(ERB.new(File.read("#{Rails.root}/config/app_config.yml")).result)[Rails.env]
+      #
+      @template = out.string
+      @template
     end
 
     def compress
@@ -58,7 +59,7 @@ module Hygroscope
       # Parsing the template to JSON and then re-outputting it is a form of
       # compression (removing all extra spaces) to keep within the 50KB limit
       # for CloudFormation templates.
-      template = self.compress
+      template = compress
 
       begin
         stack = Hygroscope::Stack.new('template-validator')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hygroscope
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Silverman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -162,8 +163,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: CloudFormation launcher
 test_files: []
+has_rdoc: