cfndsl 0.15.3 → 0.16.1

data/lib/cfndsl/orchestration_template.rb

@@ -83,7 +83,7 @@ module CfnDsl
             define_method(method) do |value = nil, &block|
               @Properties ||= {}
               @Properties[pname] ||= PropertyDefinition.new([])
-              value = pclass.new unless value
+              value ||= pclass.new
               @Properties[pname].value.push value
               value.instance_eval(&block) if block
               value
@@ -138,11 +138,11 @@ module CfnDsl
       invalids = []
       @_resource_refs = {}
       if @Resources
-        @Resources.keys.each do |resource|
+        @Resources.each_key do |resource|
           @_resource_refs[resource.to_s] = @Resources[resource].build_references({})
         end
-        @_resource_refs.keys.each do |origin|
-          @_resource_refs[origin].keys.each do |ref|
+        @_resource_refs.each_key do |origin|
+          @_resource_refs[origin].each_key do |ref|
             invalids.push "Invalid Reference: Resource #{origin} refers to #{ref}" unless valid_ref?(ref, origin)
           end
         end
@@ -154,11 +154,11 @@ module CfnDsl
       invalids = []
       output_refs = {}
       if @Outputs
-        @Outputs.keys.each do |resource|
+        @Outputs.each_key do |resource|
           output_refs[resource.to_s] = @Outputs[resource].build_references({})
         end
-        output_refs.keys.each do |origin|
-          output_refs[origin].keys.each do |ref|
+        output_refs.each_key do |origin|
+          output_refs[origin].each_key do |ref|
             invalids.push "Invalid Reference: Output #{origin} refers to #{ref}" unless valid_ref?(ref)
           end
         end

data/lib/cfndsl/patches.rb

@@ -40,28 +40,6 @@ module CfnDsl
             'Type'        => { 'PrimitiveType' => 'String' },
             'Value'       => { 'PrimitiveType' => 'String' }
           }
-        },
-        'AWS::EC2::VPNGatewayConnection' => {
-          'Properties' => {
-            'Type' => { 'PrimitiveType' => 'String' },
-            'Tags' => { 'Type' => 'List', 'ItemType' => 'Tag' }
-          }
-        },
-        'AWS::EC2::EIPAssociation' => {
-          'Properties' => {
-            'AllocationId'       => { 'PrimitiveType' => 'String' },
-            'EIP'                => { 'PrimitiveType' => 'String' },
-            'InstanceId'         => { 'PrimitiveType' => 'String' },
-            'NetworkInterfaceId' => { 'PrimitiveType' => 'String' },
-            'PrivateIpAddress'   => { 'PrimitiveType' => 'String' }
-          }
-        },
-        'AWS::Config::ConfigurationRecorder' => {
-          'Properties' => {
-            'Name'           => { 'PrimitiveType' => 'String' },
-            'RecordingGroup' => { 'Type' => 'RecordingGroup' },
-            'RoleARN'        => { 'PrimitiveType' => 'String' }
-          }
         }
       }
     end
@@ -86,11 +64,6 @@ module CfnDsl
             'PolicyDocument' => { 'PrimitiveType' => 'Json' },
             'PolicyName'     => { 'PrimitiveType' => 'String' }
           }
-        },
-        'AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType' => {
-          'Properties' => {
-            'Rules' => { 'Type' => 'List', 'ItemType' => 'MappingRule' }
-          }
         }
       }
     end

data/lib/cfndsl/specification.rb

@@ -65,7 +65,7 @@ module CfnDsl
           elsif nested_prop_info['PrimitiveItemType']
             nested_prop_type = Array(nested_prop_info['PrimitiveItemType'])
           elsif nested_prop_info['ItemType']
-            nested_prop_type = root_resource_name + nested_prop_info['ItemType']
+            nested_prop_type = Array(root_resource_name + nested_prop_info['ItemType'])
           elsif nested_prop_info['Type']
             nested_prop_type = root_resource_name + nested_prop_info['Type']
           else

data/lib/cfndsl/types.rb

@@ -18,10 +18,10 @@ module CfnDsl
       type_def.const_set('Types_Internal', types_list)
       # Do a little sanity checking - all of the types referenced in Resources
       # should be represented in Types
-      types_list['Resources'].keys.each do |resource_name|
+      types_list['Resources'].each_key do |resource_name|
         resource = types_list['Resources'][resource_name]
-        resource.values.each do |thing|
-          thing.values.each do |type|
+        resource.each_value do |thing|
+          thing.each_value do |type|
             if type.is_a?(Array)
               type.each do |inner_type|
                 puts "unknown type #{inner_type}" unless types_list['Types'].key?(inner_type)
@@ -36,7 +36,7 @@ module CfnDsl
       # All of the type values should also be references
       types_list['Types'].values do |type|
         if type.respond_to?(:values)
