humidifier 4.1.1 → 4.2.0

data/Gemfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    humidifier (4.1.1)
+    humidifier (4.2.0)
       aws-sdk-cloudformation (~> 1.25)
       aws-sdk-s3 (~> 1.48)
       fast_underscore (~> 0.3)
@@ -14,52 +14,50 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.531.0)
-    aws-sdk-cloudformation (1.60.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-partitions (1.592.0)
+    aws-sdk-cloudformation (1.69.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.122.1)
+    aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     docile (1.4.0)
     fast_underscore (0.3.3)
     hollaback (0.1.1)
-    jmespath (1.4.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    jmespath (1.6.1)
+    minitest (5.15.0)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     racc (1.6.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.23.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -67,12 +65,14 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    thor (1.1.0)
-    thor-hollaback (0.2.0)
-      hollaback (~> 0.1.0)
+    thor (1.2.1)
+    thor-hollaback (0.2.1)
+      hollaback (~> 0.1)
       thor (>= 0.19.1)
     unicode-display_width (2.1.0)
-    yard (0.9.26)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -82,7 +82,7 @@ DEPENDENCIES
   humidifier!
   minitest (~> 5.13)
   rake (~> 13.0)
-  rubocop (~> 1.0)
+  rubocop (~> 1.24)
   simplecov (~> 0.17)
   yard (~> 0.9)
 

data/README.md

@@ -25,6 +25,7 @@ Humidifier is a ruby tool for managing [AWS CloudFormation](https://aws.amazon.c
     - [`upgrade`](#upgrade)
     - [`upload [?stack]`](#upload-stack)
     - [`validate [?stack]`](#validate-stack)
+    - [`version`](#version)
   - [Parameters](#parameters)
   - [Shortcuts](#shortcuts)
     - [Automatic id properties](#automatic-id-properties)
@@ -272,6 +273,10 @@ Upload one or all stacks in the repo to S3 for reference later. Note that this m
 
 Validate that one or all stacks in the repo are properly configured and using values that CloudFormation understands.
 
+#### `version`
+
+Output the version of `Humidifier` as well as the version of the CloudFormation resource specification that you are using.
+
 ### Parameters
 
 CloudFormation template parameters can be specified by having a special `parameters.yml` file in your stack directory. This file should contain a YAML-encoded object whose keys are the names of the parameters and whose values are the parameter configuration (using the same underscore paradigm as `humidifier` resources for specifying configuration).

data/Rakefile

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'fileutils'
-require 'rake/testtask'
-require 'yard'
+require "bundler/gem_tasks"
+require "fileutils"
+require "rake/testtask"
+require "yard"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
   t.warning = false
 end
 
 task default: :test
 
 YARD::Rake::YardocTask.new(:yard) do |t|
-  filepath = File.join('lib', 'humidifier', 'magic.rb')
+  filepath = File.join("lib", "humidifier", "magic.rb")
 
-  t.stats_options = ['--list-undoc']
+  t.stats_options = ["--list-undoc"]
   t.before = lambda do
-    require 'humidifier'
-    require_relative 'yard/dynamic'
+    require "humidifier"
+    require_relative "yard/dynamic"
     Dynamic.generate(filepath)
   end
   t.after = -> { FileUtils.rm(filepath) }

data/exe/humidifier

@@ -3,13 +3,13 @@
 
 # If there is a `bin/humidifier` file, then swap out execution of this default
 # CLI with the custom CLI instead.
-if File.file?(File.join('bin', 'humidifier'))
-  exec(File.join('bin', 'humidifier'))
+if File.file?(File.join("bin", "humidifier"))
+  exec(File.join("bin", "humidifier"))
 end
 
-require 'bundler/setup'
+require "bundler/setup"
 
-$LOAD_PATH.unshift File.expand_path(File.join('..', 'lib'), __dir__)
-require 'humidifier'
+$LOAD_PATH.unshift File.expand_path(File.join("..", "lib"), __dir__)
+require "humidifier"
 
 Humidifier::CLI.start(ARGV)

data/humidifier.gemspec

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require_relative 'lib/humidifier/version'
+require_relative "lib/humidifier/version"
 
 version = Humidifier::VERSION
-repository = 'https://github.com/kddnewton/humidifier'
+repository = "https://github.com/kddnewton/humidifier"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'humidifier'
+  spec.name          = "humidifier"
   spec.version       = version
-  spec.authors       = ['Kevin Newton']
-  spec.email         = ['kddnewton@gmail.com']
+  spec.authors       = ["Kevin Newton"]
+  spec.email         = ["kddnewton@gmail.com"]
 
-  spec.summary       = 'CloudFormation made easy'
-  spec.description   = 'Programmatically generate and manage AWS ' \
-                       'CloudFormation templates, stacks, and change sets.'
+  spec.summary       = "CloudFormation made easy"
+  spec.description   = "Programmatically generate and manage AWS " \
+                       "CloudFormation templates, stacks, and change sets."
   spec.homepage      = repository
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
 
   spec.metadata      = {
-    'bug_tracker_uri' => "#{repository}/issues",
-    'changelog_uri' => "#{repository}/blob/v#{version}/CHANGELOG.md",
-    'source_code_uri' => repository,
-    'rubygems_mfa_required' => 'true'
+    "bug_tracker_uri" => "#{repository}/issues",
+    "changelog_uri" => "#{repository}/blob/v#{version}/CHANGELOG.md",
+    "source_code_uri" => repository,
+    "rubygems_mfa_required" => "true"
   }
 
   spec.files = Dir.chdir(__dir__) do
@@ -30,21 +30,21 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'aws-sdk-cloudformation', '~> 1.25'
-  spec.add_dependency 'aws-sdk-s3', '~> 1.48'
-  spec.add_dependency 'fast_underscore', '~> 0.3'
-  spec.add_dependency 'nokogiri', '~> 1.10'
-  spec.add_dependency 'thor', '~> 1.0'
-  spec.add_dependency 'thor-hollaback', '~> 0.2'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'minitest', '~> 5.13'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.0'
-  spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'yard', '~> 0.9'
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "aws-sdk-cloudformation", "~> 1.25"
+  spec.add_dependency "aws-sdk-s3", "~> 1.48"
+  spec.add_dependency "fast_underscore", "~> 0.3"
+  spec.add_dependency "nokogiri", "~> 1.10"
+  spec.add_dependency "thor", "~> 1.0"
+  spec.add_dependency "thor-hollaback", "~> 0.2"
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "minitest", "~> 5.13"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rubocop", "~> 1.24"
+  spec.add_development_dependency "simplecov", "~> 0.17"
+  spec.add_development_dependency "yard", "~> 0.9"
 end

data/lib/humidifier/cli.rb

@@ -4,13 +4,13 @@ module Humidifier
   # A CLI for running commands to manipulate the stacks that Humidifier knows
   # about.
   class CLI < Thor
-    class_option :aws_profile, desc: 'The AWS profile to authenticate with',
-                               aliases: ['-p']
+    class_option :aws_profile, desc: "The AWS profile to authenticate with",
+                               aliases: ["-p"]
 
-    class_option :debug, desc: 'Sets up debug mode', aliases: ['-d']
+    class_option :debug, desc: "Sets up debug mode", aliases: ["-d"]
     class_around :safe_execute
 
-    desc 'change [?stack]', 'Create changesets for one or all stacks'
+    desc "change [?stack]", "Create changesets for one or all stacks"
     def change(name = nil)
       authorize
 
@@ -22,10 +22,10 @@ module Humidifier
       end
     end
 
-    desc 'deploy [?stack] [*parameters]', 'Update one or all stacks'
-    option :wait, desc: 'Wait for the stack to create/update',
+    desc "deploy [?stack] [*parameters]", "Update one or all stacks"
+    option :wait, desc: "Wait for the stack to create/update",
                   type: :boolean, default: false
-    option :prefix, desc: 'The prefix to use for the stack'
+    option :prefix, desc: "The prefix to use for the stack"
     def deploy(name = nil, *parameters)
       authorize
 
@@ -37,8 +37,8 @@ module Humidifier
       end
     end
 
-    desc 'display [stack] [?pattern]',
-         'Display the CloudFormation JSON for a given stack'
+    desc "display [stack] [?pattern]",
+         "Display the CloudFormation JSON for a given stack"
     def display(name, pattern = nil)
       directory = Directory.new(name, pattern: pattern && /#{pattern}/i)
 
@@ -46,21 +46,21 @@ module Humidifier
       puts directory.to_cf
     end
 
-    desc 'stacks', 'List the stacks known to Humidifier'
+    desc "stacks", "List the stacks known to Humidifier"
     def stacks
-      puts '🗒 Listing stacks'
+      puts "🗒 Listing stacks"
       puts Humidifier.config.stack_names.sort.map { |name| "- #{name}" }
     end
 
-    desc 'upgrade', 'Download the latest CloudFormation resource specification'
+    desc "upgrade", "Download the latest CloudFormation resource specification"
     def upgrade
-      print '💾 Downloading...'
+      print "💾 Downloading..."
 
       version = Upgrade.perform
       puts " upgraded to v#{version}"
     end
 
-    desc 'upload [?stack]', 'Upload one or all stacks to S3'
+    desc "upload [?stack]", "Upload one or all stacks to S3"
     def upload(name = nil)
       authorize
 
@@ -72,22 +72,30 @@ module Humidifier
       end
     end
 
-    desc 'validate [?stack]',
-         'Validate that one or all stacks are valid with CloudFormation'
+    desc "validate [?stack]",
+         "Validate that one or all stacks are valid with CloudFormation"
     def validate(name = nil)
       authorize
 
-      print '🔍 Validating... '
+      print "🔍 Validating... "
 
       valid =
         stack_names_from(name).all? do |stack_name|
           Directory.new(stack_name).valid?
         end
 
-      puts valid ? 'Valid.' : 'Invalid.'
+      puts valid ? "Valid." : "Invalid."
     end
 
-    no_commands do # rubocop:disable Metrics/BlockLength
+    desc "version", "Display the version of Humidifier"
+    def version
+      filepath = File.expand_path("../../#{SPECIFICATION}", __dir__)
+      version = JSON.parse(File.read(filepath))["ResourceSpecificationVersion"]
+
+      puts "📦 CloudFormation specification v#{version}"
+    end
+
+    no_commands do
       def authorize
         return unless options[:aws_profile]
 
@@ -97,14 +105,14 @@ module Humidifier
 
       def parameters_from(opts)
         opts.map do |opt|
-          key, value = opt.split('=')
+          key, value = opt.split("=")
           { parameter_key: key, parameter_value: value }
         end
       end
 
       def prelude
         command = @_invocations.values.dig(0, 0)
-        command = command ? "#{command} " : ''
+        command = command ? "#{command} " : ""
         puts "\033[1mhumidifier #{command}v#{VERSION}\033[0m"
       end
 
@@ -118,7 +126,7 @@ module Humidifier
         puts error.message
         exit 1
       else
-        puts '✨ Done in %.2fs.' % (Time.now.to_f - start)
+        puts "✨ Done in %.2fs." % (Time.now.to_f - start)
       end
 
       def stack_names_from(name)

data/lib/humidifier/config/mapper.rb

@@ -83,7 +83,7 @@ module Humidifier
         end
       end
 
-      def mapped_from(clazz, key, value) # rubocop:disable Metrics/MethodLength
+      def mapped_from(clazz, key, value)
         if self.class.attribute_methods.include?(key.to_sym)
           # The given attribute name has been defined using the `::attribute`
           # DSL method, so send the given value to that method and return the

data/lib/humidifier/config/mapping.rb

@@ -10,7 +10,7 @@ module Humidifier
         raise Error, "Invalid resource: #{opts[:to].inspect}" if @clazz.nil?
 
         if opts[:using] && block_given?
-          raise Error, 'Cannot specify :using and provide an anonymous mapper'
+          raise Error, "Cannot specify :using and provide an anonymous mapper"
         end
 
         @mapper = mapper_from(opts, &block)
@@ -33,7 +33,7 @@ module Humidifier
       end
 
       def normalized(name)
-        name.start_with?('AWS') ? name : "AWS::#{name}"
+        name.start_with?("AWS") ? name : "AWS::#{name}"
       end
     end
   end

data/lib/humidifier/config.rb

@@ -26,7 +26,7 @@ module Humidifier
 
     def initialize
       @mappings = {}
-      @stack_path = '.'
+      @stack_path = "."
     end
 
     def files_for(name)

data/lib/humidifier/directory.rb

@@ -82,7 +82,7 @@ module Humidifier
         begin
           parameter_filepath =
             Humidifier.config.files_for(name).detect do |filepath|
-              File.basename(filepath, '.yml') == 'parameters'
+              File.basename(filepath, ".yml") == "parameters"
             end
 
           parameter_filepath ? parameters_from(parameter_filepath) : {}
@@ -94,7 +94,7 @@ module Humidifier
       return {} unless loaded
 
       loaded.each_with_object({}) do |(name, opts), params|
-        opts = opts.map { |key, value| [key.to_sym, value] }.to_h
+        opts = opts.to_h { |key, value| [key.to_sym, value] }
         params[name] = Parameter.new(opts)
       end
     end
@@ -109,7 +109,7 @@ module Humidifier
       loaded.each_with_object({}) do |(name, attributes), resources|
         next if pattern && name !~ pattern
 
-        attribute = attributes.delete('export')
+        attribute = attributes.delete("export")
         exports << Export.new(name, attribute) if attribute
 
         resources[name] = mapping.resource_for(name, attributes)
@@ -120,10 +120,10 @@ module Humidifier
       filepaths = Humidifier.config.files_for(name)
 
       filepaths.each_with_object({}) do |filepath, resources|
-        basename = File.basename(filepath, '.yml')
+        basename = File.basename(filepath, ".yml")
 
         # Explicitly skip past parameters so we can pull them out later
-        next if basename == 'parameters'
+        next if basename == "parameters"
 
         resources.merge!(parse(filepath, basename))
       end