rubycfn 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1bb92a5757a5c7061695b4460f8cb071cdfae48
-  data.tar.gz: 150e5faf63fde45afe96df907964e86ecc39f90a
+  metadata.gz: 54323e492522b3ea1a2d1052b07792fee27e2a95
+  data.tar.gz: 106b5915d1354d4a4753bccf45eb54b4f2af6375
 SHA512:
-  metadata.gz: 37db6e219b441d66f8cfe13d24849cef86a80bb73e32c7532df06f6f0fde98fece5cacb413148901375cad6b884f0dce71b6f6f094ad30035143dd5c58dc8a1e
-  data.tar.gz: abf563cc7cd2313fae68a60ca97cc73a0613350c584f7ad632ff662201c6c2e66c1f93cdd31b2c94dc4bf6ebe6a66952711de17e8e6e015d55a8df3ccf011b30
+  metadata.gz: 7b41fc96833ad3d852dd2092324bd8283a5e39e847860b9677c4c7ab7edaf5760bd940710ba38f6c1f2530fa17edab71a0992605b5cd87673534185864115dbe
+  data.tar.gz: 7985ac469a239223734bb8f3a2e9c976f3f5af42c365de7fd439df7ecf78149c99d2d33391f42fd685d90d62f53a7f942b694afaef9432798596c38cab1cab82

data/CHANGELOG.md

@@ -2,7 +2,13 @@
 All notable changes to Rubycfn will be documented in this file.
 This project uses [Semantic Versioning](http://semver.org/).
 
-## 0.4.6 (Next Release)
+## 0.4.7 (Next Release)
+
+## 0.4.6
+
+  * Added `template` attribute to variables -- [@dennisvink][@dennisvink]
+  * Added `rubycfn stack` command to add new stack quickly -- [@dennisvink][@dennisvink]
+  * Added `get_output` method -- [@dennisvink][@dennisvink]
 
 ## 0.4.5
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.4.5)
+    rubycfn (0.4.6)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)
@@ -119,7 +119,7 @@ GEM
     tty-screen (0.6.5)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    wisper (2.0.0)
+    wisper (2.0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -61,7 +61,7 @@ __________ ____ __________________.___._________ _____________________
  |       _/    |   /|    |  _//   |   |/    \  \/ |    __)   |    |  _/
  |    |   \    |  / |    |   \\____   |\     \____|     \    |    |   \
  |____|_  /______/  |______  // ______| \______  /\___  /    |______  /
-        \/                 \/ \/               \/     \/            \/ [v0.4.5]
+        \/                 \/ \/               \/     \/            \/ [v0.4.6]
 Project name? example
 Account ID? 1234567890
 Select region EU (Frankfurt)
@@ -313,6 +313,10 @@ part of `VpcStack`. The second line defines the name of the module, in this case
 `Main`. The code beteen `included do` and `end` is the implementation of this
 module.
 
+Adding a new stack is trivial: Go to the root folder of the project and type
+`rubycfn stack`. This will prompt you for a stack name (do not include the 'stack' keyword)
+and it will generate the stack for you.
+
 ## AWS Intrinsic functions
 
 You can Ref by postpending the .ref method to any string or hash, e.g. :foobar.ref

data/bin/rubycfn

@@ -10,29 +10,36 @@ require_relative "../lib/cli_methods"
 
 # 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?) # rubocop:disable Style/Not
-      # rubocop:enable Style/AndOr
-      contents = []
-      ARGF.each_line do |line|
-        contents.push(line)
-      end
-      contents = contents.join("\n")
-    else
-      raise "File #{ARGV.first} not found!" unless File.file?(ARGV.first)
-      contents = File.read(ARGV.first)
+  if ARGV.class == Array && ARGV.first == "stack"
+    case ARGV.first
+    when "stack"
+      scaffold_stack
     end
-    extend ActiveSupport::Concern
-    include Rubycfn
-    included do
-      eval(contents) # rubocop:disable Security/Eval
+  else
+    require "rubycfn"
+    require "active_support/concern"
+    module RubycfnStack
+      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)
+        end
+        contents = contents.join("\n")
+      else
+        raise "File #{ARGV.first} not found!" unless File.file?(ARGV.first)
+        contents = File.read(ARGV.first)
+      end
+      extend ActiveSupport::Concern
+      include Rubycfn
+      included do
+        eval(contents) # rubocop:disable Security/Eval
+      end
     end
+    cfn = include RubycfnStack # rubocop:disable Style/MixinUsage
+    puts cfn.render_template
+    exit
   end
-  cfn = include RubycfnStack # rubocop:disable Style/MixinUsage
-  puts cfn.render_template
-  exit
 end
 
 path = File.expand_path(File.dirname(File.dirname(__FILE__)))
@@ -72,7 +79,7 @@ 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)
+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)

data/lib/cli_methods.rb

@@ -50,3 +50,22 @@ def rubycfn_structure(project_name)
     project_name + "/spec/lib"
   ]
 end
+
+def scaffold_stack
+  puts rubycfn_banner(Rubycfn::VERSION)
+  raise "Run `rubycfn stack` from project root folder" unless File.file? "lib/stacks/parent_stack/parent.rb"
+  prompt = TTY::Prompt.new
+  stack_name = prompt.ask("Stack name?", default: "application") do |q|
+    q.validate(/^([a-zA-Z]*)$/, "Invalid stack name")
+  end
+  stack_name = "#{stack_name.downcase}_stack"
+  raise "Stack already exists" if File.file? "lib/stacks/#{stack_name}.rb"
+  path = File.expand_path(File.dirname(File.dirname(__FILE__)))
+  new_stack = render("new_stack.rb", { stack_name: stack_name.split("_").collect(&:capitalize).join }, path)
+  new_concern = render("new_concern.rb", { stack_name: stack_name.split("_").collect(&:capitalize).join }, path)
+  File.open("lib/stacks/#{stack_name}.rb", "w") { |file| file.write(new_stack) }
+  FileUtils.mkdir_p "lib/stacks/#{stack_name}"
+  File.open("lib/stacks/#{stack_name}/my_module.rb", "w") { |file| file.write(new_concern) }
+  puts "Created stack. Don't forget to add it to lib/stacks/parent_stack/parent.rb !"
+  exit
+end

data/lib/monkeypatch.rb

@@ -4,6 +4,15 @@ class Symbol
     to_s.split("_").map(&:capitalize).join
   end
 
+  def get_output(attr)
+    attr = attr.class == String ? attr : attr.to_s.split("_").map(&:capitalize).join
+    {
+      "Fn::GetAtt": [
+        to_s.split("_").map(&:capitalize).join, "Outputs.#{attr}"
+      ]
+    }
+  end
+
   def ref(attr = nil)
     unless attr
       return { Ref: to_s.split("_").map(&:capitalize).join }
@@ -44,6 +53,15 @@ class String
     split("_").map(&:capitalize).join
   end
 
+  def get_output(attr)
+    attr = attr.class == String ? attr : attr.to_s.split("_").map(&:capitalize).join
+    {
+      "Fn::GetAtt": [
+        to_s.split("_").map(&:capitalize).join, "Outputs.#{attr}"
+      ]
+    }
+  end
+
   def ref(attr = nil)
     unless attr
       return { Ref: self }

data/lib/rubycfn/version.rb

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

data/lib/rubycfn.rb

@@ -1,5 +1,6 @@
 # Rubycfn RubyCFN is a light-weight CloudFormation DSL
 require "active_support/concern"
+require "erb"
 require "json"
 require "neatjson"
 require "rubycfn/version"
@@ -125,6 +126,7 @@ module Rubycfn
       arguments[:required] ||= false
       arguments[:global] ||= false
       arguments[:filter] ||= nil
+      arguments[:template] ||= nil
 
       if arguments[:value].empty?
         arguments[:value] = arguments[:default]
@@ -139,6 +141,10 @@ module Rubycfn
         arguments[:value] = send(arguments[:filter], arguments[:value])
       end
 
+      if arguments[:template]
+        arguments[:value] = ERB.new("#{File.open(arguments[:template]).read}").result(binding)
+      end
+
       res = {
         "#{name}": arguments[:value]
       }
@@ -292,7 +298,7 @@ module Rubycfn
         TOPLEVEL_BINDING.eval("@depends_on = []")
         TOPLEVEL_BINDING.eval("@description = ''")
         TOPLEVEL_BINDING.eval("@transform = ''")
-        JSON.pretty_generate(skeleton.recursive_compact).gsub("<emptyString>","")
+        JSON.pretty_generate(skeleton.recursive_compact).gsub("<emptyString>", "")
       end
     end
   end

data/templates/new_concern.rb.erb

@@ -0,0 +1,10 @@
+module <%= stack_name %>
+  module MyModule
+    extend ActiveSupport::Concern
+
+    included do
+      resource :sample_resource,
+               type: "AWS::SQS::Queue"
+    end
+  end
+end

data/templates/new_stack.rb.erb

@@ -0,0 +1,12 @@
+module <%= stack_name %>
+  extend ActiveSupport::Concern
+  include Rubycfn
+
+  included do
+    include Concerns::GlobalVariables
+    include Concerns::SharedMethods
+    include <%= stack_name %>::MyModule
+
+    description generate_stack_description("<%= stack_name %>")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -297,6 +297,8 @@ files:
 - templates/helpers.rb.erb
 - templates/main.rb.erb
 - templates/main_aws_helper.rb.erb
+- templates/new_concern.rb.erb
+- templates/new_stack.rb.erb
 - templates/parent_stack_spec.rb.erb
 - templates/project_concern.rb.erb
 - templates/project_stack.rb.erb