rubycfn 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ca4d16404669aefd3141d45382ca88c36306349
-  data.tar.gz: e012a63d00655869a3b39a327a68a0d0edb91649
+  metadata.gz: 8d3bb0549114b2978a3e788c4f5654636014003a
+  data.tar.gz: 35f1181efaf15646c991ae3811e396b641391d0d
 SHA512:
-  metadata.gz: bdf0aabb7203a4b145e96ad5354c616ecba0cf42f81ee3eda9cc841fdc3d5bd6714aa51ac012f9744f14be8342889cd6f3dff0f8ed7c63acf9e2cf2fd4c185d9
-  data.tar.gz: 70a0af0a34f4dc6483ef1faf38e00f685d57011d5de380c717e6ac55b9944eaf3c604e73bd89a6b4cfb2bf6603350d434e48431fa88fef7b3817dccc969b5c11
+  metadata.gz: b66d1cf5a142433cb396022bc407ae51e85709607ee4a4e3a355f2a2b64fc14c4bde9f7d54779e79c8a88724e513412c06484e9f1695275aaf468a79badc660f
+  data.tar.gz: 124c708a9a158022f196c85c6bd45b311376bcb5663ec291d4afeb03e1323676358eadac2c9e4177121943333c1c899f5dd7e6e38761df9135a0c1565b61b643

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Change Log
+All notable changes to Rubycfn will be documented in this file.
+This project uses [Semantic Versioning](http://semver.org/).
+
+## 0.1.5 (Next Release)
+
+## 0.1.4 
+  * Made resource names overridable from within resource block with `_id` resource method. -- [@dennisvink][@dennisvink]
+
+## 0.1.3
+  * Fixed incorrect property name in generated default project -- [@dennisvink][@dennisvink]
+
+## 0.1.2
+  * Added VPC to default project -- [@dennisvink][@dennisvink]
+  * Pass original resource name to compound resources -- [@dennisvink][@dennisvink]
+  * Prefix environment name to outputted json stack -- [@dennisvink][@dennisvink]
+  * Added support for mappings and Fn::FindInMap -- [@dennisvink][@dennisvink]
+
+## 0.1.1
+  * Added Rubycfn CLI to generate new projects -- [@dennisvink][@dennisvink]
+
+[@dennisvink]: https://github.com/dennisvink
+

data/Gemfile.lock

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

data/README.md

@@ -12,7 +12,7 @@ or, create a Gemfile with this content:
 ```
 source "https://rubygems.org"
 
-gem "rubycfn", "~> 0.1.3"
+gem "rubycfn", "~> 0.1.4"
 
 ```
 

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/rubycfn.rb

@@ -1,9 +1,10 @@
 # Rubycfn RubyCFN is a light-weight CloudFormation DSL
-require "neatjson"
+require 'active_support/concern'
+require "compound/resources"
 require "json"
+require "neatjson"
 require "rubycfn/version"
-require "compound/resources"
-require 'active_support/concern'
+#require "tasks/tasks"
 
 @depends_on = [] 
 @description = ""
@@ -12,6 +13,7 @@ require 'active_support/concern'
 @properties = {}
 @mappings = {}
 @resources = {}
+@resource_name = ""
 @variables = {}
 @global_variables = {}
 
@@ -232,6 +234,10 @@ module Rubycfn
       TOPLEVEL_BINDING.eval("@depends_on = #{resources}")
     end
 
+    def self._id(name)
+      TOPLEVEL_BINDING.eval("@resource_name = '#{name}'")
+    end
+
     def self.set(name, index = 0, &block)
       res = {
         "#{name}": yield
@@ -255,8 +261,15 @@ module Rubycfn
           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 : ""
+          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 ? "" : i+1}": {
+            "#{name.to_s}#{i == 0 ? "" : resource_postpend}": {
               DependsOn: TOPLEVEL_BINDING.eval("@depends_on"),
               Properties: TOPLEVEL_BINDING.eval("@properties"),
               Type: arguments[:type]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -257,6 +257,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md