-          type.values.each do |tv|
+          type.each_value do |tv|
             puts "unknown type #{tv}" unless types_list['Types'].key?(tv)
           end
         end
@@ -76,13 +76,13 @@ module CfnDsl
                   # We are going to modify the value in some
                   # way, make sure that we have an array to mess
                   # with if we start with nothing
-                  existing = instance_variable_set(variable, []) unless existing
+                  existing ||= instance_variable_set(variable, [])
 
                   # special case for just a block, no args
                   if value.nil? && rest.empty? && block
                     val = klass.new
                     existing.push val
-                    value.instance_eval(&block(val))
+                    val.instance_eval(&block)
                     return existing
                   end
 

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.15.3'.freeze
+  VERSION = '0.16.1'.freeze
 end

data/lib/cfnlego.rb

@@ -11,7 +11,7 @@ module Cfnlego
     content = fetch_resource_content
     supported_resources = JSON.parse(content)
     resources = []
-    supported_resources['ResourceTypes'].each do |resource, _value|
+    supported_resources['ResourceTypes'].each_key do |resource|
       resources << resource
     end
     resources
@@ -35,7 +35,7 @@ module Cfnlego
     begin
       return Cfnlego::CloudFormation.new(resources).render
     rescue RuntimeError => e
-      $stderr.puts "Error: #{e.message}"
+      warn "Error: #{e.message}"
     end
     nil
   end

data/lib/cfnlego/resource.rb

@@ -29,7 +29,7 @@ module  Cfnlego
       data = datainput['ResourceTypes']
       begin
         @definition ||= data[@type]
-      rescue
+      rescue RuntimeError
         raise "unknown #{@type}, no matching definition found"
       end
     end

data/lib/deep_merge/core.rb

@@ -204,7 +204,7 @@ module DeepMerge
     end
     puts "#{di}Returning #{dest.inspect}" if merge_debug
     dest
-  end # deep_merge!
+  end
 
   # allows deep_merge! to uniformly handle overwriting of unmergeable entities
   def self.overwrite_unmergeables(source, dest, options)
@@ -241,4 +241,4 @@ module DeepMerge
     end
     obj
   end
-end # module DeepMerge
+end

data/lib/deep_merge/deep_merge.rb

@@ -9,7 +9,7 @@ module DeepMerge
       default_opts = { preserve_unmergeables: false }
       DeepMerge.deep_merge!(source, self, default_opts.merge(options))
     end
-  end # DeepMergeHashExt
+  end
 end
 
 # Extends hash with deep merge

data/spec/cfndsl_spec.rb

@@ -232,11 +232,11 @@ describe CfnDsl::CloudFormationTemplate do
 
     context 'FnFormat', 'Multiline' do
       it 'formats correctly' do
-        multiline = <<-EOF.gsub(/^ {10}/, '')
+        multiline = <<-TEXT.gsub(/^ {10}/, '')
           This is the first line
           This is the %0 line
           This is a %% sign
-        EOF
+        TEXT
         func = subject.FnFormat(multiline, 'second')
         expect(func.to_json).to eq('{"Fn::Join":["",["This is the first line\nThis is the ","second"," line\nThis is a ","%"," sign\n"]]}')
       end

data/spec/cli_spec.rb

@@ -65,7 +65,7 @@ describe 'cfndsl', type: :aruba do
       expect(last_command_started).to have_output_on_stderr(<<-WARN.gsub(/^ {8}/, '').chomp)
         The creation of constants as config is deprecated!
         Please switch to the #external_parameters method within your templates to access variables
-        See https://github.com/stevenjack/cfndsl/issues/170
+        See https://github.com/cfndsl/cfndsl/issues/170
         Use the --disable-binding flag to suppress this message
       WARN
     end

data/spec/types_definition_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe 'Type Definitions' do
         resources.each do |name, info|
           it "#{name} has all property types defined" do
             properties = info['Properties']
-            properties.each do |_, type|
+            properties.each_value do |type|
               type = type.first if type.is_a?(Array)
               expect(types).to have_key(type)
             end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.1
 platform: ruby
 authors:
 - Steven Jack
 - Chris Howe
+- Travis Dempsey
+- Greg Cockburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,6 +31,8 @@ description: DSL for creating AWS Cloudformation templates
 email:
 - stevenmajack@gmail.com
 - chris@howeville.com
+- dempsey.travis@gmail.com
+- gergnz@gmail.com
 executables:
 - cfndsl
 extensions: []
@@ -125,7 +129,7 @@ files:
 - spec/support/shared_examples/orchestration_template.rb
 - spec/transform_spec.rb
 - spec/types_definition_spec.rb
-homepage: https://github.com/stevenjack/cfndsl
+homepage: https://github.com/cfndsl/cfndsl
 licenses:
 - MIT
 metadata: {}
@@ -146,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL