humidifier 4.0.1 → 4.2.0

data/lib/humidifier/parameter.rb

@@ -15,12 +15,12 @@ module Humidifier
         instance_variable_set(:"@#{property}", opts[property])
       end
 
-      @type = opts.fetch(:type, 'String')
+      @type = opts.fetch(:type, "String")
     end
 
     # CFN stack syntax
     def to_cf
-      { 'Type' => type }.tap do |cf|
+      { "Type" => type }.tap do |cf|
         PROPERTIES.each do |name, prop|
           value = public_send(prop)
           cf[name] = Serializer.dump(value) if value

data/lib/humidifier/props.rb

@@ -18,12 +18,12 @@ module Humidifier
 
       # the link to the AWS docs
       def documentation
-        spec['Documentation']
+        spec["Documentation"]
       end
 
       # true if this property is required by the resource
       def required?
-        spec['Required']
+        spec["Required"]
       end
 
       # CFN stack syntax
@@ -34,7 +34,7 @@ module Humidifier
       # the type of update that occurs when this property is updated on its
       # associated resource
       def update_type
-        spec['UpdateType']
+        spec["UpdateType"]
       end
 
       def valid?(value)
@@ -55,34 +55,70 @@ module Humidifier
 
     class BooleanProp < Prop
       allow_type TrueClass, FalseClass
+
+      def pretty_print(q)
+        q.text("(#{name}=boolean)")
+      end
     end
 
     class DoubleProp < Prop
       allow_type Integer, Float
+
+      def pretty_print(q)
+        q.text("(#{name}=double)")
+      end
     end
 
     class IntegerProp < Prop
       allow_type Integer
+
+      def pretty_print(q)
+        q.text("(#{name}=integer)")
+      end
     end
 
     class JsonProp < Prop
       allow_type Hash
+
+      def pretty_print(q)
+        q.text("(#{name}=json)")
+      end
     end
 
     class StringProp < Prop
       allow_type String
+
+      def pretty_print(q)
+        q.text("(#{name}=string)")
+      end
     end
 
     class TimestampProp < Prop
       allow_type Time, Date
+
+      def pretty_print(q)
+        q.text("(#{name}=timestamp)")
+      end
     end
 
     class ListProp < Prop
       attr_reader :subprop
 
-      def initialize(key, spec = {}, substructs = {})
+      def initialize(key, spec = {}, subprop = nil)
         super(key, spec)
-        @subprop = Props.singular_from(key, spec, substructs)
+        @subprop = subprop
+      end
+
+      def pretty_print(q)
+        q.group do
+          q.text("(#{name}=list")
+          q.nest(2) do
+            q.breakable
+            q.pp(subprop)
+          end
+          q.breakable("")
+          q.text(")")
+        end
       end
 
       def to_cf(list)
@@ -106,9 +142,21 @@ module Humidifier
     class MapProp < Prop
       attr_reader :subprop
 
-      def initialize(key, spec = {}, substructs = {})
+      def initialize(key, spec = {}, subprop = nil)
         super(key, spec)
-        @subprop = Props.singular_from(key, spec, substructs)
+        @subprop = subprop
+      end
+
+      def pretty_print(q)
+        q.group do
+          q.text("(#{name}=map")
+          q.nest(2) do
+            q.breakable
+            q.pp(subprop)
+          end
+          q.breakable("")
+          q.text(")")
+        end
       end
 
       def to_cf(map)
@@ -116,9 +164,9 @@ module Humidifier
           if map.respond_to?(:to_cf)
             map.to_cf
           else
-            map.map do |subkey, subvalue|
+            map.to_h do |subkey, subvalue|
               [subkey, subprop.to_cf(subvalue).last]
-            end.to_h
+            end
           end
 
         [key, cf_value]
@@ -134,9 +182,21 @@ module Humidifier
     class StructureProp < Prop
       attr_reader :subprops
 
-      def initialize(key, spec = {}, substructs = {})
+      def initialize(key, spec = {}, subprops = {})
         super(key, spec)
-        @subprops = subprops_from(substructs, spec['ItemType'] || spec['Type'])
+        @subprops = subprops
+      end
+
+      def pretty_print(q)
+        q.group do
+          q.text("(#{name}=structure")
+          q.nest(2) do
+            q.breakable
+            q.seplist(subprops.values) { |subprop| q.pp(subprop) }
+          end
+          q.breakable("")
+          q.text(")")
+        end
       end
 
       def to_cf(struct)
@@ -144,9 +204,9 @@ module Humidifier
           if struct.respond_to?(:to_cf)
             struct.to_cf
           else
-            struct.map do |subkey, subvalue|
+            struct.to_h do |subkey, subvalue|
               subprops[subkey.to_s].to_cf(subvalue)
-            end.to_h
+            end
           end
 
         [key, cf_value]
@@ -158,49 +218,11 @@ module Humidifier
 
       private
 
-      def subprops_from(substructs, type)
-        subprop_names = substructs.fetch(type, {}).fetch('Properties', {})
-
-        subprop_names.each_with_object({}) do |(key, config), subprops|
-          subprops[key.underscore] =
-            if config['ItemType'] == type
-              self
-            else
-              Props.from(key, config, substructs)
-            end
-        end
-      end
-
       def valid_struct?(struct)
         struct.all? do |key, value|
           subprops.key?(key.to_s) && subprops[key.to_s].valid?(value)
         end
       end
     end
-
-    class << self
-      # builds the appropriate prop object from the given spec line
-      def from(key, spec, substructs = {})
-        case spec['Type']
-        when 'List' then ListProp.new(key, spec, substructs)
-        when 'Map'  then MapProp.new(key, spec, substructs)
-        else             singular_from(key, spec, substructs)
-        end
-      end
-
-      # builds a prop that is not a List or Map type
-      # PrimitiveType is one of Boolean, Double, Integer, Json, String, or
-      # Timestamp
-      def singular_from(key, spec, substructs)
-        primitive = spec['PrimitiveItemType'] || spec['PrimitiveType']
-
-        if primitive && !%w[List Map].include?(primitive)
-          primitive = 'Integer' if primitive == 'Long'
-          const_get(:"#{primitive}Prop").new(key, spec)
-        else
-          StructureProp.new(key, spec, substructs)
-        end
-      end
-    end
   end
 end

data/lib/humidifier/ref.rb

@@ -11,7 +11,7 @@ module Humidifier
 
     # Builds CFN syntax
     def to_cf
-      { 'Ref' => Serializer.dump(reference) }
+      { "Ref" => Serializer.dump(reference) }
     end
   end
 end

data/lib/humidifier/resource.rb

@@ -45,8 +45,8 @@ module Humidifier
         end
 
       common_attributes.merge!(
-        'Type' => self.class.aws_name,
-        'Properties' => props_cf.to_h
+        "Type" => self.class.aws_name,
+        "Properties" => props_cf.to_h
       )
     end
 
@@ -114,7 +114,7 @@ module Humidifier
 
     def validate_property(property)
       unless self.class.prop?(property)
-        raise ArgumentError, 'Attempting to set invalid property for ' \
+        raise ArgumentError, "Attempting to set invalid property for " \
                              "#{self.class.name}: #{property}"
       end
 

data/lib/humidifier/serializer.rb

@@ -7,7 +7,7 @@ module Humidifier
       # dumps the given object out to CFN syntax recursively
       def dump(node)
         case node
-        when Hash    then node.map { |key, value| [key, dump(value)] }.to_h
+        when Hash    then node.to_h { |key, value| [key, dump(value)] }
         when Array   then node.map { |value| dump(value) }
         when Ref, Fn then dump(node.to_cf)
         when Date    then node.iso8601

data/lib/humidifier/stack.rb

@@ -14,8 +14,8 @@ module Humidifier
         super(
           "Cannot use a template > #{MAX_TEMPLATE_URL_SIZE} bytes " \
           "(currently #{bytesize} bytes), consider using nested stacks " \
-          '(http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide' \
-          '/aws-properties-stack.html)'
+          "(http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide" \
+          "/aws-properties-stack.html)"
         )
       end
     end
@@ -37,7 +37,7 @@ module Humidifier
     end
 
     # The AWS region, can be set through the environment, defaults to us-east-1
-    AWS_REGION = ENV['AWS_REGION'] || 'us-east-1'
+    AWS_REGION = ENV.fetch("AWS_REGION", "us-east-1")
 
     # Lists of objects linked to the stack
     ENUMERABLE_RESOURCES =
@@ -184,7 +184,7 @@ module Humidifier
       perform_and_wait(:update, opts)
     end
 
-    def upload # rubocop:disable Metrics/AbcSize
+    def upload
       raise NoResourcesError.new(self, :upload) unless resources.any?
 
       bucket = Humidifier.config.s3_bucket
@@ -231,9 +231,9 @@ module Humidifier
         next if resources.empty?
 
         list[name] =
-          resources.map do |resource_name, resource|
+          resources.to_h do |resource_name, resource|
             [resource_name, resource.to_cf]
-          end.to_h
+          end
       end
     end
 

data/lib/humidifier/upgrade.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Humidifier
+  class Upgrade
+    PATH = -File.expand_path(File.join("..", "..", SPECIFICATION), __dir__)
+    URL = "https://docs.aws.amazon.com/AWSCloudFormation/latest" \
+          "/UserGuide/cfn-resource-specification.html"
+
+    def perform
+      require "net/http"
+      require "nokogiri"
+
+      response = Net::HTTP.get_response(uri).body
+      parsed = JSON.parse(response)
+
+      File.write(PATH, JSON.pretty_generate(parsed))
+      parsed["ResourceSpecificationVersion"]
+    end
+
+    def self.perform
+      new.perform
+    end
+
+    private
+
+    def page
+      Net::HTTP.get_response(URI.parse(URL)).body
+    end
+
+    def uri
+      Nokogiri::HTML(page).css("table tr").detect do |tr|
+        name = tr.at_css("td:first-child p")
+        next if !name || name.text.strip != "US East (N. Virginia)"
+
+        break URI.parse(tr.at_css("td:nth-child(3) p a").attr("href"))
+      end
+    end
+  end
+end

data/lib/humidifier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Humidifier
-  VERSION = '4.0.1'
+  VERSION = "4.2.0"
 end

data/lib/humidifier.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'date'
-require 'json'
-require 'pathname'
-require 'yaml'
+require "date"
+require "json"
+require "pathname"
+require "yaml"
 
-require 'aws-sdk-cloudformation'
-require 'aws-sdk-s3'
-require 'fast_underscore'
-require 'thor'
-require 'thor/hollaback'
+require "aws-sdk-cloudformation"
+require "aws-sdk-s3"
+require "fast_underscore"
+require "thor"
+require "thor/hollaback"
 
 # Hook into the string extension and ensure it works for certain AWS acronyms
 String.prepend(
@@ -22,6 +22,9 @@ String.prepend(
 
 # container module for all gem classes
 module Humidifier
+  # The file name of the specification for consistency.
+  SPECIFICATION = "CloudFormationResourceSpecification.json"
+
   # A parent class for all Humidifier errors for easier rescuing.
   class Error < StandardError; end
 
@@ -58,29 +61,30 @@ module Humidifier
 
     # a frozen hash of the given names mapped to their underscored version
     def underscore(names)
-      names.map { |name| [name, name.underscore.to_sym] }.to_h.freeze
+      names.to_h { |name| [name, name.underscore.to_sym] }.freeze
     end
   end
 end
 
-require 'humidifier/fn'
-require 'humidifier/ref'
-require 'humidifier/props'
-
-require 'humidifier/cli'
-require 'humidifier/condition'
-require 'humidifier/directory'
-require 'humidifier/loader'
-require 'humidifier/mapping'
-require 'humidifier/output'
-require 'humidifier/parameter'
-require 'humidifier/resource'
-require 'humidifier/serializer'
-require 'humidifier/stack'
-require 'humidifier/version'
-
-require 'humidifier/config'
-require 'humidifier/config/mapper'
-require 'humidifier/config/mapping'
+require "humidifier/fn"
+require "humidifier/ref"
+require "humidifier/props"
+
+require "humidifier/cli"
+require "humidifier/condition"
+require "humidifier/directory"
+require "humidifier/loader"
+require "humidifier/mapping"
+require "humidifier/output"
+require "humidifier/parameter"
+require "humidifier/resource"
+require "humidifier/serializer"
+require "humidifier/stack"
+require "humidifier/upgrade"
+require "humidifier/version"
+
+require "humidifier/config"
+require "humidifier/config/mapper"
+require "humidifier/config/mapping"
 
 Humidifier::Loader.load

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humidifier
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.2.0
 platform: ruby
 authors:
-- Kevin Deisz
-autorequire: 
-bindir: bin
+- Kevin Newton
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -53,75 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: thor-hollaback
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: thor-hollaback
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '5.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '5.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -181,14 +181,27 @@ dependencies:
 description: Programmatically generate and manage AWS CloudFormation templates, stacks,
   and change sets.
 email:
-- kevin.deisz@gmail.com
-executables: []
+- kddnewton@gmail.com
+executables:
+- humidifier
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/main.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".yardopts"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CloudFormationResourceSpecification.json
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
+- Rakefile
+- exe/humidifier
+- humidifier.gemspec
 - lib/humidifier.rb
 - lib/humidifier/cli.rb
 - lib/humidifier/condition.rb
@@ -206,12 +219,17 @@ files:
 - lib/humidifier/resource.rb
 - lib/humidifier/serializer.rb
 - lib/humidifier/stack.rb
+- lib/humidifier/upgrade.rb
 - lib/humidifier/version.rb
-homepage: https://github.com/kddeisz/humidifier
+homepage: https://github.com/kddnewton/humidifier
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/kddnewton/humidifier/issues
+  changelog_uri: https://github.com/kddnewton/humidifier/blob/v4.2.0/CHANGELOG.md
+  source_code_uri: https://github.com/kddnewton/humidifier
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,15 +237,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: CloudFormation made easy
 test_files: []