rubycfn 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ac61bfe1b03a66e40625c1b060e1bb95cbbe22
-  data.tar.gz: 9f15208720740bf70662579c0e59dd211ac94376
+  metadata.gz: 3a67c783ed3a9632618ffe3feab06c75fdfc7539
+  data.tar.gz: 1166d0dee1db9009e259e51eb4e069c84c6e0047
 SHA512:
-  metadata.gz: 8495e7b2a758bddddd44b2c343f4ed36208dcaa350549cdf635cd460da63fd68094fb294630e9dd187d0d296e9a7f2c0cc2dc9e93a639ef3bef1c14af8819e61
-  data.tar.gz: f7f4cace496dec204bf5ae8bc7ec0c1e149d351fab3d8ed05b3f28af500c4c5a3b847ea990588529ad1c8d06d02480ff53fd895baf649e8bc67bc654a7884513
+  metadata.gz: 8cbb3b83362fd9705f289e4c5fa098cd91d9d34c74d1f7c145e2cda7c131336280ea6f883fe2ff630d366bd28fb6388ce7d0cbc7f2aa36958e9940b55b768717
+  data.tar.gz: b1f803072f2bdf77d5e032c689f93252608fa31130cf8f0dc3431b4202b06e3d570d08d36e359415c035208d86f0384902545f574ebd4fd33e79b5c3cfaba6a4

data/.rubocop.yml

@@ -0,0 +1,114 @@
+AllCops:
+  TargetRubyVersion: 2.3
+  
+  DisplayCopNames: true
+  Include:
+    - "Gemfile"
+    - "Rakefile"
+    - "bin/*"
+    - "*.gemspec"
+    - "lib/**/*.rb"
+  Exclude:
+    - "lib/core/monkeypatch.rb"
+    - "test/**/*.rb"
+    - "spec/**/*.rb"
+    - "attic/**/*"
+
+Metrics/AbcSize:
+  Max: 500
+  Exclude:
+    - "test/**/*"
+    - "spec/**/*"
+
+Metrics/ClassLength:
+  Max: 500
+  Exclude:
+    - "test/**/*"
+    - "spec/**/*"
+
+Metrics/CyclomaticComplexity:
+  Max: 40
+  Exclude:
+    - "test/**/*"
+    - "spec/**/*"
+
+Metrics/PerceivedComplexity:
+  Max: 40
+  Exclude:
+    - "test/**/*"
+    - "spec/**/*"
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: space
+
+Metrics/LineLength:
+  Max: 500
+  Exclude:
+    - "test/**/*"
+    - "spec/**/*"
+
+Metrics/ModuleLength:
+  Max: 500
+
+Metrics/MethodLength:
+  Max: 40
+
+Metrics/BlockLength:
+  Max: 500
+
+Performance/Casecmp:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/Next:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Security/MarshalLoad:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: '()'
+    '%i':    '()'
+    '%w':    '()'
+
+Style/Alias:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/NestedTernaryOperator:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/RescueStandardError:
+  EnforcedStyle: "implicit"

data/CHANGELOG.md

@@ -2,7 +2,12 @@
 All notable changes to Rubycfn will be documented in this file.
 This project uses [Semantic Versioning](http://semver.org/).
 
-## 0.3.8 (Next Release)
+## 0.3.9 (Next Release)
+
+## 0.3.8
+
+  * Added Fn::Transform intrinsic function `.fntransform` -- [@dennisvink][@dennisvink]
+  * Refactored some code -- [@dennisvink][@dennisvink]
 
 ## 0.3.7
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.3.7)
+    rubycfn (0.3.8)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)

data/README.md

@@ -61,7 +61,7 @@ __________ ____ __________________.___._________ _____________________
  |       _/    |   /|    |  _//   |   |/    \  \/ |    __)   |    |  _/
  |    |   \    |  / |    |   \\____   |\     \____|     \    |    |   \
  |____|_  /______/  |______  // ______| \______  /\___  /    |______  /
-        \/                 \/ \/               \/     \/            \/ [v0.3.7]
+        \/                 \/ \/               \/     \/            \/ [v0.3.8]
 Project name? example
 Account ID? 1234567890
 Select region EU (Frankfurt)

data/bin/rubycfn

@@ -1,18 +1,20 @@
 #!/usr/bin/env ruby
 
 require "erb"
-require 'fileutils'
-require 'ostruct'
+require "fileutils"
+require "ostruct"
 require "tty-prompt"
 require "rubycfn/version"
 
 require_relative "../lib/cli_methods"
 
-if ARGV.first || (ARGF.filename != "-" or (not STDIN.tty? and not STDIN.closed?))
+# rubocop:disable Style/AndOr
+if ARGV.first || (ARGF.filename != "-" or (not STDIN.tty? and not STDIN.closed?)) # rubocop:disable Style/Not
   require "rubycfn"
   require "active_support/concern"
   module RubycfnStack
-    if (ARGF.filename != "-" or (not STDIN.tty? and not STDIN.closed?))
+    if ARGF.filename != "-" or (not STDIN.tty? and not STDIN.closed?) # rubocop:disable Style/Not
+      # rubocop:enable Style/AndOr
       contents = []
       ARGF.each_line do |line|
         contents.push(line)
@@ -25,10 +27,10 @@ if ARGV.first || (ARGF.filename != "-" or (not STDIN.tty? and not STDIN.closed?)
     extend ActiveSupport::Concern
     include Rubycfn
     included do
-      eval(contents)
+      eval(contents) # rubocop:disable Security/Eval
     end
   end
-  cfn = include RubycfnStack
+  cfn = include RubycfnStack # rubocop:disable Style/MixinUsage
   puts cfn.render_template
   exit
 end
@@ -37,97 +39,98 @@ path = File.expand_path(File.dirname(File.dirname(__FILE__)))
 puts rubycfn_banner(Rubycfn::VERSION)
 prompt = TTY::Prompt.new
 
-project_name = prompt.ask('Project name?', default: 'example') do |q|
-  q.validate(/^([a-z0-9]*)$/, 'Invalid project name')
+project_name = prompt.ask("Project name?", default: "example") do |q|
+  q.validate(/^([a-z0-9]*)$/, "Invalid project name")
 end
 
-project_path = project_name + '-rubycfn'
+project_path = project_name + "-rubycfn"
 
-account_id = prompt.ask('AWS Account ID?', default: '1234567890') do |q|
-  q.validate(/^([0-9]*)$/, 'Invalid account id')
+account_id = prompt.ask("AWS Account ID?", default: "1234567890") do |q|
+  q.validate(/^([0-9]*)$/, "Invalid account id")
 end
 
 region = prompt.select(
   "Select AWS region", aws_regions
 )
 
-dotenv = render('.env', {
-  :project_name => project_name,
-  :account_id => account_id,
-  :region => region
-}, path)
+render_args = {
+  project_name: project_name,
+  account_id: account_id,
+  region: region
+}
 
-aws_sdk = render('aws_sdk.rb', {}, path)
-compiler = render('compiler.rb', {}, path)
-core_deploy = render('core_deploy.rb', { name: project_name }, path)
-core_upload = render('core_upload.rb', {}, path)
-core_compile = render('core_compile.rb', {}, path)
-core_diff = render('core_diff.rb', {}, path)
-dependencies = render('dependencies.rb', {}, path)
-deploy = render('deploy.rb', {}, path)
-dotenv_test = render('.env.test', { name: project_name }, path)
-dotenv_production = render('.env.production', { name: project_name }, path)
-dotenv_rspec = render('.env.rspec', { name: project_name }, path)
-ecs_stack = render('ecs_stack.rb', {}, path)
-ecs_stack_concern = render('ecs_Stack_concern.rb', { name: project_name }, path)
-gemfile = render('Gemfile', { version: Rubycfn::VERSION }, path)
-gitignore = render('.gitignore', {}, path)
-global_variables = render('global_variables.rb', { name: project_name.downcase }, path)
-helpers = render('helpers.rb', {}, path)
-helper_methods = render('helper_methods.rb', {}, path)
-main = render('main.rb', {}, path)
-main_aws_helper = render('main_aws_helper.rb', {}, path)
-parent_spec = render('parent_stack_spec.rb', { name: project_name.capitalize }, path)
-project_concern = render('project_concern.rb', { name: project_name.capitalize }, path)
-project_stack = render('project_stack.rb', { name: project_name.capitalize }, path)
-rakefile = render('Rakefile', {}, path)
-rubocop = render('.rubocop.yml', {}, path)
-shared_methods = render('shared_methods.rb', {}, path)
-spec_helper = render('spec_helper.rb', {}, path)
-subnets = render('subnets.rb', { name: project_name }, path)
-upload_stack = render('upload_stack.rb', {}, path)
-vpc_stack = render('vpc_stack.rb', { name: project_name }, path)
-vpc_concern = render('vpc_concerns.rb', { name: project_name }, path)
-vpc_spec = render('vpc_spec.rb', { name: project_name.capitalize }, path)
+dotenv = render(".env", render_args, path)
+aws_sdk = render("aws_sdk.rb", {}, path)
+compiler = render("compiler.rb", {}, path)
+core_deploy = render("core_deploy.rb", { name: project_name }, path)
+core_upload = render("core_upload.rb", {}, path)
+core_compile = render("core_compile.rb", {}, path)
+core_diff = render("core_diff.rb", {}, path)
+dependencies = render("dependencies.rb", {}, path)
+deploy = render("deploy.rb", {}, path)
+dotenv_test = render(".env.test", { name: project_name }, path)
+dotenv_production = render(".env.production", { name: project_name }, path)
+dotenv_rspec = render(".env.rspec", { name: project_name }, path)
+ecs_stack = render("ecs_stack.rb", {}, path)
+ecs_stack_concern = render("ecs_Stack_concern.rb", { name: project_name }, path)
+gemfile = render("Gemfile", { version: Rubycfn::VERSION }, path)
+gitignore = render(".gitignore", {}, path)
+global_variables = render("global_variables.rb", { name: project_name.downcase }, path)
+helpers = render("helpers.rb", {}, path)
+helper_methods = render("helper_methods.rb", {}, path)
+main = render("main.rb", {}, path)
+main_aws_helper = render("main_aws_helper.rb", {}, path)
+parent_spec = render("parent_stack_spec.rb", { name: project_name.capitalize }, path)
+project_concern = render("project_concern.rb", { name: project_name.capitalize }, path)
+project_stack = render("project_stack.rb", { name: project_name.capitalize }, path)
+rakefile = render("Rakefile", {}, path)
+rubocop = render(".rubocop.yml", {}, path)
+shared_methods = render("shared_methods.rb", {}, path)
+spec_helper = render("spec_helper.rb", {}, path)
+subnets = render("subnets.rb", { name: project_name }, path)
+upload_stack = render("upload_stack.rb", {}, path)
+vpc_stack = render("vpc_stack.rb", { name: project_name }, path)
+vpc_concern = render("vpc_concerns.rb", { name: project_name }, path)
+vpc_spec = render("vpc_spec.rb", { name: project_name.capitalize }, path)
 
 # Create directory structure
 rubycfn_structure(project_path).each do |dir|
   FileUtils.mkdir_p dir
 end
 
-File.open("#{project_path}/lib/aws_helper/aws_sdk.rb", 'w') { |file| file.write(aws_sdk) }
-File.open("#{project_path}/lib/aws_helper/compiler.rb", 'w') { |file| file.write(compiler) }
-File.open("#{project_path}/lib/aws_helper/dependencies.rb", 'w') { |file| file.write(dependencies) }
-File.open("#{project_path}/lib/aws_helper/deploy.rb", 'w') { |file| file.write(deploy) }
-File.open("#{project_path}/lib/core/deploy.rb", 'w') { |file| file.write(core_deploy) }
-File.open("#{project_path}/lib/core/compile.rb", 'w') { |file| file.write(core_compile) }
-File.open("#{project_path}/lib/core/diff.rb", 'w') { |file| file.write(core_diff) }
-File.open("#{project_path}/lib/core/upload.rb", 'w') { |file| file.write(core_upload) }
-File.open("#{project_path}/.env", 'w') { |file| file.write(dotenv) }
-File.open("#{project_path}/.env.test", 'w') { |file| file.write(dotenv_test) }
-File.open("#{project_path}/.env.production", 'w') { |file| file.write(dotenv_production) }
-File.open("#{project_path}/.env.rspec", 'w') { |file| file.write(dotenv_rspec) }
-File.open("#{project_path}/lib/stacks/ecs_stack.rb", 'w') { |file| file.write(ecs_stack) }
-File.open("#{project_path}/lib/stacks/ecs_stack/ecs_cluster.rb", 'w') { |file| file.write(ecs_stack_concern) }
-File.open("#{project_path}/Gemfile", 'w') { |file| file.write(gemfile) }
-File.open("#{project_path}/.gitignore", 'w') { |file| file.write(gitignore) }
-File.open("#{project_path}/lib/shared_concerns/global_variables.rb", 'w') { |file| file.write(global_variables) }
-File.open("#{project_path}/lib/aws_helper/helpers.rb", 'w') { |file| file.write(helpers) }
-File.open("#{project_path}/lib/shared_concerns/helper_methods.rb", 'w') { |file| file.write(helper_methods) }
-File.open("#{project_path}/lib/main.rb", 'w') { |file| file.write(main) }
-File.open("#{project_path}/lib/aws_helper/main.rb", 'w') { |file| file.write(main_aws_helper) }
-File.open("#{project_path}/spec/lib/parent_spec.rb", 'w') { |file| file.write(parent_spec) }
-File.open("#{project_path}/lib/stacks/parent_stack.rb", 'w') { |file| file.write(project_stack) }
-File.open("#{project_path}/lib/stacks/parent_stack/parent.rb", 'w') { |file| file.write(project_concern) }
-File.open("#{project_path}/Rakefile", 'w') { |file| file.write(rakefile) }
-File.open("#{project_path}/.rubocop.yml", 'w') { |file| file.write(rubocop) }
-File.open("#{project_path}/lib/shared_concerns/shared_methods.rb", 'w') { |file| file.write(shared_methods) }
-File.open("#{project_path}/spec/spec_helper.rb", 'w') { |file| file.write(spec_helper) }
-File.open("#{project_path}/lib/stacks/vpc_stack/subnets.rb", 'w') { |file| file.write(subnets) }
-File.open("#{project_path}/lib/aws_helper/upload_stack.rb", 'w') { |file| file.write(upload_stack) }
-File.open("#{project_path}/spec/lib/vpc_spec.rb", 'w') { |file| file.write(vpc_spec) }
-File.open("#{project_path}/lib/stacks/vpc_stack.rb", 'w') { |file| file.write(vpc_stack) }
-File.open("#{project_path}/lib/stacks/vpc_stack/vpc.rb", 'w') { |file| file.write(vpc_concern) }
+File.open("#{project_path}/lib/aws_helper/aws_sdk.rb", "w") { |file| file.write(aws_sdk) }
+File.open("#{project_path}/lib/aws_helper/compiler.rb", "w") { |file| file.write(compiler) }
+File.open("#{project_path}/lib/aws_helper/dependencies.rb", "w") { |file| file.write(dependencies) }
+File.open("#{project_path}/lib/aws_helper/deploy.rb", "w") { |file| file.write(deploy) }
+File.open("#{project_path}/lib/core/deploy.rb", "w") { |file| file.write(core_deploy) }
+File.open("#{project_path}/lib/core/compile.rb", "w") { |file| file.write(core_compile) }
+File.open("#{project_path}/lib/core/diff.rb", "w") { |file| file.write(core_diff) }
+File.open("#{project_path}/lib/core/upload.rb", "w") { |file| file.write(core_upload) }
+File.open("#{project_path}/.env", "w") { |file| file.write(dotenv) }
+File.open("#{project_path}/.env.test", "w") { |file| file.write(dotenv_test) }
+File.open("#{project_path}/.env.production", "w") { |file| file.write(dotenv_production) }
+File.open("#{project_path}/.env.rspec", "w") { |file| file.write(dotenv_rspec) }
+File.open("#{project_path}/lib/stacks/ecs_stack.rb", "w") { |file| file.write(ecs_stack) }
+File.open("#{project_path}/lib/stacks/ecs_stack/ecs_cluster.rb", "w") { |file| file.write(ecs_stack_concern) }
+File.open("#{project_path}/Gemfile", "w") { |file| file.write(gemfile) }
+File.open("#{project_path}/.gitignore", "w") { |file| file.write(gitignore) }
+File.open("#{project_path}/lib/shared_concerns/global_variables.rb", "w") { |file| file.write(global_variables) }
+File.open("#{project_path}/lib/aws_helper/helpers.rb", "w") { |file| file.write(helpers) }
+File.open("#{project_path}/lib/shared_concerns/helper_methods.rb", "w") { |file| file.write(helper_methods) }
+File.open("#{project_path}/lib/main.rb", "w") { |file| file.write(main) }
+File.open("#{project_path}/lib/aws_helper/main.rb", "w") { |file| file.write(main_aws_helper) }
+File.open("#{project_path}/spec/lib/parent_spec.rb", "w") { |file| file.write(parent_spec) }
+File.open("#{project_path}/lib/stacks/parent_stack.rb", "w") { |file| file.write(project_stack) }
+File.open("#{project_path}/lib/stacks/parent_stack/parent.rb", "w") { |file| file.write(project_concern) }
+File.open("#{project_path}/Rakefile", "w") { |file| file.write(rakefile) }
+File.open("#{project_path}/.rubocop.yml", "w") { |file| file.write(rubocop) }
+File.open("#{project_path}/lib/shared_concerns/shared_methods.rb", "w") { |file| file.write(shared_methods) }
+File.open("#{project_path}/spec/spec_helper.rb", "w") { |file| file.write(spec_helper) }
+File.open("#{project_path}/lib/stacks/vpc_stack/subnets.rb", "w") { |file| file.write(subnets) }
+File.open("#{project_path}/lib/aws_helper/upload_stack.rb", "w") { |file| file.write(upload_stack) }
+File.open("#{project_path}/spec/lib/vpc_spec.rb", "w") { |file| file.write(vpc_spec) }
+File.open("#{project_path}/lib/stacks/vpc_stack.rb", "w") { |file| file.write(vpc_stack) }
+File.open("#{project_path}/lib/stacks/vpc_stack/vpc.rb", "w") { |file| file.write(vpc_concern) }
 
 puts "Setting up Rubycfn #{project_name} project..."
 `cd #{project_name}-rubycfn && git init && bundle`

data/lib/cli_methods.rb

@@ -38,15 +38,15 @@ end
 def rubycfn_structure(project_name)
   [
     project_name,
-    project_name + '/build',
-    project_name + '/lib/aws_helper',
-    project_name + '/lib/core',
-    project_name + '/lib/shared_concerns',
-    project_name + '/lib/stacks',
-    project_name + '/lib/stacks/ecs_stack',
-    project_name + '/lib/stacks/parent_stack',
-    project_name + '/lib/stacks/vpc_stack',
-    project_name + '/spec',
-    project_name + '/spec/lib'
+    project_name + "/build",
+    project_name + "/lib/aws_helper",
+    project_name + "/lib/core",
+    project_name + "/lib/shared_concerns",
+    project_name + "/lib/stacks",
+    project_name + "/lib/stacks/ecs_stack",
+    project_name + "/lib/stacks/parent_stack",
+    project_name + "/lib/stacks/vpc_stack",
+    project_name + "/spec",
+    project_name + "/spec/lib"
   ]
 end

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.3.7"
+  VERSION = "0.3.8".freeze
 end

data/lib/rubycfn.rb

@@ -1,11 +1,10 @@
 # Rubycfn RubyCFN is a light-weight CloudFormation DSL
-require 'active_support/concern'
+require "active_support/concern"
 require "json"
 require "neatjson"
 require "rubycfn/version"
-#require "tasks/tasks"
 
-@depends_on = [] 
+@depends_on = []
 @description = ""
 @transform = ""
 @outputs = {}
@@ -14,7 +13,7 @@ require "rubycfn/version"
 @metadata = {}
 @mappings = {}
 @conditions = {}
-@AWSresources = {}
+@aws_resources = {}
 @imports = []
 @resource_name = ""
 @variables = {}
@@ -24,10 +23,24 @@ require "rubycfn/version"
 class Symbol
   def ref(attr = nil)
     unless attr
-      return { Ref: self.to_s.split("_").map{ |e| e.capitalize }.join }
+      return { Ref: to_s.split("_").map(&:capitalize).join }
     end
-    attr = attr.class == String ? attr : attr.to_s.split('_').map{|e| e.capitalize}.join
-    return { "Fn::GetAtt": [ self.to_s.split("_").map{ |e| e.capitalize }.join, attr ] }
+    attr = attr.class == String ? attr : attr.to_s.split("_").map(&:capitalize).join
+    {
+      "Fn::GetAtt": [
+        to_s.split("_").map(&:capitalize).join, attr
+      ]
+    }
+  end
+
+  def fntransform(parameters = nil)
+    raise "fntransform parameters must be of type Hash" unless parameters.class == Hash
+    {
+      "Fn::Transform": {
+        "Name": to_s.split("_").map(&:capitalize).join,
+        "Parameters": parameters
+      }
+    }
   end
 end
 
@@ -45,15 +58,30 @@ end
 class String
   def cfnize
     return self if self !~ /_/ && self =~ /[A-Z]+.*/
-    split('_').map{|e| e.capitalize}.join
+    split("_").map(&:capitalize).join
   end
 
   def ref(attr = nil)
     unless attr
       return { Ref: self }
     end
-    attr = attr.class == String ? attr : attr.to_s.split('_').map{|e| e.capitalize}.join
-    return { "Fn::GetAtt": [ self, attr ] }
+    attr = attr.class == String ? attr : attr.to_s.split("_").map(&:capitalize).join
+    {
+      "Fn::GetAtt": [
+        self,
+        attr
+      ]
+    }
+  end
+
+  def fntransform(parameters = nil)
+    raise "fntransform parameters must be of type Hash" unless parameters.class == Hash
+    {
+      "Fn::Transform": {
+        "Name": self,
+        "Parameters": parameters
+      }
+    }
   end
 
   def fnsplit(separator = "")
@@ -66,25 +94,35 @@ class String
   end
 
   def fnbase64
-    return { "Fn::Base64": self }
+    {
+      "Fn::Base64": self
+    }
   end
 
   def fngetazs
-    return { "Fn::GetAZs": self }
+    {
+      "Fn::GetAZs": self
+    }
   end
 
   def fnsub(variable_map = nil)
     unless variable_map
       return { "Fn::Sub": self }
     end
-    return { "Fn::Sub": [ self, variable_map ] }
+    {
+      "Fn::Sub": [
+        self,
+        variable_map
+      ]
+    }
   end
 
   def fnimportvalue
-    return { "Fn::Import": self }
+    {
+      "Fn::Import": self
+    }
   end
   alias_method :fnimport, :fnimportvalue
-
 end
 
 class Array
@@ -126,7 +164,7 @@ class Array
   end
 
   def fnfindinmap(name = nil)
-    self.unshift(name.cfnize) if name
+    unshift(name.cfnize) if name
     {
       "Fn::FindInMap": self
     }
@@ -154,20 +192,26 @@ class Array
 end
 
 class ::Hash
+  # rubocop:disable Style/RedundantSelf
+  # rubocop:disable Style/CaseEquality
+  # rubocop:disable Lint/UnusedBlockArgument
   def deep_merge(second)
     merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
     self.merge(second.to_h, &merger)
   end
+  # rubocop:enable Style/RedundantSelf
+  # rubocop:enable Style/CaseEquality
+  # rubocop:enable Lint/UnusedBlockArgument
 
   def recursive_compact
     delete_if do |k, v|
-      next if v === false || k =~ /Fn\:/
-      (v.respond_to?(:empty?) ? v.empty? : !v) or v.instance_of?(Hash) && v.recursive_compact.empty?
+      next if v == false || k =~ /Fn\:/
+      (v.respond_to?(:empty?) ? v.empty? : !v) || v.instance_of?(Hash) && v.recursive_compact.empty?
     end
   end
 
   def compact
-    delete_if { |k, v| v.nil? }
+    delete_if { |_k, v| v.nil? }
   end
 
   def fnselect(index = 0)
@@ -184,6 +228,7 @@ module Rubycfn
   extend ActiveSupport::Concern
 
   included do
+    # rubocop:disable Style/UnneededCondition
     def self.method_missing(name, *args)
       super unless TOPLEVEL_BINDING.eval("@variables[:#{name}]") || \
                    TOPLEVEL_BINDING.eval("@variables[:#{name}] === false") ||
@@ -195,17 +240,16 @@ module Rubycfn
         TOPLEVEL_BINDING.eval("@global_variables[:#{name}]")
       end
     end
+    # rubocop:enable Style/UnneededCondition
 
     def self.transform(transform = "AWS::Serverless-2016-10-31")
-      unless transform.nil?
-        TOPLEVEL_BINDING.eval("@transform = '#{transform}'")
-      end
+      return if transform.nil?
+      TOPLEVEL_BINDING.eval("@transform = '#{transform}'")
     end
 
     def self.description(description = "")
-      unless description.nil?
-        TOPLEVEL_BINDING.eval("@description = '#{description}'")
-      end
+      return if description.nil?
+      TOPLEVEL_BINDING.eval("@description = '#{description}'")
     end
 
     def self.condition(name, arguments)
@@ -225,7 +269,9 @@ module Rubycfn
       end
 
       name = name.to_s.cfnize
-      kv_pairs = arguments[:data] ? arguments[:data] : { "#{arguments[:key]}": "#{arguments[:value]}" }
+      # rubocop:disable Style/UnneededCondition
+      kv_pairs = arguments[:data] ? arguments[:data] : { "#{arguments[:key]}": (arguments[:value]).to_s }
+      # rubocop:enable Style/UnneededCondition
       res = {
         "#{name}": {
           "#{arguments[:name]}": kv_pairs
@@ -287,26 +333,22 @@ module Rubycfn
       end
 
       if arguments[:filter]
-        arguments[:value] = self.send(arguments[:filter], arguments[:value])
+        arguments[:value] = send(arguments[:filter], arguments[:value])
       end
 
       res = {
         "#{name}": arguments[:value]
       }
-      if arguments[:global] == false
-        TOPLEVEL_BINDING.eval("@variables = @variables.deep_merge(#{res})")
-      else
-        TOPLEVEL_BINDING.eval("@global_variables = @global_variables.deep_merge(#{res})")
-        TOPLEVEL_BINDING.eval("@variables = @variables.deep_merge(#{res})")
-      end
+      TOPLEVEL_BINDING.eval("@global_variables = @global_variables.deep_merge(#{res})") unless arguments[:global] == false
+      TOPLEVEL_BINDING.eval("@variables = @variables.deep_merge(#{res})")
     end
 
     def self.depends_on(resources)
       case resources
-        when String
-          resources = [resources.cfnize]
-        when Array
-          resources = resources.map { |r| r.cfnize }
+      when String
+        resources = [resources.cfnize]
+      when Array
+        resources = resources.map(&:cfnize)
       end
       TOPLEVEL_BINDING.eval("@depends_on = #{resources}")
     end
@@ -315,29 +357,23 @@ module Rubycfn
       TOPLEVEL_BINDING.eval("@resource_name = '#{name}'")
     end
 
-    def self.set(name, index = 0, &block)
+    # rubocop:disable Lint/UnusedMethodArgument
+    def self.set(name, _index = 0, &block)
       res = {
         "#{name}": yield
       }
       TOPLEVEL_BINDING.eval("@variables = @variables.deep_merge(#{res})")
     end
+    # rubocop:enable Lint/UnusedMethodArgument
 
-    def self.meta(name, index = 0, &block)
-      if name.class == Symbol
-        name = TOPLEVEL_BINDING.eval("'#{name}'.cfnize")
-      else
-        name = TOPLEVEL_BINDING.eval("'#{name}'")
-      end
+    def self.meta(name, _index = 0, &block)
+      name = name.class == Symbol ? TOPLEVEL_BINDING.eval("'#{name}'.cfnize") : TOPLEVEL_BINDING.eval("'#{name}'")
       res = { "#{name}": yield(block) }
       TOPLEVEL_BINDING.eval("@metadata = @metadata.deep_merge(#{res})")
     end
 
-    def self.property(name, index = 0, &block)
-      if name.class == Symbol
-        name = TOPLEVEL_BINDING.eval("'#{name}'.cfnize")
-      else
-        name = TOPLEVEL_BINDING.eval("'#{name}'")
-      end
+    def self.property(name, _index = 0, &block)
+      name = name.class == Symbol ? TOPLEVEL_BINDING.eval("'#{name}'.cfnize") : TOPLEVEL_BINDING.eval("'#{name}'")
       res = { "#{name}": yield(block) }
       TOPLEVEL_BINDING.eval("@properties = @properties.deep_merge(#{res})")
     end
@@ -345,12 +381,8 @@ module Rubycfn
     def self.resource(name, arguments, &block)
       arguments[:amount] ||= 1
       origname = name.to_s
-      # Allow for non-camelcased resource names 
-      if name.class == Symbol
-        name = name.to_s.cfnize
-      else
-        name = name.to_s
-      end
+      # Allow for non-camelcased resource names
+      name = name.class == Symbol ? name.to_s.cfnize : name = name.to_s
       arguments[:type] =~ /^([A-Za-z0-9]*)\:\:/
       arguments[:cloud] ||= $1
 
@@ -359,20 +391,20 @@ module Rubycfn
         arguments[:cloud] = "AWS"
       end
       arguments[:amount].times do |i|
-        resource_suffix = i == 0 ? "" : "#{i+1}"
+        resource_suffix = i.zero? ? "" : (i + 1).to_s
         if arguments[:type].class == Module
           send("include", arguments[:type][origname, resource_suffix, &block])
         else
           yield self, i if block_given?
 
-          resource_postpend = TOPLEVEL_BINDING.eval("@resource_name").empty? ? i+1 : ""
+          resource_postpend = TOPLEVEL_BINDING.eval("@resource_name").empty? ? i + 1 : ""
           unless TOPLEVEL_BINDING.eval("@resource_name").empty?
             name = TOPLEVEL_BINDING.eval("@resource_name")
             TOPLEVEL_BINDING.eval("@resource_name = ''")
           end
 
           res = {
-            "#{name.to_s}#{i == 0 ? "" : resource_postpend}": {
+            "#{name.to_s}#{i.zero? ? "" : resource_postpend}": {
               DependsOn: TOPLEVEL_BINDING.eval("@depends_on"),
               Metadata: TOPLEVEL_BINDING.eval("@metadata"),
               Properties: TOPLEVEL_BINDING.eval("@properties"),
@@ -380,7 +412,7 @@ module Rubycfn
               Condition: arguments[:condition]
             }
           }
-          TOPLEVEL_BINDING.eval("@AWSresources = @AWSresources.deep_merge(#{res})")
+          TOPLEVEL_BINDING.eval("@aws_resources = @aws_resources.deep_merge(#{res})")
         end
         TOPLEVEL_BINDING.eval("@depends_on = []")
         TOPLEVEL_BINDING.eval("@properties = {}")
@@ -399,14 +431,14 @@ module Rubycfn
       when "AWS"
         skeleton = { "AWSTemplateFormatVersion": "2010-09-09" }
         skeleton = JSON.parse(skeleton.to_json)
-        skeleton.merge!(Transform: TOPLEVEL_BINDING.eval("@transform"))
-        skeleton.merge!(Description: TOPLEVEL_BINDING.eval("@description"))
-        skeleton.merge!(Mappings: sort_json(TOPLEVEL_BINDING.eval("@mappings")))
-        skeleton.merge!(Parameters: sort_json(TOPLEVEL_BINDING.eval("@parameters")))
-        skeleton.merge!(Conditions: sort_json(TOPLEVEL_BINDING.eval("@conditions")))
-        skeleton.merge!(Resources: sort_json(TOPLEVEL_BINDING.eval("@AWSresources")))
-        skeleton.merge!(Outputs: sort_json(TOPLEVEL_BINDING.eval("@outputs")))
-        TOPLEVEL_BINDING.eval("@variables = @AWSresources = @outputs = @metadata = @properties = @mappings = @parameters = {}")
+        skeleton[:Transform] = TOPLEVEL_BINDING.eval("@transform")
+        skeleton[:Description] = TOPLEVEL_BINDING.eval("@description")
+        skeleton[:Mappings] = sort_json(TOPLEVEL_BINDING.eval("@mappings"))
+        skeleton[:Parameters] = sort_json(TOPLEVEL_BINDING.eval("@parameters"))
+        skeleton[:Conditions] = sort_json(TOPLEVEL_BINDING.eval("@conditions"))
+        skeleton[:Resources] = sort_json(TOPLEVEL_BINDING.eval("@aws_resources"))
+        skeleton[:Outputs] = sort_json(TOPLEVEL_BINDING.eval("@outputs"))
+        TOPLEVEL_BINDING.eval("@variables = @aws_resources = @outputs = @metadata = @properties = @mappings = @parameters = {}")
         TOPLEVEL_BINDING.eval("@depends_on = []")
         TOPLEVEL_BINDING.eval("@description = ''")
         TOPLEVEL_BINDING.eval("@transform = ''")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -257,6 +257,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -324,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rubycfn