mkstack 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d37d2a94286016bc2fe971108aa2c9c9209cdc4492d648ce2f74627d4a3771
-  data.tar.gz: 571c7b9744eda12ba9e03f431dd6869949ef6f3c52d9b0fa06bc752631e782db
+  metadata.gz: 322eccfead31ad6c826aec54f1e7318895bf083846583c049131e0f07c7cbe23
+  data.tar.gz: 0a91db392b235136cf72837d971cd933f15af793a984cb3ff07401431f4e7248
 SHA512:
-  metadata.gz: f69c72b6898c770d866cb6fc2be8b073eff0009cd91b6aea6eb36950c989412862a084f0f703b7bfa9e596a448a8ffe319af13a0112f1cb2006c2c6f43567d03
-  data.tar.gz: 1e8918f652e058070760b73db832b902a3680701e96eb6470b3f6cfc7c8cb0bc7eb70ca23642fe331fa59c02c51a3fca39017aaf59dba3b8d64c266afd919d65
+  metadata.gz: dc047d7381bfcc86076eda6ae58de7b4b04a7e61cb29248530d2e13d7c353c3eac5925b2c381383c561d3eb530c190de46fa35ae4bfb38dce7e966667ca3591d
+  data.tar.gz: c3393240e63e337ce4ef643ca9df68949678ddfb64a118d3647d68eb6c60cdcc90ce40898440e3f5f7790a98bc5e2db4d0b20f807bf648c4ecade270ee1a8017

data/bin/mkstack

@@ -1,8 +1,10 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 
 require "logger"
 require "optparse"
-require "mkstack"
+require_relative "../lib/mkstack"
+
+version = "1.2.0"
 
 
 ##################################################
@@ -29,6 +31,7 @@ opts = OptionParser.new do |p|
 
   # Help
   p.on("-h", "--help", "Display this message") { puts opts ; exit }
+  p.on("--version", "Show version") { puts version ; exit }
   p.separator(" ")
 
   # Verbosity
@@ -75,7 +78,6 @@ template = MkStack::Template.new(options[:format], options[:erb_argv])
 files.each do |file|
   begin
     Dir.chdir(File.dirname(file)) {
-      $logger.info { "Loading #{file}" }
       template.merge(File.basename(file), options[:erb])
     }
   rescue KeyError => e

data/lib/mkstack/template.rb

@@ -5,6 +5,30 @@ require "json"
 require "yaml"
 
 module MkStack
+  ##################################################
+  # A class to represent undefined local tags.
+  #
+  # CloudFormation uses <b>!</b> to denote the YAML short form of
+  # intrinsic functions, which is the same prefix YAML uses for local
+  # tags.  The default handler strips undefined local tags, leaving
+  # just the value.
+  #
+  # Loading a YAML file will force the output to be in YAML format.
+
+  class IntrinsicShort
+    def init_with(coder)
+      @coder = coder
+    end
+
+    def encode_with(coder)
+      coder.tag = @coder.tag
+
+      coder.map = @coder.map if @coder.type == :map
+      coder.scalar = @coder.scalar if @coder.type == :scalar
+      coder.seq = @coder.seq if @coder.type == :seq
+    end
+  end
+
   ##################################################
   # A CloudFormation template
   class Template
@@ -34,10 +58,6 @@ module MkStack
       # every time we load a file.  This allows ERB code in one file to
       # be referenced in another.
       @binding = binding
-
-      # See add_domain_types
-      @yaml_domain = "mlfs.org,2020"
-      @global_tag = "tag:#{@yaml_domain}:"
     end
 
     # Shorthand accessor for template sections
@@ -60,8 +80,9 @@ module MkStack
         cfn = JSON.load(contents)
       rescue Exception => e
         # Try YAML
-        add_domain_types
-        cfn = YAML.load(contents)
+        add_tags
+        cfn = YAML.safe_load(contents, [IntrinsicShort])
+        @format = "yaml"
       end
 
       # Merge sections that are present in the file
@@ -90,9 +111,7 @@ module MkStack
       when "json"
         to_hash.to_json
       when "yaml"
-        # Strip enclosing quotes around tags and revert tags to their short form
-        # And keep Psych from splitting "long" lines
-        to_hash.to_yaml({ line_width: -1 }).gsub(/"(#{@global_tag}[^"]+?)"/, '\1').gsub("#{@global_tag}", "!")
+        to_hash.to_yaml({ line_width: -1 }) # Keep Psych from splitting "long" lines
       else
         to_hash
       end
@@ -127,20 +146,9 @@ module MkStack
 
 
     #########################
-    # Define YAML domains to handle CloudFormation intrinsic
-    # functions.
-    #
-    # CloudFormation uses <b>!</b> to denote the YAML short form of
-    # intrinsic functions, which is the same prefix YAML uses for
-    # local tags.  The default handler strips undefined local tags,
-    # leaving just the value.
-    #
-    # This puts the tags back, but in global tag format.  The global
-    # tag prefix is converted back to <b>!</b> on output.
-    #
-    # Using the short form will force the output to be in YAML format.
-    def add_domain_types
-      functions = [
+    # List of intrinsic functions that look like undefined local tags
+    def add_tags
+      [
         "Base64",
         "Cidr",
         "FindInMap",
@@ -159,14 +167,7 @@ module MkStack
         "Or",
         "Sub",
       ].each do |function|
-        YAML::add_domain_type(@yaml_domain, function) do |type, val|
-          unless @format.eql?("yaml")
-            $logger.debug "Setting output to YAML for short form intrinsic function !#{function}"
-            @format = "yaml"
-          end
-
-          (function.eql?("Sub") and val.is_a?(String))? "#{type} \"#{val}\"" : "#{type} #{val}"
-        end
+        YAML::add_tag("!#{function}", IntrinsicShort)
       end
     end
   end

data/mkstack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name	= "mkstack"
-  s.version	= "1.1.3"
+  s.version	= "1.2.0"
   s.summary	= "Merge multiple CloudFormation template files into a single template"
   s.description	= <<-EOF
 Merge multiple CloudFormation template files into a single template.  Each file may be in either JSON or YAML format.  By default all files are run through an ERB (Embedded RuBy) processor.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkstack
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Andy Rosen
@@ -33,7 +33,7 @@ cert_chain:
   kLyoFawGT9fF6+lXyIT9XiaUzOCjQUJo94on5U601Y2GXB4Sa1oxLSBlEtkSwuD3
   gMHlHdBRvoJurkVzYNWkN+Cz
   -----END CERTIFICATE-----
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation