rubycfn 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fda3f7f377b0a4e9ee10986452ef45a2a29dc5fccc83cead2b72d3cf4905deb7
-  data.tar.gz: 99ad6240a85bc7e2286e36295c0838dc6abd739acd6a23a047a5865fe54d9488
+  metadata.gz: 98d65cbb897496a9645eab2271bc04e8a7080e2cbf247537e5e5eb65e78f6fbe
+  data.tar.gz: 3da58edcf1ac8f9a58846e8e3ca459090f1590af531640b94fafc137ac949712
 SHA512:
-  metadata.gz: fa76e06abe1e03750ff2f6b4e9a95bfc7c39694a5670dbe417f7f7ffb516366a27bbc8ed0f6eeae0e92d7e1dae323205c428c3646a90cb009ab541f309478cb1
-  data.tar.gz: b4f1ff39ff403c951bee540644035189f908b9a1c65a398576b87f388fc24c7c96a4c4d3e270608f639b1e80206911ede557e9184c1274d1e3570004402430ac
+  metadata.gz: 3eed6c4a96dfafb68fa8a4e67058ec1951caea92bd5d6337f55a9d7638735874da321b5ac1c40dc3384a6207d942b0aa9aef463841213adf492d045941ec57a1
+  data.tar.gz: fda4c8d3d8436b2f4554fe15add7172d0f903792cd06086a7d8caf59e43e2fa38be4287714c303e30bb22ab78f5fcfc968232e75f8c3372a30aabbaaa2da5970

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.4.11 (Next Release)
+## 0.5.1 (Next Release)
+
+## 0.5.0
+
+  * Restructuring project -- [@dennisvink][@dennisvink]
+  * Disabled scaffolding -- [@dennisvink][@dennisvink]
 
 ## 0.4.10
 

data/Gemfile.lock

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

data/README.md

@@ -61,7 +61,7 @@ __________ ____ __________________.___._________ _____________________
  |       _/    |   /|    |  _//   |   |/    \  \/ |    __)   |    |  _/
  |    |   \    |  / |    |   \\____   |\     \____|     \    |    |   \
  |____|_  /______/  |______  // ______| \______  /\___  /    |______  /
-        \/                 \/ \/               \/     \/            \/ [v0.4.10]
+        \/                 \/ \/               \/     \/            \/ [v0.5.0]
 Project name? example
 Account ID? 1234567890
 Select region EU (Frankfurt)
@@ -75,6 +75,9 @@ Installing project dependencies:
 Updating project dependencies:
 `bundle update`
 
+Deploying dependency stack to AWS:
+`rake init`
+
 Compiling Rubycfn project:
 `rake compile`
 
@@ -87,9 +90,6 @@ Running tests and compiling:
 Uploading built stacks to s3:
 `rake upload`
 
-Checking difference between local and remote stack:
-`rake diff`
-
 Deploying stack to AWS:
 `rake apply`
 
@@ -98,21 +98,23 @@ Deploying stack to AWS:
 A new Rubycfn project has the following structure:
 
 ```
-total 112
-drwxr-xr-x  14 dennis  staff    448 Jul 15 20:43 .
-drwxr-xr-x  17 dennis  staff    544 Jul 15 20:43 ..
--rw-r--r--   1 dennis  staff     92 Jul 15 20:43 .env
--rw-r--r--   1 dennis  staff    325 Jul 15 20:43 .env.production
--rw-r--r--   1 dennis  staff    207 Jul 15 20:43 .env.rspec
--rw-r--r--   1 dennis  staff    298 Jul 15 20:43 .env.test
-drwxr-xr-x  10 dennis  staff    320 Jul 15 20:43 .git
--rw-r--r--   1 dennis  staff   1344 Jul 15 20:43 .rubocop.yml
--rw-r--r--   1 dennis  staff    502 Jul 15 20:43 Gemfile
--rw-r--r--   1 dennis  staff  27158 Jul 15 20:43 Gemfile.lock
--rw-r--r--   1 dennis  staff    998 Jul 15 20:43 Rakefile
-drwxr-xr-x   2 dennis  staff     64 Jul 15 20:43 build
-drwxr-xr-x   7 dennis  staff    224 Jul 15 20:43 lib
-drwxr-xr-x   4 dennis  staff    128 Jul 15 20:43 spec
+drwxr-xr-x   3 dennis  staff     96 Mar  4 02:43 bootstrap
+drwxr-xr-x   7 dennis  staff    224 Mar  4 02:43 lib
+drwxr-xr-x   4 dennis  staff    128 Mar  4 02:43 spec
+-rw-r--r--   1 dennis  staff     49 Mar  4 02:43 .env
+-rw-r--r--   1 dennis  staff     31 Mar  4 02:43 .env.acceptance
+-rw-r--r--   1 dennis  staff    279 Mar  4 02:43 .env.dependencies.rspec
+-rw-r--r--   1 dennis  staff     32 Mar  4 02:43 .env.development
+-rw-r--r--   1 dennis  staff     31 Mar  4 02:43 .env.production
+-rw-r--r--   1 dennis  staff     33 Mar  4 02:43 .env.rspec
+-rw-r--r--   1 dennis  staff     25 Mar  4 02:43 .env.test
+-rw-r--r--   1 dennis  staff   1110 Mar  4 02:43 .gitignore
+-rw-r--r--   1 dennis  staff   1524 Mar  4 02:43 .rubocop.yml
+-rw-r--r--   1 dennis  staff    477 Mar  4 02:43 Gemfile
+-rw-r--r--   1 dennis  staff  31603 Mar  4 02:43 Gemfile.lock
+-rw-r--r--   1 dennis  staff    292 Mar  4 02:43 README.md
+-rw-r--r--   1 dennis  staff   1267 Mar  4 02:43 Rakefile
+-rw-r--r--   1 dennis  staff   1337 Mar  4 02:43 config.yaml
 ```
 
 Lets first discuss the files in the root folder.
@@ -134,15 +136,13 @@ The `.env` file contains environment variables that are available, regardless of
 the environment you're building for. For example:
 
 ```
-AWS_ACCOUNT_ID="1234567890"
 AWS_REGION="eu-west-1"
-ENVIRONMENT="rspec"
-PROJECT_NAME="sample"
+ENVIRONMENT="development"
 ```
 
 #### .env.production and .env.test
 
-The `.env.production` and `.env.test` files contain environment variables that
+The `.env.production` and `.env.x` files contain environment variables that
 are specific to production or test respectively. For example `.env.test` can
 contain something like this:
 
@@ -150,20 +150,6 @@ contain something like this:
 # ENV vars for test environment
 CLOUD_TRAIL_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
 ROOT_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-VPC_CIDR_BLOCK="10.100.0.0/16"
-ARTIFACT_BUCKET="my-awesome-cloudformation-artifact-bucket"
-STACK_NAME="test"
-```
-
-While .env.production can look something like this:
-
-```
-# ENV vars for production environment
-CLOUD_TRAIL_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-ROOT_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-VPC_CIDR_BLOCK="10.200.0.0/16"
-ARTIFACT_BUCKET="my-awesome-cloudformation-artifact-bucket-for-production"
-STACK_NAME="production"
 ```
 
 You can reuse these environment variables in your project code.
@@ -178,7 +164,7 @@ so that you can test the resulting CloudFormation templates properly.
 There is one file that is not generated by default but does need mentioning:
 the `.env.private` file. This is a special file that allows you to override
 environment variables. An environment variable set in .env.private always takes
-precedence over environment variables set in other .env* files.
+precedence over environment variables set in other .env files.
 
 #### .rubocop.yml
 
@@ -188,12 +174,12 @@ violations.
 
 ### Rubycfn project directories
 
-As shown before, a Rubycfn project contains three directories:
+As shown before, a Rubycfn project contains four directories:
 
 ```
-drwxr-xr-x   2 dennis  staff     64 Jul 15 20:43 build
-drwxr-xr-x   7 dennis  staff    224 Jul 15 20:43 lib
-drwxr-xr-x   4 dennis  staff    128 Jul 15 20:43 spec
+drwxr-xr-x   3 dennis  staff     96 Mar  4 02:43 bootstrap
+drwxr-xr-x   7 dennis  staff    224 Mar  4 02:43 lib
+drwxr-xr-x   4 dennis  staff    128 Mar  4 02:43 spec
 ```
 
 #### build
@@ -247,39 +233,33 @@ that you want to reuse cross stacks, create a shared concern.
 The `stacks` folder, by default, contains the following:
 
 ```
-total 24
-drwxr-xr-x  8 dennis  staff  256 Jul 15 20:43 .
-drwxr-xr-x  7 dennis  staff  224 Jul 15 20:43 ..
-drwxr-xr-x  3 dennis  staff   96 Jul 15 20:43 ecs_stack
--rw-r--r--  1 dennis  staff  254 Jul 15 20:43 ecs_stack.rb
-drwxr-xr-x  3 dennis  staff   96 Jul 15 20:43 parent_stack
--rw-r--r--  1 dennis  staff  259 Jul 15 20:43 parent_stack.rb
-drwxr-xr-x  4 dennis  staff  128 Jul 15 20:43 vpc_stack
--rw-r--r--  1 dennis  staff  248 Jul 15 20:43 vpc_stack.rb
+drwxr-xr-x  4 dennis  staff  128 Mar  4 02:43 acm_stack
+drwxr-xr-x  6 dennis  staff  192 Mar  4 02:43 ecs_stack
+drwxr-xr-x  4 dennis  staff  128 Mar  4 02:43 parent_stack
+drwxr-xr-x  4 dennis  staff  128 Mar  4 02:43 vpc_stack
 ```
 
-The default project creates three CloudFormation templates: a VPC stack, an
-ECS stack and a parent stack. The parent stack is a CloudFormation stack that
-contains all other stacks. When you deploy a Rubycfn project these other stacks
-show up as `nested stacks`. The parent stack acts not only as a container for
+The default project creates four CloudFormation templates: a VPC stack, an
+ECS stack, an ACM stack and a parent stack. The parent stack is a CloudFormation
+stack that contains all other stacks. When you deploy a Rubycfn project these other
+stacks show up as `nested stacks`. The parent stack acts not only as a container for
 all other stacks, but is also responsible for passing outputs from stacks as
 parameters to another. For example: The VPC Id that is created in the VPC stack
 can easily be passed to the ECS stack as a parameter. This nested stack approach
 has an additional benefit: A change of output in stack X can trigger an update
 in stack Y.
 
-The .rb files you see in the lib/stacks/ directory are the parent stack files.
-Lets have a look at `vpc_stack.rb`:
+The lib/stacks/vpc_stack/ directory contains a `main.rb` file and a `vpc.rb` file.
+Lets have a look at the vpc_stack/main.rb file:
 
 ```ruby
 module VpcStack
   extend ActiveSupport::Concern
   include Rubycfn
-
   included do
     include Concerns::GlobalVariables
     include Concerns::SharedMethods
-    include VpcStack::Main
+    include VpcStack::InfraVpc
 
     description generate_stack_description("VpcStack")
   end
@@ -291,14 +271,14 @@ name ends with 'Stack' to make the compiler magic work. The code between
 `include do` and `end` loads in two of the shared concerns, and includes the
 VpcStack::Main module. Finally the description of the stack is set.
 
-The `lib/stacks/vpc_stack/` directory contains a `vpc.rb` file, which is the
-implementation of the VpcStack::Main module:
+The `lib/stacks/vpc_stack/vpc.rb` file contains the implementation of the
+VpcStack::InfraVpc module: 
 
 ```ruby
 require_relative "subnets"
 
 module VpcStack
-  module Main
+  module InfraVpc
     extend ActiveSupport::Concern
 
     included do
@@ -310,13 +290,9 @@ end
 
 The first line is identical to the parent stack file and defines this module is
 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
+`InfraVpc`. 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

@@ -13,7 +13,7 @@ if ARGV.first || (ARGF.filename != "-" or (not STDIN.tty? and not STDIN.closed?)
   if ARGV.class == Array && ARGV.first == "stack"
     case ARGV.first
     when "stack"
-      scaffold_stack
+      puts "Scaffolding will be reintroduced later."
     end
   else
     require "rubycfn"
@@ -61,85 +61,29 @@ region = prompt.select(
 )
 
 render_args = {
-  project_name: project_name,
   account_id: account_id,
-  region: region
+  project_name: project_name,
+  region: region,
+  version: Rubycfn::VERSION
 }
 
-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)
+FileUtils.mkdir_p project_path
 
-# Create directory structure
-rubycfn_structure(project_path).each do |dir|
-  FileUtils.mkdir_p dir
+Dir.glob("#{path}/templates/**/*", File::FNM_DOTMATCH).each do |f|
+  if File.directory?(f)
+    dir = f.gsub("#{path}/templates/","")
+    FileUtils.mkdir_p "#{project_path}/#{dir}"
+  end
 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) }
+Dir.glob("#{path}/templates/**/*", File::FNM_DOTMATCH).each do |f|
+  unless File.directory?(f)
+    file = f.gsub("#{path}/templates/","")
+    contents = render(f, render_args)
+    File.open("#{project_path}/#{file}", "w") { |file| file.write(contents) }
+  end
+end
 
 puts "Setting up Rubycfn #{project_name} project..."
 `cd #{project_name}-rubycfn && git init && bundle`
-`bundle`
 puts "Done!"

data/lib/cli_methods.rb

@@ -1,5 +1,5 @@
-def render(file, vars, path)
-  template = File.read("#{path}/templates/#{file}.erb")
+def render(file, vars)
+  template = File.read(file)
   ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
 end
 

data/lib/rubycfn/version.rb

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

data/templates/.env

@@ -0,0 +1,2 @@
+AWS_REGION="<%= region %>"
+ENVIRONMENT="development"

data/templates/.env.acceptance

@@ -0,0 +1 @@
+# Acceptance-specific ENV vars

data/templates/.env.dependencies.rspec

@@ -0,0 +1,6 @@
+ARTIFACTBUCKET=rspec-artifactbucket-m0ck
+HOSTEDZONENAME=rspec.example.com
+HOSTEDZONEID=13117756P2M0CK
+LOGGINGBUCKET=rspec-dependencystack-loggingbucket-mock
+CLOUDFORMATIONBUCKET=rspec-dependencystack-cloudformationbucket-mock
+LAMBDABUCKET=rspec-dependencystack-lambdabucket-mock

data/templates/.env.development

@@ -0,0 +1 @@
+# Development-specific ENV vars

data/templates/.env.production

@@ -0,0 +1 @@
+# Production-specific ENV vars

data/templates/.env.rspec

@@ -0,0 +1 @@
+# ENV vars for rspec environment

data/templates/.env.test

@@ -0,0 +1 @@
+# Test-specific ENV vars

data/templates/{.gitignore.erb → .gitignore}

@@ -82,3 +82,6 @@ temp/
 attic/
 /venv
 /Gemfile.lock
+.env.dependencies
+CloudFormationResourceSpecification.json
+config.json

data/templates/{.rubocop.yml.erb → .rubocop.yml}

@@ -11,6 +11,7 @@ AllCops:
   Exclude:
     - "test/**/*.rb"
     - "spec/**/*.rb"
+    - "attic/**/*"
 
 Metrics/AbcSize:
   Max: 500
@@ -34,7 +35,7 @@ Style/Documentation:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 500
+  Max: 700
   Exclude:
     - "test/**/*"
     - "spec/**/*"
@@ -87,5 +88,17 @@ Style/IfUnlessModifier:
 Style/DateTime:
   Enabled: false
 
+Style/RedundantSelf:
+  Enabled: false
+
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: space
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Max: 20
+
+Style/EvalWithLocation:
+  Enabled: false

data/templates/{Gemfile.erb → Gemfile}

@@ -2,7 +2,6 @@ source "https://rubygems.org" do
   gem "aws-sdk", "~> 3.0.1"
   gem "aws-sdk-s3", "~> 1.36.0"
   gem "colorize", "~> 0.8.1"
-  gem "diffy", "~> 3.3.0"
   gem "git-revision", "~> 0.0.2"
   gem "launchy", "~> 2.4.3"
   gem "rspec", "~> 3.8"

data/templates/README.md

@@ -0,0 +1,57 @@
+# Infrastructure for <%= project_name %>
+
+```
+__________ ____ __________________.___._________ _____________________
+\______   \    |   \______   \__  |   |\_   ___ \\_   _____/\______   \
+ |       _/    |   /|    |  _//   |   |/    \  \/ |    __)   |    |  _/
+ |    |   \    |  / |    |   \\____   |\     \____|     \    |    |   \
+ |____|_  /______/  |______  // ______| \______  /\___  /    |______  /
+        \/                 \/ \/               \/     \/            \/ [<%= version %>]
+```
+
+## Prerequisites
+
+- Edit .env.private and configure your AWS credentials, or export your AWS credentials.
+- Type `rake init` to create the DependencyStack in your AWS account
+
+## Rake commands
+
+`rake` - Compile the code into CloudFormation templates and run unit tests
+`rake init` - Deploy the DependencyStack in the AWS account
+`rake compile` - Compile the code into CloudFormation templates
+`rake spec` - Run unit tests
+`rake upload` - Upload the CloudFormation templates to s3
+`rake apply` - Deploy the CloudFormation templates
+
+## Stack configuration
+
+The `config.yaml` file in the root directory of this project contains most of the configuration.  It contains the networking configuration for each environment, subnet configuration, DNS and ECS (Docker) containers that are deployed.
+
+## Adding your own resources
+
+The lib/stacks/ directory contains all nested stacks for this project. Every nested stack has a
+directory under lib/stacks/. You can add resources to any of these stacks, or create a new stack altogether. See [https://github.com/dennisvink/rubycfn/blob/master/README.md](https://github.com/dennisvink/rubycfn/blob/master/README.md) for documentation.
+
+## About
+
+The code generated by Rubycfn is copyrighted by Dennis Vink (https://drvink.com/),
+except for modifications made to the <%= project_name %> project after the initial
+`git init` command. 
+
+For the generated code permission is hereby granted, free of charge, to any
+person obtaining a copy of the generated software and associated documentation
+files (the "Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/templates/{Rakefile.erb → Rakefile}

@@ -12,17 +12,22 @@ RSpec::Core::RakeTask.new do |t|
 end
 
 desc "Apply CloudFormation template"
-task :apply do
+task :apply_stack do
   require_relative "lib/main"
   require_relative "lib/core/deploy"
 end
 
 desc "Upload stacks to s3"
-task :upload do
+task :upload_stack do
   require_relative "lib/main"
   require_relative "lib/core/upload"
 end
 
+desc "Initialize AWS Account"
+task :init do
+  require_relative "lib/core/init"
+end
+
 desc "Clean build directory"
 task :clean do
   Dir.foreach("build/") do |f|
@@ -31,14 +36,13 @@ task :clean do
   end
 end
 
-desc "Diff CloudFormation template"
-task :diff do
-  require_relative "lib/main"
-  require_relative "lib/core/diff"
+desc "Store dependencies of DependencyStack in .env.dependencies"
+task :dependencies do
+  require_relative "lib/core/dependencies.rb"
 end
 
 desc "Compile CloudFormation"
-task :compile do
+task :compile_stack do
   require_relative "lib/main"
   require_relative "lib/core/compile"
 end
@@ -47,4 +51,7 @@ RuboCop::RakeTask.new(:rubocop) do |t|
   t.options = ["--display-cop-names"]
 end
 
-task default: %i(spec compile)
+task default: %i(dependencies compile_stack spec)
+task compile: %i(dependencies compile_stack)
+task upload: %i(dependencies upload_stack)
+task apply: %i(dependencies apply_stack)

data/templates/bootstrap/dependency_stack.rb

@@ -0,0 +1,49 @@
+description "Dependency Stack"
+
+parameter :environment,
+          description: "Environment name",
+          type: "String"
+
+parameter :domain_name,
+          description: "Domain name",
+          type: "String"
+
+condition :has_environment,
+          [["", :environment.ref].fnequals].fnnot
+
+condition :has_domain_name,
+          [["", :domain_name.ref].fnequals].fnnot
+
+%i(
+  artifact_bucket
+  cloudformation_bucket
+  lambda_bucket
+  logging_bucket
+).each do |bucket|
+  resource bucket,
+           deletion_policy: "Retain",
+           update_replace_policy: "Retain",
+           type: "AWS::S3::Bucket"
+
+  output bucket,
+         value: bucket.ref
+end
+
+resource :hosted_zone,
+         condition: "HasDomainName",
+         type: "AWS::Route53::HostedZone" do |r|
+  r.property(:hosted_zone_config) do
+    {
+      "Comment": ["Hosted zone for ", ["HasEnvironment", [:environment.ref, "."].fnjoin, ""].fnif, :domain_name.ref].fnjoin
+    }
+  end
+  r.property(:name) { [["HasEnvironment", [:environment.ref, "."].fnjoin, ""].fnif, :domain_name.ref].fnjoin }
+end
+
+output :hosted_zone_id,
+       condition: "HasDomainName",
+       value: :hosted_zone.ref
+
+output :hosted_zone_name,
+       condition: "HasDomainName",
+       value: [["HasEnvironment", [:environment.ref, "."].fnjoin, ""].fnif, :domain_name.ref].fnjoin