hygroscope 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf0c838143e22c457350f92b2464989b275af06
-  data.tar.gz: 16166f857257972e8ee90181d793a31bbebb9885
+  metadata.gz: 0d8b00db8a6e274402cc73b1db15a7250ec1733a
+  data.tar.gz: 3596dcf87638e808b78120d88ce0099cc19fc89d
 SHA512:
-  metadata.gz: 91e264b2ecca6188a62bb028388c3e51e7a21a426e6bc1a9370f44c83464beb82483f81a5cbc52edddd6f52ddcf2a989d32e317f4d87ce9634a13ead72b803be
-  data.tar.gz: d34c7c519cf094024ef5db03c5eed7e58be60bb330e2aad99f0adf037568961ce3965b78211ce7d4e7541c15731858f3c4dea19f5c2c03896290fdab7e69c5ba
+  metadata.gz: 7b068a17ed2bd8a1fae49b690a034991c4d3fa0be0a4fa4ebb5085a24261d68897c5bcb79d1a6488d668f3842e5dce8c5f566caad0e32857a1b39f9e88706d8a
+  data.tar.gz: 23d62cb6593737eaed96f793ee970029d70b2b542b1f64a32e63a0a2a44fcc9437d1d9d498004c6bea06b803befab6df93ee2cda4ff75e8b3ba3f78349b3ab59

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1 (2015-02-04)
+
+- Improved Payload parameters for more flexibility
+- Fixed broken update action
+
 ## 1.1.0 (2015-02-03)
 
 - Support passing outputs from existing stacks into parameters.

data/hygroscope.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hygroscope'
-  s.version     = '1.1.0'
+  s.version     = '1.1.1'
   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

@@ -25,10 +25,6 @@ module Hygroscope
         end
       end
 
-      def word_wrap(string, length = 80, delim = $INPUT_RECORD_SEPARATOR)
-        string.scan(/.{#{length}}|.+/).map(&:strip).join(delim)
-      end
-
       def countdown(text, time = 5)
         print "#{text}  "
         time.downto(0) do |i|
@@ -66,40 +62,43 @@ module Hygroscope
       # If the paramset exists load it, otherwise instantiate an empty one
       p = Hygroscope::ParamSet.new(options[:paramset])
 
-      # User provided a paramset, so load it and determine which parameters
-      # are set and which need to be prompted.
       if options[:paramset]
-        pkeys = p.parameters.keys
-        tkeys = t.parameters.keys
-
-        # Filter out any parameters that are not present in the template
-        filtered = pkeys - tkeys
-        pkeys = pkeys.select { |k, _v| tkeys.include?(k) }
-        say_status('info', "Keys in paramset not requested by template: #{filtered.join(', ')}", :blue) unless filtered.empty?
-
-        # If ask option was passed, consider every parameter missing
-        missing = options[:ask] ? tkeys : tkeys - pkeys
+        # User provided a paramset, so load it and determine which parameters
+        # are set and which need to be prompted.
+        paramset_keys = p.parameters.keys
+        template_keys = t.parameters.keys
+
+        # Reject any keys in paramset that are not requested by template
+        rejected_keys = paramset_keys - template_keys
+        say_status('info', "Keys in paramset not requested by template: #{rejected_keys.join(', ')}", :blue) unless rejected_keys.empty?
+
+        # Prompt for any key that is missing. If "ask" option was passed,
+        # prompt for every key.
+        missing = options[:ask] ? template_keys : template_keys - paramset_keys
       else
         # No paramset provided, so every parameter is missing!
         missing = t.parameters.keys
       end
 
-      # If an existing stack was specified, load its outputs
       if options[:existing]
+        # User specified an existing stack from which to pull outputs and
+        # translate into parameters. Load the existing stack.
         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.
+        # Fill any template parameter that matches an output from the existing
+        # stack, overwriting values from the paramset object. The user will
+        # be prompted to change these if they were not in the paramset or the
+        # --ask option was 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
+      # Prompt for each missing parameter and save it in the paramset object
       missing.each do |key|
-        # Do not prompt for keys prefixed with "Hygroscope"
+        # Do not prompt for keys prefixed with the "Hygroscope" reserved word.
+        # These parameters are populated internally without user input.
         next if key =~ /^Hygroscope/
 
         type = t.parameters[key]['Type']
@@ -132,7 +131,7 @@ module Hygroscope
       # 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?
+      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])
@@ -146,14 +145,23 @@ module Hygroscope
       if File.directory?(payload_path)
         payload = Hygroscope::Payload.new(payload_path)
         payload.prefix = options[:name]
-        url = payload.upload!
-        signed_url = payload.generate_url
-        p.set('HygroscopePayload', url) if missing.include?('HygroscopePayload')
-        p.set('HygroscopePayloadSignedUrl', signed_url) if missing.include?('HygroscopePayloadSignedUrl')
+        payload.upload!
+        p.set('HygroscopePayloadBucket', payload.bucket) if missing.include?('HygroscopePayloadBucket')
+        p.set('HygroscopePayloadKey', payload.key) if missing.include?('HygroscopePayloadKey')
+        p.set('HygroscopePayloadSignedUrl', payload.generate_url) if missing.include?('HygroscopePayloadSignedUrl')
         say_status('ok', 'Payload uploaded to:', :green)
-        say_status('', url)
+        say_status('', "s3://#{payload.bucket}/#{payload.key}")
       end
 
+      # Set some additional parameters, if present
+      # HygroscopeAccountAzList
+      # HygroscopeAccountAzCount
+      #if missing.include?('HygroscopeAccountAzList') ||
+      #   misisng.include?('HygroscopeAccountAzCount')
+      #  p.set('HygroscopeAccountAzList', azlist) if missing.include?('HygroscopeAccountAzList')
+      #  p.set('HygroscopeAccountAzCount', azlist) if missing.include?('HygroscopeAccountAzCount')
+      #end
+
       [t, p]
     end
 
@@ -221,6 +229,7 @@ module Hygroscope
       s.parameters = paramset.parameters
       s.template = template.compress
       s.capabilities = ['CAPABILITY_IAM']
+      s.timeout = 60
       s.update!
 
       status

data/lib/hygroscope/stack.rb

@@ -72,7 +72,7 @@ module Hygroscope
       stack_opts['capabilities'] = @capabilities unless @capabilities.empty?
 
       begin
-        stack_id = @client.create_stack(stack_opts)
+        stack_id = @client.update_stack(stack_opts)
       rescue => e
         raise e
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hygroscope
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel Silverman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -163,9 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: CloudFormation launcher
 test_files: []
-has_rdoc: