rubycfn 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf023ccb4bd77b29645fbfc9b06a717b9fe1871
-  data.tar.gz: e7e0a042adec2d4918c8caf7b570e2851e8bf120
+  metadata.gz: d733dda0a2fd9505dc4e84d6d65670f3acbe1322
+  data.tar.gz: 782fc35dc9375763e592671ab952fa18679f80a6
 SHA512:
-  metadata.gz: e9375683b9dfb35db23b9f87dade39f5a65caa72ce214470a36d11cbe15f383eee8acc662192409fd43cd8c0cfcba9a0e2ea89db187feb98cd8ed84bea0d7583
-  data.tar.gz: 1a7d944789d61a10b3dca153677b5927de0f891d2ad858d26587652073c6028341b595bce0709fc2ac8e29dca9a8acf24abb1a3ad7c12372c65f57b5696657ac
+  metadata.gz: 68087c6444b29e2d5f26871dcdf8e805b3996481066c93f4a444cbe161d85d8372caccf980ad6b01496e360fc0d69fa9f5266c3ba22a6efa6bdff5809c3ad17b
+  data.tar.gz: 2d3780fb60ca99005a14248dced1e4f9041fda32efd2541a4ab921f14116e183c07bd0ef0cd346b561c697d2851f7bbd12594fa9b857c645b6d9e313c6e21ec6

data/.rubocop.yml

@@ -51,7 +51,7 @@ Metrics/ModuleLength:
   Max: 500
 
 Metrics/MethodLength:
-  Max: 40
+  Max: 100
 
 Metrics/BlockLength:
   Max: 500
@@ -59,6 +59,9 @@ Metrics/BlockLength:
 Performance/Casecmp:
   Enabled: false
 
+Style/RedundantSelf:
+  Enabled: false
+
 Style/DoubleNegation:
   Enabled: false
 

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.10 (Next Release)
+## 0.4.1 (Next Release)
+
+## 0.4.0
+
+  * Added resource elements `update_policy`, `update_replace_policy`, `metadata`, `depends_on`, `deletion_policy` and `creation_policy`.
+  * This release breaks the `r.meta` property. -- [@dennisvink][@dennisvink]
 
 ## 0.3.9
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.3.9)
+    rubycfn (0.4.0)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)
@@ -16,20 +16,20 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     awesome_print (1.8.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     dotenv (2.4.0)
     equatable (0.6.1)
-    ffi (1.10.0)
+    ffi (1.11.1)
     formatador (0.2.5)
     given_core (3.8.0)
       sorcerer (>= 0.3.7)
-    guard (2.15.0)
+    guard (2.15.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -58,7 +58,7 @@ GEM
     neatjson (0.8.4)
     necromancer (0.4.0)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pastel (0.7.3)
@@ -67,7 +67,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -76,9 +76,9 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-given (3.8.0)
@@ -87,15 +87,15 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    simplecov (0.16.1)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/README.md

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

data/lib/rubycfn/version.rb

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

data/lib/rubycfn.rb

@@ -4,13 +4,11 @@ require "json"
 require "neatjson"
 require "rubycfn/version"
 
-@depends_on = []
 @description = ""
 @transform = ""
 @outputs = {}
 @parameters = {}
 @properties = {}
-@metadata = {}
 @mappings = {}
 @conditions = {}
 @aws_resources = {}
@@ -21,6 +19,11 @@ require "rubycfn/version"
 
 # Monkey patching
 class Symbol
+  def cfnize
+    return self.to_s if self.to_s !~ /_/ && self.to_s =~ /[A-Z]+.*/
+    to_s.split("_").map(&:capitalize).join
+  end
+
   def ref(attr = nil)
     unless attr
       return { Ref: to_s.split("_").map(&:capitalize).join }
@@ -192,14 +195,12 @@ 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
 
@@ -366,12 +367,6 @@ module Rubycfn
     end
     # rubocop:enable Lint/UnusedMethodArgument
 
-    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)
       name = name.class == Symbol ? TOPLEVEL_BINDING.eval("'#{name}'.cfnize") : TOPLEVEL_BINDING.eval("'#{name}'")
       res = { "#{name}": yield(block) }
@@ -403,21 +398,48 @@ module Rubycfn
             TOPLEVEL_BINDING.eval("@resource_name = ''")
           end
 
+          # Transform depends_on based on input class
+          unless arguments[:depends_on].nil? && TOPLEVEL_BINDING.eval("@depends_on").nil?
+
+            # Initialize arguments[:depends_on] if it is nil
+            arguments[:depends_on] = arguments[:depends_on].nil? && [] || arguments[:depends_on]
+
+            # If the argument is a string, create an array out of it with a single element
+            arguments[:depends_on] = arguments[:depends_on].class == Array && arguments[:depends_on] || [arguments[:depends_on]]
+
+            # `r.depends_on` is used to amend depends_on with resources with dynamic names
+            # Here we add them to arguments[:depends_on]
+            to_amend = TOPLEVEL_BINDING.eval("@depends_on")
+            unless to_amend.nil?
+              to_amend = to_amend.class == String && [to_amend] || to_amend
+              to_amend.each do |amend|
+                arguments[:depends_on].push(amend)
+              end
+            end
+            TOPLEVEL_BINDING.eval("@depends_on = []")
+
+            # Finally, we render the DependsOn array
+            arguments[:depends_on].map! { |resource| resource.class == String && resource.to_s || resource.to_s.split("_").map(&:capitalize).join }
+          end
+
           res = {
             "#{name.to_s}#{i.zero? ? "" : resource_postpend}": {
-              DependsOn: TOPLEVEL_BINDING.eval("@depends_on"),
-              Metadata: TOPLEVEL_BINDING.eval("@metadata"),
               Properties: TOPLEVEL_BINDING.eval("@properties"),
               Type: arguments[:type],
               Condition: arguments[:condition],
-              UpdatePolicy: arguments[:update_policy]
+              UpdatePolicy: arguments[:update_policy],
+              UpdateReplacePolicy: arguments[:update_replace_policy],
+              Metadata: arguments[:metadata],
+              DependsOn: arguments[:depends_on],
+              DeletionPolicy: arguments[:deletion_policy],
+              CreationPolicy: arguments[:creation_policy]
             }
           }
+          arguments[:depends_on] = []
           TOPLEVEL_BINDING.eval("@aws_resources = @aws_resources.deep_merge(#{res})")
         end
         TOPLEVEL_BINDING.eval("@depends_on = []")
         TOPLEVEL_BINDING.eval("@properties = {}")
-        TOPLEVEL_BINDING.eval("@metadata = {}")
       end
     end
 
@@ -439,7 +461,7 @@ module Rubycfn
         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("@variables = @aws_resources = @outputs = @properties = @mappings = @parameters = {}")
         TOPLEVEL_BINDING.eval("@depends_on = []")
         TOPLEVEL_BINDING.eval("@description = ''")
         TOPLEVEL_BINDING.eval("@transform = ''")

data/spec/lib/rubycfn_spec.rb

@@ -13,6 +13,7 @@ describe Rubycfn do
       description "RSpec Test Stack"
 
       resource :rspec_resource_name,
+               depends_on: [:foo_bar,"fooBar"],
                type: "Rspec::Test",
                update_policy: {
                  "AutoScalingReplacingUpdate": {
@@ -20,6 +21,7 @@ describe Rubycfn do
                  }
                },
                amount: 2 do |r|
+        r.depends_on [ "barFoo", :bar_foo ]
         r.property(:name) { "RSpec" }
       end
     end
@@ -57,10 +59,18 @@ describe Rubycfn do
         let(:resource) { resources["RspecResourceName"] }
         subject { resource }
 
+        it { should have_key "DependsOn" }
         it { should have_key "Type" }
         it { should have_key "Properties" }
         it { should have_key "UpdatePolicy"}
 
+        context "depends_on is rendered correctly" do
+          let(:depends_on)  { resource["DependsOn"] }
+          subject { depends_on }
+
+          it { should eq ["FooBar", "fooBar", "barFoo", "BarFoo"] }
+        end
+
         context "resource type is correct" do
           let(:type) { resource["Type"] }
           subject { type }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson