Rubocop fixes (#351)

* fallback to included resource spec if not overridden

* rubocop 0.51.0 compliant

* typo

* another typo

.rubocop.yml

@@ -14,11 +14,11 @@ Metrics/MethodLength:
   Max: 25
 
 # Due to our @Properties style instance names
-Style/VariableName:
+Naming/VariableName:
   Enabled: false
 
 # We are a DSL
-Style/MethodName:
+Naming/MethodName:
   Enabled: false
 
 # Because of the way FnFormat was developed

cfndsl.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cfndsl/version'

lib/cfndsl/orchestration_template.rb

@@ -83,7 +83,7 @@ def create_array_property_def(resource, pname, pclass)
             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 @@ def check_resource_refs
       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 @@ def check_output_refs
       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

lib/cfndsl/types.rb

@@ -18,10 +18,10 @@ def self.included(type_def)
       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 @@ def self.included(type_def)
       # 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,7 +76,7 @@ def self.included(type_def)
                   # 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

lib/cfnlego.rb

@@ -11,7 +11,7 @@ def self.Resources
     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 @@ def self.run(options)
     begin
       return Cfnlego::CloudFormation.new(resources).render
     rescue RuntimeError => e
-      $stderr.puts "Error: #{e.message}"
+      warn "Error: #{e.message}"
     end
     nil
   end

lib/cfnlego/resource.rb

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

lib/deep_merge/core.rb

@@ -204,7 +204,7 @@ def self.deep_merge!(source, dest, options = {})
     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 @@ def self.clear_or_nil(obj)
     end
     obj
   end
-end # module DeepMerge
+end

lib/deep_merge/deep_merge.rb

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

spec/cfndsl_spec.rb

@@ -232,11 +232,11 @@
 
     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

spec/types_definition_spec.rb

@@ -16,7 +16,7 @@
         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