hygroscope 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3e864d4248a522aae43ad781018e695449d8186
-  data.tar.gz: 28cb72dfed8f47e753d8a52b40a46d760a4f7c08
+  metadata.gz: 7bf292228af925f56215b01c2daecd575b88a870
+  data.tar.gz: e4fba09c4430e6c8842c97b764e578025545bbba
 SHA512:
-  metadata.gz: e41dd6e4dce881fe3fbe2dac6e8fcf9635de027e0cbc5d45a0fd54c67c6eecc12c6d49fe00cd4f7c6093c269227e6f36e913ce6dc3e9ebba2c8b2d636a17215b
-  data.tar.gz: fdc4dbb413dc61b2b39ce8e65db4bca6a1b51b51c6e99794467314cb6957c3818b7f82d259b1032dba6c05e6a26dd848023818c0120c0268a19c93d9664060f4
+  metadata.gz: 3fdf96c83aa5fbec940cbb140d7ac02f8ae11fd38357feed61e41fd6f5a9478ea65f97becefbb2ff6e97e6b29afb34896368dab15ec4fb622db82a920c21a86f
+  data.tar.gz: 53be8f7a4fffd08ef8654bbedf871fdec84594eaaae723a352f8d0f9040f0b415d81860e165d26e1d3a97f23d6abadbfbcfa8b6deea9e735535948567ea2d229

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.4 (2015-03-09)
+
+- Support adding custom tags to every created resource
+
 ## 1.1.3 (2015-02-09)
 
 - Longer default timeouts for payload and stack creation.

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/hygroscope.svg)](http://badge.fury.io/rb/hygroscope)
+[![Code Climate](https://codeclimate.com/github/agperson/hygroscope/badges/gpa.svg)](https://codeclimate.com/github/agperson/hygroscope)
+
 - - -
 
 > **hy·gro·scope**<br>
@@ -22,4 +25,4 @@ Hygroscope aims to solve each of these specific problems in an opinionated way:
 3. A payload directory, if present, will be packaged and uploaded to S3. Hygroscope will generate and pass to CF a signed time-limited URL for accessing and downloading the payload, or the CloudFormation template can manage an instance profile granting indefinite access to the payload.
 4. If an existing stack is specified, its outputs will be fetched and passed through as input parameters when launching a new stack.
 
-Hygroscope is currently under development but mostly functional. Run `hygroscope help` to view inline command documentation and options.  See [template structure](https://github.com/agperson/hygroscope/wiki/Structure-of-a-Hygroscopic-Template) for information about the format of hygroscopic templates.
+Hygroscope can be installed via RubyGems. Run `hygroscope help` to view inline command documentation and options.  See [template structure](https://github.com/agperson/hygroscope/wiki/Structure-of-a-Hygroscopic-Template) for information about the format of hygroscopic templates.

data/hygroscope.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hygroscope'
-  s.version     = '1.1.3'
+  s.version     = '1.1.4'
   s.summary     = 'CloudFormation launcher'
   s.description = 'A tool for managing the launch of complex CloudFormation stacks'
   s.authors     = ['Daniel Silverman']
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'thor'
   s.add_dependency 'cfoo', '>= 0.0.5'
-  s.add_dependency 'aws-sdk', '>= 2.0.0.pre'
+  s.add_dependency 'aws-sdk', '~> 2'
   s.add_dependency 'archive-zip'
   s.add_dependency 'json_color'
 

data/lib/hygroscope/cli.rb

@@ -52,6 +52,30 @@ module Hygroscope
       def template_path
         File.join(hygro_path, 'template')
       end
+
+      def say_paramset(name)
+        begin
+          p = Hygroscope::ParamSet.new(name)
+        rescue Hygroscope::ParamSetNotFoundError
+          say_fail("Paramset #{name} does not exist!")
+        end
+
+        say "Parameters for '#{File.basename(Dir.pwd)}' paramset '#{p.name}':", :yellow
+        print_table p.parameters, indent: 2
+        say "\nTo edit existing parameters, use the 'create' command with the --ask flag."
+      end
+
+      def say_paramset_list
+        files = Dir.glob(File.join(hygro_path, 'paramsets', '*.{yml,yaml}'))
+
+        say_fail("No saved paramsets for #{hygro_name}.") if files.empty?
+
+        say "Saved paramsets for '#{hygro_name}':", :yellow
+        files.map do |f|
+          say '  ' + File.basename(f, File.extname(f))
+        end
+        say "\nTo list parameters in a set, use the --name option."
+      end
     end
 
     desc 'prepare', 'Prepare to create or update a stack by generating the template, assembling parameters, and managing payload upload', hide: true
@@ -154,15 +178,6 @@ module Hygroscope
         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
 
@@ -185,6 +200,11 @@ module Hygroscope
                   type: :boolean,
                   default: false,
                   desc: 'Still prompt for parameters even when using a paramset'
+    method_option :tags,
+                  aliases: '-t',
+                  type: :array,
+                  required: false,
+                  desc: 'One or more parameters to apply as tags to all stack resources'
     def create
       check_path
       validate
@@ -195,7 +215,16 @@ module Hygroscope
       s = Hygroscope::Stack.new(options[:name])
       s.parameters = paramset.parameters
       s.template = template.compress
-      s.tags['X-Hygroscope-Template'] = File.basename(Dir.pwd)
+
+      s.tags['X-Hygroscope-Template'] = hygro_name
+      options[:tags].each do |tag|
+        if paramset.get(tag)
+          s.tags[tag] = paramset.get(tag)
+        else
+          say_status('info', "Skipping tag #{tag} because it does not exist", :blue)
+        end
+      end
+
       s.capabilities = ['CAPABILITY_IAM']
 
       s.create!
@@ -249,12 +278,13 @@ module Hygroscope
                   desc: 'Delete without asking for confirmation'
     def delete
       check_path
-      if options[:force] || yes?("Really delete stack #{options[:name]} [y/N]?")
-        say('Deleting stack!')
-        stack = Hygroscope::Stack.new(options[:name])
-        stack.delete!
-        status
-      end
+      abort unless options[:force] ||
+                   yes?("Really delete stack #{options[:name]} [y/N]?")
+
+      say('Deleting stack!')
+      stack = Hygroscope::Stack.new(options[:name])
+      stack.delete!
+      status
     end
 
     desc 'status', 'View status of stack create/update/delete action.\nUse the --name option to change which stack is reported upon.'
@@ -284,7 +314,7 @@ module Hygroscope
 
         # Fancy acrobatics to fit output to terminal width. If the terminal
         # window is too small, fallback to something appropriate for ~80 chars
-        term_width = %x(stty size 2>/dev/null).split[1].to_i || %x(tput cols 2>/dev/null).to_i
+        term_width = `stty size 2>/dev/null`.split[1].to_i || `tput cols 2>/dev/null`.to_i
         type_width   = term_width < 80 ? 30 : term_width - 50
         output_width = term_width < 80 ? 54 : term_width - 31
 
@@ -321,7 +351,9 @@ module Hygroscope
       end while true
     end
 
-    desc 'generate', "Generate and display JSON output from template files.\nTo validate that the template is well-formed use the 'validate' command."
+    desc 'generate',
+         "Generate and display JSON output from template files.\n" \
+         "To validate that the template is well-formed use the 'validate' command."
     method_option :color,
                   aliases: '-c',
                   type: :boolean,
@@ -341,21 +373,16 @@ module Hygroscope
     desc 'validate', "Generate JSON from template files and validate that it is well-formed.\nThis utilzies the CloudFormation API to validate the template but does not detect logical errors."
     def validate
       check_path
+
       begin
         t = Hygroscope::Template.new(template_path)
         t.validate
       rescue Aws::CloudFormation::Errors::ValidationError => e
-        say_status('error', 'Validation error', :red)
-        print_wrapped e.message, indent: 2
-        abort
+        say_fail("Validation error: #{e.message}")
       rescue Hygroscope::TemplateYamlParseError => e
-        say_status('error', 'YAML parsing error', :red)
-        puts e
-        abort
+        say_fail("YAML parsing error: #{e.message}")
       rescue => e
-        say_status('error', 'Unexpected error', :red)
-        print_wrapped e.message, indent: 2
-        abort
+        say_fail(e.message)
       else
         say_status('ok', 'Template is valid', :green)
       end
@@ -368,25 +395,9 @@ module Hygroscope
                   desc: 'Name of a paramset'
     def paramset
       if options[:name]
-        begin
-          p = Hygroscope::ParamSet.new(options[:name])
-        rescue Hygroscope::ParamSetNotFoundError
-          raise("Paramset #{options[:name]} does not exist!")
-        end
-        say "Parameters for '#{hygro_name}' paramset '#{p.name}':", :yellow
-        print_table p.parameters, indent: 2
-        say "\nTo edit existing parameters, use the 'create' command with the --ask flag."
+        say_paramset(options[:name])
       else
-        files = Dir.glob(File.join(hygro_path, 'paramsets', '*.{yml,yaml}'))
-        if files.empty?
-          say "No saved paramsets for '#{hygro_name}'.", :red
-        else
-          say "Saved paramsets for '#{hygro_name}':", :yellow
-          files.map do |f|
-            say '  ' + File.basename(f, File.extname(f))
-          end
-          say "\nTo list parameters in a set, use the --name option."
-        end
+        say_paramset_list
       end
     end
   end

data/lib/hygroscope/template.rb

@@ -28,9 +28,6 @@ module Hygroscope
 
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hygroscope
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Daniel Silverman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,16 +42,16 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ 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