cfn2dsl 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d41f4227841cd556701c4bdeb8b203b32a2889a9
-  data.tar.gz: acf409e0bb4abf9bc6d58bf0223f4d6c83c581e5
+SHA256:
+  metadata.gz: 362a368962d8e432205733286191423e04b5db0235647d243985153bed960b63
+  data.tar.gz: 26b99c51a9da1f59b26f3b06d3358c94cc19bc68cc5d0fb20078808cfcc44d77
 SHA512:
-  metadata.gz: 7181c56d9605bf9a15abf5e767f06d476dba22755acec7f7ff446bf6d85cbdd5fa17d403419a97975b41950571db7b13a6e89adf8580ef460cf6b2f916c17f29
-  data.tar.gz: 2057466527c91674128aa24175b4f56b302794a793268339d4499c0c0f07dba101bd72cf2b9bdd1a7f10a7dfe1a8b9ffecf3794f4e38a793afc6f46071c265be
+  metadata.gz: 8048e157208a924a3eae68415d96bf8c650a9484cefcea4d7d829c455cc35a0cf2c6fadb47e79cdbf8c195b92d41061ba4647f51c393bc5c0a2824819682ff4b
+  data.tar.gz: 2cba5277344c9e986890c1abe1ab434e989359389cc8dbb1357ead8f48591052bf79fb442f97d423e28f00b891ba7625074506210c7bd042828a212b37ca542d

data/bin/cfn2dsl

@@ -30,7 +30,7 @@ unless options[:template]
   puts op
   exit 1
 else
-  template = JSON.load(File.new(options[:template]))
+  template = IO.read(options[:template])
   cfndsl   = CloudFormation.new(template)
 end
 

data/lib/cfn2dsl.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'json'
+require 'yaml'
 require 'optparse'
 require 'ap'
 
@@ -16,6 +17,7 @@ require 'render'
 require 'version'
 require 'rules'
 require 'metadata'
+require 'error'
 
 AwesomePrint.defaults = {
   :indent    => -2,
@@ -24,3 +26,15 @@ AwesomePrint.defaults = {
   :plain     => true
 }
 
+YAML.add_domain_type('', 'Ref') { |type, val| { 'Ref' => val } }
+
+YAML.add_domain_type('', 'GetAtt') do |type, val|
+  if val.is_a? String
+    val = val.split('.')
+  end
+  { 'Fn::GetAtt' => val }
+end
+
+%w(Join Base64 Sub Cidr Split Select ImportValue GetAZs FindInMap And Or If Not).each do |function_name|
+  YAML.add_domain_type('', function_name) { |type, val| { "Fn::#{function_name}" => val } }
+end

data/lib/cfn_parser.rb

@@ -1,7 +1,7 @@
 module CfnParser
 
-  def parse_cfn_json(json)
-    send(element_type(json).to_s.snake_case, json)
+  def parse_cfn(cfn_hash)
+    send(element_type(cfn_hash).to_s.snake_case, cfn_hash)
   end
 
   def intrinsic_function?(obj)
@@ -10,30 +10,30 @@ module CfnParser
     (obj.keys.first =~ /^Fn::/ or obj.keys.first == "Ref")
   end
 
-  def array(json)
-    return json.map { |a| parse_cfn_json(a) }
+  def array(cfn_hash)
+    return cfn_hash.map { |a| parse_cfn(a) }
   end
 
-  def intrinsic_function(json)
-    fn_name    = json.keys.first
-    values     = json[fn_name]
-    parameters = parse_cfn_json(values)
+  def intrinsic_function(cfn_hash)
+    fn_name    = cfn_hash.keys.first
+    values     = cfn_hash[fn_name]
+    parameters = parse_cfn(values)
     return IntrinsicFunction.new(fn_name, parameters)
   end
 
-  def hash(json)
-    return json.merge(json) { |k, v| parse_cfn_json(v) }
+  def hash(cfn_hash)
+    return cfn_hash.merge(cfn_hash) { |k, v| parse_cfn(v) }
   end
 
-  def primitive(json)
-    json
+  def primitive(cfn_hash)
+    cfn_hash
   end
 
   private
-  def element_type(json)
-    return :Array             if json.instance_of?(Array)
-    return :IntrinsicFunction if intrinsic_function?(json)
-    return :Hash              if json.instance_of?(Hash)
+  def element_type(cfn_hash)
+    return :Array             if cfn_hash.instance_of?(Array)
+    return :IntrinsicFunction if intrinsic_function?(cfn_hash)
+    return :Hash              if cfn_hash.instance_of?(Hash)
     return :Primitive
   end
 end

data/lib/cfndsl.erb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 CloudFormation do
   <% if @cfn.description %>
-  Description(<%= @cfn.description.dump %>)
+  Description '<%= @cfn.description %>'
   <% end %>
   <% if @cfn.aws_template_format_version %>
-  AWSTemplateFormatVersion(<%= @cfn.aws_template_format_version.dump %>)
+  AWSTemplateFormatVersion '<%= @cfn.aws_template_format_version %>'
   <% end %>
   <% # Parameters %>
   <%
@@ -11,44 +12,48 @@ CloudFormation do
     @cfn.parameters.each do |param|
   %>
 
-  Parameter(<%= param.name.dump %>) do
+  Parameter('<%= param.name %>') do
     <% if param.description %>
-    Description(<%= param.description.dump %>)
+    Description '<%= param.description %>'
     <% end %>
     <% if param.type %>
-    Type(<%= param.type.dump %>)
+    Type '<%= param.type %>'
     <% end %>
     <% if param.default
           default_value = param.default
           if param.default.respond_to? :dump
-            default_value = param.default.dump
+            default_value = '\'' + param.default + '\''
           end
     %>
-    Default(<%= default_value %>)
+    Default <%= default_value %>
     <% end %>
     <% if param.allowed_values %>
-    AllowedValues(<%= param.allowed_values.ai %>)
+    <% if param.allowed_values.kind_of?(Array) %>
+    AllowedValues <%= param.allowed_values.ai.gsub('"', '\'').gsub('  ', '      ').gsub(/^\]$/, '    ]').gsub(/^\}$/, '    }') %>
+    <% else %>
+    AllowedValues '<%= param.allowed_values.ai.gsub('"', '\'') %>'
+    <% end %>
     <% end %>
     <% if param.allowed_pattern %>
-    AllowedPattern(<%= param.allowed_pattern.dump %>)
+    AllowedPattern '<%= param.allowed_pattern %>'
     <% end %>
     <% if param.no_echo %>
-    NoEcho(<%= param.no_echo %>)
+    NoEcho <%= param.no_echo %>
     <% end %>
     <% if param.max_length %>
-    MaxLength(<%= param.max_length.to_i %>)
+    MaxLength <%= param.max_length.to_i %>
     <% end %>
     <% if param.min_length %>
-    MinLength(<%= param.min_length.to_i %>)
+    MinLength <%= param.min_length.to_i %>
     <% end %>
     <% if param.max_value %>
-    MaxValue(<%= param.max_value %>)
+    MaxValue <%= param.max_value %>
     <% end %>
     <% if param.min_value %>
-    MinValue(<%= param.min_value %>)
+    MinValue <%= param.min_value %>
     <% end %>
     <% if param.constraint_description %>
-    ConstraintDescription(<%= param.constraint_description.dump %>)
+    ConstraintDescription '<%= param.constraint_description %>'
     <% end %>
   end
   <%
@@ -61,7 +66,7 @@ CloudFormation do
     @cfn.mappings.each do |map|
   %>
 
-  Mapping(<%= map.name.dump %>, <%= map.values.ai %>)
+  Mapping '<%= map.name %>' '<%= map.values.ai.gsub('"', '\'') %>'
   <%
     end
   end
@@ -72,7 +77,7 @@ CloudFormation do
     @cfn.conditions.each do |cond|
   %>
 
-  Condition(<%= cond.name.dump %>, <%= cond.evaluations.ai %>)
+  Condition('<%= cond.name %>', <%= cond.evaluations.ai.gsub('"', '\'').gsub('  ', '    ').gsub(/^\]/, '  ]').gsub(/^\)/, '  )') %>)
   <%
     end
   end
@@ -81,19 +86,23 @@ CloudFormation do
   <%
   @cfn.resources.each do |res|
   %>
-
-  Resource(<%= res.name.dump %>) do
-    Type("<%= res.type %>")
+  <%
+    resname = res.name
+    restype = res.type
+    restype = restype.split('::').delete_if{|i|i=='AWS'}
+    restype = restype.join('::').gsub('::', '_')
+   %>
+  <%= restype %>('<%= resname %>') do
     <%
     if res.creation_policy
       res.creation_policy.each_pair do |name, value|
         if value.instance_of? String
-          value = value.dump
+          value = '\'' + value + '\''
         else
-          value = value.ai
+          value = value.ai.gsub('"', '\'')
         end
     %>
-    CreationPolicy(<%= name.dump%>, <%= value %>)
+    CreationPolicy('<%= name %>', <%= value %>)
     <%
       end
     end
@@ -101,14 +110,14 @@ CloudFormation do
     <%
     if res.deletion_policy
     %>
-    DeletionPolicy(<%= res.deletion_policy.dump %>)
+    DeletionPolicy '<%= res.deletion_policy %>)'
     <%
     end
     %>
     <%
     if res.condition
     %>
-    Condition(<%= res.condition.dump %>)
+    Condition '<%= res.condition %>'
     <%
     end
     %>
@@ -116,12 +125,12 @@ CloudFormation do
     if res.update_policy
       res.update_policy.each_pair do |name, value|
         if value.instance_of? String
-          value = value.dump
+          value = "'#{value}'"
         else
-          value = value.ai
+          value = value.ai.gsub('"', '\'').gsub('{', '').gsub('}', '').chop
         end
     %>
-    UpdatePolicy(<%= name.dump %>,<%= value %>)
+    UpdatePolicy('<%= name %>',<%= value %>)
     <%
       end
     end
@@ -130,12 +139,12 @@ CloudFormation do
     if res.metadata
       res.metadata.each_pair do |name, value|
         if value.instance_of? String
-          value = value.dump
+          value = value
         else
-          value = value.ai
+          value = value.ai.gsub('"', '\'')
         end
     %>
-    Metadata(<%= name.dump %> => <%= value %>)
+    Metadata '<%= name %>' '<%= value %>'
     <%
       end
     end
@@ -143,9 +152,9 @@ CloudFormation do
     <%
     if res.depends_on
       if res.depends_on.instance_of? String
-        value = res.depends_on.dump
+        value = '\'' + res.depends_on + '\''
       else
-        value = res.depends_on.ai
+        value = res.depends_on.ai.gsub('"', '\'')
       end
     %>
     DependsOn(<%= value %>)
@@ -155,14 +164,25 @@ CloudFormation do
     <%
     if res.properties
       res.properties.each_pair do |name, value|
+        is_value_string = true
         if value.instance_of? String
-          value = value.dump
+          value = '\'' + value + '\''
         else
-          value = value.ai
+          is_value_string = false
+          value = value.ai.gsub('"', '\'')
+          .gsub('  ', '      ')
+          .gsub(/^\]$/, '    ]')
+          .gsub(/^\}$/, '    }')
+          .gsub(/[ ]+=>/, ' =>')
         end
+
+        if is_value_string
     %>
-    Property(<%= name.dump %>, <%= value %>)
+    <%= name  %> <%= value %>
+    <% else %>
+    <%= name  %>(<%= value %>)
     <%
+        end
       end
     end
     %>
@@ -176,30 +196,30 @@ CloudFormation do
     @cfn.outputs.each do |out|
   %>
 
-  Output(<%= out.name.dump %>) do
+  Output('<%= out.name %>') do
     <%
     if out.condition
     %>
-    Condition(<%= out.condition.dump %>)
+    Condition('<%= out.condition %>')
     <%
     end
     %>
     <%
     if out.description
     %>
-    Description(<%= out.description.dump %>)
+    Description '<%= out.description %>'
     <%
     end
     %>
     <%
     if out.value
       if out.value.instance_of? String
-        value = out.value.dump
+        value = '\'' + out.value + '\''
       else
-        value = out.value.ai
+        value = out.value.ai.gsub('"', '\'')
       end
     %>
-    Value(<%= value %>)
+    Value <%= value %>
     <%
     end
     %>

data/lib/cloudformation.rb

@@ -1,4 +1,5 @@
 require 'extlib'
+require 'psych'
 class CloudFormation
 
   ELEMENTS = [
@@ -15,24 +16,29 @@ class CloudFormation
 
   attr_reader(*ELEMENTS)
 
-  def initialize(json)
+  def initialize(cfn_string)
+    cfn_hash = Psych.safe_load(cfn_string)
     ELEMENTS.each do |e|
       key  = e.to_s.camel_case
       if key =~ /^Aws/
         key = key.sub(/^Aws/, "AWS")
       end
 
-      if json[key]
-        attr = parse_element(e, json[key])
+      if cfn_hash[key]
+        attr = parse_element(e, cfn_hash[key])
         instance_variable_set("@" + e.to_s, attr)
       end
     end
+  rescue Psych::DisallowedClass => error
+    raise YamlValueTypeError.new "Unsupported YAML value type found: only scalar values supported. #{error.message}"
+  rescue Psych::Exception => error
+    raise YamlSyntaxError.new "Syntax error in template. #{error.message}"
   end
 
   private
-  def parse_element(elm_name, json)
+  def parse_element(elm_name, cfn_hash)
     function = parser(elm_name)
-    send(function, elm_name, json)
+    send(function, elm_name, cfn_hash)
   end
 
   def parser(name)
@@ -46,27 +52,27 @@ class CloudFormation
     end
   end
 
-  def simple_parser(name, json)
-    json
+  def simple_parser(name, cfn_hash)
+    cfn_hash
   end
 
-  def complex_parser(name, json)
+  def complex_parser(name, cfn_hash)
     elms = []
     case name
     when :metadata
-      json.each_pair { |k, v| elms << Metadata.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Metadata.new(k, v) }
     when :rules
-      json.each_pair { |k, v| elms << Rules.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Rules.new(k, v) }
     when :parameters
-      json.each_pair { |k, v| elms << Parameter.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Parameter.new(k, v) }
     when :resources
-      json.each_pair { |k, v| elms << Resource.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Resource.new(k, v) }
     when :outputs
-      json.each_pair { |k, v| elms << Output.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Output.new(k, v) }
     when :mappings
-      json.each_pair { |k, v| elms << Mapping.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Mapping.new(k, v) }
     when :conditions
-      json.each_pair { |k, v| elms << Condition.new(k, v) }
+      cfn_hash.each_pair { |k, v| elms << Condition.new(k, v) }
     end
     return elms
   end

data/lib/condition.rb

@@ -4,6 +4,6 @@ class Condition
 
   def initialize(name, eval)
     @name        = name
-    @evaluations = parse_cfn_json(eval)
+    @evaluations = parse_cfn(eval)
   end
 end

data/lib/error.rb

@@ -0,0 +1,11 @@
+class YamlSyntaxError < StandardError
+  def initialize(msg)
+    super
+  end
+end
+
+class YamlValueTypeError < StandardError
+  def initialize(msg)
+    super
+  end
+end

data/lib/intrinsic_function.rb

@@ -20,11 +20,11 @@ class IntrinsicFunction
   private
   def fn_base64
     if @parameters.instance_of? String
-      value = '"' + @parameters.gsub('"'){'\\"'} + '"'
+      value = "'#{@parameters}'"
     else
       value = @parameters.ai
     end
-    return "FnBase64(#{value})"
+    return "FnBase64 '#{value}'"
   end
 
   def fn_select
@@ -32,7 +32,7 @@ class IntrinsicFunction
   end
 
   def ref
-    return "Ref(\"#{@parameters.gsub('"'){'\\"'}}\")"
+    return "Ref('#{@parameters.gsub('\''){'\\\''}}')"
   end
 
   def fn_and
@@ -41,13 +41,13 @@ class IntrinsicFunction
 
   def fn_equals
     if @parameters[0].instance_of? String
-      arg1 = '"' + @parameters[0].gsub('"'){'\\"'} + '"'
+      arg1 = '\'' + @parameters[0].gsub('\''){'\\\''} + '\''
     else
       arg1 = @parameters[0].ai
     end
 
     if @parameters[1].instance_of? String
-      arg2 = '"' + @parameters[1].gsub('"'){'\\"'} + '"'
+      arg2 = '\'' + @parameters[1].gsub('\''){'\\\''} + '\''
     else
       arg2 = @parameters[1].ai
     end
@@ -56,15 +56,15 @@ class IntrinsicFunction
   end
 
   def fn_if
-    cond_name = '"' + @parameters[0].gsub('"'){'\\"'} + '"'
+    cond_name = '\'' + @parameters[0].gsub('\''){'\\\''} + '\''
     if @parameters[1].instance_of? String
-      true_value = '"' + @parameters[1].gsub('"'){'\\"'} + '"'
+      true_value = '\'' + @parameters[1].gsub('\''){'\\\''} + '\''
     else
       true_value = @parameters[1].ai
     end
 
     if @parameters[2].instance_of? String
-      false_value = '"' + @parameters[2].gsub('"'){'\\"'} + '"'
+      false_value = '\'' + @parameters[2].gsub('\''){'\\\''} + '\''
     else
       false_value = @parameters[2].ai
     end
@@ -80,16 +80,16 @@ class IntrinsicFunction
   end
 
   def fn_find_in_map
-    map_name = '"' + @parameters[0] + '"'
+    map_name = '\'' + @parameters[0] + '\''
 
     if @parameters[1].instance_of? String
-      top_level_key = '"' + @parameters[1] + '"'
+      top_level_key = '\'' + @parameters[1] + '\''
     else
       top_level_key = @parameters[1].ai
     end
 
     if @parameters[2].instance_of? String
-      sec_level_key = '"' + @parameters[2] + '"'
+      sec_level_key = '\'' + @parameters[2] + '\''
     else
       sec_level_key = @parameters[2].ai
     end
@@ -98,26 +98,36 @@ class IntrinsicFunction
   end
 
   def fn_get_att
-    resource_name = '"' + @parameters[0] + '"'
-    attr_name     = '"' + @parameters[1] + '"'
+    resource_name = '\'' + @parameters[0] + '\''
+    attr_name     = '\'' + @parameters[1] + '\''
     return "FnGetAtt(#{resource_name}, #{attr_name})"
   end
 
   def fn_join
-    seperator = '"' + @parameters[0].gsub('"'){'\\"'} + '"'
+    seperator = '\'' + @parameters[0].gsub('\''){'\\\''} + '\''
     values    = @parameters[1].ai
     return "FnJoin(#{seperator}, #{values})"
   end
 
   def fn_sub
-    origin = '"' + @parameters[0].gsub('"'){'\\"'} + '"'
-    values    = @parameters[1].ai
-    return "FnSub(#{origin}, #{values})"
+   if @parameters.instance_of? String
+     value = '"' + @parameters.gsub('"'){'\\"'} + '"'
+     return "FnSub(#{value})"
+   else
+     origin = '"' + @parameters[0].gsub('"'){'\\"'} + '"'
+     values    = @parameters[1].ai
+     return "FnSub(#{origin}, #{values})"
+   end
   end
 
   def fn_split
     delimiter = '"' + @parameters[0].gsub('"'){'\\"'} + '"'
-    value     = '"' + @parameters[1] + '"'
+    # value     = '"' + @parameters[1] + '"'
+    if @parameters[1].instance_of? String
+       value     = '"' + @parameters[1] + '"'
+    else
+      value = @parameters[1].ai
+    end
     return "FnSplit(#{delimiter}, #{value})"
   end
 
@@ -128,7 +138,7 @@ class IntrinsicFunction
 
   def fn_get_a_zs
     if @parameters.instance_of? String
-      value = '"' + @parameters.gsub('"'){'\\"'} + '"'
+      value = '\'' + @parameters.gsub('\''){'\\\''} + '\''
     else
       value = @parameters.ai
     end
@@ -136,5 +146,8 @@ class IntrinsicFunction
     return "FnGetAZs(#{value})"
   end
   
+  def fn_cidr
+    return "FnCidr(#{@parameters.ai})"
+  end
 
 end

data/lib/mapping.rb

@@ -4,6 +4,6 @@ class Mapping
 
   def initialize(name, values)
     @name   = name
-    @values = parse_cfn_json(values)
+    @values = parse_cfn(values)
   end
 end

data/lib/metadata.rb

@@ -4,6 +4,6 @@ class Metadata
 
   def initialize(name, values)
     @name   = name
-    @values = parse_cfn_json(values)
+    @values = parse_cfn(values)
   end
 end

data/lib/output.rb

@@ -9,16 +9,16 @@ class Output
 
   attr_reader(:name, *ATTRIBUTES)
 
-  def initialize(name, json)
+  def initialize(name, cfn_hash)
     @name = name
-    ATTRIBUTES.each {|a| attribute(a, json)}
+    ATTRIBUTES.each {|a| attribute(a, cfn_hash)}
   end
 
   private
-  def attribute(name, json)
+  def attribute(name, cfn_hash)
     key = name.to_s.camel_case
-    if json[key]
-      value = parse_cfn_json(json[key])
+    if cfn_hash[key]
+      value = parse_cfn(cfn_hash[key])
       instance_variable_set("@" + name.to_s, value)
     end
   end

data/lib/parameter.rb

@@ -17,11 +17,11 @@ class Parameter
 
   attr_reader(*ELEMENTS)
 
-  def initialize(name, json)
+  def initialize(name, cfn_hash)
     @name = name
     ELEMENTS.each do |e|
       key_name = e.to_s.camel_case
-      instance_variable_set('@' + e.to_s, json[key_name]) if json[key_name]
+      instance_variable_set('@' + e.to_s, cfn_hash[key_name]) if cfn_hash[key_name]
     end
   end
 end

data/lib/resource.rb

@@ -14,10 +14,10 @@ class Resource
 
   attr_reader(:name, *ATTRIBUTES)
 
-  def initialize(name, json)
+  def initialize(name, cfn_hash)
     @name = name
     ATTRIBUTES.each do |a|
-      send(attribute_type(a), json, a.to_s)
+      send(attribute_type(a), cfn_hash, a.to_s)
     end
   end
 
@@ -37,18 +37,18 @@ class Resource
     return type
   end
 
-  def complex_attribute(json, name)
-    if json[name.camel_case]
-      values = json[name.camel_case].merge do |k, v|
-        parse_cfn_json(v)
+  def complex_attribute(cfn_hash, name)
+    if cfn_hash[name.camel_case]
+      values = cfn_hash[name.camel_case].merge do |k, v|
+        parse_cfn(v)
       end
       instance_variable_set('@' + name, values)
     end
   end
 
-  def basic_attribute(json, name)
-    if json[name.camel_case]
-      instance_variable_set('@' + name, parse_cfn_json(json[name.camel_case]))
+  def basic_attribute(cfn_hash, name)
+    if cfn_hash[name.camel_case]
+      instance_variable_set('@' + name, parse_cfn(cfn_hash[name.camel_case]))
     end
   end
 end

data/lib/rules.rb

@@ -4,6 +4,6 @@ class Rules
 
   def initialize(name, values)
     @name   = name
-    @values = parse_cfn_json(values)
+    @values = parse_cfn(values)
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Cfn2dsl
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cfn2dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kevin Yung
 - Valen Gunawan
+- Cam Maxwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extlib
@@ -31,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +54,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-description: A tool to convert CloudFormation JSON template into a Ruby DSL cfndsl
+description: A tool to convert CloudFormation templates into a Ruby DSL cfndsl
 email: jwrong@gmail.com
 executables:
 - cfn2dsl
@@ -66,6 +67,7 @@ files:
 - lib/cfndsl.erb
 - lib/cloudformation.rb
 - lib/condition.rb
+- lib/error.rb
 - lib/intrinsic_function.rb
 - lib/mapping.rb
 - lib/metadata.rb
@@ -87,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -95,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
-summary: A tool to convert CloudFormation JSON template into a Ruby DSL cfndsl
+summary: A tool to convert CloudFormation templates into a Ruby DSL cfndsl
 test_files: []